diff --git a/Changelog.yaml b/Changelog.yaml
index 174e7fc823..d1e42d70f3 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -19,6 +19,106 @@
# new recipes:
# - title:
+- version: 0.8.14
+ date: 2011-08-12
+
+ new features:
+ - title: "Make the keyboard shortcuts used by the main calibre interface user customizable, via Preferences->Advanced->Keyboard"
+ type: major
+
+ - title: "When switching libraries, if the library no longer exists, give the user a chance to specify a new location for the library, in case it was moved, before forgetting it."
+ tickets: [822018]
+
+ - title: "Template language: Add strcat and strlen builtin functions."
+ tickets: [821935]
+
+ bug fixes:
+ - title: "The various options to control how automerging works when adding books now also apply when copying a book from one library to another."
+ tickets: [822033]
+
+ - title: "Ebook viewer: Respond to key presses even when the book display area does not have keyboard focus"
+
+ - title: "Allow integer and float column values to go to -999999. -1000000 is the value of 'undefined'."
+ tickets: [821941]
+
+ - title: "Fix in calibre browser not working for the Open books store in Get Books."
+ tickets: [822359]
+
+ - title: "Fix regression in 0.8.13 that caused incorrect title/author for downloaded news if you turned off reading metadata from file contents in Preferences->Adding books"
+
+ - title: "Save to disk: When saving to a single directory, handle the case of the save to disk template containing path separators inside template expression correctly."
+ tickets: [821912]
+
+ - title: "Get Books: Always read metadata from the file contents, ignoring the setting in Preferences->Adding books"
+
+ - title: "Fix merge_metadata to not overwrite non-text fields ('bool', 'int', 'float', 'rating', 'datetime') that have a value of zero/false instead of None."
+ tickets: [821665]
+
+ improved recipes:
+ - The Independent
+
+ new recipes:
+ - title: "Novinite"
+ author: Martin Tsanchev
+
+ - title: "Blog Escrevinhador"
+ author: Diniz Bortolotto
+
+
+
+- version: 0.8.13
+ date: 2011-08-05
+
+ new features:
+ - title: "Add a new action 'Pick Random Book' that can be added to the toolbar via Preferences->Toolbars."
+ tickets: [818315]
+
+ - title: "Driver for Droid X2"
+ tickets: [821053]
+
+ - title: "PDF metadata: Support reading/writing of tags from the Keywords field in PDF files."
+
+ - title: "MOBI Input: Speedup reading of HUFF/CDIC compressed files"
+
+ - title: "MOBI Output: Add a command line option --extract-to that uses the inspect MOBI tool to extract the created MOBI file to the specified directory"
+
+ - title: "Template language: Add a few new functions to manipulate lists (list_difference, list_intersection, list_sort)"
+
+ - title: "Make the Manage Tags/Publishers/etc. dialog show a column with counts for each item, to easily sort by number of items"
+
+ - title: "MOBI Output: Generate navpoints for items at every level in the TOC, not just the deepest level"
+
+ bug fixes:
+ - title: "MOBI Output: Remove option to choose masthead font as the font selection control causes crashes on some windows systems"
+
+ - title: "MOBI Output: Fix bug that caused paragraphs that had only a non breaking space as text before the first child element to be removed."
+ tickets: [819058]
+
+ - title: "Display undefined dates properly in the Book details panel."
+ tickets: [819222]
+
+ - title: "Fix regression that broke deleting of books from first generation Kobos with un-upgraded firmware"
+ tickets: [818704]
+
+ - title: "Get books: Fix Gutenberg store and improvements to chitanka.info and e-knigni.net"
+
+ - title: "News download: Support https proxies"
+
+ - title: "Check library did not know about original_* files"
+
+ - title: "Fix crash caused by having very large numbers of authors > 100 for a book"
+
+ improved recipes:
+ - Nikkei News
+
+ new recipes:
+ - title: Carta Capital
+ author: Pablo Aldama
+
+ - title: El Tiempo, El Colombiano and Portafolio Colombia
+ author: Cavalencia
+
+
- version: 0.8.12
date: 2011-07-29
@@ -198,8 +298,8 @@
- title: Techcrunch and Pecat
author: Darko Miletic
- - title: Vio Mundo, IDG Now and Tojolaco
- author: Diniz Bortoletto
+ - title: "Vio Mundo, IDG Now! and Tojolaco"
+ author: Diniz Bortolotto
- title: Geek and Poke, Automatiseringgids IT
author: DrMerry
diff --git a/imgsrc/keyboard-prefs.svg b/imgsrc/keyboard-prefs.svg
new file mode 100644
index 0000000000..bcdc07f7b8
--- /dev/null
+++ b/imgsrc/keyboard-prefs.svg
@@ -0,0 +1,912 @@
+
+
+
\ No newline at end of file
diff --git a/imgsrc/languages.svg b/imgsrc/languages.svg
new file mode 100644
index 0000000000..b45019a56d
--- /dev/null
+++ b/imgsrc/languages.svg
@@ -0,0 +1,98 @@
+
+
\ No newline at end of file
diff --git a/imgsrc/mimetypes/djvu.svg b/imgsrc/mimetypes/djvu.svg
new file mode 100644
index 0000000000..401d9b4091
--- /dev/null
+++ b/imgsrc/mimetypes/djvu.svg
@@ -0,0 +1,438 @@
+
+
+
+
diff --git a/imgsrc/random.svg b/imgsrc/random.svg
new file mode 100644
index 0000000000..8dec21307e
--- /dev/null
+++ b/imgsrc/random.svg
@@ -0,0 +1,758 @@
+
+
+
+
diff --git a/recipes/carta_capital.recipe b/recipes/carta_capital.recipe
new file mode 100644
index 0000000000..8bd21046b1
--- /dev/null
+++ b/recipes/carta_capital.recipe
@@ -0,0 +1,23 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1312361378(BasicNewsRecipe):
+ title = u'Carta capital'
+ __author__ = 'Pablo Aldama'
+ language = 'pt_BR'
+ oldest_article = 9
+ max_articles_per_feed = 100
+
+ feeds = [(u'Politica', u'http://www.cartacapital.com.br/category/politica/feed')
+ ,(u'Economia', u'http://www.cartacapital.com.br/category/economia/feed')
+ ,(u'Cultura', u'http://www.cartacapital.com.br/category/cultura/feed')
+ ,(u'Internacional', u'http://www.cartacapital.com.br/category/internacional/feed')
+ ,(u'Saude', u'http://www.cartacapital.com.br/category/saude/feed')
+ ,(u'Sociedade', u'http://www.cartacapital.com.br/category/sociedade/feed')
+ ,(u'Tecnologia', u'http://www.cartacapital.com.br/category/tecnologia/feed')
+ ,(u'Carta na escola', u'http://www.cartacapital.com.br/category/carta-na-escola/feed')
+ ,(u'Carta fundamental', u'http://www.cartacapital.com.br/category/carta-fundamental/feed')
+ ,(u'Carta verde', u'http://www.cartacapital.com.br/category/carta-verde/feed')
+
+]
+ def print_version(self, url):
+ return url + '/print'
diff --git a/recipes/cnetnews.recipe b/recipes/cnetnews.recipe
index bfd4879dea..26d5992fa1 100644
--- a/recipes/cnetnews.recipe
+++ b/recipes/cnetnews.recipe
@@ -30,8 +30,14 @@ class CnetNews(BasicNewsRecipe):
remove_tags = [
dict(name='div', attrs={'id':'tweetmemeAndFacebook'})
,dict(name='ul', attrs={'class':'contentTools'})
+ ,dict(name='aside', attrs={'id':'filed'})
+ ,dict(name='div', attrs={'class':'postLinks'})
+ ,dict(name='span', attrs={'class':'shareButton'})
+ ,dict(name='span', attrs={'class':'printButton'})
+ ,dict(name='span', attrs={'class':'emailButton'})
+ ,dict(name='div', attrs={'class':'editorBio'})
]
- keep_only_tags = dict(name='div', attrs={'class':'txtWrap'})
+ keep_only_tags = dict(name='div', attrs={'class':'post'})
feeds = [(u'News', u'http://news.cnet.com/2547-1_3-0-20.xml')]
diff --git a/recipes/economist.recipe b/recipes/economist.recipe
index ded781b314..92dafeaf6f 100644
--- a/recipes/economist.recipe
+++ b/recipes/economist.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
from calibre.ebooks.BeautifulSoup import Tag, NavigableString
from collections import OrderedDict
-import time, re
+import re
class Economist(BasicNewsRecipe):
@@ -31,45 +31,41 @@ class Economist(BasicNewsRecipe):
{'class': lambda x: x and 'share-links-header' in x},
]
keep_only_tags = [dict(id='ec-article-body')]
- needs_subscription = False
no_stylesheets = True
preprocess_regexps = [(re.compile('