From owner-svn-ports-all@freebsd.org Sat Oct 5 15:37:44 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 68480136056; Sat, 5 Oct 2019 15:37:44 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46lrV02rPgz3Lgt; Sat, 5 Oct 2019 15:37:44 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 454CAEFB5; Sat, 5 Oct 2019 15:37:44 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x95FbiNY096618; Sat, 5 Oct 2019 15:37:44 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x95Fbh82096615; Sat, 5 Oct 2019 15:37:43 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201910051537.x95Fbh82096615@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sat, 5 Oct 2019 15:37:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513829 - in head/deskutils/calibre: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/deskutils/calibre: . files X-SVN-Commit-Revision: 513829 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Oct 2019 15:37:44 -0000 Author: madpilot Date: Sat Oct 5 15:37:43 2019 New Revision: 513829 URL: https://svnweb.freebsd.org/changeset/ports/513829 Log: - Update calibre to 4.0.0 - Sort plist using C locale - Import upstream patch to fix regression in this release [1] Obtained from: https://github.com/kovidgoyal/calibre/commit/e0630cadd345a1b368a2f552cbae08ac1e4da3c6 [1] Added: head/deskutils/calibre/files/patch-src_calibre_constants.py (contents, props changed) Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Sat Oct 5 10:52:21 2019 (r513828) +++ head/deskutils/calibre/Makefile Sat Oct 5 15:37:43 2019 (r513829) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 3.48.0 -PORTREVISION= 2 +PORTVERSION= 4.0.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ @@ -19,7 +18,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libicudata.so:devel/icu \ libpodofo.so:graphics/podofo \ libmtp.so:multimedia/libmtp \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libhunspell-1.7.so:textproc/hunspell BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ @@ -51,7 +51,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags pkgconfig \ python:2.7 pyqt:5 qt:5 shared-mime-info shebangfix ssl tar:xz USE_RC_SUBR= calibre -USE_PYQT= core gui network sip svg webkit widgets webkitwidgets xmlpatterns +USE_PYQT= core gui network sip svg webengine widgets xmlpatterns USE_QT= buildtools_build core dbus gui qmake_build widgets USE_GL= egl gl USE_GNOME= glib20 Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Sat Oct 5 10:52:21 2019 (r513828) +++ head/deskutils/calibre/distinfo Sat Oct 5 15:37:43 2019 (r513829) @@ -1,3 +1,3 @@ -TIMESTAMP = 1568357689 -SHA256 (calibre-3.48.0.tar.xz) = 024528f0f913c78e121fb34beb3dae8dba3686f2334422c6450808796042950c -SIZE (calibre-3.48.0.tar.xz) = 38777408 +TIMESTAMP = 1570172640 +SHA256 (calibre-4.0.0.tar.xz) = 9c012ac318aae8efc7a26ba1f5beef2e0e924407c8830e30167b229d8f6e1a9b +SIZE (calibre-4.0.0.tar.xz) = 36192552 Added: head/deskutils/calibre/files/patch-src_calibre_constants.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-src_calibre_constants.py Sat Oct 5 15:37:43 2019 (r513829) @@ -0,0 +1,11 @@ +--- src/calibre/constants.py.orig 2019-10-04 00:55:14 UTC ++++ src/calibre/constants.py +@@ -146,7 +146,7 @@ def _get_cache_dir(): + def cache_dir(): + ans = getattr(cache_dir, 'ans', None) + if ans is None: +- ans = cache_dir.ans = _get_cache_dir() ++ ans = cache_dir.ans = os.path.realpath(_get_cache_dir()) + return ans + + Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Sat Oct 5 10:52:21 2019 (r513828) +++ head/deskutils/calibre/pkg-plist Sat Oct 5 15:37:43 2019 (r513829) @@ -35,9 +35,9 @@ lib/calibre/calibre/db/backup.py lib/calibre/calibre/db/cache.py lib/calibre/calibre/db/categories.py lib/calibre/calibre/db/cli/__init__.py +lib/calibre/calibre/db/cli/cmd_add.py lib/calibre/calibre/db/cli/cmd_add_custom_column.py lib/calibre/calibre/db/cli/cmd_add_format.py -lib/calibre/calibre/db/cli/cmd_add.py lib/calibre/calibre/db/cli/cmd_backup_metadata.py lib/calibre/calibre/db/cli/cmd_catalog.py lib/calibre/calibre/db/cli/cmd_check_library.py @@ -45,11 +45,11 @@ lib/calibre/calibre/db/cli/cmd_clone.py lib/calibre/calibre/db/cli/cmd_custom_columns.py lib/calibre/calibre/db/cli/cmd_embed_metadata.py lib/calibre/calibre/db/cli/cmd_export.py -lib/calibre/calibre/db/cli/cmd_list_categories.py lib/calibre/calibre/db/cli/cmd_list.py +lib/calibre/calibre/db/cli/cmd_list_categories.py +lib/calibre/calibre/db/cli/cmd_remove.py lib/calibre/calibre/db/cli/cmd_remove_custom_column.py lib/calibre/calibre/db/cli/cmd_remove_format.py -lib/calibre/calibre/db/cli/cmd_remove.py lib/calibre/calibre/db/cli/cmd_restore_database.py lib/calibre/calibre/db/cli/cmd_saved_searches.py lib/calibre/calibre/db/cli/cmd_search.py @@ -177,10 +177,10 @@ lib/calibre/calibre/devices/user_defined/__init__.py lib/calibre/calibre/devices/user_defined/driver.py lib/calibre/calibre/devices/utils.py lib/calibre/calibre/devices/winusb.py +lib/calibre/calibre/ebooks/BeautifulSoup.py lib/calibre/calibre/ebooks/__init__.py lib/calibre/calibre/ebooks/azw4/__init__.py lib/calibre/calibre/ebooks/azw4/reader.py -lib/calibre/calibre/ebooks/BeautifulSoup.py lib/calibre/calibre/ebooks/chardet.py lib/calibre/calibre/ebooks/chm/__init__.py lib/calibre/calibre/ebooks/chm/metadata.py @@ -281,11 +281,11 @@ lib/calibre/calibre/ebooks/epub/pages.py lib/calibre/calibre/ebooks/epub/periodical.py lib/calibre/calibre/ebooks/fb2/__init__.py lib/calibre/calibre/ebooks/fb2/fb2ml.py -lib/calibre/calibre/ebooks/html_entities.py lib/calibre/calibre/ebooks/html/__init__.py lib/calibre/calibre/ebooks/html/input.py lib/calibre/calibre/ebooks/html/meta.py lib/calibre/calibre/ebooks/html/to_zip.py +lib/calibre/calibre/ebooks/html_entities.py lib/calibre/calibre/ebooks/htmlz/__init__.py lib/calibre/calibre/ebooks/htmlz/oeb2html.py lib/calibre/calibre/ebooks/hyphenate.py @@ -303,7 +303,6 @@ lib/calibre/calibre/ebooks/lrf/fonts.py lib/calibre/calibre/ebooks/lrf/html/__init__.py lib/calibre/calibre/ebooks/lrf/html/color_map.py lib/calibre/calibre/ebooks/lrf/html/convert_from.py -lib/calibre/calibre/ebooks/lrf/html/table_as_image.py lib/calibre/calibre/ebooks/lrf/html/table.py lib/calibre/calibre/ebooks/lrf/input.py lib/calibre/calibre/ebooks/lrf/lrfparser.py @@ -364,8 +363,8 @@ lib/calibre/calibre/ebooks/metadata/sources/cli.py lib/calibre/calibre/ebooks/metadata/sources/covers.py lib/calibre/calibre/ebooks/metadata/sources/douban.py lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py -lib/calibre/calibre/ebooks/metadata/sources/google_images.py lib/calibre/calibre/ebooks/metadata/sources/google.py +lib/calibre/calibre/ebooks/metadata/sources/google_images.py lib/calibre/calibre/ebooks/metadata/sources/identify.py lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py lib/calibre/calibre/ebooks/metadata/sources/overdrive.py @@ -425,8 +424,6 @@ lib/calibre/calibre/ebooks/odt/input.py lib/calibre/calibre/ebooks/oeb/__init__.py lib/calibre/calibre/ebooks/oeb/base.py lib/calibre/calibre/ebooks/oeb/display/__init__.py -lib/calibre/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py -lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py lib/calibre/calibre/ebooks/oeb/display/webview.py lib/calibre/calibre/ebooks/oeb/iterator/__init__.py lib/calibre/calibre/ebooks/oeb/iterator/book.py @@ -521,21 +518,20 @@ lib/calibre/calibre/ebooks/pdb/ztxt/__init__.py lib/calibre/calibre/ebooks/pdb/ztxt/reader.py lib/calibre/calibre/ebooks/pdb/ztxt/writer.py lib/calibre/calibre/ebooks/pdf/__init__.py -lib/calibre/calibre/ebooks/pdf/outline_writer.py +lib/calibre/calibre/ebooks/pdf/develop.py +lib/calibre/calibre/ebooks/pdf/html_writer.py +lib/calibre/calibre/ebooks/pdf/image_writer.py lib/calibre/calibre/ebooks/pdf/pageoptions.py lib/calibre/calibre/ebooks/pdf/pdftohtml.py lib/calibre/calibre/ebooks/pdf/reflow.py lib/calibre/calibre/ebooks/pdf/render/__init__.py lib/calibre/calibre/ebooks/pdf/render/common.py -lib/calibre/calibre/ebooks/pdf/render/engine.py lib/calibre/calibre/ebooks/pdf/render/fonts.py -lib/calibre/calibre/ebooks/pdf/render/from_html.py lib/calibre/calibre/ebooks/pdf/render/gradients.py lib/calibre/calibre/ebooks/pdf/render/graphics.py lib/calibre/calibre/ebooks/pdf/render/links.py lib/calibre/calibre/ebooks/pdf/render/serialize.py -lib/calibre/calibre/ebooks/pdf/render/test.py -lib/calibre/calibre/ebooks/pdf/render/toc.py +lib/calibre/calibre/ebooks/pdf/test_html_writer.py lib/calibre/calibre/ebooks/pml/__init__.py lib/calibre/calibre/ebooks/pml/pmlconverter.py lib/calibre/calibre/ebooks/pml/pmlml.py @@ -548,10 +544,12 @@ lib/calibre/calibre/ebooks/readability/cleaners.py lib/calibre/calibre/ebooks/readability/debug.py lib/calibre/calibre/ebooks/readability/htmls.py lib/calibre/calibre/ebooks/readability/readability.py +lib/calibre/calibre/ebooks/render_html.py lib/calibre/calibre/ebooks/rtf/__init__.py lib/calibre/calibre/ebooks/rtf/input.py lib/calibre/calibre/ebooks/rtf/preprocess.py lib/calibre/calibre/ebooks/rtf/rtfml.py +lib/calibre/calibre/ebooks/rtf2xml/ParseRtf.py lib/calibre/calibre/ebooks/rtf2xml/__init__.py lib/calibre/calibre/ebooks/rtf2xml/add_brackets.py lib/calibre/calibre/ebooks/rtf2xml/body_styles.py @@ -590,7 +588,6 @@ lib/calibre/calibre/ebooks/rtf2xml/output.py lib/calibre/calibre/ebooks/rtf2xml/override_table.py lib/calibre/calibre/ebooks/rtf2xml/paragraph_def.py lib/calibre/calibre/ebooks/rtf2xml/paragraphs.py -lib/calibre/calibre/ebooks/rtf2xml/ParseRtf.py lib/calibre/calibre/ebooks/rtf2xml/pict.py lib/calibre/calibre/ebooks/rtf2xml/preamble_div.py lib/calibre/calibre/ebooks/rtf2xml/preamble_rest.py @@ -598,8 +595,8 @@ lib/calibre/calibre/ebooks/rtf2xml/process_tokens.py lib/calibre/calibre/ebooks/rtf2xml/replace_illegals.py lib/calibre/calibre/ebooks/rtf2xml/sections.py lib/calibre/calibre/ebooks/rtf2xml/styles.py -lib/calibre/calibre/ebooks/rtf2xml/table_info.py lib/calibre/calibre/ebooks/rtf2xml/table.py +lib/calibre/calibre/ebooks/rtf2xml/table_info.py lib/calibre/calibre/ebooks/rtf2xml/tokenize.py lib/calibre/calibre/ebooks/snb/__init__.py lib/calibre/calibre/ebooks/snb/snbfile.py @@ -631,11 +628,10 @@ lib/calibre/calibre/ebooks/unihandecode/unidecoder.py lib/calibre/calibre/ebooks/unihandecode/vncodepoints.py lib/calibre/calibre/ebooks/unihandecode/vndecoder.py lib/calibre/calibre/ebooks/unihandecode/zhcodepoints.py -lib/calibre/calibre/gui_launch.py lib/calibre/calibre/gui2/__init__.py lib/calibre/calibre/gui2/actions/__init__.py -lib/calibre/calibre/gui2/actions/add_to_library.py lib/calibre/calibre/gui2/actions/add.py +lib/calibre/calibre/gui2/actions/add_to_library.py lib/calibre/calibre/gui2/actions/annotate.py lib/calibre/calibre/gui2/actions/author_mapper.py lib/calibre/calibre/gui2/actions/catalog.py @@ -671,88 +667,88 @@ lib/calibre/calibre/gui2/actions/tweak_epub.py lib/calibre/calibre/gui2/actions/unpack_book.py lib/calibre/calibre/gui2/actions/view.py lib/calibre/calibre/gui2/actions/virtual_library.py -lib/calibre/calibre/gui2/add_filters.py lib/calibre/calibre/gui2/add.py +lib/calibre/calibre/gui2/add_filters.py lib/calibre/calibre/gui2/author_mapper.py lib/calibre/calibre/gui2/auto_add.py lib/calibre/calibre/gui2/bars.py lib/calibre/calibre/gui2/book_details.py lib/calibre/calibre/gui2/catalog/__init__.py -lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py lib/calibre/calibre/gui2/catalog/catalog_bibtex.py +lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py -lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py +lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py lib/calibre/calibre/gui2/changes.py lib/calibre/calibre/gui2/comments_editor.py lib/calibre/calibre/gui2/complete2.py lib/calibre/calibre/gui2/convert/__init__.py -lib/calibre/calibre/gui2/convert/azw3_output_ui.py lib/calibre/calibre/gui2/convert/azw3_output.py +lib/calibre/calibre/gui2/convert/azw3_output_ui.py lib/calibre/calibre/gui2/convert/bulk.py -lib/calibre/calibre/gui2/convert/comic_input_ui.py lib/calibre/calibre/gui2/convert/comic_input.py -lib/calibre/calibre/gui2/convert/debug_ui.py +lib/calibre/calibre/gui2/convert/comic_input_ui.py lib/calibre/calibre/gui2/convert/debug.py -lib/calibre/calibre/gui2/convert/docx_input_ui.py +lib/calibre/calibre/gui2/convert/debug_ui.py lib/calibre/calibre/gui2/convert/docx_input.py +lib/calibre/calibre/gui2/convert/docx_input_ui.py lib/calibre/calibre/gui2/convert/docx_output.py -lib/calibre/calibre/gui2/convert/epub_output_ui.py lib/calibre/calibre/gui2/convert/epub_output.py -lib/calibre/calibre/gui2/convert/fb2_input_ui.py +lib/calibre/calibre/gui2/convert/epub_output_ui.py lib/calibre/calibre/gui2/convert/fb2_input.py -lib/calibre/calibre/gui2/convert/fb2_output_ui.py +lib/calibre/calibre/gui2/convert/fb2_input_ui.py lib/calibre/calibre/gui2/convert/fb2_output.py -lib/calibre/calibre/gui2/convert/font_key_ui.py +lib/calibre/calibre/gui2/convert/fb2_output_ui.py lib/calibre/calibre/gui2/convert/font_key.py +lib/calibre/calibre/gui2/convert/font_key_ui.py lib/calibre/calibre/gui2/convert/gui_conversion.py -lib/calibre/calibre/gui2/convert/heuristics_ui.py lib/calibre/calibre/gui2/convert/heuristics.py -lib/calibre/calibre/gui2/convert/htmlz_output_ui.py +lib/calibre/calibre/gui2/convert/heuristics_ui.py lib/calibre/calibre/gui2/convert/htmlz_output.py -lib/calibre/calibre/gui2/convert/look_and_feel_ui.py +lib/calibre/calibre/gui2/convert/htmlz_output_ui.py lib/calibre/calibre/gui2/convert/look_and_feel.py -lib/calibre/calibre/gui2/convert/lrf_output_ui.py +lib/calibre/calibre/gui2/convert/look_and_feel_ui.py lib/calibre/calibre/gui2/convert/lrf_output.py -lib/calibre/calibre/gui2/convert/metadata_ui.py +lib/calibre/calibre/gui2/convert/lrf_output_ui.py lib/calibre/calibre/gui2/convert/metadata.py -lib/calibre/calibre/gui2/convert/mobi_output_ui.py +lib/calibre/calibre/gui2/convert/metadata_ui.py lib/calibre/calibre/gui2/convert/mobi_output.py -lib/calibre/calibre/gui2/convert/page_setup_ui.py +lib/calibre/calibre/gui2/convert/mobi_output_ui.py lib/calibre/calibre/gui2/convert/page_setup.py -lib/calibre/calibre/gui2/convert/pdb_output_ui.py +lib/calibre/calibre/gui2/convert/page_setup_ui.py lib/calibre/calibre/gui2/convert/pdb_output.py -lib/calibre/calibre/gui2/convert/pdf_input_ui.py +lib/calibre/calibre/gui2/convert/pdb_output_ui.py lib/calibre/calibre/gui2/convert/pdf_input.py -lib/calibre/calibre/gui2/convert/pdf_output_ui.py +lib/calibre/calibre/gui2/convert/pdf_input_ui.py lib/calibre/calibre/gui2/convert/pdf_output.py +lib/calibre/calibre/gui2/convert/pdf_output_ui.py lib/calibre/calibre/gui2/convert/pml_output.py lib/calibre/calibre/gui2/convert/pmlz_output_ui.py -lib/calibre/calibre/gui2/convert/rb_output_ui.py lib/calibre/calibre/gui2/convert/rb_output.py -lib/calibre/calibre/gui2/convert/regex_builder_ui.py +lib/calibre/calibre/gui2/convert/rb_output_ui.py lib/calibre/calibre/gui2/convert/regex_builder.py -lib/calibre/calibre/gui2/convert/rtf_input_ui.py +lib/calibre/calibre/gui2/convert/regex_builder_ui.py lib/calibre/calibre/gui2/convert/rtf_input.py -lib/calibre/calibre/gui2/convert/search_and_replace_ui.py +lib/calibre/calibre/gui2/convert/rtf_input_ui.py lib/calibre/calibre/gui2/convert/search_and_replace.py -lib/calibre/calibre/gui2/convert/single_ui.py +lib/calibre/calibre/gui2/convert/search_and_replace_ui.py lib/calibre/calibre/gui2/convert/single.py -lib/calibre/calibre/gui2/convert/snb_output_ui.py +lib/calibre/calibre/gui2/convert/single_ui.py lib/calibre/calibre/gui2/convert/snb_output.py -lib/calibre/calibre/gui2/convert/structure_detection_ui.py +lib/calibre/calibre/gui2/convert/snb_output_ui.py lib/calibre/calibre/gui2/convert/structure_detection.py -lib/calibre/calibre/gui2/convert/toc_ui.py +lib/calibre/calibre/gui2/convert/structure_detection_ui.py lib/calibre/calibre/gui2/convert/toc.py -lib/calibre/calibre/gui2/convert/txt_input_ui.py +lib/calibre/calibre/gui2/convert/toc_ui.py lib/calibre/calibre/gui2/convert/txt_input.py -lib/calibre/calibre/gui2/convert/txt_output_ui.py +lib/calibre/calibre/gui2/convert/txt_input_ui.py lib/calibre/calibre/gui2/convert/txt_output.py +lib/calibre/calibre/gui2/convert/txt_output_ui.py lib/calibre/calibre/gui2/convert/txtz_output.py lib/calibre/calibre/gui2/convert/xexp_edit_ui.py -lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py lib/calibre/calibre/gui2/convert/xpath_wizard.py +lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py lib/calibre/calibre/gui2/cover_flow.py lib/calibre/calibre/gui2/covers.py lib/calibre/calibre/gui2/css_transform_rules.py @@ -765,76 +761,76 @@ lib/calibre/calibre/gui2/dbus_export/menu2.py lib/calibre/calibre/gui2/dbus_export/tray.py lib/calibre/calibre/gui2/dbus_export/utils.py lib/calibre/calibre/gui2/dbus_export/widgets.py +lib/calibre/calibre/gui2/device.py lib/calibre/calibre/gui2/device_drivers/__init__.py -lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py lib/calibre/calibre/gui2/device_drivers/configwidget.py +lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py lib/calibre/calibre/gui2/device_drivers/mtp_config.py lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py lib/calibre/calibre/gui2/device_drivers/tabbed_device_config.py -lib/calibre/calibre/gui2/device.py lib/calibre/calibre/gui2/dialogs/__init__.py lib/calibre/calibre/gui2/dialogs/add_empty_book.py lib/calibre/calibre/gui2/dialogs/add_from_isbn.py lib/calibre/calibre/gui2/dialogs/authors_edit.py lib/calibre/calibre/gui2/dialogs/book_info.py -lib/calibre/calibre/gui2/dialogs/catalog_ui.py lib/calibre/calibre/gui2/dialogs/catalog.py +lib/calibre/calibre/gui2/dialogs/catalog_ui.py lib/calibre/calibre/gui2/dialogs/check_library.py -lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py -lib/calibre/calibre/gui2/dialogs/choose_format_device.py lib/calibre/calibre/gui2/dialogs/choose_format.py -lib/calibre/calibre/gui2/dialogs/choose_library_ui.py +lib/calibre/calibre/gui2/dialogs/choose_format_device.py +lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py lib/calibre/calibre/gui2/dialogs/choose_library.py +lib/calibre/calibre/gui2/dialogs/choose_library_ui.py lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py lib/calibre/calibre/gui2/dialogs/comicconf_ui.py -lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py lib/calibre/calibre/gui2/dialogs/comments_dialog.py -lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py -lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py +lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py lib/calibre/calibre/gui2/dialogs/confirm_delete.py +lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py +lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py lib/calibre/calibre/gui2/dialogs/confirm_merge.py -lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py lib/calibre/calibre/gui2/dialogs/conversion_error.py +lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py lib/calibre/calibre/gui2/dialogs/custom_recipes.py -lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py -lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py +lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py lib/calibre/calibre/gui2/dialogs/device_category_editor.py -lib/calibre/calibre/gui2/dialogs/drm_error_ui.py +lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py lib/calibre/calibre/gui2/dialogs/drm_error.py +lib/calibre/calibre/gui2/dialogs/drm_error_ui.py lib/calibre/calibre/gui2/dialogs/duplicates.py -lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py +lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py lib/calibre/calibre/gui2/dialogs/exim.py lib/calibre/calibre/gui2/dialogs/jobs_ui.py -lib/calibre/calibre/gui2/dialogs/match_books_ui.py lib/calibre/calibre/gui2/dialogs/match_books.py +lib/calibre/calibre/gui2/dialogs/match_books_ui.py lib/calibre/calibre/gui2/dialogs/message_box.py -lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py lib/calibre/calibre/gui2/dialogs/metadata_bulk.py +lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py lib/calibre/calibre/gui2/dialogs/opml.py -lib/calibre/calibre/gui2/dialogs/password_ui.py lib/calibre/calibre/gui2/dialogs/password.py +lib/calibre/calibre/gui2/dialogs/password_ui.py lib/calibre/calibre/gui2/dialogs/plugin_updater.py lib/calibre/calibre/gui2/dialogs/progress.py -lib/calibre/calibre/gui2/dialogs/quickview_ui.py lib/calibre/calibre/gui2/dialogs/quickview.py +lib/calibre/calibre/gui2/dialogs/quickview_ui.py lib/calibre/calibre/gui2/dialogs/restore_library.py -lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py lib/calibre/calibre/gui2/dialogs/saved_search_editor.py +lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py lib/calibre/calibre/gui2/dialogs/scheduler.py lib/calibre/calibre/gui2/dialogs/search.py lib/calibre/calibre/gui2/dialogs/select_formats.py -lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py lib/calibre/calibre/gui2/dialogs/smartdevice.py -lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py +lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py lib/calibre/calibre/gui2/dialogs/tag_categories.py -lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py +lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py lib/calibre/calibre/gui2/dialogs/tag_editor.py -lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py +lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py lib/calibre/calibre/gui2/dialogs/tag_list_editor.py -lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py +lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py lib/calibre/calibre/gui2/dialogs/template_dialog.py +lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py lib/calibre/calibre/gui2/dialogs/template_line_editor.py lib/calibre/calibre/gui2/dialogs/trim_image.py lib/calibre/calibre/gui2/dnd.py @@ -844,13 +840,14 @@ lib/calibre/calibre/gui2/filename_pattern_ui.py lib/calibre/calibre/gui2/font_family_chooser.py lib/calibre/calibre/gui2/gestures.py lib/calibre/calibre/gui2/icon_theme.py +lib/calibre/calibre/gui2/image_popup.py lib/calibre/calibre/gui2/init.py lib/calibre/calibre/gui2/job_indicator.py lib/calibre/calibre/gui2/jobs.py lib/calibre/calibre/gui2/keyboard.py lib/calibre/calibre/gui2/languages.py -lib/calibre/calibre/gui2/layout_menu.py lib/calibre/calibre/gui2/layout.py +lib/calibre/calibre/gui2/layout_menu.py lib/calibre/calibre/gui2/library/__init__.py lib/calibre/calibre/gui2/library/alternate_views.py lib/calibre/calibre/gui2/library/caches.py @@ -862,30 +859,30 @@ lib/calibre/calibre/gui2/lrf_renderer/__init__.py lib/calibre/calibre/gui2/lrf_renderer/bookview.py lib/calibre/calibre/gui2/lrf_renderer/config_ui.py lib/calibre/calibre/gui2/lrf_renderer/document.py -lib/calibre/calibre/gui2/lrf_renderer/main_ui.py lib/calibre/calibre/gui2/lrf_renderer/main.py +lib/calibre/calibre/gui2/lrf_renderer/main_ui.py lib/calibre/calibre/gui2/lrf_renderer/text.py -lib/calibre/calibre/gui2/main_window.py lib/calibre/calibre/gui2/main.py +lib/calibre/calibre/gui2/main_window.py lib/calibre/calibre/gui2/metadata/__init__.py lib/calibre/calibre/gui2/metadata/basic_widgets.py lib/calibre/calibre/gui2/metadata/bulk_download.py lib/calibre/calibre/gui2/metadata/config.py lib/calibre/calibre/gui2/metadata/diff.py lib/calibre/calibre/gui2/metadata/pdf_covers.py -lib/calibre/calibre/gui2/metadata/single_download.py lib/calibre/calibre/gui2/metadata/single.py +lib/calibre/calibre/gui2/metadata/single_download.py lib/calibre/calibre/gui2/notify.py lib/calibre/calibre/gui2/open_with.py lib/calibre/calibre/gui2/pin_columns.py lib/calibre/calibre/gui2/preferences/__init__.py -lib/calibre/calibre/gui2/preferences/adding_ui.py lib/calibre/calibre/gui2/preferences/adding.py -lib/calibre/calibre/gui2/preferences/behavior_ui.py +lib/calibre/calibre/gui2/preferences/adding_ui.py lib/calibre/calibre/gui2/preferences/behavior.py +lib/calibre/calibre/gui2/preferences/behavior_ui.py lib/calibre/calibre/gui2/preferences/coloring.py -lib/calibre/calibre/gui2/preferences/columns_ui.py lib/calibre/calibre/gui2/preferences/columns.py +lib/calibre/calibre/gui2/preferences/columns_ui.py lib/calibre/calibre/gui2/preferences/conversion.py lib/calibre/calibre/gui2/preferences/create_custom_column.py lib/calibre/calibre/gui2/preferences/device_debug.py @@ -895,31 +892,31 @@ lib/calibre/calibre/gui2/preferences/emailp.py lib/calibre/calibre/gui2/preferences/history.py lib/calibre/calibre/gui2/preferences/ignored_devices.py lib/calibre/calibre/gui2/preferences/keyboard.py -lib/calibre/calibre/gui2/preferences/look_feel_ui.py lib/calibre/calibre/gui2/preferences/look_feel.py +lib/calibre/calibre/gui2/preferences/look_feel_ui.py lib/calibre/calibre/gui2/preferences/main.py -lib/calibre/calibre/gui2/preferences/metadata_sources_ui.py lib/calibre/calibre/gui2/preferences/metadata_sources.py -lib/calibre/calibre/gui2/preferences/misc_ui.py +lib/calibre/calibre/gui2/preferences/metadata_sources_ui.py lib/calibre/calibre/gui2/preferences/misc.py -lib/calibre/calibre/gui2/preferences/plugboard_ui.py +lib/calibre/calibre/gui2/preferences/misc_ui.py lib/calibre/calibre/gui2/preferences/plugboard.py -lib/calibre/calibre/gui2/preferences/plugins_ui.py +lib/calibre/calibre/gui2/preferences/plugboard_ui.py lib/calibre/calibre/gui2/preferences/plugins.py -lib/calibre/calibre/gui2/preferences/save_template_ui.py +lib/calibre/calibre/gui2/preferences/plugins_ui.py lib/calibre/calibre/gui2/preferences/save_template.py -lib/calibre/calibre/gui2/preferences/saving_ui.py +lib/calibre/calibre/gui2/preferences/save_template_ui.py lib/calibre/calibre/gui2/preferences/saving.py -lib/calibre/calibre/gui2/preferences/search_ui.py +lib/calibre/calibre/gui2/preferences/saving_ui.py lib/calibre/calibre/gui2/preferences/search.py -lib/calibre/calibre/gui2/preferences/sending_ui.py +lib/calibre/calibre/gui2/preferences/search_ui.py lib/calibre/calibre/gui2/preferences/sending.py +lib/calibre/calibre/gui2/preferences/sending_ui.py lib/calibre/calibre/gui2/preferences/server.py -lib/calibre/calibre/gui2/preferences/template_functions_ui.py lib/calibre/calibre/gui2/preferences/template_functions.py +lib/calibre/calibre/gui2/preferences/template_functions_ui.py lib/calibre/calibre/gui2/preferences/texture_chooser.py -lib/calibre/calibre/gui2/preferences/toolbar_ui.py lib/calibre/calibre/gui2/preferences/toolbar.py +lib/calibre/calibre/gui2/preferences/toolbar_ui.py lib/calibre/calibre/gui2/preferences/tweaks.py lib/calibre/calibre/gui2/proceed.py lib/calibre/calibre/gui2/progress_indicator/__init__.py @@ -930,32 +927,32 @@ lib/calibre/calibre/gui2/search_restriction_mixin.py lib/calibre/calibre/gui2/shortcuts.py lib/calibre/calibre/gui2/splash_screen.py lib/calibre/calibre/gui2/store/__init__.py -lib/calibre/calibre/gui2/store/basic_config_widget_ui.py lib/calibre/calibre/gui2/store/basic_config.py +lib/calibre/calibre/gui2/store/basic_config_widget_ui.py lib/calibre/calibre/gui2/store/config/__init__.py lib/calibre/calibre/gui2/store/config/chooser/__init__.py -lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py +lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py -lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py +lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py lib/calibre/calibre/gui2/store/config/chooser/models.py lib/calibre/calibre/gui2/store/config/chooser/results_view.py lib/calibre/calibre/gui2/store/config/search/__init__.py -lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py lib/calibre/calibre/gui2/store/config/search/search_widget.py +lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py lib/calibre/calibre/gui2/store/config/store.py lib/calibre/calibre/gui2/store/loader.py lib/calibre/calibre/gui2/store/opensearch_store.py -lib/calibre/calibre/gui2/store/search_result.py lib/calibre/calibre/gui2/store/search/__init__.py -lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py lib/calibre/calibre/gui2/store/search/adv_search_builder.py +lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py lib/calibre/calibre/gui2/store/search/download_thread.py lib/calibre/calibre/gui2/store/search/models.py lib/calibre/calibre/gui2/store/search/results_view.py -lib/calibre/calibre/gui2/store/search/search_ui.py lib/calibre/calibre/gui2/store/search/search.py +lib/calibre/calibre/gui2/store/search/search_ui.py +lib/calibre/calibre/gui2/store/search_result.py lib/calibre/calibre/gui2/store/stores/__init__.py lib/calibre/calibre/gui2/store/stores/amazon_au_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py @@ -991,15 +988,15 @@ lib/calibre/calibre/gui2/store/stores/litres_plugin.py lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py lib/calibre/calibre/gui2/store/stores/mills_boon_uk_plugin.py lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py -lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py -lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py +lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py +lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py lib/calibre/calibre/gui2/store/stores/mobileread/models.py -lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py +lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py lib/calibre/calibre/gui2/store/stores/nexto_plugin.py lib/calibre/calibre/gui2/store/stores/open_books_plugin.py lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py @@ -1014,8 +1011,7 @@ lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugi lib/calibre/calibre/gui2/store/stores/woblink_plugin.py lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py -lib/calibre/calibre/gui2/store/web_control.py -lib/calibre/calibre/gui2/store/web_store_dialog_ui.py +lib/calibre/calibre/gui2/store/web_store.py lib/calibre/calibre/gui2/store/web_store_dialog.py lib/calibre/calibre/gui2/tag_browser/__init__.py lib/calibre/calibre/gui2/tag_browser/model.py @@ -1031,8 +1027,8 @@ lib/calibre/calibre/gui2/tools.py lib/calibre/calibre/gui2/tweak_book/__init__.py lib/calibre/calibre/gui2/tweak_book/boss.py lib/calibre/calibre/gui2/tweak_book/char_select.py -lib/calibre/calibre/gui2/tweak_book/check_links.py lib/calibre/calibre/gui2/tweak_book/check.py +lib/calibre/calibre/gui2/tweak_book/check_links.py lib/calibre/calibre/gui2/tweak_book/completion/__init__.py lib/calibre/calibre/gui2/tweak_book/completion/basic.py lib/calibre/calibre/gui2/tweak_book/completion/popup.py @@ -1090,24 +1086,17 @@ lib/calibre/calibre/gui2/tweak_book/widgets.py lib/calibre/calibre/gui2/ui.py lib/calibre/calibre/gui2/update.py lib/calibre/calibre/gui2/viewer/__init__.py -lib/calibre/calibre/gui2/viewer/bookmarkmanager.py +lib/calibre/calibre/gui2/viewer/annotations.py +lib/calibre/calibre/gui2/viewer/bookmarks.py lib/calibre/calibre/gui2/viewer/config_ui.py -lib/calibre/calibre/gui2/viewer/config.py -lib/calibre/calibre/gui2/viewer/documentview.py -lib/calibre/calibre/gui2/viewer/fake_net.py -lib/calibre/calibre/gui2/viewer/flip.py -lib/calibre/calibre/gui2/viewer/footnote.py -lib/calibre/calibre/gui2/viewer/gestures.py -lib/calibre/calibre/gui2/viewer/image_popup.py -lib/calibre/calibre/gui2/viewer/inspector.py -lib/calibre/calibre/gui2/viewer/javascript.py -lib/calibre/calibre/gui2/viewer/keys.py +lib/calibre/calibre/gui2/viewer/convert_book.py +lib/calibre/calibre/gui2/viewer/lookup.py lib/calibre/calibre/gui2/viewer/main.py -lib/calibre/calibre/gui2/viewer/position.py -lib/calibre/calibre/gui2/viewer/printing.py -lib/calibre/calibre/gui2/viewer/table_popup.py +lib/calibre/calibre/gui2/viewer/mathjax.py lib/calibre/calibre/gui2/viewer/toc.py lib/calibre/calibre/gui2/viewer/ui.py +lib/calibre/calibre/gui2/viewer/web_view.py +lib/calibre/calibre/gui2/webengine.py lib/calibre/calibre/gui2/widgets.py lib/calibre/calibre/gui2/widgets2.py lib/calibre/calibre/gui2/win_file_dialogs.py @@ -1116,17 +1105,18 @@ lib/calibre/calibre/gui2/wizard/device_ui.py lib/calibre/calibre/gui2/wizard/finish_ui.py lib/calibre/calibre/gui2/wizard/kindle_ui.py lib/calibre/calibre/gui2/wizard/library_ui.py -lib/calibre/calibre/gui2/wizard/send_email_ui.py lib/calibre/calibre/gui2/wizard/send_email.py +lib/calibre/calibre/gui2/wizard/send_email_ui.py lib/calibre/calibre/gui2/wizard/stanza_ui.py +lib/calibre/calibre/gui_launch.py lib/calibre/calibre/library/__init__.py lib/calibre/calibre/library/add_to_library.py lib/calibre/calibre/library/caches.py lib/calibre/calibre/library/catalogs/__init__.py lib/calibre/calibre/library/catalogs/bibtex.py lib/calibre/calibre/library/catalogs/csv_xml.py -lib/calibre/calibre/library/catalogs/epub_mobi_builder.py lib/calibre/calibre/library/catalogs/epub_mobi.py +lib/calibre/calibre/library/catalogs/epub_mobi_builder.py lib/calibre/calibre/library/catalogs/utils.py lib/calibre/calibre/library/check_library.py lib/calibre/calibre/library/coloring.py @@ -1144,9 +1134,9 @@ lib/calibre/calibre/libunzip.py lib/calibre/calibre/linux.py lib/calibre/calibre/plugins/_patiencediff_c.so lib/calibre/calibre/plugins/bzzdec.so +lib/calibre/calibre/plugins/cPalmdoc.so lib/calibre/calibre/plugins/certgen.so lib/calibre/calibre/plugins/chmlib.so -lib/calibre/calibre/plugins/cPalmdoc.so lib/calibre/calibre/plugins/freetype.so lib/calibre/calibre/plugins/html.so lib/calibre/calibre/plugins/hunspell.so @@ -1163,7 +1153,6 @@ lib/calibre/calibre/plugins/msdes.so lib/calibre/calibre/plugins/pictureflow.so lib/calibre/calibre/plugins/podofo.so lib/calibre/calibre/plugins/progress_indicator.so -lib/calibre/calibre/plugins/qt_hack.so lib/calibre/calibre/plugins/speedup.so lib/calibre/calibre/plugins/sqlite_custom.so lib/calibre/calibre/plugins/tokenizer.so @@ -1215,8 +1204,8 @@ lib/calibre/calibre/srv/tests/loop.py lib/calibre/calibre/srv/tests/main.py lib/calibre/calibre/srv/tests/routes.py lib/calibre/calibre/srv/tests/web_sockets.py -lib/calibre/calibre/srv/users_api.py lib/calibre/calibre/srv/users.py +lib/calibre/calibre/srv/users_api.py lib/calibre/calibre/srv/utils.py lib/calibre/calibre/srv/web_socket.py lib/calibre/calibre/startup.py @@ -1224,6 +1213,7 @@ lib/calibre/calibre/test_build.py lib/calibre/calibre/translations/__init__.py lib/calibre/calibre/translations/dynamic.py lib/calibre/calibre/translations/msgfmt.py +lib/calibre/calibre/utils/Zeroconf.py lib/calibre/calibre/utils/__init__.py lib/calibre/calibre/utils/bibtex.py lib/calibre/calibre/utils/browser.py @@ -1232,8 +1222,8 @@ lib/calibre/calibre/utils/chm/__init__.py lib/calibre/calibre/utils/chm/chm.py lib/calibre/calibre/utils/cleantext.py lib/calibre/calibre/utils/complete.py -lib/calibre/calibre/utils/config_base.py lib/calibre/calibre/utils/config.py +lib/calibre/calibre/utils/config_base.py lib/calibre/calibre/utils/date.py lib/calibre/calibre/utils/dbus_service.py lib/calibre/calibre/utils/exim.py @@ -1259,16 +1249,17 @@ lib/calibre/calibre/utils/fonts/sfnt/head.py lib/calibre/calibre/utils/fonts/sfnt/kern.py lib/calibre/calibre/utils/fonts/sfnt/loca.py lib/calibre/calibre/utils/fonts/sfnt/maxp.py +lib/calibre/calibre/utils/fonts/sfnt/merge.py lib/calibre/calibre/utils/fonts/sfnt/metrics.py lib/calibre/calibre/utils/fonts/sfnt/subset.py lib/calibre/calibre/utils/fonts/utils.py lib/calibre/calibre/utils/fonts/win_fonts.py -lib/calibre/calibre/utils/formatter_functions.py lib/calibre/calibre/utils/formatter.py +lib/calibre/calibre/utils/formatter_functions.py lib/calibre/calibre/utils/html2text.py lib/calibre/calibre/utils/https.py -lib/calibre/calibre/utils/icu_test.py lib/calibre/calibre/utils/icu.py +lib/calibre/calibre/utils/icu_test.py lib/calibre/calibre/utils/img.py lib/calibre/calibre/utils/imghdr.py lib/calibre/calibre/utils/inotify.py @@ -1315,7 +1306,6 @@ lib/calibre/calibre/utils/run_tests.py lib/calibre/calibre/utils/search_query_parser.py lib/calibre/calibre/utils/search_query_parser_test.py lib/calibre/calibre/utils/serialize.py -lib/calibre/calibre/utils/serve_coffee.py lib/calibre/calibre/utils/shared_file.py lib/calibre/calibre/utils/short_uuid.py lib/calibre/calibre/utils/smartypants.py @@ -1344,7 +1334,6 @@ lib/calibre/calibre/utils/wmf/__init__.py lib/calibre/calibre/utils/wmf/emf.py lib/calibre/calibre/utils/wmf/parse.py lib/calibre/calibre/utils/wordcount.py -lib/calibre/calibre/utils/Zeroconf.py lib/calibre/calibre/utils/zipfile.py lib/calibre/calibre/web/__init__.py lib/calibre/calibre/web/feeds/__init__.py @@ -1362,8 +1351,6 @@ lib/calibre/css_selectors/ordered_set.py lib/calibre/css_selectors/parser.py lib/calibre/css_selectors/select.py lib/calibre/css_selectors/tests.py -lib/calibre/duktape/__init__.py -lib/calibre/duktape/tests.py lib/calibre/lzma/__init__.py lib/calibre/lzma/errors.py lib/calibre/lzma/lzma1.py @@ -1449,8 +1436,6 @@ lib/calibre/tinycss/version.py %%DATADIR%%/catalog/section_list_templates.conf %%DATADIR%%/catalog/stylesheet.css %%DATADIR%%/catalog/template.xhtml -%%DATADIR%%/coffee-script.js -%%DATADIR%%/compiled_coffeescript.zip %%DATADIR%%/content-server/calibre.appcache %%DATADIR%%/content-server/calibre.png %%DATADIR%%/content-server/empty.html @@ -1497,8 +1482,8 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/apple-touch-icon.png %%DATADIR%%/images/arrow-down.png %%DATADIR%%/images/arrow-up.png -%%DATADIR%%/images/auto_author_sort.png %%DATADIR%%/images/auto-reload.png +%%DATADIR%%/images/auto_author_sort.png %%DATADIR%%/images/back.png %%DATADIR%%/images/beautify.png %%DATADIR%%/images/blank.png @@ -1513,8 +1498,8 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/column.png %%DATADIR%%/images/compress-image.png %%DATADIR%%/images/config.png -%%DATADIR%%/images/connect_share_on.png %%DATADIR%%/images/connect_share.png +%%DATADIR%%/images/connect_share_on.png %%DATADIR%%/images/convert.png %%DATADIR%%/images/copy-to-library.png %%DATADIR%%/images/cover_flow.png @@ -1535,19 +1520,17 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/dialog_warning.png %%DATADIR%%/images/dictionary.png %%DATADIR%%/images/diff.png -%%DATADIR%%/images/document_open.png %%DATADIR%%/images/document-encrypt.png %%DATADIR%%/images/document-import.png %%DATADIR%%/images/document-new.png %%DATADIR%%/images/document-split.png +%%DATADIR%%/images/document_open.png %%DATADIR%%/images/donate.png %%DATADIR%%/images/dot_green.png %%DATADIR%%/images/dot_red.png %%DATADIR%%/images/download-metadata.png %%DATADIR%%/images/drm-locked.png %%DATADIR%%/images/drm-unlocked.png -%%DATADIR%%/images/edit_book.png -%%DATADIR%%/images/edit_input.png %%DATADIR%%/images/edit-clear.png %%DATADIR%%/images/edit-copy.png %%DATADIR%%/images/edit-cut.png @@ -1555,14 +1538,16 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/edit-redo.png %%DATADIR%%/images/edit-select-all.png %%DATADIR%%/images/edit-undo.png +%%DATADIR%%/images/edit_book.png +%%DATADIR%%/images/edit_input.png %%DATADIR%%/images/eject.png %%DATADIR%%/images/embed-fonts.png %%DATADIR%%/images/exec.png %%DATADIR%%/images/filter.png %%DATADIR%%/images/folder_saved_search.png +%%DATADIR%%/images/font.png %%DATADIR%%/images/font_size_larger.png %%DATADIR%%/images/font_size_smaller.png -%%DATADIR%%/images/font.png %%DATADIR%%/images/format-fill-color.png %%DATADIR%%/images/format-indent-less.png %%DATADIR%%/images/format-indent-more.png @@ -1603,8 +1588,8 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/lt.png %%DATADIR%%/images/mail.png %%DATADIR%%/images/marked.png -%%DATADIR%%/images/merge_books.png %%DATADIR%%/images/merge.png +%%DATADIR%%/images/merge_books.png %%DATADIR%%/images/metadata.png %%DATADIR%%/images/mimetypes/azw2.png %%DATADIR%%/images/mimetypes/azw3.png @@ -1653,11 +1638,11 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/plugins/plugin_disabled_invalid.png %%DATADIR%%/images/plugins/plugin_disabled_ok.png %%DATADIR%%/images/plugins/plugin_disabled_valid.png +%%DATADIR%%/images/plugins/plugin_new.png %%DATADIR%%/images/plugins/plugin_new_invalid.png %%DATADIR%%/images/plugins/plugin_new_valid.png -%%DATADIR%%/images/plugins/plugin_new.png -%%DATADIR%%/images/plugins/plugin_updater_updates.png %%DATADIR%%/images/plugins/plugin_updater.png +%%DATADIR%%/images/plugins/plugin_updater_updates.png %%DATADIR%%/images/plugins/plugin_upgrade_invalid.png %%DATADIR%%/images/plugins/plugin_upgrade_ok.png %%DATADIR%%/images/plugins/plugin_upgrade_valid.png @@ -1680,10 +1665,10 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/scheduler.png %%DATADIR%%/images/scroll.png %%DATADIR%%/images/sd.png +%%DATADIR%%/images/search.png %%DATADIR%%/images/search_add_saved.png %%DATADIR%%/images/search_copy_saved.png %%DATADIR%%/images/search_delete_saved.png -%%DATADIR%%/images/search.png %%DATADIR%%/images/series.png %%DATADIR%%/images/similar.png %%DATADIR%%/images/smarten-punctuation.png @@ -1728,6 +1713,43 @@ lib/calibre/tinycss/version.py %%DATADIR%%/localization/pykakasi/kanwadict2.calibre_msgpack %%DATADIR%%/localization/stats.calibre_msgpack %%DATADIR%%/localization/website-languages.txt +%%DATADIR%%/lookup.js +%%DATADIR%%/mathjax/MathJax.js +%%DATADIR%%/mathjax/extensions/AssistiveMML.js +%%DATADIR%%/mathjax/extensions/CHTML-preview.js +%%DATADIR%%/mathjax/extensions/FontWarnings.js +%%DATADIR%%/mathjax/extensions/HTML-CSS/handle-floats.js +%%DATADIR%%/mathjax/extensions/HelpDialog.js +%%DATADIR%%/mathjax/extensions/MatchWebFonts.js +%%DATADIR%%/mathjax/extensions/MathEvents.js +%%DATADIR%%/mathjax/extensions/MathML/content-mathml.js +%%DATADIR%%/mathjax/extensions/MathML/mml3.js +%%DATADIR%%/mathjax/extensions/MathMenu.js +%%DATADIR%%/mathjax/extensions/MathZoom.js +%%DATADIR%%/mathjax/extensions/Safe.js +%%DATADIR%%/mathjax/extensions/TeX/AMScd.js +%%DATADIR%%/mathjax/extensions/TeX/AMSmath.js +%%DATADIR%%/mathjax/extensions/TeX/AMSsymbols.js +%%DATADIR%%/mathjax/extensions/TeX/HTML.js +%%DATADIR%%/mathjax/extensions/TeX/action.js +%%DATADIR%%/mathjax/extensions/TeX/autobold.js +%%DATADIR%%/mathjax/extensions/TeX/autoload-all.js +%%DATADIR%%/mathjax/extensions/TeX/bbox.js +%%DATADIR%%/mathjax/extensions/TeX/begingroup.js +%%DATADIR%%/mathjax/extensions/TeX/boldsymbol.js +%%DATADIR%%/mathjax/extensions/TeX/cancel.js +%%DATADIR%%/mathjax/extensions/TeX/color.js +%%DATADIR%%/mathjax/extensions/TeX/enclose.js +%%DATADIR%%/mathjax/extensions/TeX/extpfeil.js +%%DATADIR%%/mathjax/extensions/TeX/mathchoice.js +%%DATADIR%%/mathjax/extensions/TeX/mediawiki-texvc.js +%%DATADIR%%/mathjax/extensions/TeX/mhchem.js +%%DATADIR%%/mathjax/extensions/TeX/mhchem3/mhchem.js +%%DATADIR%%/mathjax/extensions/TeX/newcommand.js +%%DATADIR%%/mathjax/extensions/TeX/noErrors.js +%%DATADIR%%/mathjax/extensions/TeX/noUndefined.js +%%DATADIR%%/mathjax/extensions/TeX/unicode.js +%%DATADIR%%/mathjax/extensions/TeX/verb.js %%DATADIR%%/mathjax/extensions/a11y/accessibility-menu.js %%DATADIR%%/mathjax/extensions/a11y/auto-collapse.js %%DATADIR%%/mathjax/extensions/a11y/collapsible.js @@ -1841,44 +1863,9 @@ lib/calibre/tinycss/version.py %%DATADIR%%/mathjax/extensions/a11y/semantic-enrich.js %%DATADIR%%/mathjax/extensions/a11y/wgxpath.install.js %%DATADIR%%/mathjax/extensions/asciimath2jax.js -%%DATADIR%%/mathjax/extensions/AssistiveMML.js -%%DATADIR%%/mathjax/extensions/CHTML-preview.js %%DATADIR%%/mathjax/extensions/fast-preview.js -%%DATADIR%%/mathjax/extensions/FontWarnings.js -%%DATADIR%%/mathjax/extensions/HelpDialog.js -%%DATADIR%%/mathjax/extensions/HTML-CSS/handle-floats.js %%DATADIR%%/mathjax/extensions/jsMath2jax.js -%%DATADIR%%/mathjax/extensions/MatchWebFonts.js -%%DATADIR%%/mathjax/extensions/MathEvents.js -%%DATADIR%%/mathjax/extensions/MathMenu.js -%%DATADIR%%/mathjax/extensions/MathML/content-mathml.js -%%DATADIR%%/mathjax/extensions/MathML/mml3.js -%%DATADIR%%/mathjax/extensions/MathZoom.js %%DATADIR%%/mathjax/extensions/mml2jax.js -%%DATADIR%%/mathjax/extensions/Safe.js -%%DATADIR%%/mathjax/extensions/TeX/action.js -%%DATADIR%%/mathjax/extensions/TeX/AMScd.js -%%DATADIR%%/mathjax/extensions/TeX/AMSmath.js -%%DATADIR%%/mathjax/extensions/TeX/AMSsymbols.js -%%DATADIR%%/mathjax/extensions/TeX/autobold.js -%%DATADIR%%/mathjax/extensions/TeX/autoload-all.js -%%DATADIR%%/mathjax/extensions/TeX/bbox.js -%%DATADIR%%/mathjax/extensions/TeX/begingroup.js -%%DATADIR%%/mathjax/extensions/TeX/boldsymbol.js -%%DATADIR%%/mathjax/extensions/TeX/cancel.js -%%DATADIR%%/mathjax/extensions/TeX/color.js -%%DATADIR%%/mathjax/extensions/TeX/enclose.js -%%DATADIR%%/mathjax/extensions/TeX/extpfeil.js -%%DATADIR%%/mathjax/extensions/TeX/HTML.js -%%DATADIR%%/mathjax/extensions/TeX/mathchoice.js -%%DATADIR%%/mathjax/extensions/TeX/mediawiki-texvc.js -%%DATADIR%%/mathjax/extensions/TeX/mhchem.js -%%DATADIR%%/mathjax/extensions/TeX/mhchem3/mhchem.js -%%DATADIR%%/mathjax/extensions/TeX/newcommand.js -%%DATADIR%%/mathjax/extensions/TeX/noErrors.js -%%DATADIR%%/mathjax/extensions/TeX/noUndefined.js -%%DATADIR%%/mathjax/extensions/TeX/unicode.js -%%DATADIR%%/mathjax/extensions/TeX/verb.js %%DATADIR%%/mathjax/extensions/tex2jax.js %%DATADIR%%/mathjax/extensions/toMathML.js %%DATADIR%%/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff @@ -1920,9 +1907,9 @@ lib/calibre/tinycss/version.py %%DATADIR%%/mathjax/jax/element/mml/optable/MiscSymbolsAndArrows.js %%DATADIR%%/mathjax/jax/element/mml/optable/MiscTechnical.js %%DATADIR%%/mathjax/jax/element/mml/optable/SpacingModLetters.js +%%DATADIR%%/mathjax/jax/element/mml/optable/SuppMathOperators.js %%DATADIR%%/mathjax/jax/element/mml/optable/SupplementalArrowsA.js %%DATADIR%%/mathjax/jax/element/mml/optable/SupplementalArrowsB.js -%%DATADIR%%/mathjax/jax/element/mml/optable/SuppMathOperators.js %%DATADIR%%/mathjax/jax/input/AsciiMath/config.js %%DATADIR%%/mathjax/jax/input/AsciiMath/jax.js %%DATADIR%%/mathjax/jax/input/MathML/config.js @@ -1969,8 +1956,6 @@ lib/calibre/tinycss/version.py %%DATADIR%%/mathjax/jax/output/CommonHTML/config.js %%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/AMS-Regular.js %%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/Caligraphic-Bold.js -%%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/fontdata-extra.js -%%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/fontdata.js %%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/Fraktur-Bold.js %%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/Fraktur-Regular.js %%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/Main-Bold.js @@ -1980,56 +1965,39 @@ lib/calibre/tinycss/version.py %%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/SansSerif-Regular.js %%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/Script-Regular.js %%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/Typewriter-Regular.js +%%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/fontdata-extra.js +%%DATADIR%%/mathjax/jax/output/CommonHTML/fonts/TeX/fontdata.js %%DATADIR%%/mathjax/jax/output/CommonHTML/jax.js %%DATADIR%%/mathjax/manifest.json -%%DATADIR%%/mathjax/MathJax.js %%DATADIR%%/metadata_sqlite.sql %%DATADIR%%/mime.types %%DATADIR%%/mozilla-ca-certs.pem +%%DATADIR%%/pdf-mathjax-loader.js %%DATADIR%%/quick_start/deu.epub %%DATADIR%%/quick_start/eng.epub %%DATADIR%%/quick_start/fra.epub %%DATADIR%%/quick_start/ita.epub %%DATADIR%%/quick_start/swe.epub %%DATADIR%%/rapydscript/compiler.js.xz -%%DATADIR%%/rapydscript/lib/aes.pyj -%%DATADIR%%/rapydscript/lib/elementmaker.pyj -%%DATADIR%%/rapydscript/lib/encodings.pyj -%%DATADIR%%/rapydscript/lib/gettext.pyj -%%DATADIR%%/rapydscript/lib/math.pyj -%%DATADIR%%/rapydscript/lib/operator.pyj -%%DATADIR%%/rapydscript/lib/pythonize.pyj -%%DATADIR%%/rapydscript/lib/random.pyj -%%DATADIR%%/rapydscript/lib/re.pyj -%%DATADIR%%/rapydscript/lib/traceback.pyj -%%DATADIR%%/rapydscript/lib/uuid.pyj %%DATADIR%%/scripts.calibre_msgpack %%DATADIR%%/template-functions.json %%DATADIR%%/templates/book_details.css %%DATADIR%%/templates/fb2.xsl -%%DATADIR%%/templates/html_export_default_index.tmpl +%%DATADIR%%/templates/html.css %%DATADIR%%/templates/html_export_default.css %%DATADIR%%/templates/html_export_default.tmpl -%%DATADIR%%/templates/html.css +%%DATADIR%%/templates/html_export_default_index.tmpl %%DATADIR%%/templates/inline_toc_styles.css %%DATADIR%%/templates/lrf.xsl *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***