Update to 1.38.0.

- version: 1.38.0
  date: 2014-05-23

  new features:
    - title: "Edit Book: A 'Live CSS' tool that shows all the style
    rules for the tag you are currently editing."
      description: "You can use it to easily jump to any style
      rules that affect the current tag. Enable it via View->Live
      CSS. See http://manual.calibre-ebook.com/edit.html#the-live-css-panel
      for details"
      type: major

    - title: "Add an option to hide the book rating in the cover
    browser (Preferences->Look & Feel->Cover Browser)."
      tickets: [1319476]

    - title: "DOCX Input: if no language is defined in the metadata,
    use the language specified in the document default style."
      tickets: [1321346]

  bug fixes:
    - title: "Edit book: Fix regression that sometimes caused
    incorrect syntax highlighting when non-breaking spaces/typographic
    hyphens are present in the text."
      tickets: [1321317]

    - title: "Fix a regression that broke the compare books tool
    when used outside the book editor."
      tickets: [1321975]

    - title: "Get Books: Update the Woblink plugin to handle changes
    to the Woblink website"

    - title: "DOCX Input: Workaround buggy version of Microsoft
    Word converting newlines in the document summary into _x000d_.
    They are now ignored when reading metadata from docx files."
      tickets: [1321343]

    - title: "Edit book: Fix Check Book failing if a binary file
    such as an image or font is mislabelled in the OPF as being a
    text file."
      tickets: [1320977]

    - title: "OS X Build: Fix a bug that was preventing multiple
    instances of calibre being used by different user accounts on
    the same computer."
      tickets: [1320347]

    - title: "Edit book: Dont show an error message when trying to
    use quick open with no book open"

    - title: "Content server: Add .ibooks (note the trailing s) as
    an allowed format as well."

    - title: "Edit Book: Fix an error when running the Check Book
    tool on files with empty <style> tags."
      tickets: [1320459]

    - title: "Edit Book: A more complete fix for non ascii usernames
    on windows when using the export file dialog."
      tickets: [1298071]

  improved recipes:
    - Ars Technica
    - Slate
    - Instapaper
    - The Independent

3 files changed, 35 insertions, 124 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index a71f13e2af4..8e22b6322e0 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2014/05/16 12:08:30 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2014/05/23 08:14:52 wiz Exp $
 
-DISTNAME=	calibre-1.37.0
+DISTNAME=	calibre-1.38.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
@@ -55,123 +55,13 @@ INSTALLATION_DIRS=	share/calibre/recipes
 
 FIX_PYTHON_PATHS+=	*.py
 FIX_PYTHON_PATHS+=	recipes/*.recipe
-FIX_PYTHON_PATHS+=	resources/*.py
-FIX_PYTHON_PATHS+=	resources/catalog/*.py
-FIX_PYTHON_PATHS+=	setup/*.py
-FIX_PYTHON_PATHS+=	setup/installer/*.py
-FIX_PYTHON_PATHS+=	setup/installer/linux/*.py
-FIX_PYTHON_PATHS+=	setup/installer/osx/*.py
-FIX_PYTHON_PATHS+=	setup/installer/osx/app/*.py
-FIX_PYTHON_PATHS+=	setup/installer/windows/*.py
-FIX_PYTHON_PATHS+=	src/calibre/*.py
-FIX_PYTHON_PATHS+=	src/calibre/customize/*.py
-FIX_PYTHON_PATHS+=	src/calibre/db/*.py
-FIX_PYTHON_PATHS+=	src/calibre/db/tests/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/android/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/eslick/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/folder_device/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/idevice/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/iriver/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/kobo/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/mtp/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/mtp/unix/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/mtp/unix/upstream/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/mtp/windows/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/prs505/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/prst1/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/smart_device_app/*.py
-FIX_PYTHON_PATHS+=	src/calibre/devices/teclast/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/chm/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/comic/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/compression/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/conversion/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/conversion/plugins/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/djvu/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/docx/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/docx/writer/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/epub/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/fb2/__init__.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/html/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/iterator/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/lit/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/html/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/pylrs/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/markdown/extensions/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/book/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/sources/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/debug/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/reader/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/writer2/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/writer8/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/odt/__init__.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/display/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/display/test-cfi/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/iterator/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/polish/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/polish/check/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/polish/tests/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/transforms/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdb/haodoo/__init__.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/__init__.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/reflow.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/render/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/readability/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/rtf/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/rtf2xml/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/snb/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/textile/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/txt/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/actions/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/add_wizard/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/catalog/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/convert/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/device_drivers/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/dialogs/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/library/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/metadata/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/preferences/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/progress_indicator/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/store/loader.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/store/stores/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/tag_browser/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/toc/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/diff/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/editor/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/editor/smart/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/editor/syntax/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/viewer/*.py
-FIX_PYTHON_PATHS+=	src/calibre/gui2/wizard/*.py
-FIX_PYTHON_PATHS+=	src/calibre/library/*.py
-FIX_PYTHON_PATHS+=	src/calibre/library/catalogs/*.py
-FIX_PYTHON_PATHS+=	src/calibre/library/server/*.py
-FIX_PYTHON_PATHS+=	src/calibre/spell/*.py
-FIX_PYTHON_PATHS+=	src/calibre/translations/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/sfnt/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/sfnt/cff/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/woff/__init__.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/ipc/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/magick/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/podofo/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/pyconsole/*.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/spell/__init__.py
-FIX_PYTHON_PATHS+=	src/calibre/utils/wmf/*.py
-FIX_PYTHON_PATHS+=	src/calibre/web/feeds/*.py
-FIX_PYTHON_PATHS+=	src/calibre/web/feeds/recipes/*.py
-FIX_PYTHON_PATHS+=	src/calibre/web/fetch/*.py
-FIX_PYTHON_PATHS+=	src/calibre/web/jsbrowser/*.py
-FIX_PYTHON_PATHS+=	src/qtcurve/test_rendering.py
-FIX_PYTHON_PATHS+=	src/templite/*.py
+FIX_PYTHON_PATHS+=	*/*.py
+FIX_PYTHON_PATHS+=	*/*/*.py
+FIX_PYTHON_PATHS+=	*/*/*/*.py
+FIX_PYTHON_PATHS+=	*/*/*/*/*.py
+FIX_PYTHON_PATHS+=	*/*/*/*/*/*.py
+FIX_PYTHON_PATHS+=	*/*/*/*/*/*/*.py
+
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
 SUBST_MESSAGE.prefix=	Fixing path to QMAKE
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 477b81a93a4..35ed7e454b8 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2014/05/09 16:53:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2014/05/23 08:14:52 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1010,6 +1010,7 @@ lib/calibre/calibre/gui2/tweak_book/editor/canvas.py
 lib/calibre/calibre/gui2/tweak_book/editor/image.py
 lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py
 lib/calibre/calibre/gui2/tweak_book/editor/smart/__init__.py
+lib/calibre/calibre/gui2/tweak_book/editor/smart/css.py
 lib/calibre/calibre/gui2/tweak_book/editor/smart/html.py
 lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py
 lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py
@@ -1020,6 +1021,7 @@ lib/calibre/calibre/gui2/tweak_book/editor/themes.py
 lib/calibre/calibre/gui2/tweak_book/editor/widget.py
 lib/calibre/calibre/gui2/tweak_book/file_list.py
 lib/calibre/calibre/gui2/tweak_book/job.py
+lib/calibre/calibre/gui2/tweak_book/live_css.py
 lib/calibre/calibre/gui2/tweak_book/main.py
 lib/calibre/calibre/gui2/tweak_book/preferences.py
 lib/calibre/calibre/gui2/tweak_book/preview.py
@@ -1120,6 +1122,7 @@ 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
 lib/calibre/calibre/plugins/unrar.so
 lib/calibre/calibre/plugins/woff.so
 lib/calibre/calibre/ptempfile.py
@@ -1305,6 +1308,22 @@ lib/calibre/routes/route.py
 lib/calibre/routes/util.py
 lib/calibre/six.py
 lib/calibre/templite/__init__.py
+lib/calibre/tinycss/__init__.py
+lib/calibre/tinycss/color3.py
+lib/calibre/tinycss/css21.py
+lib/calibre/tinycss/decoding.py
+lib/calibre/tinycss/page3.py
+lib/calibre/tinycss/parsing.py
+lib/calibre/tinycss/tests/__init__.py
+lib/calibre/tinycss/tests/color3.py
+lib/calibre/tinycss/tests/css21.py
+lib/calibre/tinycss/tests/decoding.py
+lib/calibre/tinycss/tests/main.py
+lib/calibre/tinycss/tests/page3.py
+lib/calibre/tinycss/tests/tokenizing.py
+lib/calibre/tinycss/token_data.py
+lib/calibre/tinycss/tokenizer.py
+lib/calibre/tinycss/version.py
 ${PYSITELIB}/init_calibre.py
 share/applications/calibre-ebook-edit.desktop
 share/applications/calibre-ebook-viewer.desktop
@@ -1371,6 +1390,7 @@ share/calibre/content_server/stacktrace.js
 share/calibre/content_server/star-half.png
 share/calibre/content_server/star-off.png
 share/calibre/content_server/star-on.png
+share/calibre/csscolorparser.js
 share/calibre/default_tweaks.py
 share/calibre/dictionaries/en-GB/en-GB.aff
 share/calibre/dictionaries/en-GB/en-GB.dic
@@ -3385,3 +3405,4 @@ share/pixmaps/calibre-ebook-edit.png
 share/pixmaps/calibre-gui.png
 share/pixmaps/calibre-lrf.png
 share/pixmaps/calibre-viewer.png
+@pkgdir share/appdata
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index faecaeda0b4..fa9bd27a99a 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2014/05/16 12:08:30 wiz Exp $
+$NetBSD: distinfo,v 1.22 2014/05/23 08:14:52 wiz Exp $
 
-SHA1 (calibre-1.37.0.tar.xz) = 418781e06dbd5de90fb9072ba87010821e2ccd83
-RMD160 (calibre-1.37.0.tar.xz) = ecfcc26dae2697446d8ed038a6d7bc983c96590f
-Size (calibre-1.37.0.tar.xz) = 34093504 bytes
+SHA1 (calibre-1.38.0.tar.xz) = ee1977d642196ce2ccb2354788617b1a1596626d
+RMD160 (calibre-1.38.0.tar.xz) = 591d03066745796e3676bff43516d211c470f68b
+Size (calibre-1.38.0.tar.xz) = 34185808 bytes
 SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
 RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
 Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes