Update to 1.47:

- version: 1.47.0
  date: 2014-08-01

  new features:
    - title: "Cover Grid: Allow user defined emblems (icons) to be
  displayed next to covers"
      type: major
      description: "Now you can have your own custom icons displayed
      next to covers in the cover grid, based on simple rules you
      create. For example, you can display a heart icon next to
      books with a rating of more than four stars or a tick mark
      next to books you read and so on. To create these rules go
      to Preferences->Cover Grid and click the Emblems tab on the
      left."

    - title: "E-book Viewer: Use wiktionary.org and wordnik.com as
    dictionary providers instead of dict.org"
      description: "When looking up words, the word definition is
      now opened in a separate browser window.  The language of
      the dictionary to lookup is automatically selected based on
      the language of the current book. To lookup a word in the
      viewer simply select the word with your mouse and right click,
      then choose 'Lookup in dictionary'"

    - title: "Edit Book: Allow customizing the templates used when
    creating new, blank HTML/CSS files via Preferences->Editor
    settings."

    - title: "Comic Input: When sorting the pages inside a comic,
    recognize numbers, so that page2 sorts before page10"

    - title: "Conversion: When inserting a metadata jacket, format
    the series number using roman numerals. This behavior can be
    disabled by using a custom jacket template, as described here:
    http://manual.calibre-ebook.com/customize.html#overriding-icons-templates-et-cetera"

  bug fixes:
    - title: "Edit Book: Fix incorrect results when running replace
    all on marked text and more than one replacement is made."

    - title: "Edit Book: Live CSS: Improve detection of which tag
    the cursor is inside when there are multiple tags on the same
    line."

    - title: "Edit Book: Clear the Check Book panel when opening
    a new book"

    - title: "Edit Book: Allow the import files into book action
    to be added to the toolbar"

    - title: "Edit Book: Fix subsetting of fonts not working if
    the text contains non-BMP unicode characters."

    - title: "News download: Fix HTML parser used in the news
    download subsystem not preserving whitespace inside <pre> tags"

    - title: "Conversion: Do not strip underscores from classnames."

    - title: "Edit Book: Fix cursor positioning not working when
    creating a new file from a template"

    - title: "Fix a rare error that could happen when using series
    columns inside a custom column template"

    - title: "E-book viewer: Handle quoted URLs inside @font-face
    rules"

  improved recipes:
    - New Yorker

3 files changed, 8 insertions, 9 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 44faec6a6d8..9b834479dd5 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.83 2014/07/25 14:04:17 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2014/08/02 08:57:01 wiz Exp $
 
-DISTNAME=	calibre-1.46.0
+DISTNAME=	calibre-1.47.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index cada0ede8e2..91c4df6646a 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2014/07/25 14:04:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2014/08/02 08:57:01 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1048,7 +1048,6 @@ lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
 lib/calibre/calibre/gui2/viewer/config.py
 lib/calibre/calibre/gui2/viewer/config_ui.py
-lib/calibre/calibre/gui2/viewer/dictionary.py
 lib/calibre/calibre/gui2/viewer/documentview.py
 lib/calibre/calibre/gui2/viewer/flip.py
 lib/calibre/calibre/gui2/viewer/gestures.py
@@ -1158,7 +1157,6 @@ lib/calibre/calibre/utils/complete.py
 lib/calibre/calibre/utils/config.py
 lib/calibre/calibre/utils/config_base.py
 lib/calibre/calibre/utils/date.py
-lib/calibre/calibre/utils/dictclient.py
 lib/calibre/calibre/utils/file_associations.py
 lib/calibre/calibre/utils/filenames.py
 lib/calibre/calibre/utils/fonts/__init__.py
@@ -1477,6 +1475,7 @@ share/calibre/images/dialog_warning.png
 share/calibre/images/dictionary.png
 share/calibre/images/diff.png
 share/calibre/images/document-encrypt.png
+share/calibre/images/document-import.png
 share/calibre/images/document-new.png
 share/calibre/images/document_open.png
 share/calibre/images/donate.png
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index eeb2f16c70b..addc26de9d6 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2014/07/25 14:04:17 wiz Exp $
+$NetBSD: distinfo,v 1.28 2014/08/02 08:57:01 wiz Exp $
 
-SHA1 (calibre-1.46.0.tar.xz) = 6abb1153b6ae17bb1f41cf0d6f3e401861cc7d10
-RMD160 (calibre-1.46.0.tar.xz) = db1135396a9e5ba21ba451559bcbbc7f5345251b
-Size (calibre-1.46.0.tar.xz) = 36580156 bytes
+SHA1 (calibre-1.47.0.tar.xz) = d38c3289a8a2af3bc184f7466d60e3368824fd3e
+RMD160 (calibre-1.47.0.tar.xz) = 5dcec0e9f590bc444a3349d5d84a3d1a77ea40d9
+Size (calibre-1.47.0.tar.xz) = 36581960 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