Sun Feb 8 00:37:10 2015 UTC ()
Update to 2.18. Lots of changes since 1.x, most significant one probably
the switch from qt4 to qt5; but also support for more new readers and
more recipes.

Based on wip package by myself.


(wiz)
diff -r1.89 -r1.90 pkgsrc/misc/calibre/Makefile
diff -r1.28 -r1.29 pkgsrc/misc/calibre/PLIST
diff -r1.29 -r1.30 pkgsrc/misc/calibre/distinfo
diff -r0 -r1.1 pkgsrc/misc/calibre/patches/patch-setup_build__environment.py
diff -r1.4 -r1.5 pkgsrc/misc/calibre/patches/patch-setup_extensions.py
diff -r1.4 -r1.5 pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py
cvs diff -r1.89 -r1.90 pkgsrc/misc/calibre/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2015/01/08 10:20:34 1.89
+++ pkgsrc/misc/calibre/Makefile 2015/02/08 00:37:09 1.90
@@ -1,160 +1,151 @@ @@ -1,160 +1,151 @@
1# $NetBSD: Makefile,v 1.89 2015/01/08 10:20:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.90 2015/02/08 00:37:09 wiz Exp $
2 2
3DISTNAME= calibre-1.48.0 3DISTNAME= calibre-2.18.0
4PKGREVISION= 4 
5CATEGORIES= misc 4CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.calibre-ebook.com/ 10HOMEPAGE= http://www.calibre-ebook.com/
12COMMENT= E-book library management application 11COMMENT= E-book library management application
13LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
14 13
15DEPENDS+= help2man>=1.36.4:../../converters/help2man 14#DEPENDS+= help2man>=1.36.4:../../converters/help2man
16DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 15#DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
17DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils 16DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
18DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 17#DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
19DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml 18DEPENDS+= ${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml
20DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup 19DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
21DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize 20DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
22DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect 21DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
23DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils 22DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
24# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 23DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
25DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf 24## Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 25#DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
26DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy 26DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
27DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib 27DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
28DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet 28#DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
29DEPENDS+= ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces 29DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
30DEPENDS+= ${PYPKGPREFIX}-apsw-[0-9]*:../../databases/py-apsw 30DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
31 31
 32# dateutil>=1.4.1
 33# dns>=1.6.0
32PYTHON_VERSIONED_DEPENDENCIES= dateutil dns 34PYTHON_VERSIONED_DEPENDENCIES= dateutil dns
33 35
34# We also need the distfile for qt4-libs to extract some private header files 
35# If QTVERSION changes, the distinfo file needs to be updated too. 
36QTVERSION= 4.8.5 # from ../../x11/qt4/Makefile.common 
37# Including that file to avoid hardcoding the version number won't work, 
38# since it will occur in the distinfo anyway. 
39QTNAME= qt-everywhere-opensource-src-${QTVERSION} 
40DISTFILES+= ${QTNAME}.tar.gz 
41MASTER_SITES+= http://releases.qt-project.org/qt4/source/ 
42EXTRACT_USING= bsdtar 36EXTRACT_USING= bsdtar
43 37
44USE_LANGUAGES= c c++ 38USE_LANGUAGES= c c++
 39USE_LIBTOOL= yes
45USE_TOOLS+= pkg-config pax 40USE_TOOLS+= pkg-config pax
46PYTHON_VERSIONS_ACCEPTED= 27 41PYTHON_VERSIONS_ACCEPTED= 27
47PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces 42PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
48PYDISTUTILSPKG= yes 43PYDISTUTILSPKG= yes
49PYSETUPOPTARGS= # empty 44PYSETUPOPTARGS= # empty
50PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX} 45PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
51WRKSRC= ${WRKDIR}/calibre 
52 46
53INSTALLATION_DIRS= share/applications 47INSTALLATION_DIRS= share/applications
54INSTALLATION_DIRS= share/icons 48INSTALLATION_DIRS= share/icons
55INSTALLATION_DIRS= share/calibre/recipes 49INSTALLATION_DIRS= share/calibre/recipes
56 50
57FIX_PYTHON_PATHS+= *.py 51FIX_PYTHON_PATHS+= *.py
58FIX_PYTHON_PATHS+= recipes/*.recipe 52FIX_PYTHON_PATHS+= recipes/*.recipe
59FIX_PYTHON_PATHS+= */*.py 53FIX_PYTHON_PATHS+= */*.py
60FIX_PYTHON_PATHS+= */*/*.py 54FIX_PYTHON_PATHS+= */*/*.py
61FIX_PYTHON_PATHS+= */*/*/*.py 55FIX_PYTHON_PATHS+= */*/*/*.py
62FIX_PYTHON_PATHS+= */*/*/*/*.py 56FIX_PYTHON_PATHS+= */*/*/*/*.py
63FIX_PYTHON_PATHS+= */*/*/*/*/*.py 57FIX_PYTHON_PATHS+= */*/*/*/*/*.py
64FIX_PYTHON_PATHS+= */*/*/*/*/*/*.py 58FIX_PYTHON_PATHS+= */*/*/*/*/*/*.py
65 59
66SUBST_CLASSES+= prefix 60SUBST_CLASSES+= prefix
67SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake'," 61SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt5/bin/qmake',"
68SUBST_MESSAGE.prefix= Fixing path to QMAKE 62SUBST_MESSAGE.prefix= Fixing path to QMAKE
69SUBST_STAGE.prefix= post-patch 63SUBST_STAGE.prefix= post-patch
70SUBST_FILES.prefix= setup/build_environment.py 64SUBST_FILES.prefix= setup/build_environment.py
71 65
72# This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2) 66# This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2)
73SUBST_CLASSES+= path 67SUBST_CLASSES+= path
74SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN}," 68SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
75SUBST_MESSAGE.path= Fixing path to python. 69SUBST_MESSAGE.path= Fixing path to python.
76SUBST_STAGE.path= post-patch 70SUBST_STAGE.path= post-patch
77SUBST_FILES.path= ${FIX_PYTHON_PATHS} 71SUBST_FILES.path= ${FIX_PYTHON_PATHS}
78 72
79# These ones are for replacing python[0-9*] with PYTHONBIN 73# These ones are for replacing python[0-9*] with PYTHONBIN
80REPLACE_PYTHON+= recipes/animal_politico.recipe 74REPLACE_PYTHON+= recipes/animal_politico.recipe
81REPLACE_PYTHON+= recipes/respekt_magazine.recipe 75REPLACE_PYTHON+= recipes/respekt_magazine.recipe
82REPLACE_PYTHON+= recipes/respekt_web.recipe 76REPLACE_PYTHON+= recipes/respekt_web.recipe
83REPLACE_PYTHON+= recipes/kompiutierra.recipe 77REPLACE_PYTHON+= recipes/kompiutierra.recipe
84REPLACE_PYTHON+= recipes/trouw.recipe 78REPLACE_PYTHON+= recipes/trouw.recipe
85REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py 79REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py
86REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py 80REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py
87REPLACE_PYTHON+= src/calibre/utils/*.py 81REPLACE_PYTHON+= src/calibre/utils/*.py
88REPLACE_PYTHON+= src/odf/*.py 82REPLACE_PYTHON+= src/odf/*.py
89 83
90MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig 84MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
91MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib 85MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
92MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo 86MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
93MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib 87MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 88MAKE_ENV+= SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
94#MAKE_ENV+= WITH_USB=no 89#MAKE_ENV+= WITH_USB=no
95 90
96# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 91# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
97pre-configure: 92pre-configure:
98 cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet 93 cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet
99 94
100# Turn off x bits on non-executable files. 95# Turn off x bits on non-executable files.
101post-extract: 96post-extract:
102 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \; 97 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
103 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \; 98 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \;
104 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py 99 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
105 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py 100 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
106 101
107# Get access to (some of) the Qt4 private header files (for qt_hack). 102# not sure why libheadless installed into wrong directory
108post-wrapper: 103# side effect of patch-setup_extensions.py?
109 cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \ 
110 ln -s ../../../../${QTNAME}/include/QtGui/private . 
111 cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \ 
112 ln -s ../../../../${QTNAME}/include/QtCore/private . 
113 
114post-install: 104post-install:
115 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \ 105 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
116 ${DESTDIR}${PREFIX}/share/calibre/recipes 106 ${DESTDIR}${PREFIX}/share/calibre/recipes
117 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \ 107 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
118 COPYRIGHT INSTALL LICENSE.* \ 108 COPYRIGHT INSTALL LICENSE.* \
119 ${DESTDIR}${PREFIX}/share/doc/calibre 109 ${DESTDIR}${PREFIX}/share/doc/calibre
 110 cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so
120 111
121.include "../../lang/python/application.mk" 112.include "../../lang/python/application.mk"
122.include "../../lang/python/versioned_dependencies.mk" 113.include "../../lang/python/versioned_dependencies.mk"
123.include "../../databases/sqlite3/buildlink3.mk" 114.include "../../databases/sqlite3/buildlink3.mk"
 115BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.40
124.include "../../devel/chmlib/buildlink3.mk" 116.include "../../devel/chmlib/buildlink3.mk"
 117BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5
 118.include "../../devel/libmtp/buildlink3.mk"
125BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12 119BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
126.include "../../devel/libusb/buildlink3.mk" 120.include "../../devel/libusb/buildlink3.mk"
127.include "../../fonts/fontconfig/buildlink3.mk" 121.include "../../fonts/fontconfig/buildlink3.mk"
128BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9 122BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9
129.include "../../graphics/ImageMagick/buildlink3.mk" 123.include "../../graphics/ImageMagick/buildlink3.mk"
130BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.6 124BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.6
131.include "../../graphics/py-imaging/buildlink3.mk" 125.include "../../graphics/py-imaging/buildlink3.mk"
132BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8 126BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8
133.include "../../graphics/libwmf/buildlink3.mk" 127.include "../../graphics/libwmf/buildlink3.mk"
134.include "../../lang/python/egg.mk" 128.include "../../lang/python/egg.mk"
135_PYSETUPTOOLSINSTALLARGS= # empty 129_PYSETUPTOOLSINSTALLARGS= # empty
136# Get rid of --root=${DESTDIR}, use our own version from above instead. 130# Get rid of --root=${DESTDIR}, use our own version from above instead.
137# because the setup.py is not the standard one and behaves differently. 131# because the setup.py is not the standard one and behaves differently.
138_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS} 132_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
139#.include "../../lang/python/extension.mk" 133#.include "../../lang/python/extension.mk"
 134BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2
140.include "../../print/podofo/buildlink3.mk" 135.include "../../print/podofo/buildlink3.mk"
141# ??? BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2 136BUILDLINK_API_DEPENDS.poppler+= poppler>=0.20.2
142.include "../../print/poppler-includes/buildlink3.mk" 137.include "../../print/poppler-includes/buildlink3.mk"
143.include "../../print/poppler/buildlink3.mk" 138.include "../../print/poppler/buildlink3.mk"
144BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.12.0 139.include "../../print/poppler-qt5/buildlink3.mk"
145.include "../../print/poppler-qt4/buildlink3.mk" 
146.include "../../sysutils/desktop-file-utils/desktopdb.mk" 140.include "../../sysutils/desktop-file-utils/desktopdb.mk"
147.include "../../sysutils/hal/buildlink3.mk" 141.include "../../sysutils/hal/buildlink3.mk"
148BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2 142BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2
149.include "../../sysutils/py-dbus/buildlink3.mk" 143.include "../../sysutils/py-dbus/buildlink3.mk"
150.include "../../textproc/icu/buildlink3.mk" 144.include "../../textproc/icu/buildlink3.mk"
151.include "../../databases/shared-mime-info/mimedb.mk" 145.include "../../databases/shared-mime-info/mimedb.mk"
152.include "../../textproc/py-elementtree/buildlink3.mk" 146.include "../../textproc/py-elementtree/buildlink3.mk"
153.include "../../x11/py-sip/buildlink3.mk" 147.include "../../x11/py-sip/buildlink3.mk"
154BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0 148.include "../../x11/qt5-qtbase/buildlink3.mk"
155.include "../../x11/py-qt4/buildlink3.mk" 149BUILDLINK_API_DEPENDS.py-qt5+= ${PYPKGPREFIX}-qt5>=5.4
156BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7.0 150.include "../../x11/py-qt5/buildlink3.mk"
157.include "../../x11/qt4-tools/buildlink3.mk" 
158BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.7.0 
159.include "../../x11/qt4-qdbus/buildlink3.mk" 
160.include "../../mk/bsd.pkg.mk" 151.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/misc/calibre/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/calibre/PLIST 2014/08/08 22:02:49 1.28
+++ pkgsrc/misc/calibre/PLIST 2015/02/08 00:37:09 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.28 2014/08/08 22:02:49 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.29 2015/02/08 00:37:09 wiz Exp $
2bin/calibre 2bin/calibre
3bin/calibre-complete 3bin/calibre-complete
4bin/calibre-customize 4bin/calibre-customize
5bin/calibre-debug 5bin/calibre-debug
6bin/calibre-parallel 6bin/calibre-parallel
7bin/calibre-server 7bin/calibre-server
8bin/calibre-smtp 8bin/calibre-smtp
9bin/calibredb 9bin/calibredb
10bin/ebook-convert 10bin/ebook-convert
11bin/ebook-device 11bin/ebook-device
12bin/ebook-edit 12bin/ebook-edit
13bin/ebook-meta 13bin/ebook-meta
14bin/ebook-polish 14bin/ebook-polish
@@ -206,52 +206,56 @@ lib/calibre/calibre/ebooks/conversion/pl @@ -206,52 +206,56 @@ lib/calibre/calibre/ebooks/conversion/pl
206lib/calibre/calibre/ebooks/conversion/plugins/rb_output.py 206lib/calibre/calibre/ebooks/conversion/plugins/rb_output.py
207lib/calibre/calibre/ebooks/conversion/plugins/recipe_input.py 207lib/calibre/calibre/ebooks/conversion/plugins/recipe_input.py
208lib/calibre/calibre/ebooks/conversion/plugins/rtf_input.py 208lib/calibre/calibre/ebooks/conversion/plugins/rtf_input.py
209lib/calibre/calibre/ebooks/conversion/plugins/rtf_output.py 209lib/calibre/calibre/ebooks/conversion/plugins/rtf_output.py
210lib/calibre/calibre/ebooks/conversion/plugins/snb_input.py 210lib/calibre/calibre/ebooks/conversion/plugins/snb_input.py
211lib/calibre/calibre/ebooks/conversion/plugins/snb_output.py 211lib/calibre/calibre/ebooks/conversion/plugins/snb_output.py
212lib/calibre/calibre/ebooks/conversion/plugins/tcr_input.py 212lib/calibre/calibre/ebooks/conversion/plugins/tcr_input.py
213lib/calibre/calibre/ebooks/conversion/plugins/tcr_output.py 213lib/calibre/calibre/ebooks/conversion/plugins/tcr_output.py
214lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py 214lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py
215lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py 215lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py
216lib/calibre/calibre/ebooks/conversion/plumber.py 216lib/calibre/calibre/ebooks/conversion/plumber.py
217lib/calibre/calibre/ebooks/conversion/preprocess.py 217lib/calibre/calibre/ebooks/conversion/preprocess.py
218lib/calibre/calibre/ebooks/conversion/utils.py 218lib/calibre/calibre/ebooks/conversion/utils.py
 219lib/calibre/calibre/ebooks/covers.py
219lib/calibre/calibre/ebooks/djvu/__init__.py 220lib/calibre/calibre/ebooks/djvu/__init__.py
220lib/calibre/calibre/ebooks/djvu/djvu.py 221lib/calibre/calibre/ebooks/djvu/djvu.py
221lib/calibre/calibre/ebooks/djvu/djvubzzdec.py 222lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
222lib/calibre/calibre/ebooks/docx/__init__.py 223lib/calibre/calibre/ebooks/docx/__init__.py
223lib/calibre/calibre/ebooks/docx/block_styles.py 224lib/calibre/calibre/ebooks/docx/block_styles.py
224lib/calibre/calibre/ebooks/docx/char_styles.py 225lib/calibre/calibre/ebooks/docx/char_styles.py
225lib/calibre/calibre/ebooks/docx/cleanup.py 226lib/calibre/calibre/ebooks/docx/cleanup.py
226lib/calibre/calibre/ebooks/docx/container.py 227lib/calibre/calibre/ebooks/docx/container.py
227lib/calibre/calibre/ebooks/docx/dump.py 228lib/calibre/calibre/ebooks/docx/dump.py
228lib/calibre/calibre/ebooks/docx/fields.py 229lib/calibre/calibre/ebooks/docx/fields.py
229lib/calibre/calibre/ebooks/docx/fonts.py 230lib/calibre/calibre/ebooks/docx/fonts.py
230lib/calibre/calibre/ebooks/docx/footnotes.py 231lib/calibre/calibre/ebooks/docx/footnotes.py
231lib/calibre/calibre/ebooks/docx/images.py 232lib/calibre/calibre/ebooks/docx/images.py
232lib/calibre/calibre/ebooks/docx/index.py 233lib/calibre/calibre/ebooks/docx/index.py
233lib/calibre/calibre/ebooks/docx/lcid.py 234lib/calibre/calibre/ebooks/docx/lcid.py
234lib/calibre/calibre/ebooks/docx/names.py 235lib/calibre/calibre/ebooks/docx/names.py
235lib/calibre/calibre/ebooks/docx/numbering.py 236lib/calibre/calibre/ebooks/docx/numbering.py
236lib/calibre/calibre/ebooks/docx/settings.py 237lib/calibre/calibre/ebooks/docx/settings.py
237lib/calibre/calibre/ebooks/docx/styles.py 238lib/calibre/calibre/ebooks/docx/styles.py
238lib/calibre/calibre/ebooks/docx/tables.py 239lib/calibre/calibre/ebooks/docx/tables.py
239lib/calibre/calibre/ebooks/docx/theme.py 240lib/calibre/calibre/ebooks/docx/theme.py
240lib/calibre/calibre/ebooks/docx/to_html.py 241lib/calibre/calibre/ebooks/docx/to_html.py
241lib/calibre/calibre/ebooks/docx/toc.py 242lib/calibre/calibre/ebooks/docx/toc.py
242lib/calibre/calibre/ebooks/docx/writer/__init__.py 243lib/calibre/calibre/ebooks/docx/writer/__init__.py
243lib/calibre/calibre/ebooks/docx/writer/container.py 244lib/calibre/calibre/ebooks/docx/writer/container.py
244lib/calibre/calibre/ebooks/epub/__init__.py 245lib/calibre/calibre/ebooks/epub/__init__.py
 246lib/calibre/calibre/ebooks/epub/cfi/__init__.py
 247lib/calibre/calibre/ebooks/epub/cfi/parse.py
 248lib/calibre/calibre/ebooks/epub/cfi/tests.py
245lib/calibre/calibre/ebooks/epub/pages.py 249lib/calibre/calibre/ebooks/epub/pages.py
246lib/calibre/calibre/ebooks/epub/periodical.py 250lib/calibre/calibre/ebooks/epub/periodical.py
247lib/calibre/calibre/ebooks/fb2/__init__.py 251lib/calibre/calibre/ebooks/fb2/__init__.py
248lib/calibre/calibre/ebooks/fb2/fb2ml.py 252lib/calibre/calibre/ebooks/fb2/fb2ml.py
249lib/calibre/calibre/ebooks/html/__init__.py 253lib/calibre/calibre/ebooks/html/__init__.py
250lib/calibre/calibre/ebooks/html/input.py 254lib/calibre/calibre/ebooks/html/input.py
251lib/calibre/calibre/ebooks/html/meta.py 255lib/calibre/calibre/ebooks/html/meta.py
252lib/calibre/calibre/ebooks/html/to_zip.py 256lib/calibre/calibre/ebooks/html/to_zip.py
253lib/calibre/calibre/ebooks/html_entities.py 257lib/calibre/calibre/ebooks/html_entities.py
254lib/calibre/calibre/ebooks/htmlz/__init__.py 258lib/calibre/calibre/ebooks/htmlz/__init__.py
255lib/calibre/calibre/ebooks/htmlz/oeb2html.py 259lib/calibre/calibre/ebooks/htmlz/oeb2html.py
256lib/calibre/calibre/ebooks/hyphenate.py 260lib/calibre/calibre/ebooks/hyphenate.py
257lib/calibre/calibre/ebooks/iterator/__init__.py 261lib/calibre/calibre/ebooks/iterator/__init__.py
@@ -406,68 +410,69 @@ lib/calibre/calibre/ebooks/mobi/writer8/ @@ -406,68 +410,69 @@ lib/calibre/calibre/ebooks/mobi/writer8/
406lib/calibre/calibre/ebooks/mobi/writer8/skeleton.py 410lib/calibre/calibre/ebooks/mobi/writer8/skeleton.py
407lib/calibre/calibre/ebooks/mobi/writer8/tbs.py 411lib/calibre/calibre/ebooks/mobi/writer8/tbs.py
408lib/calibre/calibre/ebooks/mobi/writer8/toc.py 412lib/calibre/calibre/ebooks/mobi/writer8/toc.py
409lib/calibre/calibre/ebooks/odt/__init__.py 413lib/calibre/calibre/ebooks/odt/__init__.py
410lib/calibre/calibre/ebooks/odt/input.py 414lib/calibre/calibre/ebooks/odt/input.py
411lib/calibre/calibre/ebooks/oeb/__init__.py 415lib/calibre/calibre/ebooks/oeb/__init__.py
412lib/calibre/calibre/ebooks/oeb/base.py 416lib/calibre/calibre/ebooks/oeb/base.py
413lib/calibre/calibre/ebooks/oeb/display/__init__.py 417lib/calibre/calibre/ebooks/oeb/display/__init__.py
414lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py 418lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
415lib/calibre/calibre/ebooks/oeb/display/webview.py 419lib/calibre/calibre/ebooks/oeb/display/webview.py
416lib/calibre/calibre/ebooks/oeb/iterator/__init__.py 420lib/calibre/calibre/ebooks/oeb/iterator/__init__.py
417lib/calibre/calibre/ebooks/oeb/iterator/book.py 421lib/calibre/calibre/ebooks/oeb/iterator/book.py
418lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py 422lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py
419lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py 
420lib/calibre/calibre/ebooks/oeb/iterator/spine.py 423lib/calibre/calibre/ebooks/oeb/iterator/spine.py
421lib/calibre/calibre/ebooks/oeb/normalize_css.py 424lib/calibre/calibre/ebooks/oeb/normalize_css.py
422lib/calibre/calibre/ebooks/oeb/parse_utils.py 425lib/calibre/calibre/ebooks/oeb/parse_utils.py
423lib/calibre/calibre/ebooks/oeb/polish/__init__.py 426lib/calibre/calibre/ebooks/oeb/polish/__init__.py
424lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py 427lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py
425lib/calibre/calibre/ebooks/oeb/polish/check/base.py 428lib/calibre/calibre/ebooks/oeb/polish/check/base.py
426lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py 429lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py
427lib/calibre/calibre/ebooks/oeb/polish/check/images.py 430lib/calibre/calibre/ebooks/oeb/polish/check/images.py
428lib/calibre/calibre/ebooks/oeb/polish/check/links.py 431lib/calibre/calibre/ebooks/oeb/polish/check/links.py
429lib/calibre/calibre/ebooks/oeb/polish/check/main.py 432lib/calibre/calibre/ebooks/oeb/polish/check/main.py
430lib/calibre/calibre/ebooks/oeb/polish/check/opf.py 433lib/calibre/calibre/ebooks/oeb/polish/check/opf.py
431lib/calibre/calibre/ebooks/oeb/polish/check/parsing.py 434lib/calibre/calibre/ebooks/oeb/polish/check/parsing.py
432lib/calibre/calibre/ebooks/oeb/polish/container.py 435lib/calibre/calibre/ebooks/oeb/polish/container.py
433lib/calibre/calibre/ebooks/oeb/polish/cover.py 436lib/calibre/calibre/ebooks/oeb/polish/cover.py
434lib/calibre/calibre/ebooks/oeb/polish/create.py 437lib/calibre/calibre/ebooks/oeb/polish/create.py
435lib/calibre/calibre/ebooks/oeb/polish/css.py 438lib/calibre/calibre/ebooks/oeb/polish/css.py
436lib/calibre/calibre/ebooks/oeb/polish/embed.py 439lib/calibre/calibre/ebooks/oeb/polish/embed.py
437lib/calibre/calibre/ebooks/oeb/polish/errors.py 440lib/calibre/calibre/ebooks/oeb/polish/errors.py
438lib/calibre/calibre/ebooks/oeb/polish/fonts.py 441lib/calibre/calibre/ebooks/oeb/polish/fonts.py
439lib/calibre/calibre/ebooks/oeb/polish/import_book.py 442lib/calibre/calibre/ebooks/oeb/polish/import_book.py
440lib/calibre/calibre/ebooks/oeb/polish/jacket.py 443lib/calibre/calibre/ebooks/oeb/polish/jacket.py
441lib/calibre/calibre/ebooks/oeb/polish/main.py 444lib/calibre/calibre/ebooks/oeb/polish/main.py
442lib/calibre/calibre/ebooks/oeb/polish/opf.py 445lib/calibre/calibre/ebooks/oeb/polish/opf.py
443lib/calibre/calibre/ebooks/oeb/polish/parsing.py 446lib/calibre/calibre/ebooks/oeb/polish/parsing.py
444lib/calibre/calibre/ebooks/oeb/polish/pretty.py 447lib/calibre/calibre/ebooks/oeb/polish/pretty.py
445lib/calibre/calibre/ebooks/oeb/polish/replace.py 448lib/calibre/calibre/ebooks/oeb/polish/replace.py
 449lib/calibre/calibre/ebooks/oeb/polish/report.py
446lib/calibre/calibre/ebooks/oeb/polish/spell.py 450lib/calibre/calibre/ebooks/oeb/polish/spell.py
447lib/calibre/calibre/ebooks/oeb/polish/split.py 451lib/calibre/calibre/ebooks/oeb/polish/split.py
448lib/calibre/calibre/ebooks/oeb/polish/stats.py 452lib/calibre/calibre/ebooks/oeb/polish/stats.py
449lib/calibre/calibre/ebooks/oeb/polish/subset.py 453lib/calibre/calibre/ebooks/oeb/polish/subset.py
450lib/calibre/calibre/ebooks/oeb/polish/tests/__init__.py 454lib/calibre/calibre/ebooks/oeb/polish/tests/__init__.py
451lib/calibre/calibre/ebooks/oeb/polish/tests/base.py 455lib/calibre/calibre/ebooks/oeb/polish/tests/base.py
452lib/calibre/calibre/ebooks/oeb/polish/tests/container.py 456lib/calibre/calibre/ebooks/oeb/polish/tests/container.py
453lib/calibre/calibre/ebooks/oeb/polish/tests/main.py 457lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
454lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py 458lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
455lib/calibre/calibre/ebooks/oeb/polish/toc.py 459lib/calibre/calibre/ebooks/oeb/polish/toc.py
456lib/calibre/calibre/ebooks/oeb/polish/utils.py 460lib/calibre/calibre/ebooks/oeb/polish/utils.py
457lib/calibre/calibre/ebooks/oeb/reader.py 461lib/calibre/calibre/ebooks/oeb/reader.py
458lib/calibre/calibre/ebooks/oeb/stylizer.py 462lib/calibre/calibre/ebooks/oeb/stylizer.py
459lib/calibre/calibre/ebooks/oeb/transforms/__init__.py 463lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
460lib/calibre/calibre/ebooks/oeb/transforms/cover.py 464lib/calibre/calibre/ebooks/oeb/transforms/cover.py
 465lib/calibre/calibre/ebooks/oeb/transforms/data_url.py
461lib/calibre/calibre/ebooks/oeb/transforms/embed_fonts.py 466lib/calibre/calibre/ebooks/oeb/transforms/embed_fonts.py
462lib/calibre/calibre/ebooks/oeb/transforms/filenames.py 467lib/calibre/calibre/ebooks/oeb/transforms/filenames.py
463lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py 468lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
464lib/calibre/calibre/ebooks/oeb/transforms/guide.py 469lib/calibre/calibre/ebooks/oeb/transforms/guide.py
465lib/calibre/calibre/ebooks/oeb/transforms/htmltoc.py 470lib/calibre/calibre/ebooks/oeb/transforms/htmltoc.py
466lib/calibre/calibre/ebooks/oeb/transforms/jacket.py 471lib/calibre/calibre/ebooks/oeb/transforms/jacket.py
467lib/calibre/calibre/ebooks/oeb/transforms/linearize_tables.py 472lib/calibre/calibre/ebooks/oeb/transforms/linearize_tables.py
468lib/calibre/calibre/ebooks/oeb/transforms/manglecase.py 473lib/calibre/calibre/ebooks/oeb/transforms/manglecase.py
469lib/calibre/calibre/ebooks/oeb/transforms/metadata.py 474lib/calibre/calibre/ebooks/oeb/transforms/metadata.py
470lib/calibre/calibre/ebooks/oeb/transforms/page_margin.py 475lib/calibre/calibre/ebooks/oeb/transforms/page_margin.py
471lib/calibre/calibre/ebooks/oeb/transforms/rasterize.py 476lib/calibre/calibre/ebooks/oeb/transforms/rasterize.py
472lib/calibre/calibre/ebooks/oeb/transforms/rescale.py 477lib/calibre/calibre/ebooks/oeb/transforms/rescale.py
473lib/calibre/calibre/ebooks/oeb/transforms/split.py 478lib/calibre/calibre/ebooks/oeb/transforms/split.py
@@ -630,50 +635,47 @@ lib/calibre/calibre/gui2/actions/fetch_n @@ -630,50 +635,47 @@ lib/calibre/calibre/gui2/actions/fetch_n
630lib/calibre/calibre/gui2/actions/help.py 635lib/calibre/calibre/gui2/actions/help.py
631lib/calibre/calibre/gui2/actions/mark_books.py 636lib/calibre/calibre/gui2/actions/mark_books.py
632lib/calibre/calibre/gui2/actions/match_books.py 637lib/calibre/calibre/gui2/actions/match_books.py
633lib/calibre/calibre/gui2/actions/next_match.py 638lib/calibre/calibre/gui2/actions/next_match.py
634lib/calibre/calibre/gui2/actions/open.py 639lib/calibre/calibre/gui2/actions/open.py
635lib/calibre/calibre/gui2/actions/plugin_updates.py 640lib/calibre/calibre/gui2/actions/plugin_updates.py
636lib/calibre/calibre/gui2/actions/polish.py 641lib/calibre/calibre/gui2/actions/polish.py
637lib/calibre/calibre/gui2/actions/preferences.py 642lib/calibre/calibre/gui2/actions/preferences.py
638lib/calibre/calibre/gui2/actions/random.py 643lib/calibre/calibre/gui2/actions/random.py
639lib/calibre/calibre/gui2/actions/restart.py 644lib/calibre/calibre/gui2/actions/restart.py
640lib/calibre/calibre/gui2/actions/save_to_disk.py 645lib/calibre/calibre/gui2/actions/save_to_disk.py
641lib/calibre/calibre/gui2/actions/show_book_details.py 646lib/calibre/calibre/gui2/actions/show_book_details.py
642lib/calibre/calibre/gui2/actions/show_quickview.py 647lib/calibre/calibre/gui2/actions/show_quickview.py
 648lib/calibre/calibre/gui2/actions/show_template_tester.py
643lib/calibre/calibre/gui2/actions/similar_books.py 649lib/calibre/calibre/gui2/actions/similar_books.py
644lib/calibre/calibre/gui2/actions/sort.py 650lib/calibre/calibre/gui2/actions/sort.py
645lib/calibre/calibre/gui2/actions/store.py 651lib/calibre/calibre/gui2/actions/store.py
646lib/calibre/calibre/gui2/actions/toc_edit.py 652lib/calibre/calibre/gui2/actions/toc_edit.py
647lib/calibre/calibre/gui2/actions/tweak_epub.py 653lib/calibre/calibre/gui2/actions/tweak_epub.py
648lib/calibre/calibre/gui2/actions/unpack_book.py 654lib/calibre/calibre/gui2/actions/unpack_book.py
649lib/calibre/calibre/gui2/actions/view.py 655lib/calibre/calibre/gui2/actions/view.py
650lib/calibre/calibre/gui2/add.py 656lib/calibre/calibre/gui2/add.py
651lib/calibre/calibre/gui2/add_wizard/__init__.py 
652lib/calibre/calibre/gui2/add_wizard/scan_ui.py 
653lib/calibre/calibre/gui2/add_wizard/welcome_ui.py 
654lib/calibre/calibre/gui2/auto_add.py 657lib/calibre/calibre/gui2/auto_add.py
655lib/calibre/calibre/gui2/bars.py 658lib/calibre/calibre/gui2/bars.py
656lib/calibre/calibre/gui2/book_details.py 659lib/calibre/calibre/gui2/book_details.py
657lib/calibre/calibre/gui2/catalog/__init__.py 660lib/calibre/calibre/gui2/catalog/__init__.py
658lib/calibre/calibre/gui2/catalog/catalog_bibtex.py 661lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
659lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py 662lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py
660lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py 663lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
661lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.py 664lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.py
662lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py 665lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
663lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py 666lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
664lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py 667lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
665lib/calibre/calibre/gui2/comments_editor.py 668lib/calibre/calibre/gui2/comments_editor.py
666lib/calibre/calibre/gui2/complete.py 
667lib/calibre/calibre/gui2/complete2.py 669lib/calibre/calibre/gui2/complete2.py
668lib/calibre/calibre/gui2/convert/__init__.py 670lib/calibre/calibre/gui2/convert/__init__.py
669lib/calibre/calibre/gui2/convert/azw3_output.py 671lib/calibre/calibre/gui2/convert/azw3_output.py
670lib/calibre/calibre/gui2/convert/azw3_output_ui.py 672lib/calibre/calibre/gui2/convert/azw3_output_ui.py
671lib/calibre/calibre/gui2/convert/bulk.py 673lib/calibre/calibre/gui2/convert/bulk.py
672lib/calibre/calibre/gui2/convert/comic_input.py 674lib/calibre/calibre/gui2/convert/comic_input.py
673lib/calibre/calibre/gui2/convert/comic_input_ui.py 675lib/calibre/calibre/gui2/convert/comic_input_ui.py
674lib/calibre/calibre/gui2/convert/debug.py 676lib/calibre/calibre/gui2/convert/debug.py
675lib/calibre/calibre/gui2/convert/debug_ui.py 677lib/calibre/calibre/gui2/convert/debug_ui.py
676lib/calibre/calibre/gui2/convert/docx_input.py 678lib/calibre/calibre/gui2/convert/docx_input.py
677lib/calibre/calibre/gui2/convert/docx_input_ui.py 679lib/calibre/calibre/gui2/convert/docx_input_ui.py
678lib/calibre/calibre/gui2/convert/epub_output.py 680lib/calibre/calibre/gui2/convert/epub_output.py
679lib/calibre/calibre/gui2/convert/epub_output_ui.py 681lib/calibre/calibre/gui2/convert/epub_output_ui.py
@@ -721,27 +723,36 @@ lib/calibre/calibre/gui2/convert/snb_out @@ -721,27 +723,36 @@ lib/calibre/calibre/gui2/convert/snb_out
721lib/calibre/calibre/gui2/convert/structure_detection.py 723lib/calibre/calibre/gui2/convert/structure_detection.py
722lib/calibre/calibre/gui2/convert/structure_detection_ui.py 724lib/calibre/calibre/gui2/convert/structure_detection_ui.py
723lib/calibre/calibre/gui2/convert/toc.py 725lib/calibre/calibre/gui2/convert/toc.py
724lib/calibre/calibre/gui2/convert/toc_ui.py 726lib/calibre/calibre/gui2/convert/toc_ui.py
725lib/calibre/calibre/gui2/convert/txt_input.py 727lib/calibre/calibre/gui2/convert/txt_input.py
726lib/calibre/calibre/gui2/convert/txt_input_ui.py 728lib/calibre/calibre/gui2/convert/txt_input_ui.py
727lib/calibre/calibre/gui2/convert/txt_output.py 729lib/calibre/calibre/gui2/convert/txt_output.py
728lib/calibre/calibre/gui2/convert/txt_output_ui.py 730lib/calibre/calibre/gui2/convert/txt_output_ui.py
729lib/calibre/calibre/gui2/convert/txtz_output.py 731lib/calibre/calibre/gui2/convert/txtz_output.py
730lib/calibre/calibre/gui2/convert/xexp_edit_ui.py 732lib/calibre/calibre/gui2/convert/xexp_edit_ui.py
731lib/calibre/calibre/gui2/convert/xpath_wizard.py 733lib/calibre/calibre/gui2/convert/xpath_wizard.py
732lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py 734lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
733lib/calibre/calibre/gui2/cover_flow.py 735lib/calibre/calibre/gui2/cover_flow.py
 736lib/calibre/calibre/gui2/covers.py
734lib/calibre/calibre/gui2/custom_column_widgets.py 737lib/calibre/calibre/gui2/custom_column_widgets.py
 738lib/calibre/calibre/gui2/dbus_export/__init__.py
 739lib/calibre/calibre/gui2/dbus_export/demo.py
 740lib/calibre/calibre/gui2/dbus_export/gtk.py
 741lib/calibre/calibre/gui2/dbus_export/menu.py
 742lib/calibre/calibre/gui2/dbus_export/menu2.py
 743lib/calibre/calibre/gui2/dbus_export/tray.py
 744lib/calibre/calibre/gui2/dbus_export/utils.py
 745lib/calibre/calibre/gui2/dbus_export/widgets.py
735lib/calibre/calibre/gui2/device.py 746lib/calibre/calibre/gui2/device.py
736lib/calibre/calibre/gui2/device_drivers/__init__.py 747lib/calibre/calibre/gui2/device_drivers/__init__.py
737lib/calibre/calibre/gui2/device_drivers/configwidget.py 748lib/calibre/calibre/gui2/device_drivers/configwidget.py
738lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py 749lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
739lib/calibre/calibre/gui2/device_drivers/mtp_config.py 750lib/calibre/calibre/gui2/device_drivers/mtp_config.py
740lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py 751lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
741lib/calibre/calibre/gui2/dialogs/__init__.py 752lib/calibre/calibre/gui2/dialogs/__init__.py
742lib/calibre/calibre/gui2/dialogs/add_empty_book.py 753lib/calibre/calibre/gui2/dialogs/add_empty_book.py
743lib/calibre/calibre/gui2/dialogs/add_from_isbn.py 754lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
744lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py 755lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py
745lib/calibre/calibre/gui2/dialogs/authors_edit.py 756lib/calibre/calibre/gui2/dialogs/authors_edit.py
746lib/calibre/calibre/gui2/dialogs/book_info.py 757lib/calibre/calibre/gui2/dialogs/book_info.py
747lib/calibre/calibre/gui2/dialogs/catalog.py 758lib/calibre/calibre/gui2/dialogs/catalog.py
@@ -754,26 +765,27 @@ lib/calibre/calibre/gui2/dialogs/choose_ @@ -754,26 +765,27 @@ lib/calibre/calibre/gui2/dialogs/choose_
754lib/calibre/calibre/gui2/dialogs/choose_library.py 765lib/calibre/calibre/gui2/dialogs/choose_library.py
755lib/calibre/calibre/gui2/dialogs/choose_library_ui.py 766lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
756lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py 767lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
757lib/calibre/calibre/gui2/dialogs/comicconf.py 768lib/calibre/calibre/gui2/dialogs/comicconf.py
758lib/calibre/calibre/gui2/dialogs/comicconf_ui.py 769lib/calibre/calibre/gui2/dialogs/comicconf_ui.py
759lib/calibre/calibre/gui2/dialogs/comments_dialog.py 770lib/calibre/calibre/gui2/dialogs/comments_dialog.py
760lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py 771lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
761lib/calibre/calibre/gui2/dialogs/confirm_delete.py 772lib/calibre/calibre/gui2/dialogs/confirm_delete.py
762lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py 773lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
763lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py 774lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
764lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py 775lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py
765lib/calibre/calibre/gui2/dialogs/conversion_error.py 776lib/calibre/calibre/gui2/dialogs/conversion_error.py
766lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py 777lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
 778lib/calibre/calibre/gui2/dialogs/custom_recipes.py
767lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py 779lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
768lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py 780lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py
769lib/calibre/calibre/gui2/dialogs/device_category_editor.py 781lib/calibre/calibre/gui2/dialogs/device_category_editor.py
770lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py 782lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py
771lib/calibre/calibre/gui2/dialogs/drm_error.py 783lib/calibre/calibre/gui2/dialogs/drm_error.py
772lib/calibre/calibre/gui2/dialogs/drm_error_ui.py 784lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
773lib/calibre/calibre/gui2/dialogs/duplicates.py 785lib/calibre/calibre/gui2/dialogs/duplicates.py
774lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py 786lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
775lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py 787lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
776lib/calibre/calibre/gui2/dialogs/job_view_ui.py 788lib/calibre/calibre/gui2/dialogs/job_view_ui.py
777lib/calibre/calibre/gui2/dialogs/jobs_ui.py 789lib/calibre/calibre/gui2/dialogs/jobs_ui.py
778lib/calibre/calibre/gui2/dialogs/match_books.py 790lib/calibre/calibre/gui2/dialogs/match_books.py
779lib/calibre/calibre/gui2/dialogs/match_books_ui.py 791lib/calibre/calibre/gui2/dialogs/match_books_ui.py
@@ -801,28 +813,26 @@ lib/calibre/calibre/gui2/dialogs/select_ @@ -801,28 +813,26 @@ lib/calibre/calibre/gui2/dialogs/select_
801lib/calibre/calibre/gui2/dialogs/smartdevice.py 813lib/calibre/calibre/gui2/dialogs/smartdevice.py
802lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py 814lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
803lib/calibre/calibre/gui2/dialogs/tag_categories.py 815lib/calibre/calibre/gui2/dialogs/tag_categories.py
804lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py 816lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
805lib/calibre/calibre/gui2/dialogs/tag_editor.py 817lib/calibre/calibre/gui2/dialogs/tag_editor.py
806lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py 818lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py
807lib/calibre/calibre/gui2/dialogs/tag_list_editor.py 819lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
808lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py 820lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
809lib/calibre/calibre/gui2/dialogs/template_dialog.py 821lib/calibre/calibre/gui2/dialogs/template_dialog.py
810lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py 822lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
811lib/calibre/calibre/gui2/dialogs/template_line_editor.py 823lib/calibre/calibre/gui2/dialogs/template_line_editor.py
812lib/calibre/calibre/gui2/dialogs/test_email_ui.py 824lib/calibre/calibre/gui2/dialogs/test_email_ui.py
813lib/calibre/calibre/gui2/dialogs/trim_image.py 825lib/calibre/calibre/gui2/dialogs/trim_image.py
814lib/calibre/calibre/gui2/dialogs/user_profiles.py 
815lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py 
816lib/calibre/calibre/gui2/dnd.py 826lib/calibre/calibre/gui2/dnd.py
817lib/calibre/calibre/gui2/ebook_download.py 827lib/calibre/calibre/gui2/ebook_download.py
818lib/calibre/calibre/gui2/email.py 828lib/calibre/calibre/gui2/email.py
819lib/calibre/calibre/gui2/filename_pattern_ui.py 829lib/calibre/calibre/gui2/filename_pattern_ui.py
820lib/calibre/calibre/gui2/font_family_chooser.py 830lib/calibre/calibre/gui2/font_family_chooser.py
821lib/calibre/calibre/gui2/init.py 831lib/calibre/calibre/gui2/init.py
822lib/calibre/calibre/gui2/job_indicator.py 832lib/calibre/calibre/gui2/job_indicator.py
823lib/calibre/calibre/gui2/jobs.py 833lib/calibre/calibre/gui2/jobs.py
824lib/calibre/calibre/gui2/keyboard.py 834lib/calibre/calibre/gui2/keyboard.py
825lib/calibre/calibre/gui2/languages.py 835lib/calibre/calibre/gui2/languages.py
826lib/calibre/calibre/gui2/layout.py 836lib/calibre/calibre/gui2/layout.py
827lib/calibre/calibre/gui2/library/__init__.py 837lib/calibre/calibre/gui2/library/__init__.py
828lib/calibre/calibre/gui2/library/alternate_views.py 838lib/calibre/calibre/gui2/library/alternate_views.py
@@ -887,30 +897,32 @@ lib/calibre/calibre/gui2/preferences/sea @@ -887,30 +897,32 @@ lib/calibre/calibre/gui2/preferences/sea
887lib/calibre/calibre/gui2/preferences/sending.py 897lib/calibre/calibre/gui2/preferences/sending.py
888lib/calibre/calibre/gui2/preferences/sending_ui.py 898lib/calibre/calibre/gui2/preferences/sending_ui.py
889lib/calibre/calibre/gui2/preferences/server.py 899lib/calibre/calibre/gui2/preferences/server.py
890lib/calibre/calibre/gui2/preferences/server_ui.py 900lib/calibre/calibre/gui2/preferences/server_ui.py
891lib/calibre/calibre/gui2/preferences/template_functions.py 901lib/calibre/calibre/gui2/preferences/template_functions.py
892lib/calibre/calibre/gui2/preferences/template_functions_ui.py 902lib/calibre/calibre/gui2/preferences/template_functions_ui.py
893lib/calibre/calibre/gui2/preferences/texture_chooser.py 903lib/calibre/calibre/gui2/preferences/texture_chooser.py
894lib/calibre/calibre/gui2/preferences/toolbar.py 904lib/calibre/calibre/gui2/preferences/toolbar.py
895lib/calibre/calibre/gui2/preferences/toolbar_ui.py 905lib/calibre/calibre/gui2/preferences/toolbar_ui.py
896lib/calibre/calibre/gui2/preferences/tweaks.py 906lib/calibre/calibre/gui2/preferences/tweaks.py
897lib/calibre/calibre/gui2/preferences/tweaks_ui.py 907lib/calibre/calibre/gui2/preferences/tweaks_ui.py
898lib/calibre/calibre/gui2/proceed.py 908lib/calibre/calibre/gui2/proceed.py
899lib/calibre/calibre/gui2/progress_indicator/__init__.py 909lib/calibre/calibre/gui2/progress_indicator/__init__.py
 910lib/calibre/calibre/gui2/save.py
900lib/calibre/calibre/gui2/search_box.py 911lib/calibre/calibre/gui2/search_box.py
901lib/calibre/calibre/gui2/search_restriction_mixin.py 912lib/calibre/calibre/gui2/search_restriction_mixin.py
902lib/calibre/calibre/gui2/shortcuts.py 913lib/calibre/calibre/gui2/shortcuts.py
903lib/calibre/calibre/gui2/shortcuts_ui.py 914lib/calibre/calibre/gui2/shortcuts_ui.py
 915lib/calibre/calibre/gui2/splash.py
904lib/calibre/calibre/gui2/store/__init__.py 916lib/calibre/calibre/gui2/store/__init__.py
905lib/calibre/calibre/gui2/store/basic_config.py 917lib/calibre/calibre/gui2/store/basic_config.py
906lib/calibre/calibre/gui2/store/basic_config_widget_ui.py 918lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
907lib/calibre/calibre/gui2/store/config/__init__.py 919lib/calibre/calibre/gui2/store/config/__init__.py
908lib/calibre/calibre/gui2/store/config/chooser/__init__.py 920lib/calibre/calibre/gui2/store/config/chooser/__init__.py
909lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py 921lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py
910lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py 922lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py
911lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py 923lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py
912lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py 924lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py
913lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py 925lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py
914lib/calibre/calibre/gui2/store/config/chooser/models.py 926lib/calibre/calibre/gui2/store/config/chooser/models.py
915lib/calibre/calibre/gui2/store/config/chooser/results_view.py 927lib/calibre/calibre/gui2/store/config/chooser/results_view.py
916lib/calibre/calibre/gui2/store/config/search/__init__.py 928lib/calibre/calibre/gui2/store/config/search/__init__.py
@@ -919,39 +931,40 @@ lib/calibre/calibre/gui2/store/config/se @@ -919,39 +931,40 @@ lib/calibre/calibre/gui2/store/config/se
919lib/calibre/calibre/gui2/store/config/store.py 931lib/calibre/calibre/gui2/store/config/store.py
920lib/calibre/calibre/gui2/store/loader.py 932lib/calibre/calibre/gui2/store/loader.py
921lib/calibre/calibre/gui2/store/opensearch_store.py 933lib/calibre/calibre/gui2/store/opensearch_store.py
922lib/calibre/calibre/gui2/store/search/__init__.py 934lib/calibre/calibre/gui2/store/search/__init__.py
923lib/calibre/calibre/gui2/store/search/adv_search_builder.py 935lib/calibre/calibre/gui2/store/search/adv_search_builder.py
924lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py 936lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py
925lib/calibre/calibre/gui2/store/search/download_thread.py 937lib/calibre/calibre/gui2/store/search/download_thread.py
926lib/calibre/calibre/gui2/store/search/models.py 938lib/calibre/calibre/gui2/store/search/models.py
927lib/calibre/calibre/gui2/store/search/results_view.py 939lib/calibre/calibre/gui2/store/search/results_view.py
928lib/calibre/calibre/gui2/store/search/search.py 940lib/calibre/calibre/gui2/store/search/search.py
929lib/calibre/calibre/gui2/store/search/search_ui.py 941lib/calibre/calibre/gui2/store/search/search_ui.py
930lib/calibre/calibre/gui2/store/search_result.py 942lib/calibre/calibre/gui2/store/search_result.py
931lib/calibre/calibre/gui2/store/stores/__init__.py 943lib/calibre/calibre/gui2/store/stores/__init__.py
932lib/calibre/calibre/gui2/store/stores/allegro_plugin.py 
933lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py 944lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py
934lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py 945lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py
935lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py 946lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
936lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py 947lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
937lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py 948lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py
938lib/calibre/calibre/gui2/store/stores/amazon_plugin.py 949lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
939lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py 950lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
940lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py 951lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
941lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py 952lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
942lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py 953lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
943lib/calibre/calibre/gui2/store/stores/biblio_plugin.py 954lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
944lib/calibre/calibre/gui2/store/stores/bn_plugin.py 955lib/calibre/calibre/gui2/store/stores/bn_plugin.py
 956lib/calibre/calibre/gui2/store/stores/bubok_portugal_plugin.py
 957lib/calibre/calibre/gui2/store/stores/bubok_publishing_plugin.py
945lib/calibre/calibre/gui2/store/stores/cdp_plugin.py 958lib/calibre/calibre/gui2/store/stores/cdp_plugin.py
946lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py 959lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
947lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py 960lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
948lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py 961lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
949lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py 962lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
950lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py 963lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py
951lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py 964lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
952lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py 965lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
953lib/calibre/calibre/gui2/store/stores/empik_plugin.py 966lib/calibre/calibre/gui2/store/stores/empik_plugin.py
954lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py 967lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
955lib/calibre/calibre/gui2/store/stores/google_books_plugin.py 968lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
956lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py 969lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
957lib/calibre/calibre/gui2/store/stores/kobo_plugin.py 970lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
@@ -995,91 +1008,108 @@ lib/calibre/calibre/gui2/tag_browser/__i @@ -995,91 +1008,108 @@ lib/calibre/calibre/gui2/tag_browser/__i
995lib/calibre/calibre/gui2/tag_browser/model.py 1008lib/calibre/calibre/gui2/tag_browser/model.py
996lib/calibre/calibre/gui2/tag_browser/ui.py 1009lib/calibre/calibre/gui2/tag_browser/ui.py
997lib/calibre/calibre/gui2/tag_browser/view.py 1010lib/calibre/calibre/gui2/tag_browser/view.py
998lib/calibre/calibre/gui2/threaded_jobs.py 1011lib/calibre/calibre/gui2/threaded_jobs.py
999lib/calibre/calibre/gui2/throbber.py 1012lib/calibre/calibre/gui2/throbber.py
1000lib/calibre/calibre/gui2/toc/__init__.py 1013lib/calibre/calibre/gui2/toc/__init__.py
1001lib/calibre/calibre/gui2/toc/location.py 1014lib/calibre/calibre/gui2/toc/location.py
1002lib/calibre/calibre/gui2/toc/main.py 1015lib/calibre/calibre/gui2/toc/main.py
1003lib/calibre/calibre/gui2/tools.py 1016lib/calibre/calibre/gui2/tools.py
1004lib/calibre/calibre/gui2/tweak_book/__init__.py 1017lib/calibre/calibre/gui2/tweak_book/__init__.py
1005lib/calibre/calibre/gui2/tweak_book/boss.py 1018lib/calibre/calibre/gui2/tweak_book/boss.py
1006lib/calibre/calibre/gui2/tweak_book/char_select.py 1019lib/calibre/calibre/gui2/tweak_book/char_select.py
1007lib/calibre/calibre/gui2/tweak_book/check.py 1020lib/calibre/calibre/gui2/tweak_book/check.py
 1021lib/calibre/calibre/gui2/tweak_book/completion/__init__.py
 1022lib/calibre/calibre/gui2/tweak_book/completion/basic.py
 1023lib/calibre/calibre/gui2/tweak_book/completion/popup.py
 1024lib/calibre/calibre/gui2/tweak_book/completion/utils.py
 1025lib/calibre/calibre/gui2/tweak_book/completion/worker.py
1008lib/calibre/calibre/gui2/tweak_book/diff/__init__.py 1026lib/calibre/calibre/gui2/tweak_book/diff/__init__.py
1009lib/calibre/calibre/gui2/tweak_book/diff/highlight.py 1027lib/calibre/calibre/gui2/tweak_book/diff/highlight.py
1010lib/calibre/calibre/gui2/tweak_book/diff/main.py 1028lib/calibre/calibre/gui2/tweak_book/diff/main.py
1011lib/calibre/calibre/gui2/tweak_book/diff/view.py 1029lib/calibre/calibre/gui2/tweak_book/diff/view.py
1012lib/calibre/calibre/gui2/tweak_book/editor/__init__.py 1030lib/calibre/calibre/gui2/tweak_book/editor/__init__.py
1013lib/calibre/calibre/gui2/tweak_book/editor/canvas.py 1031lib/calibre/calibre/gui2/tweak_book/editor/canvas.py
1014lib/calibre/calibre/gui2/tweak_book/editor/help.py 1032lib/calibre/calibre/gui2/tweak_book/editor/help.py
1015lib/calibre/calibre/gui2/tweak_book/editor/image.py 1033lib/calibre/calibre/gui2/tweak_book/editor/image.py
1016lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py 1034lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py
1017lib/calibre/calibre/gui2/tweak_book/editor/smart/__init__.py 1035lib/calibre/calibre/gui2/tweak_book/editor/smarts/__init__.py
1018lib/calibre/calibre/gui2/tweak_book/editor/smart/css.py 1036lib/calibre/calibre/gui2/tweak_book/editor/smarts/css.py
1019lib/calibre/calibre/gui2/tweak_book/editor/smart/html.py 1037lib/calibre/calibre/gui2/tweak_book/editor/smarts/html.py
 1038lib/calibre/calibre/gui2/tweak_book/editor/smarts/python.py
 1039lib/calibre/calibre/gui2/tweak_book/editor/smarts/utils.py
 1040lib/calibre/calibre/gui2/tweak_book/editor/snippets.py
1020lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py 1041lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py
1021lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py 1042lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py
1022lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py 1043lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py
1023lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py 1044lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py
 1045lib/calibre/calibre/gui2/tweak_book/editor/syntax/javascript.py
 1046lib/calibre/calibre/gui2/tweak_book/editor/syntax/pygments_highlighter.py
 1047lib/calibre/calibre/gui2/tweak_book/editor/syntax/python.py
 1048lib/calibre/calibre/gui2/tweak_book/editor/syntax/utils.py
 1049lib/calibre/calibre/gui2/tweak_book/editor/syntax/xml.py
1024lib/calibre/calibre/gui2/tweak_book/editor/text.py 1050lib/calibre/calibre/gui2/tweak_book/editor/text.py
1025lib/calibre/calibre/gui2/tweak_book/editor/themes.py 1051lib/calibre/calibre/gui2/tweak_book/editor/themes.py
1026lib/calibre/calibre/gui2/tweak_book/editor/widget.py 1052lib/calibre/calibre/gui2/tweak_book/editor/widget.py
1027lib/calibre/calibre/gui2/tweak_book/file_list.py 1053lib/calibre/calibre/gui2/tweak_book/file_list.py
 1054lib/calibre/calibre/gui2/tweak_book/function_replace.py
1028lib/calibre/calibre/gui2/tweak_book/job.py 1055lib/calibre/calibre/gui2/tweak_book/job.py
1029lib/calibre/calibre/gui2/tweak_book/live_css.py 1056lib/calibre/calibre/gui2/tweak_book/live_css.py
1030lib/calibre/calibre/gui2/tweak_book/main.py 1057lib/calibre/calibre/gui2/tweak_book/main.py
1031lib/calibre/calibre/gui2/tweak_book/manage_fonts.py 1058lib/calibre/calibre/gui2/tweak_book/manage_fonts.py
1032lib/calibre/calibre/gui2/tweak_book/plugin.py 1059lib/calibre/calibre/gui2/tweak_book/plugin.py
1033lib/calibre/calibre/gui2/tweak_book/polish.py 1060lib/calibre/calibre/gui2/tweak_book/polish.py
1034lib/calibre/calibre/gui2/tweak_book/preferences.py 1061lib/calibre/calibre/gui2/tweak_book/preferences.py
1035lib/calibre/calibre/gui2/tweak_book/preview.py 1062lib/calibre/calibre/gui2/tweak_book/preview.py
 1063lib/calibre/calibre/gui2/tweak_book/reports.py
1036lib/calibre/calibre/gui2/tweak_book/save.py 1064lib/calibre/calibre/gui2/tweak_book/save.py
1037lib/calibre/calibre/gui2/tweak_book/search.py 1065lib/calibre/calibre/gui2/tweak_book/search.py
1038lib/calibre/calibre/gui2/tweak_book/spell.py 1066lib/calibre/calibre/gui2/tweak_book/spell.py
1039lib/calibre/calibre/gui2/tweak_book/templates.py 1067lib/calibre/calibre/gui2/tweak_book/templates.py
1040lib/calibre/calibre/gui2/tweak_book/toc.py 1068lib/calibre/calibre/gui2/tweak_book/toc.py
1041lib/calibre/calibre/gui2/tweak_book/ui.py 1069lib/calibre/calibre/gui2/tweak_book/ui.py
1042lib/calibre/calibre/gui2/tweak_book/undo.py 1070lib/calibre/calibre/gui2/tweak_book/undo.py
1043lib/calibre/calibre/gui2/tweak_book/widgets.py 1071lib/calibre/calibre/gui2/tweak_book/widgets.py
1044lib/calibre/calibre/gui2/ui.py 1072lib/calibre/calibre/gui2/ui.py
1045lib/calibre/calibre/gui2/update.py 1073lib/calibre/calibre/gui2/update.py
1046lib/calibre/calibre/gui2/viewer/__init__.py 1074lib/calibre/calibre/gui2/viewer/__init__.py
1047lib/calibre/calibre/gui2/viewer/bookmarkmanager.py 1075lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
1048lib/calibre/calibre/gui2/viewer/config.py 1076lib/calibre/calibre/gui2/viewer/config.py
1049lib/calibre/calibre/gui2/viewer/config_ui.py 1077lib/calibre/calibre/gui2/viewer/config_ui.py
1050lib/calibre/calibre/gui2/viewer/documentview.py 1078lib/calibre/calibre/gui2/viewer/documentview.py
1051lib/calibre/calibre/gui2/viewer/flip.py 1079lib/calibre/calibre/gui2/viewer/flip.py
 1080lib/calibre/calibre/gui2/viewer/footnote.py
1052lib/calibre/calibre/gui2/viewer/gestures.py 1081lib/calibre/calibre/gui2/viewer/gestures.py
1053lib/calibre/calibre/gui2/viewer/image_popup.py 1082lib/calibre/calibre/gui2/viewer/image_popup.py
1054lib/calibre/calibre/gui2/viewer/inspector.py 1083lib/calibre/calibre/gui2/viewer/inspector.py
1055lib/calibre/calibre/gui2/viewer/javascript.py 1084lib/calibre/calibre/gui2/viewer/javascript.py
1056lib/calibre/calibre/gui2/viewer/keys.py 1085lib/calibre/calibre/gui2/viewer/keys.py
1057lib/calibre/calibre/gui2/viewer/main.py 1086lib/calibre/calibre/gui2/viewer/main.py
1058lib/calibre/calibre/gui2/viewer/position.py 1087lib/calibre/calibre/gui2/viewer/position.py
1059lib/calibre/calibre/gui2/viewer/printing.py 1088lib/calibre/calibre/gui2/viewer/printing.py
1060lib/calibre/calibre/gui2/viewer/table_popup.py 1089lib/calibre/calibre/gui2/viewer/table_popup.py
1061lib/calibre/calibre/gui2/viewer/toc.py 1090lib/calibre/calibre/gui2/viewer/toc.py
1062lib/calibre/calibre/gui2/viewer/ui.py 1091lib/calibre/calibre/gui2/viewer/ui.py
1063lib/calibre/calibre/gui2/widgets.py 1092lib/calibre/calibre/gui2/widgets.py
1064lib/calibre/calibre/gui2/widgets2.py 1093lib/calibre/calibre/gui2/widgets2.py
1065lib/calibre/calibre/gui2/wizard/__init__.py 1094lib/calibre/calibre/gui2/wizard/__init__.py
1066lib/calibre/calibre/gui2/wizard/device_ui.py 1095lib/calibre/calibre/gui2/wizard/device_ui.py
1067lib/calibre/calibre/gui2/wizard/finish_ui.py 1096lib/calibre/calibre/gui2/wizard/finish_ui.py
1068lib/calibre/calibre/gui2/wizard/kindle_ui.py 1097lib/calibre/calibre/gui2/wizard/kindle_ui.py
1069lib/calibre/calibre/gui2/wizard/library_ui.py 1098lib/calibre/calibre/gui2/wizard/library_ui.py
1070lib/calibre/calibre/gui2/wizard/send_email.py 1099lib/calibre/calibre/gui2/wizard/send_email.py
1071lib/calibre/calibre/gui2/wizard/send_email_ui.py 1100lib/calibre/calibre/gui2/wizard/send_email_ui.py
1072lib/calibre/calibre/gui2/wizard/stanza_ui.py 1101lib/calibre/calibre/gui2/wizard/stanza_ui.py
 1102lib/calibre/calibre/gui_launch.py
1073lib/calibre/calibre/library/__init__.py 1103lib/calibre/calibre/library/__init__.py
1074lib/calibre/calibre/library/add_to_library.py 1104lib/calibre/calibre/library/add_to_library.py
1075lib/calibre/calibre/library/caches.py 1105lib/calibre/calibre/library/caches.py
1076lib/calibre/calibre/library/catalogs/__init__.py 1106lib/calibre/calibre/library/catalogs/__init__.py
1077lib/calibre/calibre/library/catalogs/bibtex.py 1107lib/calibre/calibre/library/catalogs/bibtex.py
1078lib/calibre/calibre/library/catalogs/csv_xml.py 1108lib/calibre/calibre/library/catalogs/csv_xml.py
1079lib/calibre/calibre/library/catalogs/epub_mobi.py 1109lib/calibre/calibre/library/catalogs/epub_mobi.py
1080lib/calibre/calibre/library/catalogs/epub_mobi_builder.py 1110lib/calibre/calibre/library/catalogs/epub_mobi_builder.py
1081lib/calibre/calibre/library/catalogs/utils.py 1111lib/calibre/calibre/library/catalogs/utils.py
1082lib/calibre/calibre/library/check_library.py 1112lib/calibre/calibre/library/check_library.py
1083lib/calibre/calibre/library/cli.py 1113lib/calibre/calibre/library/cli.py
1084lib/calibre/calibre/library/coloring.py 1114lib/calibre/calibre/library/coloring.py
1085lib/calibre/calibre/library/comments.py 1115lib/calibre/calibre/library/comments.py
@@ -1102,33 +1132,33 @@ lib/calibre/calibre/library/server/main. @@ -1102,33 +1132,33 @@ lib/calibre/calibre/library/server/main.
1102lib/calibre/calibre/library/server/mobile.py 1132lib/calibre/calibre/library/server/mobile.py
1103lib/calibre/calibre/library/server/opds.py 1133lib/calibre/calibre/library/server/opds.py
1104lib/calibre/calibre/library/server/utils.py 1134lib/calibre/calibre/library/server/utils.py
1105lib/calibre/calibre/library/server/xml.py 1135lib/calibre/calibre/library/server/xml.py
1106lib/calibre/calibre/library/sqlite.py 1136lib/calibre/calibre/library/sqlite.py
1107lib/calibre/calibre/library/test.py 1137lib/calibre/calibre/library/test.py
1108lib/calibre/calibre/libunzip.py 1138lib/calibre/calibre/libunzip.py
1109lib/calibre/calibre/libwand.py 1139lib/calibre/calibre/libwand.py
1110lib/calibre/calibre/linux.py 1140lib/calibre/calibre/linux.py
1111lib/calibre/calibre/plugins/_patiencediff_c.so 1141lib/calibre/calibre/plugins/_patiencediff_c.so
1112lib/calibre/calibre/plugins/_regex.so 1142lib/calibre/calibre/plugins/_regex.so
1113lib/calibre/calibre/plugins/bzzdec.so 1143lib/calibre/calibre/plugins/bzzdec.so
1114lib/calibre/calibre/plugins/cPalmdoc.so 1144lib/calibre/calibre/plugins/cPalmdoc.so
1115lib/calibre/calibre/plugins/calibre_style.so 
1116lib/calibre/calibre/plugins/chm_extra.so 1145lib/calibre/calibre/plugins/chm_extra.so
1117lib/calibre/calibre/plugins/chmlib.so 1146lib/calibre/calibre/plugins/chmlib.so
1118lib/calibre/calibre/plugins/freetype.so 1147lib/calibre/calibre/plugins/freetype.so
1119lib/calibre/calibre/plugins/html.so 1148lib/calibre/calibre/plugins/html.so
1120lib/calibre/calibre/plugins/hunspell.so 1149lib/calibre/calibre/plugins/hunspell.so
1121lib/calibre/calibre/plugins/icu.so 1150lib/calibre/calibre/plugins/icu.so
 1151lib/calibre/calibre/plugins/libheadless.so
1122lib/calibre/calibre/plugins/lzx.so 1152lib/calibre/calibre/plugins/lzx.so
1123lib/calibre/calibre/plugins/magick.so 1153lib/calibre/calibre/plugins/magick.so
1124lib/calibre/calibre/plugins/matcher.so 1154lib/calibre/calibre/plugins/matcher.so
1125lib/calibre/calibre/plugins/msdes.so 1155lib/calibre/calibre/plugins/msdes.so
1126lib/calibre/calibre/plugins/pictureflow.so 1156lib/calibre/calibre/plugins/pictureflow.so
1127lib/calibre/calibre/plugins/podofo.so 1157lib/calibre/calibre/plugins/podofo.so
1128lib/calibre/calibre/plugins/progress_indicator.so 1158lib/calibre/calibre/plugins/progress_indicator.so
1129lib/calibre/calibre/plugins/qt_hack.so 1159lib/calibre/calibre/plugins/qt_hack.so
1130lib/calibre/calibre/plugins/speedup.so 1160lib/calibre/calibre/plugins/speedup.so
1131lib/calibre/calibre/plugins/sqlite_custom.so 1161lib/calibre/calibre/plugins/sqlite_custom.so
1132lib/calibre/calibre/plugins/tokenizer.so 1162lib/calibre/calibre/plugins/tokenizer.so
1133lib/calibre/calibre/plugins/unrar.so 1163lib/calibre/calibre/plugins/unrar.so
1134lib/calibre/calibre/plugins/woff.so 1164lib/calibre/calibre/plugins/woff.so
@@ -1146,26 +1176,27 @@ lib/calibre/calibre/translations/msgfmt. @@ -1146,26 +1176,27 @@ lib/calibre/calibre/translations/msgfmt.
1146lib/calibre/calibre/utils/Zeroconf.py 1176lib/calibre/calibre/utils/Zeroconf.py
1147lib/calibre/calibre/utils/__init__.py 1177lib/calibre/calibre/utils/__init__.py
1148lib/calibre/calibre/utils/apsw_shell.py 1178lib/calibre/calibre/utils/apsw_shell.py
1149lib/calibre/calibre/utils/bibtex.py 1179lib/calibre/calibre/utils/bibtex.py
1150lib/calibre/calibre/utils/browser.py 1180lib/calibre/calibre/utils/browser.py
1151lib/calibre/calibre/utils/chm/__init__.py 1181lib/calibre/calibre/utils/chm/__init__.py
1152lib/calibre/calibre/utils/chm/chm.py 1182lib/calibre/calibre/utils/chm/chm.py
1153lib/calibre/calibre/utils/chm/chmlib.py 1183lib/calibre/calibre/utils/chm/chmlib.py
1154lib/calibre/calibre/utils/cleantext.py 1184lib/calibre/calibre/utils/cleantext.py
1155lib/calibre/calibre/utils/complete.py 1185lib/calibre/calibre/utils/complete.py
1156lib/calibre/calibre/utils/config.py 1186lib/calibre/calibre/utils/config.py
1157lib/calibre/calibre/utils/config_base.py 1187lib/calibre/calibre/utils/config_base.py
1158lib/calibre/calibre/utils/date.py 1188lib/calibre/calibre/utils/date.py
 1189lib/calibre/calibre/utils/dbus_service.py
1159lib/calibre/calibre/utils/file_associations.py 1190lib/calibre/calibre/utils/file_associations.py
1160lib/calibre/calibre/utils/filenames.py 1191lib/calibre/calibre/utils/filenames.py
1161lib/calibre/calibre/utils/fonts/__init__.py 1192lib/calibre/calibre/utils/fonts/__init__.py
1162lib/calibre/calibre/utils/fonts/free_type.py 1193lib/calibre/calibre/utils/fonts/free_type.py
1163lib/calibre/calibre/utils/fonts/metadata.py 1194lib/calibre/calibre/utils/fonts/metadata.py
1164lib/calibre/calibre/utils/fonts/scanner.py 1195lib/calibre/calibre/utils/fonts/scanner.py
1165lib/calibre/calibre/utils/fonts/sfnt/__init__.py 1196lib/calibre/calibre/utils/fonts/sfnt/__init__.py
1166lib/calibre/calibre/utils/fonts/sfnt/cff/__init__.py 1197lib/calibre/calibre/utils/fonts/sfnt/cff/__init__.py
1167lib/calibre/calibre/utils/fonts/sfnt/cff/constants.py 1198lib/calibre/calibre/utils/fonts/sfnt/cff/constants.py
1168lib/calibre/calibre/utils/fonts/sfnt/cff/dict_data.py 1199lib/calibre/calibre/utils/fonts/sfnt/cff/dict_data.py
1169lib/calibre/calibre/utils/fonts/sfnt/cff/table.py 1200lib/calibre/calibre/utils/fonts/sfnt/cff/table.py
1170lib/calibre/calibre/utils/fonts/sfnt/cff/writer.py 1201lib/calibre/calibre/utils/fonts/sfnt/cff/writer.py
1171lib/calibre/calibre/utils/fonts/sfnt/cmap.py 1202lib/calibre/calibre/utils/fonts/sfnt/cmap.py
@@ -1183,51 +1214,51 @@ lib/calibre/calibre/utils/fonts/sfnt/sub @@ -1183,51 +1214,51 @@ lib/calibre/calibre/utils/fonts/sfnt/sub
1183lib/calibre/calibre/utils/fonts/utils.py 1214lib/calibre/calibre/utils/fonts/utils.py
1184lib/calibre/calibre/utils/fonts/win_fonts.py 1215lib/calibre/calibre/utils/fonts/win_fonts.py
1185lib/calibre/calibre/utils/fonts/woff/__init__.py 1216lib/calibre/calibre/utils/fonts/woff/__init__.py
1186lib/calibre/calibre/utils/formatter.py 1217lib/calibre/calibre/utils/formatter.py
1187lib/calibre/calibre/utils/formatter_functions.py 1218lib/calibre/calibre/utils/formatter_functions.py
1188lib/calibre/calibre/utils/html2text.py 1219lib/calibre/calibre/utils/html2text.py
1189lib/calibre/calibre/utils/https.py 1220lib/calibre/calibre/utils/https.py
1190lib/calibre/calibre/utils/icu.py 1221lib/calibre/calibre/utils/icu.py
1191lib/calibre/calibre/utils/icu_test.py 1222lib/calibre/calibre/utils/icu_test.py
1192lib/calibre/calibre/utils/imghdr.py 1223lib/calibre/calibre/utils/imghdr.py
1193lib/calibre/calibre/utils/ipc/__init__.py 1224lib/calibre/calibre/utils/ipc/__init__.py
1194lib/calibre/calibre/utils/ipc/job.py 1225lib/calibre/calibre/utils/ipc/job.py
1195lib/calibre/calibre/utils/ipc/launch.py 1226lib/calibre/calibre/utils/ipc/launch.py
 1227lib/calibre/calibre/utils/ipc/pool.py
1196lib/calibre/calibre/utils/ipc/proxy.py 1228lib/calibre/calibre/utils/ipc/proxy.py
1197lib/calibre/calibre/utils/ipc/server.py 1229lib/calibre/calibre/utils/ipc/server.py
1198lib/calibre/calibre/utils/ipc/simple_worker.py 1230lib/calibre/calibre/utils/ipc/simple_worker.py
1199lib/calibre/calibre/utils/ipc/worker.py 1231lib/calibre/calibre/utils/ipc/worker.py
1200lib/calibre/calibre/utils/ipython.py 1232lib/calibre/calibre/utils/ipython.py
1201lib/calibre/calibre/utils/linux_trash.py 1233lib/calibre/calibre/utils/linux_trash.py
1202lib/calibre/calibre/utils/localization.py 1234lib/calibre/calibre/utils/localization.py
1203lib/calibre/calibre/utils/localunzip.py 1235lib/calibre/calibre/utils/localunzip.py
1204lib/calibre/calibre/utils/lock.py 1236lib/calibre/calibre/utils/lock.py
1205lib/calibre/calibre/utils/logging.py 1237lib/calibre/calibre/utils/logging.py
1206lib/calibre/calibre/utils/magick/__init__.py 1238lib/calibre/calibre/utils/magick/__init__.py
1207lib/calibre/calibre/utils/magick/draw.py 1239lib/calibre/calibre/utils/magick/draw.py
1208lib/calibre/calibre/utils/magick/generate.py 1240lib/calibre/calibre/utils/magick/generate.py
1209lib/calibre/calibre/utils/matcher.py 1241lib/calibre/calibre/utils/matcher.py
1210lib/calibre/calibre/utils/mdns.py 1242lib/calibre/calibre/utils/mdns.py
1211lib/calibre/calibre/utils/mem.py 1243lib/calibre/calibre/utils/mem.py
1212lib/calibre/calibre/utils/monotonic.py 1244lib/calibre/calibre/utils/monotonic.py
1213lib/calibre/calibre/utils/mreplace.py 1245lib/calibre/calibre/utils/mreplace.py
1214lib/calibre/calibre/utils/network.py 1246lib/calibre/calibre/utils/network.py
1215lib/calibre/calibre/utils/opensearch/__init__.py 1247lib/calibre/calibre/utils/opensearch/__init__.py
1216lib/calibre/calibre/utils/opensearch/description.py 1248lib/calibre/calibre/utils/opensearch/description.py
1217lib/calibre/calibre/utils/opensearch/query.py 1249lib/calibre/calibre/utils/opensearch/query.py
1218lib/calibre/calibre/utils/opensearch/url.py 1250lib/calibre/calibre/utils/opensearch/url.py
1219lib/calibre/calibre/utils/ordered_dict.py 1251lib/calibre/calibre/utils/ordered_dict.py
1220lib/calibre/calibre/utils/osx_symlinks.py 
1221lib/calibre/calibre/utils/pdftk.py 1252lib/calibre/calibre/utils/pdftk.py
1222lib/calibre/calibre/utils/podofo/__init__.py 1253lib/calibre/calibre/utils/podofo/__init__.py
1223lib/calibre/calibre/utils/pyconsole/__init__.py 1254lib/calibre/calibre/utils/pyconsole/__init__.py
1224lib/calibre/calibre/utils/pyconsole/console.py 1255lib/calibre/calibre/utils/pyconsole/console.py
1225lib/calibre/calibre/utils/pyconsole/controller.py 1256lib/calibre/calibre/utils/pyconsole/controller.py
1226lib/calibre/calibre/utils/pyconsole/formatter.py 1257lib/calibre/calibre/utils/pyconsole/formatter.py
1227lib/calibre/calibre/utils/pyconsole/history.py 1258lib/calibre/calibre/utils/pyconsole/history.py
1228lib/calibre/calibre/utils/pyconsole/interpreter.py 1259lib/calibre/calibre/utils/pyconsole/interpreter.py
1229lib/calibre/calibre/utils/pyconsole/main.py 1260lib/calibre/calibre/utils/pyconsole/main.py
1230lib/calibre/calibre/utils/pyparsing.py 1261lib/calibre/calibre/utils/pyparsing.py
1231lib/calibre/calibre/utils/recycle_bin.py 1262lib/calibre/calibre/utils/recycle_bin.py
1232lib/calibre/calibre/utils/resources.py 1263lib/calibre/calibre/utils/resources.py
1233lib/calibre/calibre/utils/rss_gen.py 1264lib/calibre/calibre/utils/rss_gen.py
@@ -1292,59 +1323,60 @@ lib/calibre/odf/odf2xhtml.py @@ -1292,59 +1323,60 @@ lib/calibre/odf/odf2xhtml.py
1292lib/calibre/odf/odfmanifest.py 1323lib/calibre/odf/odfmanifest.py
1293lib/calibre/odf/office.py 1324lib/calibre/odf/office.py
1294lib/calibre/odf/opendocument.py 1325lib/calibre/odf/opendocument.py
1295lib/calibre/odf/presentation.py 1326lib/calibre/odf/presentation.py
1296lib/calibre/odf/script.py 1327lib/calibre/odf/script.py
1297lib/calibre/odf/style.py 1328lib/calibre/odf/style.py
1298lib/calibre/odf/svg.py 1329lib/calibre/odf/svg.py
1299lib/calibre/odf/table.py 1330lib/calibre/odf/table.py
1300lib/calibre/odf/teletype.py 1331lib/calibre/odf/teletype.py
1301lib/calibre/odf/text.py 1332lib/calibre/odf/text.py
1302lib/calibre/odf/thumbnail.py 1333lib/calibre/odf/thumbnail.py
1303lib/calibre/odf/userfield.py 1334lib/calibre/odf/userfield.py
1304lib/calibre/odf/xforms.py 1335lib/calibre/odf/xforms.py
1305lib/calibre/qtcurve/test_rendering.py 
1306lib/calibre/regex/__init__.py 1336lib/calibre/regex/__init__.py
1307lib/calibre/regex/_regex_core.py 1337lib/calibre/regex/_regex_core.py
1308lib/calibre/routes/__init__.py 1338lib/calibre/routes/__init__.py
1309lib/calibre/routes/base.py 1339lib/calibre/routes/base.py
1310lib/calibre/routes/lru.py 1340lib/calibre/routes/lru.py
1311lib/calibre/routes/mapper.py 1341lib/calibre/routes/mapper.py
1312lib/calibre/routes/middleware.py 1342lib/calibre/routes/middleware.py
1313lib/calibre/routes/route.py 1343lib/calibre/routes/route.py
1314lib/calibre/routes/util.py 1344lib/calibre/routes/util.py
1315lib/calibre/six.py 
1316lib/calibre/templite/__init__.py 1345lib/calibre/templite/__init__.py
1317lib/calibre/tinycss/__init__.py 1346lib/calibre/tinycss/__init__.py
1318lib/calibre/tinycss/color3.py 1347lib/calibre/tinycss/color3.py
1319lib/calibre/tinycss/css21.py 1348lib/calibre/tinycss/css21.py
1320lib/calibre/tinycss/decoding.py 1349lib/calibre/tinycss/decoding.py
1321lib/calibre/tinycss/fonts3.py 1350lib/calibre/tinycss/fonts3.py
1322lib/calibre/tinycss/media3.py 1351lib/calibre/tinycss/media3.py
1323lib/calibre/tinycss/page3.py 1352lib/calibre/tinycss/page3.py
1324lib/calibre/tinycss/parsing.py 1353lib/calibre/tinycss/parsing.py
1325lib/calibre/tinycss/tests/__init__.py 1354lib/calibre/tinycss/tests/__init__.py
1326lib/calibre/tinycss/tests/color3.py 1355lib/calibre/tinycss/tests/color3.py
1327lib/calibre/tinycss/tests/css21.py 1356lib/calibre/tinycss/tests/css21.py
1328lib/calibre/tinycss/tests/decoding.py 1357lib/calibre/tinycss/tests/decoding.py
1329lib/calibre/tinycss/tests/fonts3.py 1358lib/calibre/tinycss/tests/fonts3.py
1330lib/calibre/tinycss/tests/main.py 1359lib/calibre/tinycss/tests/main.py
1331lib/calibre/tinycss/tests/media3.py 1360lib/calibre/tinycss/tests/media3.py
1332lib/calibre/tinycss/tests/page3.py 1361lib/calibre/tinycss/tests/page3.py
1333lib/calibre/tinycss/tests/tokenizing.py 1362lib/calibre/tinycss/tests/tokenizing.py
1334lib/calibre/tinycss/token_data.py 1363lib/calibre/tinycss/token_data.py
1335lib/calibre/tinycss/tokenizer.py 1364lib/calibre/tinycss/tokenizer.py
1336lib/calibre/tinycss/version.py 1365lib/calibre/tinycss/version.py
1337${PYSITELIB}/init_calibre.py 1366${PYSITELIB}/init_calibre.py
 1367share/appdata/calibre-ebook-edit.appdata.xml
 1368share/appdata/calibre-ebook-viewer.appdata.xml
 1369share/appdata/calibre-gui.appdata.xml
1338share/applications/calibre-ebook-edit.desktop 1370share/applications/calibre-ebook-edit.desktop
1339share/applications/calibre-ebook-viewer.desktop 1371share/applications/calibre-ebook-viewer.desktop
1340share/applications/calibre-gui.desktop 1372share/applications/calibre-gui.desktop
1341share/applications/calibre-lrfviewer.desktop 1373share/applications/calibre-lrfviewer.desktop
1342share/bash-completion/completions/calibre 1374share/bash-completion/completions/calibre
1343share/calibre/builtin_recipes.xml 1375share/calibre/builtin_recipes.xml
1344share/calibre/builtin_recipes.zip 1376share/calibre/builtin_recipes.zip
1345share/calibre/calibre-ebook-root-CA.crt 1377share/calibre/calibre-ebook-root-CA.crt
1346share/calibre/calibre-mimetypes.xml 1378share/calibre/calibre-mimetypes.xml
1347share/calibre/calibre-portable.bat 1379share/calibre/calibre-portable.bat
1348share/calibre/calibre-portable.sh 1380share/calibre/calibre-portable.sh
1349share/calibre/catalog/DefaultCover.jpg 1381share/calibre/catalog/DefaultCover.jpg
1350share/calibre/catalog/mastheadImage.gif 1382share/calibre/catalog/mastheadImage.gif
@@ -1402,26 +1434,27 @@ share/calibre/content_server/star-off.pn @@ -1402,26 +1434,27 @@ share/calibre/content_server/star-off.pn
1402share/calibre/content_server/star-on.png 1434share/calibre/content_server/star-on.png
1403share/calibre/csscolorparser.js 1435share/calibre/csscolorparser.js
1404share/calibre/default_tweaks.py 1436share/calibre/default_tweaks.py
1405share/calibre/dictionaries/en-GB/en-GB.aff 1437share/calibre/dictionaries/en-GB/en-GB.aff
1406share/calibre/dictionaries/en-GB/en-GB.dic 1438share/calibre/dictionaries/en-GB/en-GB.dic
1407share/calibre/dictionaries/en-GB/locales 1439share/calibre/dictionaries/en-GB/locales
1408share/calibre/dictionaries/en-US/en-US.aff 1440share/calibre/dictionaries/en-US/en-US.aff
1409share/calibre/dictionaries/en-US/en-US.dic 1441share/calibre/dictionaries/en-US/en-US.dic
1410share/calibre/dictionaries/en-US/locales 1442share/calibre/dictionaries/en-US/locales
1411share/calibre/dictionaries/es-ES/es-ES.aff 1443share/calibre/dictionaries/es-ES/es-ES.aff
1412share/calibre/dictionaries/es-ES/es-ES.dic 1444share/calibre/dictionaries/es-ES/es-ES.dic
1413share/calibre/dictionaries/es-ES/locales 1445share/calibre/dictionaries/es-ES/locales
1414share/calibre/ebook-convert-complete.pickle 1446share/calibre/ebook-convert-complete.pickle
 1447share/calibre/editor-functions.json
1415share/calibre/editor-help/css.json 1448share/calibre/editor-help/css.json
1416share/calibre/editor-help/html.json 1449share/calibre/editor-help/html.json
1417share/calibre/editor-help/mathml.json 1450share/calibre/editor-help/mathml.json
1418share/calibre/editor-help/opf2.json 1451share/calibre/editor-help/opf2.json
1419share/calibre/editor-help/opf3.json 1452share/calibre/editor-help/opf3.json
1420share/calibre/editor-help/svg.json 1453share/calibre/editor-help/svg.json
1421share/calibre/fonts/calibreSymbols.otf 1454share/calibre/fonts/calibreSymbols.otf
1422share/calibre/fonts/liberation/LiberationMono-Bold.ttf 1455share/calibre/fonts/liberation/LiberationMono-Bold.ttf
1423share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf 1456share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
1424share/calibre/fonts/liberation/LiberationMono-Italic.ttf 1457share/calibre/fonts/liberation/LiberationMono-Italic.ttf
1425share/calibre/fonts/liberation/LiberationMono-Regular.ttf 1458share/calibre/fonts/liberation/LiberationMono-Regular.ttf
1426share/calibre/fonts/liberation/LiberationSans-Bold.ttf 1459share/calibre/fonts/liberation/LiberationSans-Bold.ttf
1427share/calibre/fonts/liberation/LiberationSans-BoldItalic.ttf 1460share/calibre/fonts/liberation/LiberationSans-BoldItalic.ttf
@@ -1444,52 +1477,54 @@ share/calibre/images/book.png @@ -1444,52 +1477,54 @@ share/calibre/images/book.png
1444share/calibre/images/bookmarks.png 1477share/calibre/images/bookmarks.png
1445share/calibre/images/books_in_series.png 1478share/calibre/images/books_in_series.png
1446share/calibre/images/catalog.png 1479share/calibre/images/catalog.png
1447share/calibre/images/chapters.png 1480share/calibre/images/chapters.png
1448share/calibre/images/character-set.png 1481share/calibre/images/character-set.png
1449share/calibre/images/clear_left.png 1482share/calibre/images/clear_left.png
1450share/calibre/images/code.png 1483share/calibre/images/code.png
1451share/calibre/images/column.png 1484share/calibre/images/column.png
1452share/calibre/images/config.png 1485share/calibre/images/config.png
1453share/calibre/images/connect_share.png 1486share/calibre/images/connect_share.png
1454share/calibre/images/connect_share_on.png 1487share/calibre/images/connect_share_on.png
1455share/calibre/images/console.png 1488share/calibre/images/console.png
1456share/calibre/images/convert.png 1489share/calibre/images/convert.png
 1490share/calibre/images/copy-to-library.png
1457share/calibre/images/cover_flow.png 1491share/calibre/images/cover_flow.png
1458share/calibre/images/cover_texture.png 1492share/calibre/images/cover_texture.png
1459share/calibre/images/debug.png 1493share/calibre/images/debug.png
1460share/calibre/images/default_cover.png 1494share/calibre/images/default_cover.png
1461share/calibre/images/devices/bambook.png 1495share/calibre/images/devices/bambook.png
1462share/calibre/images/devices/boox.jpg 1496share/calibre/images/devices/boox.jpg
1463share/calibre/images/devices/folder.png 1497share/calibre/images/devices/folder.png
1464share/calibre/images/devices/ipad.png 1498share/calibre/images/devices/ipad.png
1465share/calibre/images/devices/italica.png 1499share/calibre/images/devices/italica.png
1466share/calibre/images/devices/itunes.png 1500share/calibre/images/devices/itunes.png
1467share/calibre/images/devices/kindle.jpg 1501share/calibre/images/devices/kindle.jpg
1468share/calibre/images/devices/nook.jpg 1502share/calibre/images/devices/nook.jpg
1469share/calibre/images/devices/tablet.png 1503share/calibre/images/devices/tablet.png
1470share/calibre/images/dialog_error.png 1504share/calibre/images/dialog_error.png
1471share/calibre/images/dialog_information.png 1505share/calibre/images/dialog_information.png
1472share/calibre/images/dialog_question.png 1506share/calibre/images/dialog_question.png
1473share/calibre/images/dialog_warning.png 1507share/calibre/images/dialog_warning.png
1474share/calibre/images/dictionary.png 1508share/calibre/images/dictionary.png
1475share/calibre/images/diff.png 1509share/calibre/images/diff.png
1476share/calibre/images/document-encrypt.png 1510share/calibre/images/document-encrypt.png
1477share/calibre/images/document-import.png 1511share/calibre/images/document-import.png
1478share/calibre/images/document-new.png 1512share/calibre/images/document-new.png
1479share/calibre/images/document_open.png 1513share/calibre/images/document_open.png
1480share/calibre/images/donate.png 1514share/calibre/images/donate.png
1481share/calibre/images/dot_green.png 1515share/calibre/images/dot_green.png
1482share/calibre/images/dot_red.png 1516share/calibre/images/dot_red.png
 1517share/calibre/images/download-metadata.png
1483share/calibre/images/drawer.png 1518share/calibre/images/drawer.png
1484share/calibre/images/drm-locked.png 1519share/calibre/images/drm-locked.png
1485share/calibre/images/drm-unlocked.png 1520share/calibre/images/drm-unlocked.png
1486share/calibre/images/edit-clear.png 1521share/calibre/images/edit-clear.png
1487share/calibre/images/edit-copy.png 1522share/calibre/images/edit-copy.png
1488share/calibre/images/edit-cut.png 1523share/calibre/images/edit-cut.png
1489share/calibre/images/edit-paste.png 1524share/calibre/images/edit-paste.png
1490share/calibre/images/edit-redo.png 1525share/calibre/images/edit-redo.png
1491share/calibre/images/edit-select-all.png 1526share/calibre/images/edit-select-all.png
1492share/calibre/images/edit-undo.png 1527share/calibre/images/edit-undo.png
1493share/calibre/images/edit_input.png 1528share/calibre/images/edit_input.png
1494share/calibre/images/eject.png 1529share/calibre/images/eject.png
1495share/calibre/images/embed-fonts.png 1530share/calibre/images/embed-fonts.png
@@ -1596,38 +1631,40 @@ share/calibre/images/plugins/plugin_upda @@ -1596,38 +1631,40 @@ share/calibre/images/plugins/plugin_upda
1596share/calibre/images/plugins/plugin_upgrade_invalid.png 1631share/calibre/images/plugins/plugin_upgrade_invalid.png
1597share/calibre/images/plugins/plugin_upgrade_ok.png 1632share/calibre/images/plugins/plugin_upgrade_ok.png
1598share/calibre/images/plugins/plugin_upgrade_valid.png 1633share/calibre/images/plugins/plugin_upgrade_valid.png
1599share/calibre/images/plus.png 1634share/calibre/images/plus.png
1600share/calibre/images/plusplus.png 1635share/calibre/images/plusplus.png
1601share/calibre/images/polish.png 1636share/calibre/images/polish.png
1602share/calibre/images/previous.png 1637share/calibre/images/previous.png
1603share/calibre/images/print-preview.png 1638share/calibre/images/print-preview.png
1604share/calibre/images/print.png 1639share/calibre/images/print.png
1605share/calibre/images/publisher.png 1640share/calibre/images/publisher.png
1606share/calibre/images/random.png 1641share/calibre/images/random.png
1607share/calibre/images/rating.png 1642share/calibre/images/rating.png
1608share/calibre/images/reader.png 1643share/calibre/images/reader.png
 1644share/calibre/images/reports.png
1609share/calibre/images/resize.png 1645share/calibre/images/resize.png
1610share/calibre/images/rotate-right.png 1646share/calibre/images/rotate-right.png
1611share/calibre/images/save.png 1647share/calibre/images/save.png
1612share/calibre/images/scheduler.png 1648share/calibre/images/scheduler.png
1613share/calibre/images/scroll.png 1649share/calibre/images/scroll.png
1614share/calibre/images/sd.png 1650share/calibre/images/sd.png
1615share/calibre/images/search.png 1651share/calibre/images/search.png
1616share/calibre/images/search_add_saved.png 1652share/calibre/images/search_add_saved.png
1617share/calibre/images/search_copy_saved.png 1653share/calibre/images/search_copy_saved.png
1618share/calibre/images/search_delete_saved.png 1654share/calibre/images/search_delete_saved.png
1619share/calibre/images/series.png 1655share/calibre/images/series.png
1620share/calibre/images/smarten-punctuation.png 1656share/calibre/images/smarten-punctuation.png
 1657share/calibre/images/snippets.png
1621share/calibre/images/spell-check.png 1658share/calibre/images/spell-check.png
1622share/calibre/images/store.png 1659share/calibre/images/store.png
1623share/calibre/images/subset-fonts.png 1660share/calibre/images/subset-fonts.png
1624share/calibre/images/swap.png 1661share/calibre/images/swap.png
1625share/calibre/images/sync-right.png 1662share/calibre/images/sync-right.png
1626share/calibre/images/sync.png 1663share/calibre/images/sync.png
1627share/calibre/images/tags.png 1664share/calibre/images/tags.png
1628share/calibre/images/tb_folder.png 1665share/calibre/images/tb_folder.png
1629share/calibre/images/template_funcs.png 1666share/calibre/images/template_funcs.png
1630share/calibre/images/textures/dark_cloth.png 1667share/calibre/images/textures/dark_cloth.png
1631share/calibre/images/textures/dark_wood.png 1668share/calibre/images/textures/dark_wood.png
1632share/calibre/images/textures/grey_wash_wall.png 1669share/calibre/images/textures/grey_wash_wall.png
1633share/calibre/images/textures/light_wood.png 1670share/calibre/images/textures/light_wood.png
@@ -1680,77 +1717,81 @@ share/calibre/recipes/abc_py.recipe @@ -1680,77 +1717,81 @@ share/calibre/recipes/abc_py.recipe
1680share/calibre/recipes/accountancyage.recipe 1717share/calibre/recipes/accountancyage.recipe
1681share/calibre/recipes/acim_bilim_dergisi.recipe 1718share/calibre/recipes/acim_bilim_dergisi.recipe
1682share/calibre/recipes/acrimed.recipe 1719share/calibre/recipes/acrimed.recipe
1683share/calibre/recipes/ad.recipe 1720share/calibre/recipes/ad.recipe
1684share/calibre/recipes/adevarul.recipe 1721share/calibre/recipes/adevarul.recipe
1685share/calibre/recipes/adnkronos.recipe 1722share/calibre/recipes/adnkronos.recipe
1686share/calibre/recipes/ads_of_the_world.recipe 1723share/calibre/recipes/ads_of_the_world.recipe
1687share/calibre/recipes/adventure_zone_pl.recipe 1724share/calibre/recipes/adventure_zone_pl.recipe
1688share/calibre/recipes/adventuregamers.recipe 1725share/calibre/recipes/adventuregamers.recipe
1689share/calibre/recipes/aftenposten.recipe 1726share/calibre/recipes/aftenposten.recipe
1690share/calibre/recipes/agrogerila.recipe 1727share/calibre/recipes/agrogerila.recipe
1691share/calibre/recipes/aif_ru.recipe 1728share/calibre/recipes/aif_ru.recipe
1692share/calibre/recipes/air_force_times.recipe 1729share/calibre/recipes/air_force_times.recipe
 1730share/calibre/recipes/ajans_firat.recipe
1693share/calibre/recipes/ajc.recipe 1731share/calibre/recipes/ajc.recipe
1694share/calibre/recipes/ajiajin.recipe 1732share/calibre/recipes/ajiajin.recipe
1695share/calibre/recipes/aksiyon_derigisi.recipe 1733share/calibre/recipes/aksiyon_derigisi.recipe
1696share/calibre/recipes/akter.recipe 1734share/calibre/recipes/akter.recipe
1697share/calibre/recipes/akter_dnevnik.recipe 1735share/calibre/recipes/akter_dnevnik.recipe
1698share/calibre/recipes/aktualne.cz.recipe 1736share/calibre/recipes/aktualne.cz.recipe
1699share/calibre/recipes/al_ahram.recipe 1737share/calibre/recipes/al_ahram.recipe
1700share/calibre/recipes/al_jazeera.recipe 1738share/calibre/recipes/al_jazeera.recipe
1701share/calibre/recipes/al_masry_al_youm.recipe 1739share/calibre/recipes/al_masry_al_youm.recipe
 1740share/calibre/recipes/al_monitor.recipe
1702share/calibre/recipes/albert_mohler.recipe 1741share/calibre/recipes/albert_mohler.recipe
1703share/calibre/recipes/alejakomiksu_com.recipe 1742share/calibre/recipes/alejakomiksu_com.recipe
1704share/calibre/recipes/alo_novine.recipe 1743share/calibre/recipes/alo_novine.recipe
1705share/calibre/recipes/alt_om_herning.recipe 1744share/calibre/recipes/alt_om_herning.recipe
1706share/calibre/recipes/alternet.recipe 1745share/calibre/recipes/alternet.recipe
1707share/calibre/recipes/am730.recipe 1746share/calibre/recipes/am730.recipe
1708share/calibre/recipes/ambito.recipe 1747share/calibre/recipes/ambito.recipe
1709share/calibre/recipes/ambito_financiero.recipe 1748share/calibre/recipes/ambito_financiero.recipe
1710share/calibre/recipes/american_thinker.recipe 1749share/calibre/recipes/american_thinker.recipe
1711share/calibre/recipes/amspec.recipe 1750share/calibre/recipes/amspec.recipe
1712share/calibre/recipes/an_druma_mor.recipe 1751share/calibre/recipes/an_druma_mor.recipe
1713share/calibre/recipes/anandtech.recipe 1752share/calibre/recipes/anandtech.recipe
1714share/calibre/recipes/anchorage_daily.recipe 1753share/calibre/recipes/anchorage_daily.recipe
1715share/calibre/recipes/android_com_pl.recipe 1754share/calibre/recipes/android_com_pl.recipe
1716share/calibre/recipes/animal_politico.recipe 1755share/calibre/recipes/animal_politico.recipe
1717share/calibre/recipes/antyweb.recipe 1756share/calibre/recipes/antyweb.recipe
1718share/calibre/recipes/ap.recipe 1757share/calibre/recipes/ap.recipe
1719share/calibre/recipes/apcom.recipe 1758share/calibre/recipes/apcom.recipe
1720share/calibre/recipes/apod.recipe 1759share/calibre/recipes/apod.recipe
1721share/calibre/recipes/app_funds.recipe 1760share/calibre/recipes/app_funds.recipe
1722share/calibre/recipes/apple_daily.recipe 1761share/calibre/recipes/apple_daily.recipe
 1762share/calibre/recipes/appledaily_tw.recipe
1723share/calibre/recipes/applefobia.recipe 1763share/calibre/recipes/applefobia.recipe
1724share/calibre/recipes/aprospect.recipe 1764share/calibre/recipes/aprospect.recipe
1725share/calibre/recipes/ara_info.recipe 1765share/calibre/recipes/ara_info.recipe
1726share/calibre/recipes/arabian_business.recipe 1766share/calibre/recipes/arabian_business.recipe
1727share/calibre/recipes/arbetaren.recipe 1767share/calibre/recipes/arbetaren.recipe
1728share/calibre/recipes/arcadia.recipe 1768share/calibre/recipes/arcadia.recipe
1729share/calibre/recipes/arcamax.recipe 1769share/calibre/recipes/arcamax.recipe
1730share/calibre/recipes/archeowiesci.recipe 1770share/calibre/recipes/archeowiesci.recipe
1731share/calibre/recipes/argnoticias.recipe 1771share/calibre/recipes/argnoticias.recipe
1732share/calibre/recipes/arizona_republic.recipe 1772share/calibre/recipes/arizona_republic.recipe
1733share/calibre/recipes/army_times.recipe 1773share/calibre/recipes/army_times.recipe
1734share/calibre/recipes/arret_sur_images.recipe 1774share/calibre/recipes/arret_sur_images.recipe
1735share/calibre/recipes/ars_technica.recipe 1775share/calibre/recipes/ars_technica.recipe
1736share/calibre/recipes/asco_de_vida.recipe 1776share/calibre/recipes/asco_de_vida.recipe
1737share/calibre/recipes/asia_one.recipe 1777share/calibre/recipes/asia_one.recipe
1738share/calibre/recipes/asianreviewofbooks.recipe 1778share/calibre/recipes/asianreviewofbooks.recipe
1739share/calibre/recipes/astro_news_pl.recipe 1779share/calibre/recipes/astro_news_pl.recipe
1740share/calibre/recipes/astroflesz.recipe 1780share/calibre/recipes/astroflesz.recipe
1741share/calibre/recipes/astronomia_pl.recipe 1781share/calibre/recipes/astronomia_pl.recipe
1742share/calibre/recipes/athens_news.recipe 1782share/calibre/recipes/athens_news.recipe
1743share/calibre/recipes/atlantic.recipe 1783share/calibre/recipes/atlantic.recipe
 1784share/calibre/recipes/atlantic_com.recipe
1744share/calibre/recipes/attac_es.recipe 1785share/calibre/recipes/attac_es.recipe
1745share/calibre/recipes/auto.recipe 1786share/calibre/recipes/auto.recipe
1746share/calibre/recipes/auto_blog.recipe 1787share/calibre/recipes/auto_blog.recipe
1747share/calibre/recipes/auto_prove.recipe 1788share/calibre/recipes/auto_prove.recipe
1748share/calibre/recipes/autobild.recipe 1789share/calibre/recipes/autobild.recipe
1749share/calibre/recipes/automatiseringgids.recipe 1790share/calibre/recipes/automatiseringgids.recipe
1750share/calibre/recipes/autosport.recipe 1791share/calibre/recipes/autosport.recipe
1751share/calibre/recipes/avantaje.recipe 1792share/calibre/recipes/avantaje.recipe
1752share/calibre/recipes/aventurilapescuit.recipe 1793share/calibre/recipes/aventurilapescuit.recipe
1753share/calibre/recipes/avto-magazin.recipe 1794share/calibre/recipes/avto-magazin.recipe
1754share/calibre/recipes/axxon_magazine.recipe 1795share/calibre/recipes/axxon_magazine.recipe
1755share/calibre/recipes/axxon_news.recipe 1796share/calibre/recipes/axxon_news.recipe
1756share/calibre/recipes/azstarnet.recipe 1797share/calibre/recipes/azstarnet.recipe
@@ -1760,26 +1801,27 @@ share/calibre/recipes/ba_herald.recipe @@ -1760,26 +1801,27 @@ share/calibre/recipes/ba_herald.recipe
1760share/calibre/recipes/babyonline.recipe 1801share/calibre/recipes/babyonline.recipe
1761share/calibre/recipes/bachormagazyn.recipe 1802share/calibre/recipes/bachormagazyn.recipe
1762share/calibre/recipes/badania_net.recipe 1803share/calibre/recipes/badania_net.recipe
1763share/calibre/recipes/balkaninsight.recipe 1804share/calibre/recipes/balkaninsight.recipe
1764share/calibre/recipes/baltimore_sun.recipe 1805share/calibre/recipes/baltimore_sun.recipe
1765share/calibre/recipes/banat_news.recipe 1806share/calibre/recipes/banat_news.recipe
1766share/calibre/recipes/bangkok_biz.recipe 1807share/calibre/recipes/bangkok_biz.recipe
1767share/calibre/recipes/bangkokpost.recipe 1808share/calibre/recipes/bangkokpost.recipe
1768share/calibre/recipes/bankier_pl.recipe 1809share/calibre/recipes/bankier_pl.recipe
1769share/calibre/recipes/barrons.recipe 1810share/calibre/recipes/barrons.recipe
1770share/calibre/recipes/bash_org_pl.recipe 1811share/calibre/recipes/bash_org_pl.recipe
1771share/calibre/recipes/bay_citizen.recipe 1812share/calibre/recipes/bay_citizen.recipe
1772share/calibre/recipes/bbc.recipe 1813share/calibre/recipes/bbc.recipe
 1814share/calibre/recipes/bbc_arabic.recipe
1773share/calibre/recipes/bbc_brasil.recipe 1815share/calibre/recipes/bbc_brasil.recipe
1774share/calibre/recipes/bbc_chinese.recipe 1816share/calibre/recipes/bbc_chinese.recipe
1775share/calibre/recipes/bbc_es.recipe 1817share/calibre/recipes/bbc_es.recipe
1776share/calibre/recipes/bbc_fast.recipe 1818share/calibre/recipes/bbc_fast.recipe
1777share/calibre/recipes/bbc_sport.recipe 1819share/calibre/recipes/bbc_sport.recipe
1778share/calibre/recipes/bbcvietnamese.recipe 1820share/calibre/recipes/bbcvietnamese.recipe
1779share/calibre/recipes/benchmark_pl.recipe 1821share/calibre/recipes/benchmark_pl.recipe
1780share/calibre/recipes/beppe_grillo.recipe 1822share/calibre/recipes/beppe_grillo.recipe
1781share/calibre/recipes/berliner_zeitung.recipe 1823share/calibre/recipes/berliner_zeitung.recipe
1782share/calibre/recipes/berlingske_dk.recipe 1824share/calibre/recipes/berlingske_dk.recipe
1783share/calibre/recipes/berria.recipe 1825share/calibre/recipes/berria.recipe
1784share/calibre/recipes/beta.recipe 1826share/calibre/recipes/beta.recipe
1785share/calibre/recipes/beta_en.recipe 1827share/calibre/recipes/beta_en.recipe
@@ -1791,27 +1833,26 @@ share/calibre/recipes/big_picture.recipe @@ -1791,27 +1833,26 @@ share/calibre/recipes/big_picture.recipe
1791share/calibre/recipes/biggovernment.recipe 1833share/calibre/recipes/biggovernment.recipe
1792share/calibre/recipes/bighollywood.recipe 1834share/calibre/recipes/bighollywood.recipe
1793share/calibre/recipes/bild_de.recipe 1835share/calibre/recipes/bild_de.recipe
1794share/calibre/recipes/billorielly.recipe 1836share/calibre/recipes/billorielly.recipe
1795share/calibre/recipes/biolog_pl.recipe 1837share/calibre/recipes/biolog_pl.recipe
1796share/calibre/recipes/birgun_gazetesi.recipe 1838share/calibre/recipes/birgun_gazetesi.recipe
1797share/calibre/recipes/birmingham_evening_mail.recipe 1839share/calibre/recipes/birmingham_evening_mail.recipe
1798share/calibre/recipes/birmingham_post.recipe 1840share/calibre/recipes/birmingham_post.recipe
1799share/calibre/recipes/bitacora.recipe 1841share/calibre/recipes/bitacora.recipe
1800share/calibre/recipes/biweekly.recipe 1842share/calibre/recipes/biweekly.recipe
1801share/calibre/recipes/biz_portal.recipe 1843share/calibre/recipes/biz_portal.recipe
1802share/calibre/recipes/blesk.recipe 1844share/calibre/recipes/blesk.recipe
1803share/calibre/recipes/blic.recipe 1845share/calibre/recipes/blic.recipe
1804share/calibre/recipes/blind_buch_de.recipe 
1805share/calibre/recipes/blog_biszopa.recipe 1846share/calibre/recipes/blog_biszopa.recipe
1806share/calibre/recipes/blog_da_cidadania.recipe 1847share/calibre/recipes/blog_da_cidadania.recipe
1807share/calibre/recipes/blognexto.recipe 1848share/calibre/recipes/blognexto.recipe
1808share/calibre/recipes/blues.recipe 1849share/calibre/recipes/blues.recipe
1809share/calibre/recipes/boortz.recipe 1850share/calibre/recipes/boortz.recipe
1810share/calibre/recipes/borse_online.recipe 1851share/calibre/recipes/borse_online.recipe
1811share/calibre/recipes/boston.com.recipe 1852share/calibre/recipes/boston.com.recipe
1812share/calibre/recipes/brand_eins.recipe 1853share/calibre/recipes/brand_eins.recipe
1813share/calibre/recipes/brasil_de_fato.recipe 1854share/calibre/recipes/brasil_de_fato.recipe
1814share/calibre/recipes/brecha.recipe 1855share/calibre/recipes/brecha.recipe
1815share/calibre/recipes/brewiarz.recipe 1856share/calibre/recipes/brewiarz.recipe
1816share/calibre/recipes/brigitte_de.recipe 1857share/calibre/recipes/brigitte_de.recipe
1817share/calibre/recipes/bucataras.recipe 1858share/calibre/recipes/bucataras.recipe
@@ -1900,41 +1941,43 @@ share/calibre/recipes/conowego_pl.recipe @@ -1900,41 +1941,43 @@ share/calibre/recipes/conowego_pl.recipe
1900share/calibre/recipes/consortium_news.recipe 1941share/calibre/recipes/consortium_news.recipe
1901share/calibre/recipes/consumerist.recipe 1942share/calibre/recipes/consumerist.recipe
1902share/calibre/recipes/contemporary_argentine_writers.recipe 1943share/calibre/recipes/contemporary_argentine_writers.recipe
1903share/calibre/recipes/corren2.recipe 1944share/calibre/recipes/corren2.recipe
1904share/calibre/recipes/corriere_della_sera_en.recipe 1945share/calibre/recipes/corriere_della_sera_en.recipe
1905share/calibre/recipes/corriere_della_sera_it.recipe 1946share/calibre/recipes/corriere_della_sera_it.recipe
1906share/calibre/recipes/corriere_dello_sport.recipe 1947share/calibre/recipes/corriere_dello_sport.recipe
1907share/calibre/recipes/cosmopolitan.recipe 1948share/calibre/recipes/cosmopolitan.recipe
1908share/calibre/recipes/cosmopolitan_de.recipe 1949share/calibre/recipes/cosmopolitan_de.recipe
1909share/calibre/recipes/cosmopolitan_uk.recipe 1950share/calibre/recipes/cosmopolitan_uk.recipe
1910share/calibre/recipes/cotidianul.recipe 1951share/calibre/recipes/cotidianul.recipe
1911share/calibre/recipes/counterpunch.recipe 1952share/calibre/recipes/counterpunch.recipe
1912share/calibre/recipes/countryfile.recipe 1953share/calibre/recipes/countryfile.recipe
 1954share/calibre/recipes/courier_mail.recipe
1913share/calibre/recipes/courrier.recipe 1955share/calibre/recipes/courrier.recipe
1914share/calibre/recipes/courrierinternational.recipe 1956share/calibre/recipes/courrierinternational.recipe
1915share/calibre/recipes/cracked_com.recipe 1957share/calibre/recipes/cracked_com.recipe
1916share/calibre/recipes/craigslist.recipe 1958share/calibre/recipes/craigslist.recipe
1917share/calibre/recipes/credit_slips.recipe 1959share/calibre/recipes/credit_slips.recipe
1918share/calibre/recipes/csid.recipe 1960share/calibre/recipes/csid.recipe
1919share/calibre/recipes/ct24.recipe 1961share/calibre/recipes/ct24.recipe
1920share/calibre/recipes/cubadebate.recipe 1962share/calibre/recipes/cubadebate.recipe
1921share/calibre/recipes/cumhuriyet.recipe 1963share/calibre/recipes/cumhuriyet.recipe
1922share/calibre/recipes/curierulnational.recipe 1964share/calibre/recipes/curierulnational.recipe
1923share/calibre/recipes/cvecezla.recipe 1965share/calibre/recipes/cvecezla.recipe
1924share/calibre/recipes/cyberpresse.recipe 1966share/calibre/recipes/cyberpresse.recipe
1925share/calibre/recipes/cynewslive.recipe 1967share/calibre/recipes/cynewslive.recipe
1926share/calibre/recipes/cyprus_weekly.recipe 1968share/calibre/recipes/cyprus_weekly.recipe
1927share/calibre/recipes/czas_gentlemanow.recipe 1969share/calibre/recipes/czas_gentlemanow.recipe
 1970share/calibre/recipes/dachauer_nachrichten.recipe
1928share/calibre/recipes/dagens_industri.recipe 1971share/calibre/recipes/dagens_industri.recipe
1929share/calibre/recipes/daily_express.recipe 1972share/calibre/recipes/daily_express.recipe
1930share/calibre/recipes/daily_mail.recipe 1973share/calibre/recipes/daily_mail.recipe
1931share/calibre/recipes/daily_mirror.recipe 1974share/calibre/recipes/daily_mirror.recipe
1932share/calibre/recipes/daily_telegraph.recipe 1975share/calibre/recipes/daily_telegraph.recipe
1933share/calibre/recipes/daily_writing_tips.recipe 1976share/calibre/recipes/daily_writing_tips.recipe
1934share/calibre/recipes/dailyreckoning.recipe 1977share/calibre/recipes/dailyreckoning.recipe
1935share/calibre/recipes/dailytportal.recipe 1978share/calibre/recipes/dailytportal.recipe
1936share/calibre/recipes/dallas.recipe 1979share/calibre/recipes/dallas.recipe
1937share/calibre/recipes/danas.recipe 1980share/calibre/recipes/danas.recipe
1938share/calibre/recipes/dani.recipe 1981share/calibre/recipes/dani.recipe
1939share/calibre/recipes/dark_horizons.recipe 1982share/calibre/recipes/dark_horizons.recipe
1940share/calibre/recipes/dark_reading.recipe 1983share/calibre/recipes/dark_reading.recipe
@@ -1998,59 +2041,62 @@ share/calibre/recipes/dingoo_a320.recipe @@ -1998,59 +2041,62 @@ share/calibre/recipes/dingoo_a320.recipe
1998share/calibre/recipes/discover_magazine.recipe 2041share/calibre/recipes/discover_magazine.recipe
1999share/calibre/recipes/disinformatico.recipe 2042share/calibre/recipes/disinformatico.recipe
2000share/calibre/recipes/divahair.recipe 2043share/calibre/recipes/divahair.recipe
2001share/calibre/recipes/dn_se.recipe 2044share/calibre/recipes/dn_se.recipe
2002share/calibre/recipes/dna.recipe 2045share/calibre/recipes/dna.recipe
2003share/calibre/recipes/dnevni_avaz.recipe 2046share/calibre/recipes/dnevni_avaz.recipe
2004share/calibre/recipes/dnevnik.recipe 2047share/calibre/recipes/dnevnik.recipe
2005share/calibre/recipes/dnevnik_cro.recipe 2048share/calibre/recipes/dnevnik_cro.recipe
2006share/calibre/recipes/dnevnik_mk.recipe 2049share/calibre/recipes/dnevnik_mk.recipe
2007share/calibre/recipes/dobanevinosti.recipe 2050share/calibre/recipes/dobanevinosti.recipe
2008share/calibre/recipes/dobreprogamy.recipe 2051share/calibre/recipes/dobreprogamy.recipe
2009share/calibre/recipes/doghousediaries.recipe 2052share/calibre/recipes/doghousediaries.recipe
2010share/calibre/recipes/dominion.recipe 2053share/calibre/recipes/dominion.recipe
 2054share/calibre/recipes/dorfener_anzeiger.recipe
2011share/calibre/recipes/dosisdiarias.recipe 2055share/calibre/recipes/dosisdiarias.recipe
2012share/calibre/recipes/dot_net.recipe 2056share/calibre/recipes/dot_net.recipe
2013share/calibre/recipes/dotpod.recipe 2057share/calibre/recipes/dotpod.recipe
2014share/calibre/recipes/down_to_earth.recipe 2058share/calibre/recipes/down_to_earth.recipe
2015share/calibre/recipes/dr_dk.recipe 2059share/calibre/recipes/dr_dk.recipe
2016share/calibre/recipes/drivelry.recipe 2060share/calibre/recipes/drivelry.recipe
2017share/calibre/recipes/drytooling_pl.recipe 2061share/calibre/recipes/drytooling_pl.recipe
2018share/calibre/recipes/dunya_bizim.recipe 2062share/calibre/recipes/dunya_bizim.recipe
2019share/calibre/recipes/dunya_bulteni.recipe 2063share/calibre/recipes/dunya_bulteni.recipe
2020share/calibre/recipes/dvhn.recipe 2064share/calibre/recipes/dvhn.recipe
2021share/calibre/recipes/dwutygodnik.recipe 2065share/calibre/recipes/dwutygodnik.recipe
2022share/calibre/recipes/dzial_zagraniczny.recipe 2066share/calibre/recipes/dzial_zagraniczny.recipe
2023share/calibre/recipes/dzieje_pl.recipe 2067share/calibre/recipes/dzieje_pl.recipe
2024share/calibre/recipes/dziennik_baltycki.recipe 2068share/calibre/recipes/dziennik_baltycki.recipe
2025share/calibre/recipes/dziennik_lodzki.recipe 2069share/calibre/recipes/dziennik_lodzki.recipe
2026share/calibre/recipes/dziennik_pl.recipe 2070share/calibre/recipes/dziennik_pl.recipe
2027share/calibre/recipes/dziennik_polski.recipe 2071share/calibre/recipes/dziennik_polski.recipe
2028share/calibre/recipes/dziennik_wschodni.recipe 2072share/calibre/recipes/dziennik_wschodni.recipe
2029share/calibre/recipes/dziennik_zachodni.recipe 2073share/calibre/recipes/dziennik_zachodni.recipe
2030share/calibre/recipes/e_novine.recipe 2074share/calibre/recipes/e_novine.recipe
 2075share/calibre/recipes/ebetrsberger_zeitung.recipe
2031share/calibre/recipes/echo_dnia.recipe 2076share/calibre/recipes/echo_dnia.recipe
2032share/calibre/recipes/echo_moskvy.recipe 2077share/calibre/recipes/echo_moskvy.recipe
2033share/calibre/recipes/echo_online.recipe 2078share/calibre/recipes/echo_online.recipe
2034share/calibre/recipes/eclicto.recipe 2079share/calibre/recipes/eclicto.recipe
2035share/calibre/recipes/eclipseonline.recipe 2080share/calibre/recipes/eclipseonline.recipe
2036share/calibre/recipes/ecogeek.recipe 2081share/calibre/recipes/ecogeek.recipe
2037share/calibre/recipes/economia.recipe 2082share/calibre/recipes/economia.recipe
2038share/calibre/recipes/economico.recipe 2083share/calibre/recipes/economico.recipe
2039share/calibre/recipes/economist.recipe 2084share/calibre/recipes/economist.recipe
2040share/calibre/recipes/economist_free.recipe 2085share/calibre/recipes/economist_free.recipe
2041share/calibre/recipes/ecotrend.recipe 2086share/calibre/recipes/ecotrend.recipe
2042share/calibre/recipes/ecuisine.recipe 2087share/calibre/recipes/ecuisine.recipe
2043share/calibre/recipes/edebistan.recipe 2088share/calibre/recipes/edebistan.recipe
 2089share/calibre/recipes/edebiyat_haber.recipe
2044share/calibre/recipes/edge_conversations.recipe 2090share/calibre/recipes/edge_conversations.recipe
2045share/calibre/recipes/editor_and_publisher.recipe 2091share/calibre/recipes/editor_and_publisher.recipe
2046share/calibre/recipes/editoriali.recipe 2092share/calibre/recipes/editoriali.recipe
2047share/calibre/recipes/edmonton_journal.recipe 2093share/calibre/recipes/edmonton_journal.recipe
2048share/calibre/recipes/egirl.recipe 2094share/calibre/recipes/egirl.recipe
2049share/calibre/recipes/eioba.recipe 2095share/calibre/recipes/eioba.recipe
2050share/calibre/recipes/ekantipur.recipe 2096share/calibre/recipes/ekantipur.recipe
2051share/calibre/recipes/ekathemerini.recipe 2097share/calibre/recipes/ekathemerini.recipe
2052share/calibre/recipes/ekologia_pl.recipe 2098share/calibre/recipes/ekologia_pl.recipe
2053share/calibre/recipes/ekot.recipe 2099share/calibre/recipes/ekot.recipe
2054share/calibre/recipes/ekundelek_pl.recipe 2100share/calibre/recipes/ekundelek_pl.recipe
2055share/calibre/recipes/el_colombiano.recipe 2101share/calibre/recipes/el_colombiano.recipe
2056share/calibre/recipes/el_correo.recipe 2102share/calibre/recipes/el_correo.recipe
@@ -2091,26 +2137,27 @@ share/calibre/recipes/eluniversal_ve.rec @@ -2091,26 +2137,27 @@ share/calibre/recipes/eluniversal_ve.rec
2091share/calibre/recipes/eluniversalimpresa.recipe 2137share/calibre/recipes/eluniversalimpresa.recipe
2092share/calibre/recipes/eluniverso_ec.recipe 2138share/calibre/recipes/eluniverso_ec.recipe
2093share/calibre/recipes/emg_en.recipe 2139share/calibre/recipes/emg_en.recipe
2094share/calibre/recipes/emg_rs.recipe 2140share/calibre/recipes/emg_rs.recipe
2095share/calibre/recipes/empire_magazine.recipe 2141share/calibre/recipes/empire_magazine.recipe
2096share/calibre/recipes/emuzica_pl.recipe 2142share/calibre/recipes/emuzica_pl.recipe
2097share/calibre/recipes/endgadget.recipe 2143share/calibre/recipes/endgadget.recipe
2098share/calibre/recipes/endgadget_ja.recipe 2144share/calibre/recipes/endgadget_ja.recipe
2099share/calibre/recipes/entrepeneur.recipe 2145share/calibre/recipes/entrepeneur.recipe
2100share/calibre/recipes/epicurious.recipe 2146share/calibre/recipes/epicurious.recipe
2101share/calibre/recipes/epl_talk.recipe 2147share/calibre/recipes/epl_talk.recipe
2102share/calibre/recipes/epw.recipe 2148share/calibre/recipes/epw.recipe
2103share/calibre/recipes/equipped.recipe 2149share/calibre/recipes/equipped.recipe
 2150share/calibre/recipes/erdinger_anzeiger.recipe
2104share/calibre/recipes/escrevinhador.recipe 2151share/calibre/recipes/escrevinhador.recipe
2105share/calibre/recipes/esenja.recipe 2152share/calibre/recipes/esenja.recipe
2106share/calibre/recipes/esensja_(rss).recipe 2153share/calibre/recipes/esensja_(rss).recipe
2107share/calibre/recipes/eso_pl.recipe 2154share/calibre/recipes/eso_pl.recipe
2108share/calibre/recipes/espn.recipe 2155share/calibre/recipes/espn.recipe
2109share/calibre/recipes/esquire.recipe 2156share/calibre/recipes/esquire.recipe
2110share/calibre/recipes/estadao.recipe 2157share/calibre/recipes/estadao.recipe
2111share/calibre/recipes/eu_commission.recipe 2158share/calibre/recipes/eu_commission.recipe
2112share/calibre/recipes/europa_press.recipe 2159share/calibre/recipes/europa_press.recipe
2113share/calibre/recipes/europasur.recipe 2160share/calibre/recipes/europasur.recipe
2114share/calibre/recipes/european_voice.recipe 2161share/calibre/recipes/european_voice.recipe
2115share/calibre/recipes/evangelizo.recipe 2162share/calibre/recipes/evangelizo.recipe
2116share/calibre/recipes/everett_herald.recipe 2163share/calibre/recipes/everett_herald.recipe
@@ -2158,59 +2205,64 @@ share/calibre/recipes/foreign_policy.rec @@ -2158,59 +2205,64 @@ share/calibre/recipes/foreign_policy.rec
2158share/calibre/recipes/foreignaffairs.recipe 2205share/calibre/recipes/foreignaffairs.recipe
2159share/calibre/recipes/formulaas.recipe 2206share/calibre/recipes/formulaas.recipe
2160share/calibre/recipes/forsal.recipe 2207share/calibre/recipes/forsal.recipe
2161share/calibre/recipes/fortune_magazine.recipe 2208share/calibre/recipes/fortune_magazine.recipe
2162share/calibre/recipes/fotoblogia_pl.recipe 2209share/calibre/recipes/fotoblogia_pl.recipe
2163share/calibre/recipes/foxnews.recipe 2210share/calibre/recipes/foxnews.recipe
2164share/calibre/recipes/fr_online.recipe 2211share/calibre/recipes/fr_online.recipe
2165share/calibre/recipes/frandroid.recipe 2212share/calibre/recipes/frandroid.recipe
2166share/calibre/recipes/frankfurter_rundschau.recipe 2213share/calibre/recipes/frankfurter_rundschau.recipe
2167share/calibre/recipes/frazpc.recipe 2214share/calibre/recipes/frazpc.recipe
2168share/calibre/recipes/freakonomics.recipe 2215share/calibre/recipes/freakonomics.recipe
2169share/calibre/recipes/freenature.recipe 2216share/calibre/recipes/freenature.recipe
2170share/calibre/recipes/freeway.recipe 2217share/calibre/recipes/freeway.recipe
 2218share/calibre/recipes/freisinger_tagblatt.recipe
2171share/calibre/recipes/fria.recipe 2219share/calibre/recipes/fria.recipe
2172share/calibre/recipes/frontlineonnet.recipe 2220share/calibre/recipes/frontlineonnet.recipe
2173share/calibre/recipes/fstream.recipe 2221share/calibre/recipes/fstream.recipe
2174share/calibre/recipes/ftd.recipe 2222share/calibre/recipes/ftd.recipe
2175share/calibre/recipes/fudzilla.recipe 2223share/calibre/recipes/fudzilla.recipe
 2224share/calibre/recipes/furstenfeldbrucker_tagblatt.recipe
2176share/calibre/recipes/futurismic.recipe 2225share/calibre/recipes/futurismic.recipe
2177share/calibre/recipes/galaxys_edge.recipe 2226share/calibre/recipes/galaxys_edge.recipe
2178share/calibre/recipes/galicia_confidential.recipe 2227share/calibre/recipes/galicia_confidential.recipe
2179share/calibre/recipes/gamasutra_fa.recipe 2228share/calibre/recipes/gamasutra_fa.recipe
2180share/calibre/recipes/gamasutra_news.recipe 2229share/calibre/recipes/gamasutra_news.recipe
2181share/calibre/recipes/gamekult.recipe 2230share/calibre/recipes/gamekult.recipe
2182share/calibre/recipes/gameplay_pl.recipe 2231share/calibre/recipes/gameplay_pl.recipe
2183share/calibre/recipes/gamespot.recipe 2232share/calibre/recipes/gamespot.recipe
2184share/calibre/recipes/gandul.recipe 2233share/calibre/recipes/gandul.recipe
 2234share/calibre/recipes/garmischer_tagblatt.recipe
2185share/calibre/recipes/gawker.recipe 2235share/calibre/recipes/gawker.recipe
2186share/calibre/recipes/gazeta-prawna-calibre-v1.recipe 2236share/calibre/recipes/gazeta-prawna-calibre-v1.recipe
2187share/calibre/recipes/gazeta_krakowska.recipe 2237share/calibre/recipes/gazeta_krakowska.recipe
2188share/calibre/recipes/gazeta_lubuska.recipe 2238share/calibre/recipes/gazeta_lubuska.recipe
2189share/calibre/recipes/gazeta_pl_bydgoszcz.recipe 2239share/calibre/recipes/gazeta_pl_bydgoszcz.recipe
2190share/calibre/recipes/gazeta_pl_krakow.recipe 2240share/calibre/recipes/gazeta_pl_krakow.recipe
2191share/calibre/recipes/gazeta_pl_szczecin.recipe 2241share/calibre/recipes/gazeta_pl_szczecin.recipe
2192share/calibre/recipes/gazeta_pl_warszawa.recipe 2242share/calibre/recipes/gazeta_pl_warszawa.recipe
2193share/calibre/recipes/gazeta_pomorska.recipe 2243share/calibre/recipes/gazeta_pomorska.recipe
2194share/calibre/recipes/gazeta_wroclawska.recipe 2244share/calibre/recipes/gazeta_wroclawska.recipe
2195share/calibre/recipes/gazeta_wspolczesna.recipe 2245share/calibre/recipes/gazeta_wspolczesna.recipe
2196share/calibre/recipes/gazeta_wyborcza.recipe 2246share/calibre/recipes/gazeta_wyborcza.recipe
2197share/calibre/recipes/gcn.recipe 2247share/calibre/recipes/gcn.recipe
2198share/calibre/recipes/geek_poke.recipe 2248share/calibre/recipes/geek_poke.recipe
2199share/calibre/recipes/geopolityka.recipe 2249share/calibre/recipes/geopolityka.recipe
 2250share/calibre/recipes/geretsrieder_merkur.recipe
2200share/calibre/recipes/german_gov.recipe 2251share/calibre/recipes/german_gov.recipe
2201share/calibre/recipes/gezgin_dergi.recipe 2252share/calibre/recipes/gezgin_dergi.recipe
2202share/calibre/recipes/gildia_pl.recipe 2253share/calibre/recipes/gildia_pl.recipe
2203share/calibre/recipes/gizmodo.recipe 2254share/calibre/recipes/gizmodo.recipe
 2255share/calibre/recipes/gkt.recipe
2204share/calibre/recipes/glamour.recipe 2256share/calibre/recipes/glamour.recipe
2205share/calibre/recipes/glas_srpske.recipe 2257share/calibre/recipes/glas_srpske.recipe
2206share/calibre/recipes/glasgow_herald.recipe 2258share/calibre/recipes/glasgow_herald.recipe
2207share/calibre/recipes/glasjavnosti.recipe 2259share/calibre/recipes/glasjavnosti.recipe
2208share/calibre/recipes/glenn_greenwald.recipe 2260share/calibre/recipes/glenn_greenwald.recipe
2209share/calibre/recipes/glennbeck.recipe 2261share/calibre/recipes/glennbeck.recipe
2210share/calibre/recipes/globaltimes.recipe 2262share/calibre/recipes/globaltimes.recipe
2211share/calibre/recipes/globe_and_mail.recipe 2263share/calibre/recipes/globe_and_mail.recipe
2212share/calibre/recipes/globes_co_il.recipe 2264share/calibre/recipes/globes_co_il.recipe
2213share/calibre/recipes/glos_wielkopolski.recipe 2265share/calibre/recipes/glos_wielkopolski.recipe
2214share/calibre/recipes/go4it.recipe 2266share/calibre/recipes/go4it.recipe
2215share/calibre/recipes/go_comics.recipe 2267share/calibre/recipes/go_comics.recipe
2216share/calibre/recipes/goal.recipe 2268share/calibre/recipes/goal.recipe
@@ -2225,83 +2277,86 @@ share/calibre/recipes/gram_pl.recipe @@ -2225,83 +2277,86 @@ share/calibre/recipes/gram_pl.recipe
2225share/calibre/recipes/grandes_corresponsales_es.recipe 2277share/calibre/recipes/grandes_corresponsales_es.recipe
2226share/calibre/recipes/granma.recipe 2278share/calibre/recipes/granma.recipe
2227share/calibre/recipes/grantland.recipe 2279share/calibre/recipes/grantland.recipe
2228share/calibre/recipes/greensboro_news_and_record.recipe 2280share/calibre/recipes/greensboro_news_and_record.recipe
2229share/calibre/recipes/grid_to.recipe 2281share/calibre/recipes/grid_to.recipe
2230share/calibre/recipes/grrm.recipe 2282share/calibre/recipes/grrm.recipe
2231share/calibre/recipes/gry_online_pl.recipe 2283share/calibre/recipes/gry_online_pl.recipe
2232share/calibre/recipes/gs24_pl.recipe 2284share/calibre/recipes/gs24_pl.recipe
2233share/calibre/recipes/gsp.recipe 2285share/calibre/recipes/gsp.recipe
2234share/calibre/recipes/guardian.recipe 2286share/calibre/recipes/guardian.recipe
2235share/calibre/recipes/gulfnews.recipe 2287share/calibre/recipes/gulfnews.recipe
2236share/calibre/recipes/gulli.recipe 2288share/calibre/recipes/gulli.recipe
2237share/calibre/recipes/gva_be.recipe 2289share/calibre/recipes/gva_be.recipe
 2290share/calibre/recipes/gwup.recipe
2238share/calibre/recipes/h1.recipe 2291share/calibre/recipes/h1.recipe
2239share/calibre/recipes/h2.recipe 2292share/calibre/recipes/h2.recipe
2240share/calibre/recipes/h3.recipe 2293share/calibre/recipes/h3.recipe
2241share/calibre/recipes/h7_tumspor.recipe 2294share/calibre/recipes/h7_tumspor.recipe
2242share/calibre/recipes/haaretz_en.recipe 2295share/calibre/recipes/haaretz_en.recipe
2243share/calibre/recipes/haber7.recipe 2296share/calibre/recipes/haber7.recipe
2244share/calibre/recipes/hackernews.recipe 2297share/calibre/recipes/hackernews.recipe
2245share/calibre/recipes/haksoz.recipe 2298share/calibre/recipes/haksoz.recipe
2246share/calibre/recipes/hallo_assen.recipe 2299share/calibre/recipes/hallo_assen.recipe
2247share/calibre/recipes/hamilton_spectator.recipe 2300share/calibre/recipes/hamilton_spectator.recipe
2248share/calibre/recipes/handelsblatt.recipe 2301share/calibre/recipes/handelsblatt.recipe
2249share/calibre/recipes/hankyoreh.recipe 2302share/calibre/recipes/hankyoreh.recipe
2250share/calibre/recipes/hankyoreh21.recipe 2303share/calibre/recipes/hankyoreh21.recipe
2251share/calibre/recipes/hannoversche_zeitung.recipe 2304share/calibre/recipes/hannoversche_zeitung.recipe
2252share/calibre/recipes/harpers.recipe 2305share/calibre/recipes/harpers.recipe
2253share/calibre/recipes/harpers_full.recipe 2306share/calibre/recipes/harpers_full.recipe
2254share/calibre/recipes/hartford_courant.recipe 2307share/calibre/recipes/hartford_courant.recipe
2255share/calibre/recipes/hatalska.recipe 2308share/calibre/recipes/hatalska.recipe
2256share/calibre/recipes/hawaii.recipe 2309share/calibre/recipes/hawaii.recipe
2257share/calibre/recipes/hbr.recipe 2310share/calibre/recipes/hbr.recipe
2258share/calibre/recipes/hbr_blogs.recipe 
2259share/calibre/recipes/heavy_metal_it.recipe 2311share/calibre/recipes/heavy_metal_it.recipe
2260share/calibre/recipes/heise.recipe 2312share/calibre/recipes/heise.recipe
2261share/calibre/recipes/heise_online.recipe 2313share/calibre/recipes/heise_online.recipe
2262share/calibre/recipes/heise_open.recipe 2314share/calibre/recipes/heise_open.recipe
2263share/calibre/recipes/helsingin_sanomat.recipe 2315share/calibre/recipes/helsingin_sanomat.recipe
2264share/calibre/recipes/heraldo.recipe 2316share/calibre/recipes/heraldo.recipe
2265share/calibre/recipes/heritage_foundation.recipe 2317share/calibre/recipes/heritage_foundation.recipe
2266share/calibre/recipes/high_country_news.recipe 2318share/calibre/recipes/high_country_news.recipe
2267share/calibre/recipes/hindu.recipe 2319share/calibre/recipes/hindu.recipe
2268share/calibre/recipes/hindu_business_line.recipe 2320share/calibre/recipes/hindu_business_line.recipe
2269share/calibre/recipes/hindustan_times.recipe 2321share/calibre/recipes/hindustan_times.recipe
2270share/calibre/recipes/hira.recipe 2322share/calibre/recipes/hira.recipe
2271share/calibre/recipes/histmag.recipe 2323share/calibre/recipes/histmag.recipe
2272share/calibre/recipes/historia_news.recipe 2324share/calibre/recipes/historia_news.recipe
2273share/calibre/recipes/historia_pl.recipe 2325share/calibre/recipes/historia_pl.recipe
2274share/calibre/recipes/historiaro.recipe 2326share/calibre/recipes/historiaro.recipe
2275share/calibre/recipes/historias_del_mundo_es.recipe 2327share/calibre/recipes/historias_del_mundo_es.recipe
2276share/calibre/recipes/histories_del_mon_ca.recipe 2328share/calibre/recipes/histories_del_mon_ca.recipe
2277share/calibre/recipes/history_today.recipe 2329share/calibre/recipes/history_today.recipe
2278share/calibre/recipes/hitro.recipe 2330share/calibre/recipes/hitro.recipe
2279share/calibre/recipes/hln.recipe 2331share/calibre/recipes/hln.recipe
2280share/calibre/recipes/hln_be.recipe 2332share/calibre/recipes/hln_be.recipe
2281share/calibre/recipes/hna.recipe 2333share/calibre/recipes/hna.recipe
2282share/calibre/recipes/hnonline.recipe 2334share/calibre/recipes/hnonline.recipe
2283share/calibre/recipes/hola.recipe 2335share/calibre/recipes/hola.recipe
 2336share/calibre/recipes/hollywood_reporter.recipe
 2337share/calibre/recipes/holzkirchener_merkur.recipe
2284share/calibre/recipes/homopedia_pl.recipe 2338share/calibre/recipes/homopedia_pl.recipe
2285share/calibre/recipes/hotair.recipe 2339share/calibre/recipes/hotair.recipe
2286share/calibre/recipes/hotcity.recipe 2340share/calibre/recipes/hotcity.recipe
2287share/calibre/recipes/hotnews.recipe 2341share/calibre/recipes/hotnews.recipe
2288share/calibre/recipes/house_news.recipe 2342share/calibre/recipes/house_news.recipe
2289share/calibre/recipes/houston_chronicle.recipe 2343share/calibre/recipes/houston_chronicle.recipe
2290share/calibre/recipes/howtogeek.recipe 2344share/calibre/recipes/howtogeek.recipe
2291share/calibre/recipes/hoy.recipe 2345share/calibre/recipes/hoy.recipe
2292share/calibre/recipes/hrt.recipe 2346share/calibre/recipes/hrt.recipe
2293share/calibre/recipes/huffingtonpost.recipe 2347share/calibre/recipes/huffingtonpost.recipe
2294share/calibre/recipes/huffingtonpost_uk.recipe 2348share/calibre/recipes/huffingtonpost_uk.recipe
 2349share/calibre/recipes/hurriyet_daily_news.recipe
2295share/calibre/recipes/hvg.recipe 2350share/calibre/recipes/hvg.recipe
2296share/calibre/recipes/ibm_smarter_planet.recipe 2351share/calibre/recipes/ibm_smarter_planet.recipe
2297share/calibre/recipes/ideal_almeria.recipe 2352share/calibre/recipes/ideal_almeria.recipe
2298share/calibre/recipes/ideal_granada.recipe 2353share/calibre/recipes/ideal_granada.recipe
2299share/calibre/recipes/ideal_jaen.recipe 2354share/calibre/recipes/ideal_jaen.recipe
2300share/calibre/recipes/idg_now.recipe 2355share/calibre/recipes/idg_now.recipe
2301share/calibre/recipes/idg_se.recipe 2356share/calibre/recipes/idg_se.recipe
2302share/calibre/recipes/idnes.recipe 2357share/calibre/recipes/idnes.recipe
2303share/calibre/recipes/ieco.recipe 2358share/calibre/recipes/ieco.recipe
2304share/calibre/recipes/ieeespectrum.recipe 2359share/calibre/recipes/ieeespectrum.recipe
2305share/calibre/recipes/ifzm.recipe 2360share/calibre/recipes/ifzm.recipe
2306share/calibre/recipes/ihned.cz.recipe 2361share/calibre/recipes/ihned.cz.recipe
2307share/calibre/recipes/ihned.recipe 2362share/calibre/recipes/ihned.recipe
@@ -2336,30 +2391,32 @@ share/calibre/recipes/inquirer_net.recip @@ -2336,30 +2391,32 @@ share/calibre/recipes/inquirer_net.recip
2336share/calibre/recipes/insan_okur.recipe 2391share/calibre/recipes/insan_okur.recipe
2337share/calibre/recipes/insider.recipe 2392share/calibre/recipes/insider.recipe
2338share/calibre/recipes/instapaper.recipe 2393share/calibre/recipes/instapaper.recipe
2339share/calibre/recipes/intelligencer.recipe 2394share/calibre/recipes/intelligencer.recipe
2340share/calibre/recipes/interia_fakty.recipe 2395share/calibre/recipes/interia_fakty.recipe
2341share/calibre/recipes/interia_sport.recipe 2396share/calibre/recipes/interia_sport.recipe
2342share/calibre/recipes/intrefete.recipe 2397share/calibre/recipes/intrefete.recipe
2343share/calibre/recipes/io9.recipe 2398share/calibre/recipes/io9.recipe
2344share/calibre/recipes/iol_za.recipe 2399share/calibre/recipes/iol_za.recipe
2345share/calibre/recipes/ionline_pt.recipe 2400share/calibre/recipes/ionline_pt.recipe
2346share/calibre/recipes/iprofesional.recipe 2401share/calibre/recipes/iprofesional.recipe
2347share/calibre/recipes/irish_independent.recipe 2402share/calibre/recipes/irish_independent.recipe
2348share/calibre/recipes/irish_times.recipe 2403share/calibre/recipes/irish_times.recipe
 2404share/calibre/recipes/isar-loisachbote.recipe
2349share/calibre/recipes/ittechblog.recipe 2405share/calibre/recipes/ittechblog.recipe
2350share/calibre/recipes/ivanamilakovic.recipe 2406share/calibre/recipes/ivanamilakovic.recipe
2351share/calibre/recipes/izdiham.com.recipe 2407share/calibre/recipes/izdiham.com.recipe
2352share/calibre/recipes/izvestia.recipe 2408share/calibre/recipes/izvestia.recipe
 2409share/calibre/recipes/jagran_josh.recipe
2353share/calibre/recipes/jakarta_globe.recipe 2410share/calibre/recipes/jakarta_globe.recipe
2354share/calibre/recipes/jakarta_post.recipe 2411share/calibre/recipes/jakarta_post.recipe
2355share/calibre/recipes/jalopnik.recipe 2412share/calibre/recipes/jalopnik.recipe
2356share/calibre/recipes/japaa.recipe 2413share/calibre/recipes/japaa.recipe
2357share/calibre/recipes/japan_news.recipe 2414share/calibre/recipes/japan_news.recipe
2358share/calibre/recipes/japan_times.recipe 2415share/calibre/recipes/japan_times.recipe
2359share/calibre/recipes/javalobby.recipe 2416share/calibre/recipes/javalobby.recipe
2360share/calibre/recipes/jazzpress.recipe 2417share/calibre/recipes/jazzpress.recipe
2361share/calibre/recipes/jb_online.recipe 2418share/calibre/recipes/jb_online.recipe
2362share/calibre/recipes/jbpress.recipe 2419share/calibre/recipes/jbpress.recipe
2363share/calibre/recipes/jeuxvideo.recipe 2420share/calibre/recipes/jeuxvideo.recipe
2364share/calibre/recipes/jezebel.recipe 2421share/calibre/recipes/jezebel.recipe
2365share/calibre/recipes/jijinews.recipe 2422share/calibre/recipes/jijinews.recipe
@@ -2395,26 +2452,27 @@ share/calibre/recipes/klubknjige.recipe @@ -2395,26 +2452,27 @@ share/calibre/recipes/klubknjige.recipe
2395share/calibre/recipes/km_blog.recipe 2452share/calibre/recipes/km_blog.recipe
2396share/calibre/recipes/komchadluek.recipe 2453share/calibre/recipes/komchadluek.recipe
2397share/calibre/recipes/kommersant.recipe 2454share/calibre/recipes/kommersant.recipe
2398share/calibre/recipes/kompas.recipe 2455share/calibre/recipes/kompas.recipe
2399share/calibre/recipes/kompiutierra.recipe 2456share/calibre/recipes/kompiutierra.recipe
2400share/calibre/recipes/konflikty_zbrojne.recipe 2457share/calibre/recipes/konflikty_zbrojne.recipe
2401share/calibre/recipes/kopalniawiedzy.recipe 2458share/calibre/recipes/kopalniawiedzy.recipe
2402share/calibre/recipes/korben.recipe 2459share/calibre/recipes/korben.recipe
2403share/calibre/recipes/korea_herald.recipe 2460share/calibre/recipes/korea_herald.recipe
2404share/calibre/recipes/korespondent.recipe 2461share/calibre/recipes/korespondent.recipe
2405share/calibre/recipes/kosmonauta_pl.recipe 2462share/calibre/recipes/kosmonauta_pl.recipe
2406share/calibre/recipes/kotaku.recipe 2463share/calibre/recipes/kotaku.recipe
2407share/calibre/recipes/kp.recipe 2464share/calibre/recipes/kp.recipe
 2465share/calibre/recipes/krebs_on_security.recipe
2408share/calibre/recipes/kresy_pl.recipe 2466share/calibre/recipes/kresy_pl.recipe
2409share/calibre/recipes/krstarica.recipe 2467share/calibre/recipes/krstarica.recipe
2410share/calibre/recipes/krstarica_en.recipe 2468share/calibre/recipes/krstarica_en.recipe
2411share/calibre/recipes/ksiazka_pl.recipe 2469share/calibre/recipes/ksiazka_pl.recipe
2412share/calibre/recipes/kstar.recipe 2470share/calibre/recipes/kstar.recipe
2413share/calibre/recipes/kudika.recipe 2471share/calibre/recipes/kudika.recipe
2414share/calibre/recipes/kudy_z_nudy.recipe 2472share/calibre/recipes/kudy_z_nudy.recipe
2415share/calibre/recipes/kukuburi.recipe 2473share/calibre/recipes/kukuburi.recipe
2416share/calibre/recipes/kurier.recipe 2474share/calibre/recipes/kurier.recipe
2417share/calibre/recipes/kurier_galicyjski.recipe 2475share/calibre/recipes/kurier_galicyjski.recipe
2418share/calibre/recipes/kurier_lubelski.recipe 2476share/calibre/recipes/kurier_lubelski.recipe
2419share/calibre/recipes/kurier_poranny.recipe 2477share/calibre/recipes/kurier_poranny.recipe
2420share/calibre/recipes/kurier_szczecinski.recipe 2478share/calibre/recipes/kurier_szczecinski.recipe
@@ -2541,26 +2599,27 @@ share/calibre/recipes/medscape.recipe @@ -2541,26 +2599,27 @@ share/calibre/recipes/medscape.recipe
2541share/calibre/recipes/melbourne_herald_sun.recipe 2599share/calibre/recipes/melbourne_herald_sun.recipe
2542share/calibre/recipes/men24_gr.recipe 2600share/calibre/recipes/men24_gr.recipe
2543share/calibre/recipes/menorca.recipe 2601share/calibre/recipes/menorca.recipe
2544share/calibre/recipes/mens_health.recipe 2602share/calibre/recipes/mens_health.recipe
2545share/calibre/recipes/merco_press.recipe 2603share/calibre/recipes/merco_press.recipe
2546share/calibre/recipes/mesec.recipe 2604share/calibre/recipes/mesec.recipe
2547share/calibre/recipes/metro_montreal.recipe 2605share/calibre/recipes/metro_montreal.recipe
2548share/calibre/recipes/metro_news_nl.recipe 2606share/calibre/recipes/metro_news_nl.recipe
2549share/calibre/recipes/metro_uk.recipe 2607share/calibre/recipes/metro_uk.recipe
2550share/calibre/recipes/metropol_tv.recipe 2608share/calibre/recipes/metropol_tv.recipe
2551share/calibre/recipes/miami_herald.recipe 2609share/calibre/recipes/miami_herald.recipe
2552share/calibre/recipes/michalkiewicz.recipe 2610share/calibre/recipes/michalkiewicz.recipe
2553share/calibre/recipes/michellemalkin.recipe 2611share/calibre/recipes/michellemalkin.recipe
 2612share/calibre/recipes/miesbacher_merkur.recipe
2554share/calibre/recipes/milenio.recipe 2613share/calibre/recipes/milenio.recipe
2555share/calibre/recipes/military_times.recipe 2614share/calibre/recipes/military_times.recipe
2556share/calibre/recipes/ming_pao.recipe 2615share/calibre/recipes/ming_pao.recipe
2557share/calibre/recipes/ming_pao_toronto.recipe 2616share/calibre/recipes/ming_pao_toronto.recipe
2558share/calibre/recipes/ming_pao_vancouver.recipe 2617share/calibre/recipes/ming_pao_vancouver.recipe
2559share/calibre/recipes/miradasalsur.recipe 2618share/calibre/recipes/miradasalsur.recipe
2560share/calibre/recipes/mlody_technik_pl.recipe 2619share/calibre/recipes/mlody_technik_pl.recipe
2561share/calibre/recipes/mmc_rtv.recipe 2620share/calibre/recipes/mmc_rtv.recipe
2562share/calibre/recipes/mobile_bulgaria.recipe 2621share/calibre/recipes/mobile_bulgaria.recipe
2563share/calibre/recipes/mobilenations.recipe 2622share/calibre/recipes/mobilenations.recipe
2564share/calibre/recipes/mobilna.recipe 2623share/calibre/recipes/mobilna.recipe
2565share/calibre/recipes/modoros.recipe 2624share/calibre/recipes/modoros.recipe
2566share/calibre/recipes/mojegotowanie.recipe 2625share/calibre/recipes/mojegotowanie.recipe
@@ -2572,26 +2631,31 @@ share/calibre/recipes/money_pl.recipe @@ -2572,26 +2631,31 @@ share/calibre/recipes/money_pl.recipe
2572share/calibre/recipes/moneycontrol.recipe 2631share/calibre/recipes/moneycontrol.recipe
2573share/calibre/recipes/moneynews.recipe 2632share/calibre/recipes/moneynews.recipe
2574share/calibre/recipes/moneyro.recipe 2633share/calibre/recipes/moneyro.recipe
2575share/calibre/recipes/monitor.recipe 2634share/calibre/recipes/monitor.recipe
2576share/calibre/recipes/montevideo_com.recipe 2635share/calibre/recipes/montevideo_com.recipe
2577share/calibre/recipes/montreal_gazette.recipe 2636share/calibre/recipes/montreal_gazette.recipe
2578share/calibre/recipes/more_intelligent_life.recipe 2637share/calibre/recipes/more_intelligent_life.recipe
2579share/calibre/recipes/moscow_times.recipe 2638share/calibre/recipes/moscow_times.recipe
2580share/calibre/recipes/motherjones.recipe 2639share/calibre/recipes/motherjones.recipe
2581share/calibre/recipes/msdnmag_en.recipe 2640share/calibre/recipes/msdnmag_en.recipe
2582share/calibre/recipes/msnbc.recipe 2641share/calibre/recipes/msnbc.recipe
2583share/calibre/recipes/msnsankei.recipe 2642share/calibre/recipes/msnsankei.recipe
2584share/calibre/recipes/mumbai_mirror.recipe 2643share/calibre/recipes/mumbai_mirror.recipe
 2644share/calibre/recipes/munchner_merkur_nord.recipe
 2645share/calibre/recipes/munchner_merkur_stadt.recipe
 2646share/calibre/recipes/munchner_merkur_sud.recipe
 2647share/calibre/recipes/munchner_merkur_wurmtal.recipe
 2648share/calibre/recipes/murnauer_tagblatt.recipe
2585share/calibre/recipes/mwjournal.recipe 2649share/calibre/recipes/mwjournal.recipe
2586share/calibre/recipes/myapple_pl.recipe 2650share/calibre/recipes/myapple_pl.recipe
2587share/calibre/recipes/nachdenkseiten.recipe 2651share/calibre/recipes/nachdenkseiten.recipe
2588share/calibre/recipes/nacional_cro.recipe 2652share/calibre/recipes/nacional_cro.recipe
2589share/calibre/recipes/nacionred.recipe 2653share/calibre/recipes/nacionred.recipe
2590share/calibre/recipes/nadacni_fond_proti_korupci.recipe 2654share/calibre/recipes/nadacni_fond_proti_korupci.recipe
2591share/calibre/recipes/najwyzszy_czas.recipe 2655share/calibre/recipes/najwyzszy_czas.recipe
2592share/calibre/recipes/nakedcapitalism.recipe 2656share/calibre/recipes/nakedcapitalism.recipe
2593share/calibre/recipes/nanfengchuang.recipe 2657share/calibre/recipes/nanfengchuang.recipe
2594share/calibre/recipes/nasa.recipe 2658share/calibre/recipes/nasa.recipe
2595share/calibre/recipes/naszdziennik.recipe 2659share/calibre/recipes/naszdziennik.recipe
2596share/calibre/recipes/natemat_pl.recipe 2660share/calibre/recipes/natemat_pl.recipe
2597share/calibre/recipes/natgeo.recipe 2661share/calibre/recipes/natgeo.recipe
@@ -2706,74 +2770,76 @@ share/calibre/recipes/oldnewthing.recipe @@ -2706,74 +2770,76 @@ share/calibre/recipes/oldnewthing.recipe
2706share/calibre/recipes/omgubuntu.recipe 2770share/calibre/recipes/omgubuntu.recipe
2707share/calibre/recipes/onda_rock.recipe 2771share/calibre/recipes/onda_rock.recipe
2708share/calibre/recipes/onemagazine.recipe 2772share/calibre/recipes/onemagazine.recipe
2709share/calibre/recipes/onionavclub.recipe 2773share/calibre/recipes/onionavclub.recipe
2710share/calibre/recipes/open_left.recipe 2774share/calibre/recipes/open_left.recipe
2711share/calibre/recipes/opinion_bo.recipe 2775share/calibre/recipes/opinion_bo.recipe
2712share/calibre/recipes/optyczne_pl.recipe 2776share/calibre/recipes/optyczne_pl.recipe
2713share/calibre/recipes/oregonian.recipe 2777share/calibre/recipes/oregonian.recipe
2714share/calibre/recipes/oreilly_premium.recipe 2778share/calibre/recipes/oreilly_premium.recipe
2715share/calibre/recipes/oriental_daily.recipe 2779share/calibre/recipes/oriental_daily.recipe
2716share/calibre/recipes/origo_hu.recipe 2780share/calibre/recipes/origo_hu.recipe
2717share/calibre/recipes/orlando_sentinel.recipe 2781share/calibre/recipes/orlando_sentinel.recipe
2718share/calibre/recipes/orsai.recipe 2782share/calibre/recipes/orsai.recipe
 2783share/calibre/recipes/osel_cz.recipe
2719share/calibre/recipes/osw.recipe 2784share/calibre/recipes/osw.recipe
2720share/calibre/recipes/osworld_pl.recipe 2785share/calibre/recipes/osworld_pl.recipe
2721share/calibre/recipes/ottawa_citizen.recipe 2786share/calibre/recipes/ottawa_citizen.recipe
2722share/calibre/recipes/ourdailybread.recipe 2787share/calibre/recipes/ourdailybread.recipe
2723share/calibre/recipes/outlook_india.recipe 2788share/calibre/recipes/outlook_india.recipe
2724share/calibre/recipes/outside_magazine.recipe 
2725share/calibre/recipes/overclock_pl.recipe 2789share/calibre/recipes/overclock_pl.recipe
2726share/calibre/recipes/oxford_mail.recipe 2790share/calibre/recipes/oxford_mail.recipe
2727share/calibre/recipes/padreydecano.recipe 2791share/calibre/recipes/padreydecano.recipe
2728share/calibre/recipes/pagina12.recipe 2792share/calibre/recipes/pagina12.recipe
2729share/calibre/recipes/pagina_12_print_ed.recipe 2793share/calibre/recipes/pagina_12_print_ed.recipe
2730share/calibre/recipes/pajama.recipe 2794share/calibre/recipes/pajama.recipe
2731share/calibre/recipes/palmtop_pl.recipe 2795share/calibre/recipes/palmtop_pl.recipe
2732share/calibre/recipes/pambianco.recipe 2796share/calibre/recipes/pambianco.recipe
2733share/calibre/recipes/panorama.recipe 2797share/calibre/recipes/panorama.recipe
2734share/calibre/recipes/paperli_topic.recipe 2798share/calibre/recipes/paperli_topic.recipe
2735share/calibre/recipes/parlamentni_listy.recipe 2799share/calibre/recipes/parlamentni_listy.recipe
2736share/calibre/recipes/patente_de_corso.recipe 2800share/calibre/recipes/patente_de_corso.recipe
2737share/calibre/recipes/pc_advisor.recipe 2801share/calibre/recipes/pc_advisor.recipe
2738share/calibre/recipes/pc_arena.recipe 2802share/calibre/recipes/pc_arena.recipe
2739share/calibre/recipes/pc_centre_pl.recipe 2803share/calibre/recipes/pc_centre_pl.recipe
2740share/calibre/recipes/pc_foster.recipe 2804share/calibre/recipes/pc_foster.recipe
2741share/calibre/recipes/pc_lab.recipe 2805share/calibre/recipes/pc_lab.recipe
2742share/calibre/recipes/pc_mag.recipe 2806share/calibre/recipes/pc_mag.recipe
2743share/calibre/recipes/pc_world.recipe 2807share/calibre/recipes/pc_world.recipe
2744share/calibre/recipes/pcworld_hu.recipe 2808share/calibre/recipes/pcworld_hu.recipe
2745share/calibre/recipes/pcworldro.recipe 2809share/calibre/recipes/pcworldro.recipe
2746share/calibre/recipes/pecat.recipe 2810share/calibre/recipes/pecat.recipe
2747share/calibre/recipes/penguin_news.recipe 2811share/calibre/recipes/penguin_news.recipe
 2812share/calibre/recipes/penzberger_merkur.recipe
2748share/calibre/recipes/people_daily.recipe 2813share/calibre/recipes/people_daily.recipe
2749share/calibre/recipes/people_us_mashup.recipe 2814share/calibre/recipes/people_us_mashup.recipe
2750share/calibre/recipes/perfil.recipe 2815share/calibre/recipes/perfil.recipe
2751share/calibre/recipes/periodismo_humano_es.recipe 2816share/calibre/recipes/periodismo_humano_es.recipe
2752share/calibre/recipes/pescanik.recipe 2817share/calibre/recipes/pescanik.recipe
2753share/calibre/recipes/peterschiff.recipe 2818share/calibre/recipes/peterschiff.recipe
2754share/calibre/recipes/phd_comics.recipe 2819share/calibre/recipes/phd_comics.recipe
2755share/calibre/recipes/philippino_star_ngayon.recipe 2820share/calibre/recipes/philippino_star_ngayon.recipe
2756share/calibre/recipes/phillosophy_now.recipe 2821share/calibre/recipes/phillosophy_now.recipe
2757share/calibre/recipes/philly.recipe 2822share/calibre/recipes/philly.recipe
2758share/calibre/recipes/phoronix.recipe 2823share/calibre/recipes/phoronix.recipe
2759share/calibre/recipes/phys_org.recipe 2824share/calibre/recipes/phys_org.recipe
2760share/calibre/recipes/physics_today.recipe 2825share/calibre/recipes/physics_today.recipe
2761share/calibre/recipes/physics_world.recipe 2826share/calibre/recipes/physics_world.recipe
2762share/calibre/recipes/picoboard_pl.recipe 2827share/calibre/recipes/picoboard_pl.recipe
2763share/calibre/recipes/pilot.recipe 2828share/calibre/recipes/pilot.recipe
2764share/calibre/recipes/piratska_strana.recipe 2829share/calibre/recipes/piratska_strana.recipe
2765share/calibre/recipes/piratske_noviny.recipe 2830share/calibre/recipes/piratske_noviny.recipe
2766share/calibre/recipes/planet_kde.recipe 2831share/calibre/recipes/planet_kde.recipe
 2832share/calibre/recipes/planet_python.recipe
2767share/calibre/recipes/plus_info.recipe 2833share/calibre/recipes/plus_info.recipe
2768share/calibre/recipes/pnn.recipe 2834share/calibre/recipes/pnn.recipe
2769share/calibre/recipes/pobjeda.recipe 2835share/calibre/recipes/pobjeda.recipe
2770share/calibre/recipes/poche.recipe 2836share/calibre/recipes/poche.recipe
2771share/calibre/recipes/podnikatel.recipe 2837share/calibre/recipes/podnikatel.recipe
2772share/calibre/recipes/politico.recipe 2838share/calibre/recipes/politico.recipe
2773share/calibre/recipes/politifact.recipe 2839share/calibre/recipes/politifact.recipe
2774share/calibre/recipes/politika.recipe 2840share/calibre/recipes/politika.recipe
2775share/calibre/recipes/politiken_dk.recipe 2841share/calibre/recipes/politiken_dk.recipe
2776share/calibre/recipes/polityka.recipe 2842share/calibre/recipes/polityka.recipe
2777share/calibre/recipes/polizeipress_de.recipe 2843share/calibre/recipes/polizeipress_de.recipe
2778share/calibre/recipes/polska_times.recipe 2844share/calibre/recipes/polska_times.recipe
2779share/calibre/recipes/polter_pl.recipe 2845share/calibre/recipes/polter_pl.recipe
@@ -2888,26 +2954,27 @@ share/calibre/recipes/salon.recipe @@ -2888,26 +2954,27 @@ share/calibre/recipes/salon.recipe
2888share/calibre/recipes/salonica_press_news.recipe 2954share/calibre/recipes/salonica_press_news.recipe
2889share/calibre/recipes/samanyolu_haber.recipe 2955share/calibre/recipes/samanyolu_haber.recipe
2890share/calibre/recipes/samanyolu_teknoloji.recipe 2956share/calibre/recipes/samanyolu_teknoloji.recipe
2891share/calibre/recipes/samcik_blox.recipe 2957share/calibre/recipes/samcik_blox.recipe
2892share/calibre/recipes/san_fran_chronicle.recipe 2958share/calibre/recipes/san_fran_chronicle.recipe
2893share/calibre/recipes/sanjosemercurynews.recipe 2959share/calibre/recipes/sanjosemercurynews.recipe
2894share/calibre/recipes/sarajevo_x.recipe 2960share/calibre/recipes/sarajevo_x.recipe
2895share/calibre/recipes/saskatoon_star_phoenix.recipe 2961share/calibre/recipes/saskatoon_star_phoenix.recipe
2896share/calibre/recipes/satira.recipe 2962share/calibre/recipes/satira.recipe
2897share/calibre/recipes/satkurier.recipe 2963share/calibre/recipes/satkurier.recipe
2898share/calibre/recipes/satmagazine.recipe 2964share/calibre/recipes/satmagazine.recipe
2899share/calibre/recipes/sb_nation.recipe 2965share/calibre/recipes/sb_nation.recipe
2900share/calibre/recipes/schattenblick.recipe 2966share/calibre/recipes/schattenblick.recipe
 2967share/calibre/recipes/schongauer_nachrichten.recipe
2901share/calibre/recipes/science_aas.recipe 2968share/calibre/recipes/science_aas.recipe
2902share/calibre/recipes/science_based_medicine.recipe 2969share/calibre/recipes/science_based_medicine.recipe
2903share/calibre/recipes/science_news.recipe 2970share/calibre/recipes/science_news.recipe
2904share/calibre/recipes/science_news_recent_issues.recipe 2971share/calibre/recipes/science_news_recent_issues.recipe
2905share/calibre/recipes/sciencedaily.recipe 2972share/calibre/recipes/sciencedaily.recipe
2906share/calibre/recipes/scientific_american.recipe 2973share/calibre/recipes/scientific_american.recipe
2907share/calibre/recipes/scinexx.recipe 2974share/calibre/recipes/scinexx.recipe
2908share/calibre/recipes/scmp.recipe 2975share/calibre/recipes/scmp.recipe
2909share/calibre/recipes/scott_hanselman.recipe 2976share/calibre/recipes/scott_hanselman.recipe
2910share/calibre/recipes/scprint.recipe 2977share/calibre/recipes/scprint.recipe
2911share/calibre/recipes/seanhannity.recipe 2978share/calibre/recipes/seanhannity.recipe
2912share/calibre/recipes/seattle_times.recipe 2979share/calibre/recipes/seattle_times.recipe
2913share/calibre/recipes/security_watch.recipe 2980share/calibre/recipes/security_watch.recipe
@@ -2955,26 +3022,27 @@ share/calibre/recipes/spiegelde.recipe @@ -2955,26 +3022,27 @@ share/calibre/recipes/spiegelde.recipe
2955share/calibre/recipes/spin_magazine.recipe 3022share/calibre/recipes/spin_magazine.recipe
2956share/calibre/recipes/sport_pl.recipe 3023share/calibre/recipes/sport_pl.recipe
2957share/calibre/recipes/sportowefakty.recipe 3024share/calibre/recipes/sportowefakty.recipe
2958share/calibre/recipes/sportsillustrated.recipe 3025share/calibre/recipes/sportsillustrated.recipe
2959share/calibre/recipes/sportsillustrated_columnists.recipe 3026share/calibre/recipes/sportsillustrated_columnists.recipe
2960share/calibre/recipes/st_louis_post_dispatch.recipe 3027share/calibre/recipes/st_louis_post_dispatch.recipe
2961share/calibre/recipes/st_petersburg_times.recipe 3028share/calibre/recipes/st_petersburg_times.recipe
2962share/calibre/recipes/stackoverflow.recipe 3029share/calibre/recipes/stackoverflow.recipe
2963share/calibre/recipes/stamgasten.recipe 3030share/calibre/recipes/stamgasten.recipe
2964share/calibre/recipes/standardmedia_ke.recipe 3031share/calibre/recipes/standardmedia_ke.recipe
2965share/calibre/recipes/standardmoney.recipe 3032share/calibre/recipes/standardmoney.recipe
2966share/calibre/recipes/star_gazetesi.recipe 3033share/calibre/recipes/star_gazetesi.recipe
2967share/calibre/recipes/staradvertiser.recipe 3034share/calibre/recipes/staradvertiser.recipe
 3035share/calibre/recipes/starnberger_merkur.recipe
2968share/calibre/recipes/stars_and_stripes.recipe 3036share/calibre/recipes/stars_and_stripes.recipe
2969share/calibre/recipes/starwars.recipe 3037share/calibre/recipes/starwars.recipe
2970share/calibre/recipes/statesman.recipe 3038share/calibre/recipes/statesman.recipe
2971share/calibre/recipes/stiintasitehnica.recipe 3039share/calibre/recipes/stiintasitehnica.recipe
2972share/calibre/recipes/stnn.recipe 3040share/calibre/recipes/stnn.recipe
2973share/calibre/recipes/stopklatka.recipe 3041share/calibre/recipes/stopklatka.recipe
2974share/calibre/recipes/straitstimes.recipe 3042share/calibre/recipes/straitstimes.recipe
2975share/calibre/recipes/strange_horizons.recipe 3043share/calibre/recipes/strange_horizons.recipe
2976share/calibre/recipes/strategic_culture.recipe 3044share/calibre/recipes/strategic_culture.recipe
2977share/calibre/recipes/strategy-business.recipe 3045share/calibre/recipes/strategy-business.recipe
2978share/calibre/recipes/sueddeutsche.recipe 3046share/calibre/recipes/sueddeutsche.recipe
2979share/calibre/recipes/sueddeutsche_mobil.recipe 3047share/calibre/recipes/sueddeutsche_mobil.recipe
2980share/calibre/recipes/sueddeutschezeitung.recipe 3048share/calibre/recipes/sueddeutschezeitung.recipe
@@ -2995,62 +3063,65 @@ share/calibre/recipes/tanjug.recipe @@ -2995,62 +3063,65 @@ share/calibre/recipes/tanjug.recipe
2995share/calibre/recipes/tanuki.recipe 3063share/calibre/recipes/tanuki.recipe
2996share/calibre/recipes/tasfiye_dergisi.recipe 3064share/calibre/recipes/tasfiye_dergisi.recipe
2997share/calibre/recipes/tawernarpg_pl.recipe 3065share/calibre/recipes/tawernarpg_pl.recipe
2998share/calibre/recipes/taz.recipe 3066share/calibre/recipes/taz.recipe
2999share/calibre/recipes/taz_rss.recipe 3067share/calibre/recipes/taz_rss.recipe
3000share/calibre/recipes/tech_economy.recipe 3068share/calibre/recipes/tech_economy.recipe
3001share/calibre/recipes/tech_world.recipe 3069share/calibre/recipes/tech_world.recipe
3002share/calibre/recipes/techcrunch.recipe 3070share/calibre/recipes/techcrunch.recipe
3003share/calibre/recipes/techdirt.recipe 3071share/calibre/recipes/techdirt.recipe
3004share/calibre/recipes/technology_review.recipe 3072share/calibre/recipes/technology_review.recipe
3005share/calibre/recipes/technology_review_de.recipe 3073share/calibre/recipes/technology_review_de.recipe
3006share/calibre/recipes/techtarget.recipe 3074share/calibre/recipes/techtarget.recipe
3007share/calibre/recipes/tedneward.recipe 3075share/calibre/recipes/tedneward.recipe
 3076share/calibre/recipes/tegernseer_zeitung.recipe
3008share/calibre/recipes/telam.recipe 3077share/calibre/recipes/telam.recipe
3009share/calibre/recipes/telegraph_in.recipe 3078share/calibre/recipes/telegraph_in.recipe
3010share/calibre/recipes/telegraph_uk.recipe 3079share/calibre/recipes/telegraph_uk.recipe
3011share/calibre/recipes/telepolis.recipe 3080share/calibre/recipes/telepolis.recipe
3012share/calibre/recipes/telepolis_artikel.recipe 3081share/calibre/recipes/telepolis_artikel.recipe
3013share/calibre/recipes/telepolis_pl.recipe 3082share/calibre/recipes/telepolis_pl.recipe
3014share/calibre/recipes/teleread.recipe 3083share/calibre/recipes/teleread.recipe
3015share/calibre/recipes/television_without_pity.recipe 3084share/calibre/recipes/television_without_pity.recipe
3016share/calibre/recipes/thai_post_daily.recipe 3085share/calibre/recipes/thai_post_daily.recipe
3017share/calibre/recipes/thairath.recipe 3086share/calibre/recipes/thairath.recipe
3018share/calibre/recipes/the_age.recipe 3087share/calibre/recipes/the_age.recipe
3019share/calibre/recipes/the_budget_fashionista.recipe 3088share/calibre/recipes/the_budget_fashionista.recipe
3020share/calibre/recipes/the_clinic_online.recipe 3089share/calibre/recipes/the_clinic_online.recipe
 3090share/calibre/recipes/the_conversation.recipe
3021share/calibre/recipes/the_daily_news_egypt.recipe 3091share/calibre/recipes/the_daily_news_egypt.recipe
3022share/calibre/recipes/the_escapist.recipe 3092share/calibre/recipes/the_escapist.recipe
3023share/calibre/recipes/the_feature.recipe 3093share/calibre/recipes/the_feature.recipe
3024share/calibre/recipes/the_freeman.recipe 3094share/calibre/recipes/the_freeman.recipe
3025share/calibre/recipes/the_friday_times.recipe 3095share/calibre/recipes/the_friday_times.recipe
3026share/calibre/recipes/the_journal.recipe 3096share/calibre/recipes/the_journal.recipe
3027share/calibre/recipes/the_manila_bulletin.recipe 3097share/calibre/recipes/the_manila_bulletin.recipe
3028share/calibre/recipes/the_manila_times.recipe 3098share/calibre/recipes/the_manila_times.recipe
3029share/calibre/recipes/the_marker.recipe 3099share/calibre/recipes/the_marker.recipe
3030share/calibre/recipes/the_nation.recipe 3100share/calibre/recipes/the_nation.recipe
3031share/calibre/recipes/the_nation_thai.recipe 3101share/calibre/recipes/the_nation_thai.recipe
3032share/calibre/recipes/the_new_age_za.recipe 3102share/calibre/recipes/the_new_age_za.recipe
3033share/calibre/recipes/the_new_republic.recipe 3103share/calibre/recipes/the_new_republic.recipe
3034share/calibre/recipes/the_oz.recipe 3104share/calibre/recipes/the_oz.recipe
3035share/calibre/recipes/the_philippine_daily_inquirer.recipe 3105share/calibre/recipes/the_philippine_daily_inquirer.recipe
3036share/calibre/recipes/the_philippine_star.recipe 3106share/calibre/recipes/the_philippine_star.recipe
3037share/calibre/recipes/the_register.recipe 3107share/calibre/recipes/the_register.recipe
3038share/calibre/recipes/the_scotsman.recipe 3108share/calibre/recipes/the_scotsman.recipe
3039share/calibre/recipes/the_sun.recipe 3109share/calibre/recipes/the_sun.recipe
3040share/calibre/recipes/the_verge.recipe 3110share/calibre/recipes/the_verge.recipe
3041share/calibre/recipes/the_week_magazine_free.recipe 3111share/calibre/recipes/the_week_magazine_free.recipe
3042share/calibre/recipes/the_workingham_times.recipe 3112share/calibre/recipes/the_workingham_times.recipe
3043share/calibre/recipes/thecultofghoul.recipe 3113share/calibre/recipes/thecultofghoul.recipe
 3114share/calibre/recipes/thedailywtf.recipe
3044share/calibre/recipes/thedgesingapore.recipe 3115share/calibre/recipes/thedgesingapore.recipe
3045share/calibre/recipes/theecocolapse.recipe 3116share/calibre/recipes/theecocolapse.recipe
3046share/calibre/recipes/theeconomictimes_india.recipe 3117share/calibre/recipes/theeconomictimes_india.recipe
3047share/calibre/recipes/theluminouslandscape.recipe 3118share/calibre/recipes/theluminouslandscape.recipe
3048share/calibre/recipes/themarketticker.recipe 3119share/calibre/recipes/themarketticker.recipe
3049share/calibre/recipes/thenews.recipe 3120share/calibre/recipes/thenews.recipe
3050share/calibre/recipes/theoldfoodie.recipe 3121share/calibre/recipes/theoldfoodie.recipe
3051share/calibre/recipes/theonion.recipe 3122share/calibre/recipes/theonion.recipe
3052share/calibre/recipes/theonlinephotographer.recipe 3123share/calibre/recipes/theonlinephotographer.recipe
3053share/calibre/recipes/thestar.recipe 3124share/calibre/recipes/thestar.recipe
3054share/calibre/recipes/thewest_au.recipe 3125share/calibre/recipes/thewest_au.recipe
3055share/calibre/recipes/think_progress.recipe 3126share/calibre/recipes/think_progress.recipe
3056share/calibre/recipes/thn.recipe 3127share/calibre/recipes/thn.recipe
@@ -3060,26 +3131,27 @@ share/calibre/recipes/tijolaco.recipe @@ -3060,26 +3131,27 @@ share/calibre/recipes/tijolaco.recipe
3060share/calibre/recipes/tillsonburg.recipe 3131share/calibre/recipes/tillsonburg.recipe
3061share/calibre/recipes/time_magazine.recipe 3132share/calibre/recipes/time_magazine.recipe
3062share/calibre/recipes/time_turk.recipe 3133share/calibre/recipes/time_turk.recipe
3063share/calibre/recipes/times_of_malta.recipe 3134share/calibre/recipes/times_of_malta.recipe
3064share/calibre/recipes/times_online.recipe 3135share/calibre/recipes/times_online.recipe
3065share/calibre/recipes/timesnewroman.recipe 3136share/calibre/recipes/timesnewroman.recipe
3066share/calibre/recipes/titanic_de.recipe 3137share/calibre/recipes/titanic_de.recipe
3067share/calibre/recipes/tjournal.recipe 3138share/calibre/recipes/tjournal.recipe
3068share/calibre/recipes/tmz.recipe 3139share/calibre/recipes/tmz.recipe
3069share/calibre/recipes/tnxm.recipe 3140share/calibre/recipes/tnxm.recipe
3070share/calibre/recipes/today_online.recipe 3141share/calibre/recipes/today_online.recipe
3071share/calibre/recipes/todays_zaman.recipe 3142share/calibre/recipes/todays_zaman.recipe
3072share/calibre/recipes/toi.recipe 3143share/calibre/recipes/toi.recipe
 3144share/calibre/recipes/tolzer_kurier.recipe
3073share/calibre/recipes/tomshardware.recipe 3145share/calibre/recipes/tomshardware.recipe
3074share/calibre/recipes/tomshardware_de.recipe 3146share/calibre/recipes/tomshardware_de.recipe
3075share/calibre/recipes/tomshardware_it.recipe 3147share/calibre/recipes/tomshardware_it.recipe
3076share/calibre/recipes/toronto_sun.recipe 3148share/calibre/recipes/toronto_sun.recipe
3077share/calibre/recipes/tovima.recipe 3149share/calibre/recipes/tovima.recipe
3078share/calibre/recipes/toyokeizai.recipe 3150share/calibre/recipes/toyokeizai.recipe
3079share/calibre/recipes/tpm_uk.recipe 3151share/calibre/recipes/tpm_uk.recipe
3080share/calibre/recipes/tr.recipe 3152share/calibre/recipes/tr.recipe
3081share/calibre/recipes/tri_city_herald.recipe 3153share/calibre/recipes/tri_city_herald.recipe
3082share/calibre/recipes/trojmiasto_pl.recipe 3154share/calibre/recipes/trojmiasto_pl.recipe
3083share/calibre/recipes/trombon.recipe 3155share/calibre/recipes/trombon.recipe
3084share/calibre/recipes/trouw.recipe 3156share/calibre/recipes/trouw.recipe
3085share/calibre/recipes/trv.recipe 3157share/calibre/recipes/trv.recipe
@@ -3114,51 +3186,53 @@ share/calibre/recipes/usatoday.recipe @@ -3114,51 +3186,53 @@ share/calibre/recipes/usatoday.recipe
3114share/calibre/recipes/usnews.recipe 3186share/calibre/recipes/usnews.recipe
3115share/calibre/recipes/utne.recipe 3187share/calibre/recipes/utne.recipe
3116share/calibre/recipes/utrinski.recipe 3188share/calibre/recipes/utrinski.recipe
3117share/calibre/recipes/vancouver_province.recipe 3189share/calibre/recipes/vancouver_province.recipe
3118share/calibre/recipes/vancouver_sun.recipe 3190share/calibre/recipes/vancouver_sun.recipe
3119share/calibre/recipes/vanityfair.recipe 3191share/calibre/recipes/vanityfair.recipe
3120share/calibre/recipes/variety.recipe 3192share/calibre/recipes/variety.recipe
3121share/calibre/recipes/vecernji_list.recipe 3193share/calibre/recipes/vecernji_list.recipe
3122share/calibre/recipes/vedomosti.recipe 3194share/calibre/recipes/vedomosti.recipe
3123share/calibre/recipes/veintitres.recipe 3195share/calibre/recipes/veintitres.recipe
3124share/calibre/recipes/version2.recipe 3196share/calibre/recipes/version2.recipe
3125share/calibre/recipes/vfr_magazine.recipe 3197share/calibre/recipes/vfr_magazine.recipe
3126share/calibre/recipes/vic_times.recipe 3198share/calibre/recipes/vic_times.recipe
 3199share/calibre/recipes/vice.recipe
3127share/calibre/recipes/vice_magazine.recipe 3200share/calibre/recipes/vice_magazine.recipe
3128share/calibre/recipes/vice_magazine_de.recipe 3201share/calibre/recipes/vice_magazine_de.recipe
3129share/calibre/recipes/vignette.recipe 3202share/calibre/recipes/vignette.recipe
3130share/calibre/recipes/vijesti.recipe 3203share/calibre/recipes/vijesti.recipe
3131share/calibre/recipes/villagevoice.recipe 3204share/calibre/recipes/villagevoice.recipe
3132share/calibre/recipes/vio_mundo.recipe 3205share/calibre/recipes/vio_mundo.recipe
3133share/calibre/recipes/virtualshackles.recipe 3206share/calibre/recipes/virtualshackles.recipe
3134share/calibre/recipes/vitalia.recipe 3207share/calibre/recipes/vitalia.recipe
3135share/calibre/recipes/viva.recipe 3208share/calibre/recipes/viva.recipe
3136share/calibre/recipes/vnexpress.recipe 3209share/calibre/recipes/vnexpress.recipe
3137share/calibre/recipes/voice_of_america.recipe 3210share/calibre/recipes/voice_of_america.recipe
3138share/calibre/recipes/volksrant.recipe 3211share/calibre/recipes/volksrant.recipe
3139share/calibre/recipes/vreme.recipe 3212share/calibre/recipes/vreme.recipe
3140share/calibre/recipes/vrijnederland.recipe 3213share/calibre/recipes/vrijnederland.recipe
3141share/calibre/recipes/waco_tribune.recipe 3214share/calibre/recipes/waco_tribune.recipe
3142share/calibre/recipes/walla.recipe 3215share/calibre/recipes/walla.recipe
3143share/calibre/recipes/wallstreetro.recipe 3216share/calibre/recipes/wallstreetro.recipe
3144share/calibre/recipes/walrusmag.recipe 3217share/calibre/recipes/walrusmag.recipe
3145share/calibre/recipes/wapo_cartoons.recipe 3218share/calibre/recipes/wapo_cartoons.recipe
3146share/calibre/recipes/warentest.recipe 3219share/calibre/recipes/warentest.recipe
3147share/calibre/recipes/wash_post.recipe 3220share/calibre/recipes/wash_post.recipe
3148share/calibre/recipes/wash_times.recipe 3221share/calibre/recipes/wash_times.recipe
3149share/calibre/recipes/watchingamerica.recipe 3222share/calibre/recipes/watchingamerica.recipe
3150share/calibre/recipes/weblogs_sl.recipe 3223share/calibre/recipes/weblogs_sl.recipe
3151share/calibre/recipes/websecurity_pl.recipe 3224share/calibre/recipes/websecurity_pl.recipe
 3225share/calibre/recipes/weilheimer_tagblatt.recipe
3152share/calibre/recipes/welt.recipe 3226share/calibre/recipes/welt.recipe
3153share/calibre/recipes/welt_der_physik.recipe 3227share/calibre/recipes/welt_der_physik.recipe
3154share/calibre/recipes/wenxuecity-znjy.recipe 3228share/calibre/recipes/wenxuecity-znjy.recipe
3155share/calibre/recipes/what_if.recipe 3229share/calibre/recipes/what_if.recipe
3156share/calibre/recipes/wichita_eagle.recipe 3230share/calibre/recipes/wichita_eagle.recipe
3157share/calibre/recipes/wikinews_en.recipe 3231share/calibre/recipes/wikinews_en.recipe
3158share/calibre/recipes/windows_star.recipe 3232share/calibre/recipes/windows_star.recipe
3159share/calibre/recipes/windsor_star.recipe 3233share/calibre/recipes/windsor_star.recipe
3160share/calibre/recipes/winnipeg_free_press.recipe 3234share/calibre/recipes/winnipeg_free_press.recipe
3161share/calibre/recipes/winnipeg_sun.recipe 3235share/calibre/recipes/winnipeg_sun.recipe
3162share/calibre/recipes/winsupersite.recipe 3236share/calibre/recipes/winsupersite.recipe
3163share/calibre/recipes/winter_olympics.recipe 3237share/calibre/recipes/winter_olympics.recipe
3164share/calibre/recipes/wired.recipe 3238share/calibre/recipes/wired.recipe
@@ -3206,29 +3280,32 @@ share/calibre/recipes/zerohedge.recipe @@ -3206,29 +3280,32 @@ share/calibre/recipes/zerohedge.recipe
3206share/calibre/recipes/ziarulfinanciar.recipe 3280share/calibre/recipes/ziarulfinanciar.recipe
3207share/calibre/recipes/ziuaveche.recipe 3281share/calibre/recipes/ziuaveche.recipe
3208share/calibre/recipes/znadplanszy_pl.recipe 3282share/calibre/recipes/znadplanszy_pl.recipe
3209share/calibre/recipes/zougla.recipe 3283share/calibre/recipes/zougla.recipe
3210share/calibre/recipes/zycie_warszawy.recipe 3284share/calibre/recipes/zycie_warszawy.recipe
3211share/calibre/scripts.pickle 3285share/calibre/scripts.pickle
3212share/calibre/template-functions.json 3286share/calibre/template-functions.json
3213share/calibre/templates/book_details.css 3287share/calibre/templates/book_details.css
3214share/calibre/templates/fb2.xsl 3288share/calibre/templates/fb2.xsl
3215share/calibre/templates/html.css 3289share/calibre/templates/html.css
3216share/calibre/templates/html_export_default.css 3290share/calibre/templates/html_export_default.css
3217share/calibre/templates/html_export_default.tmpl 3291share/calibre/templates/html_export_default.tmpl
3218share/calibre/templates/html_export_default_index.tmpl 3292share/calibre/templates/html_export_default_index.tmpl
 3293share/calibre/templates/inline_toc_styles.css
3219share/calibre/templates/lrf.xsl 3294share/calibre/templates/lrf.xsl
 3295share/calibre/templates/new_book.html
3220share/calibre/templates/rtf.xsl 3296share/calibre/templates/rtf.xsl
3221share/calibre/tracer.epub 3297share/calibre/tracer.epub
 3298share/calibre/user-manual-translation-stats.json
3222share/calibre/viewer/blank.html 3299share/calibre/viewer/blank.html
3223share/calibre/viewer/bookmarks.js 3300share/calibre/viewer/bookmarks.js
3224share/calibre/viewer/hyphenate/Hyphenator.js 3301share/calibre/viewer/hyphenate/Hyphenator.js
3225share/calibre/viewer/hyphenate/patterns.zip 3302share/calibre/viewer/hyphenate/patterns.zip
3226share/calibre/viewer/hyphenation.js 3303share/calibre/viewer/hyphenation.js
3227share/calibre/viewer/images.js 3304share/calibre/viewer/images.js
3228share/calibre/viewer/jquery_scrollTo.js 3305share/calibre/viewer/jquery_scrollTo.js
3229share/calibre/viewer/mathjax/MathJax.js 3306share/calibre/viewer/mathjax/MathJax.js
3230share/calibre/viewer/mathjax/extensions/FontWarnings.js 3307share/calibre/viewer/mathjax/extensions/FontWarnings.js
3231share/calibre/viewer/mathjax/extensions/MathEvents.js 3308share/calibre/viewer/mathjax/extensions/MathEvents.js
3232share/calibre/viewer/mathjax/extensions/MathMenu.js 3309share/calibre/viewer/mathjax/extensions/MathMenu.js
3233share/calibre/viewer/mathjax/extensions/MathZoom.js 3310share/calibre/viewer/mathjax/extensions/MathZoom.js
3234share/calibre/viewer/mathjax/extensions/TeX/AMSmath.js 3311share/calibre/viewer/mathjax/extensions/TeX/AMSmath.js
@@ -3418,14 +3495,13 @@ share/calibre/viewer/mathjax/jax/output/ @@ -3418,14 +3495,13 @@ share/calibre/viewer/mathjax/jax/output/
3418share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js 3495share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js
3419share/calibre/viewer/mathjax/jax/output/SVG/jax.js 3496share/calibre/viewer/mathjax/jax/output/SVG/jax.js
3420share/calibre/viewer/referencing.js 3497share/calibre/viewer/referencing.js
3421share/doc/calibre/COPYRIGHT 3498share/doc/calibre/COPYRIGHT
3422share/doc/calibre/Changelog.old.yaml 3499share/doc/calibre/Changelog.old.yaml
3423share/doc/calibre/Changelog.yaml 3500share/doc/calibre/Changelog.yaml
3424share/doc/calibre/INSTALL 3501share/doc/calibre/INSTALL
3425share/doc/calibre/LICENSE.rtf 3502share/doc/calibre/LICENSE.rtf
3426share/doc/calibre/README.md 3503share/doc/calibre/README.md
3427share/pixmaps/calibre-ebook-edit.png 3504share/pixmaps/calibre-ebook-edit.png
3428share/pixmaps/calibre-gui.png 3505share/pixmaps/calibre-gui.png
3429share/pixmaps/calibre-lrf.png 3506share/pixmaps/calibre-lrf.png
3430share/pixmaps/calibre-viewer.png 3507share/pixmaps/calibre-viewer.png
3431@pkgdir share/appdata 
cvs diff -r1.29 -r1.30 pkgsrc/misc/calibre/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/calibre/distinfo 2014/08/08 22:02:49 1.29
+++ pkgsrc/misc/calibre/distinfo 2015/02/08 00:37:10 1.30
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.29 2014/08/08 22:02:49 wiz Exp $ 1$NetBSD: distinfo,v 1.30 2015/02/08 00:37:10 wiz Exp $
2 2
3SHA1 (calibre-1.48.0.tar.xz) = 9a466a33f5d2076d7ed7d096b5247b89a12b1625 3SHA1 (calibre-2.18.0.tar.xz) = e104aa9ed9b6dd732802471d139e4f550575984d
4RMD160 (calibre-1.48.0.tar.xz) = ff8e1bf0daa3c2ec6ace3cb9280c9bca3952c8a0 4RMD160 (calibre-2.18.0.tar.xz) = f963a4aae13586e9bfc164692d4bbdd0cfb64c86
5Size (calibre-1.48.0.tar.xz) = 35126680 bytes 5Size (calibre-2.18.0.tar.xz) = 36196564 bytes
6SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e 6SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
7RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d 7SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556
8Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes 8SHA1 (patch-src_calibre_linux.py) = 2bab5511078e20893136a8f1098bab703f739b0d
9SHA1 (patch-setup_extensions.py) = 285ab1aff5b0d5f7c0a016f68e705d312a120d65 
10SHA1 (patch-src_calibre_linux.py) = 5abce220798f9a32ffda45080227a8bc937de838 
File Added: pkgsrc/misc/calibre/patches/Attic/patch-setup_build__environment.py
$NetBSD: patch-setup_build__environment.py,v 1.1 2015/02/08 00:37:10 wiz Exp $

Avoid problem on NetBSD:

####### Building extension magick #######
Compiling magick
Traceback (most recent call last):
  File "setup.py", line 99, in <module>
    sys.exit(main())
  File "setup.py", line 85, in main
    command.run_all(opts)
  File "/scratch/wip/calibre/work/calibre-2.15.0/setup/__init__.py", line 181, in run_all
    self.run_cmd(self, opts)
  File "/scratch/wip/calibre/work/calibre-2.15.0/setup/__init__.py", line 178, in run_cmd
    cmd.run(opts)
  File "/scratch/wip/calibre/work/calibre-2.15.0/setup/extensions.py", line 412, in run
    self.build(ext, dest)
  File "/scratch/wip/calibre/work/calibre-2.15.0/setup/extensions.py", line 456, in build
    if not parallel_build(jobs, self.info):
  File "/scratch/wip/calibre/work/calibre-2.15.0/setup/parallel_build.py", line 32, in parallel_build
    p = Pool(cpu_count)
  File "/usr/pkg/lib/python2.7/multiprocessing/dummy/__init__.py", line 151, in Pool
    return ThreadPool(processes, initializer, initargs)
  File "/usr/pkg/lib/python2.7/multiprocessing/pool.py", line 718, in __init__
    Pool.__init__(self, processes, initializer, initargs)
  File "/usr/pkg/lib/python2.7/multiprocessing/pool.py", line 159, in __init__
    self._repopulate_pool()
  File "/usr/pkg/lib/python2.7/multiprocessing/pool.py", line 223, in _repopulate_pool
    w.start()
  File "/usr/pkg/lib/python2.7/multiprocessing/dummy/__init__.py", line 75, in start
    threading.Thread.start(self)
  File "/usr/pkg/lib/python2.7/threading.py", line 745, in start
    _start_new_thread(self.__bootstrap, ())
thread.error: can't start new thread
 *** Error code 1

(The same chunk works fine in the interactive shell, not sure why
it so reliably breaks. -- wiz 20150207)

See also
http://debian.2.n7.nabble.com/Bug-760865-calibre-FTBFS-on-mips-thread-error-can-t-start-new-thread-td3353306.html

--- setup/build_environment.py.orig	2015-02-07 14:26:27.000000000 +0000
+++ setup/build_environment.py
@@ -43,11 +43,7 @@ if iswindows:
     import win32api
     cpu_count = win32api.GetSystemInfo()[5]
 else:
-    from multiprocessing import cpu_count
-    try:
-        cpu_count = cpu_count()
-    except NotImplementedError:
-        cpu_count = 1
+    cpu_count = 1
 
 def run_pkgconfig(name, envvar, default, flag, prefix):
     ans = []
cvs diff -r1.4 -r1.5 pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py (expand / switch to unified diff)

--- pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py 2014/04/16 17:22:30 1.4
+++ pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py 2015/02/08 00:37:10 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-setup_extensions.py,v 1.4 2014/04/16 17:22:30 wiz Exp $ 1$NetBSD: patch-setup_extensions.py,v 1.5 2015/02/08 00:37:10 wiz Exp $
2 2
3Correct directory name. 3Fix build for pictureflow.
4 4
5--- setup/extensions.py.orig 2014-04-04 02:33:40.000000000 +0000 5--- setup/extensions.py.orig 2014-08-29 03:59:29.000000000 +0000
6+++ setup/extensions.py 6+++ setup/extensions.py
7@@ -567,7 +567,7 @@ class Build(Command): 7@@ -602,7 +602,7 @@ class Build(Command):
8 self.check_call(qmc + ['qtcurve.pro']) 8 if iswindows:
9 self.check_call([make]+([] if iswindows else ['-j%d'%(cpu_count() 9 qmc += ['-spec', 'win32-msvc2008']
10 or 1)])) 10 fext = 'dll' if iswindows else 'dylib' if isosx else 'so'
11- src = (glob.glob('*.so') + glob.glob('release/*.dll') + 11- name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext)
12+ src = (glob.glob('.libs/*.so') + glob.glob('release/*.dll') + 12+ name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext)
13 glob.glob('*.dylib')) 13 try:
14 ext = 'pyd' if iswindows else 'so' 14 os.chdir(src_dir)
15 if not os.path.exists(dest): 15 if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers):
cvs diff -r1.4 -r1.5 pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py (expand / switch to unified diff)

--- pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py 2014/07/12 15:48:02 1.4
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py 2015/02/08 00:37:10 1.5
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-src_calibre_linux.py,v 1.4 2014/07/12 15:48:02 wiz Exp $ 1$NetBSD: patch-src_calibre_linux.py,v 1.5 2015/02/08 00:37:10 wiz Exp $
2 2
3Lifted from ArchLinux, saves mime and desktop files on disk 3Lifted from ArchLinux, saves mime and desktop files on disk
4instead of trying to add them directly. 4instead of trying to add them directly.
5 5
6See https://www.archlinux.org/packages/community/x86_64/calibre/ -> 6See https://www.archlinux.org/packages/community/x86_64/calibre/ ->
7https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/calibre -> 7https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/calibre ->
8https://projects.archlinux.org/svntogit/community.git/plain/trunk/desktop_integration.patch?h=packages/calibre 8https://projects.archlinux.org/svntogit/community.git/plain/trunk/desktop_integration.patch?h=packages/calibre
9 9
10--- src/calibre/linux.py.orig 2014-07-11 02:19:43.000000000 +0000 10--- src/calibre/linux.py.orig 2014-08-29 03:59:29.000000000 +0000
11+++ src/calibre/linux.py 11+++ src/calibre/linux.py
12@@ -644,18 +644,6 @@ class PostInstall: 12@@ -691,18 +691,6 @@ class PostInstall:
13 self.setup_completion() 13 self.setup_completion()
14 if islinux or isbsd: 14 if islinux or isbsd:
15 self.setup_desktop_integration() 15 self.setup_desktop_integration()
16- self.create_uninstaller() 16- self.create_uninstaller()
17- 17-
18- from calibre.utils.config import config_dir 18- from calibre.utils.config import config_dir
19- if os.path.exists(config_dir): 19- if os.path.exists(config_dir):
20- os.chdir(config_dir) 20- os.chdir(config_dir)
21- if islinux or isbsd: 21- if islinux or isbsd:
22- for f in os.listdir('.'): 22- for f in os.listdir('.'):
23- if os.stat(f).st_uid == 0: 23- if os.stat(f).st_uid == 0:
24- import shutil 24- import shutil
25- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f) 25- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
26- if os.stat(config_dir).st_uid == 0: 26- if os.stat(config_dir).st_uid == 0:
27- os.rmdir(config_dir) 27- os.rmdir(config_dir)
28  28
29 if warn is None and self.warnings: 29 if warn is None and self.warnings:
30 self.info('\n\nThere were %d warnings\n'%len(self.warnings)) 30 self.info('\n\nThere were %d warnings\n'%len(self.warnings))
31@@ -729,56 +717,39 @@ class PostInstall: 31@@ -776,56 +764,39 @@ class PostInstall:
32  32
33 with TemporaryDirectory() as tdir, CurrentDir(tdir), \ 33 with TemporaryDirectory() as tdir, CurrentDir(tdir), \
34 PreserveMIMEDefaults(): 34 PreserveMIMEDefaults():
35- render_img('mimetypes/lrf.png', 'calibre-lrf.png') 35- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
36- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) 36- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
37- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) 37- self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
38- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) 38- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
39- self.icon_resources.append(('mimetypes', 'application-lrs', 39- self.icon_resources.append(('mimetypes', 'application-lrs',
40- '128')) 40- '128'))
41- render_img('mimetypes/mobi.png', 'calibre-mobi.png') 41- render_img('mimetypes/mobi.png', 'calibre-mobi.png')
42- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True) 42- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
43- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128')) 43- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
44- render_img('mimetypes/tpz.png', 'calibre-tpz.png') 44- render_img('mimetypes/tpz.png', 'calibre-tpz.png')
@@ -89,13 +89,22 @@ https://projects.archlinux.org/svntogit/ @@ -89,13 +89,22 @@ https://projects.archlinux.org/svntogit/
89 f.write(EVIEWER) 89 f.write(EVIEWER)
90 write_mimetypes(f) 90 write_mimetypes(f)
91- f = open('calibre-ebook-edit.desktop', 'wb') 91- f = open('calibre-ebook-edit.desktop', 'wb')
92+ f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb') 92+ f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
93 f.write(ETWEAK) 93 f.write(ETWEAK)
94 mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED] 94 mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
95 f.write('MimeType=%s;\n'%';'.join(mt)) 95 f.write('MimeType=%s;\n'%';'.join(mt))
96 f.close() 96 f.close()
97- f = open('calibre-gui.desktop', 'wb') 97- f = open('calibre-gui.desktop', 'wb')
98+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') 98+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
99 f.write(GUI) 99 f.write(GUI)
100 write_mimetypes(f) 100 write_mimetypes(f)
101 f.close() 101 f.close()
 102@@ -845,7 +816,7 @@ class PostInstall:
 103
 104 APPDATA = get_appdata()
 105 for x in des:
 106- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
 107+ cmd = ['xdg-desktop-menu', 'install', '--noupdate', appdata + '/../applications/'+x]
 108 cc(' '.join(cmd), shell=True)
 109 self.menu_resources.append(x)
 110 ak = x.partition('.')[0]