Update to 1.40.0:

- version: 1.40.0
  date: 2014-06-12

  new features:
    - title: "Edit Book: Add a new tool to manage fonts. Allows
    easily changing/removing/embedding fonts in the entire book.
    To use it go to Tools->Manage Fonts"

    - title: "Edit Book: Allow the color of the links in the Live
    CSS panel to be themed."
      tickets: [1326897]

    - title: "E-book viewer: Add a keyboard shortcut to bookmark
    current location."
      tickets: [1326198]

  bug fixes:
    - title: "Edit Book: Check book: When auto-changing font name
    to match actual name in font file, also change the font name
    in shorthand font declarations"

    - title: "Edit Book/Book polishing: Fix embedding all referenced
    fonts not catching fonts that are only specified via style
    attributes and not in any stylesheets."

    - title: "Conversion: Fix normalization of CSS shorthand font
    property not working when multiple font families are specified
    in the same shorthand property"

    - title: "Edit Book: Live CSS: Fix clicking on link to go to
    style definition not working if the stylesheet contains CSS 3
    @media queries or @font-face rules"

    - title: "Edit Book: When importing DOCX files, set the media
    type for html files correctly"

    - title: "Edit Book: Fix import of DOCX files that contain no
    Table of Contents not working."
      tickets: [1327522]

    - title: "Portable installer: Fix a crash if the user selects
    a destination for the portable install that does not have enough
    disk space."
      tickets: [1324575]

    - title: "Fix date column not showing date added when adding
    zip/rar files that contain an OPF with a calibre timestamp in
    its metadata"

    - title: "Sony driver: Fix SONY annotation app not working with
    files sent to the device by calibre"

    - title: "Linux build: Fix regression that caused opening PDF
    files (or any externally viewed files) preventing calibre from
    being restarted as long as the external viewer is not shutdown."
      tickets: [1326453]

    - title: "Edit book: Fix changing underline style to none when
    creating a custom color scheme causes error."

    - title: "Check Book: Fix empty (zero byte) XML files causing
    check book to fail."
      tickets: [1326073]

    - title: "Check Book: Fix combination of mismatching font family
    names and a font-family declaration with an invalid value (such
    as a dimension) causing auto fixing of errors to fail."
      tickets: [1325070]

  improved recipes:
    - Respekt
    - Newsweek
    - Jerusalem Post
    - Outlook India
    - PC Magazine
    - Instapaper

3 files changed, 15 insertions, 8 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 0f9fb09a21b..76d8cf9525e 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2014/05/30 13:00:02 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2014/06/14 06:03:50 wiz Exp $
 
-DISTNAME=	calibre-1.39.0
+DISTNAME=	calibre-1.40.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 35ed7e454b8..dd7a4809ba4 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2014/05/23 08:14:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2014/06/14 06:03:50 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -433,6 +433,7 @@ lib/calibre/calibre/ebooks/oeb/polish/create.py
 lib/calibre/calibre/ebooks/oeb/polish/css.py
 lib/calibre/calibre/ebooks/oeb/polish/embed.py
 lib/calibre/calibre/ebooks/oeb/polish/errors.py
+lib/calibre/calibre/ebooks/oeb/polish/fonts.py
 lib/calibre/calibre/ebooks/oeb/polish/import_book.py
 lib/calibre/calibre/ebooks/oeb/polish/jacket.py
 lib/calibre/calibre/ebooks/oeb/polish/main.py
@@ -1023,6 +1024,7 @@ 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/manage_fonts.py
 lib/calibre/calibre/gui2/tweak_book/preferences.py
 lib/calibre/calibre/gui2/tweak_book/preview.py
 lib/calibre/calibre/gui2/tweak_book/save.py
@@ -1312,13 +1314,17 @@ lib/calibre/tinycss/__init__.py
 lib/calibre/tinycss/color3.py
 lib/calibre/tinycss/css21.py
 lib/calibre/tinycss/decoding.py
+lib/calibre/tinycss/fonts3.py
+lib/calibre/tinycss/media3.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/fonts3.py
 lib/calibre/tinycss/tests/main.py
+lib/calibre/tinycss/tests/media3.py
 lib/calibre/tinycss/tests/page3.py
 lib/calibre/tinycss/tests/tokenizing.py
 lib/calibre/tinycss/token_data.py
@@ -2819,7 +2825,8 @@ share/calibre/recipes/reptantes.recipe
 share/calibre/recipes/republica.recipe
 share/calibre/recipes/republika.recipe
 share/calibre/recipes/res_publica.recipe
-share/calibre/recipes/respekt.recipe
+share/calibre/recipes/respekt_magazine.recipe
+share/calibre/recipes/respekt_web.recipe
 share/calibre/recipes/resurgence.recipe
 share/calibre/recipes/reuters.recipe
 share/calibre/recipes/reuters_ja.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index c5c39588f91..24fde3ba351 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2014/05/30 13:00:02 wiz Exp $
+$NetBSD: distinfo,v 1.24 2014/06/14 06:03:50 wiz Exp $
 
-SHA1 (calibre-1.39.0.tar.xz) = 6b9c9d628a8c97392241818bded334741578eb53
-RMD160 (calibre-1.39.0.tar.xz) = f360157f5a475c3714ab94424e3263e4c7fb539e
-Size (calibre-1.39.0.tar.xz) = 34446476 bytes
+SHA1 (calibre-1.40.0.tar.xz) = c2bf4b7d50ce661eb66ab8e73f13a7e0de87a0b1
+RMD160 (calibre-1.40.0.tar.xz) = 061b6f9d9ad38ab891f7a94b4c80311ea17c8331
+Size (calibre-1.40.0.tar.xz) = 34457004 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