diff --git a/Changelog.yaml b/Changelog.yaml
index c2124aadd9..3b5dcd8d10 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -4,6 +4,250 @@
# for important features/bug fixes.
# Also, each release can have new and improved recipes.
+- version: 0.6.40
+ date: 2010-02-12
+
+ new features:
+ - title: "Ability to perform exact match and regular expression based searches."
+ type: major
+ tickets: [4830]
+ description: >
+ "You can now perform exact match searches by prefixing your search term with an =.
+ So for example, tag:=fiction will match all tags named fiction, but not tags named
+ non-fiction. Similarly, you can use regular expression based searches by prefixing
+ the search term by ~."
+
+ - title: "Autodetect if a zip/rar file is actually a comic and if so, import it as CBZ/CBR"
+ tickets: [4753]
+
+ - title: "Add plugin to automatically extract an ebook during import if it is in a zip/rar archive"
+
+ - title: "Linux source install: Install a calibre environment module to ease the integration of calibre into other python projects"
+
+ bug fixes:
+ - title: "Fix regression in 0.6.39 that broke the LRF viewer"
+
+ - title: "ZIP/EPUB files: Try to detect file name encoding instead of assuming the name is encoded in UTF-8. Also correctly
+ encode the extracted file name in the local filesystem encoding."
+
+ - title: "HTML Input: Handle HTML fragments more gracefully"
+ tickets: [4854]
+
+ - title: "Zip files: Workaround invalid zip files that contain end-of-file comments but set comment size to zero"
+
+ - title: "Restore the recipe for the Wired daily feed."
+ tickets: [4871]
+
+ - title: "MOBI metadata: Preserve original EXTH records when not overwrriten by calibre metadata."
+
+ - title: "Catalog generation: Improved series sorting. All books not in a series are now grouped together"
+
+ - title: "Fix occassional threading related crash when using the ChooseFormatDialog"
+
+ - title: "Catalog generation: Various fixes for handling invalid data"
+
+ new recipes:
+ - title: Sueddeustche Zeitung
+ author: Darko Miletic
+
+ improved recipes:
+ - Pagina 12
+ - Variety
+ - Toronto Sun
+ - Telegraph UK
+ - Danas
+ - Dilbert
+
+- version: 0.6.39
+ date: 2010-02-09
+
+ new features:
+ - title: "Add ability to control how author sort strings are automatically generated from author strings, via the config file tweaks.py"
+
+ - title: "Handle broken EPUB files from Project Gutenberg that have invalid OCF containers"
+ tickets: [4832]
+
+ bug fixes:
+ - title: "Fix regression in 0.6.38 that broke setting bookmarks in the viewer"
+
+ - title: "HTML Input: Ignore filenames that are encoded incorerctly."
+
+ new recipes:
+
+ - title: Radikal
+ author: Darko Miletic
+
+
+- version: 0.6.38
+ date: 2010-02-09
+
+ new features:
+ - title: "Driver for the Irex DR 800"
+
+ - title: "Driver for the Booq e-book reader"
+
+ - title: "Allow automatic series increment algorithm to be tweaked by editing the config file tweaks.py"
+
+ - title: "Various improvements to the catlog generation. Larger thumbnails in EPUB output and better series sorting. Better handling of html markup in the comments."
+
+ - title: "MOBI Output: Make font used for generated masthead images user customizable."
+
+ bug fixes:
+ - title: "E-book viewer: Make bookmarking (and remebering last open position more robust). For linuxsource installs, you must have Qt 4.6"
+ tickets: [4812]
+
+ - title: "Fix conversion/import of HTML files with very long href links on windows"
+ tickets: [4783]
+
+ - title: "Don't read metadata from filenames for download news, even if the user has the read metadata from filename option set"
+ tickets: [4758]
+
+ - title: "Don't allow leading or trailing space in tags and series. Also normalize all internal spaces to a single space"
+ tickets: [4809]
+
+ - title: "E-book viewer: Toolbars remember their position"
+ tickets: [4811]
+
+ - title: "Fix year being repeated when editing date in main library screen on windows"
+ tickets: [4829]
+
+ - title: "New download: Fix downloading of images from URLs with an ampersand in them"
+
+ - title: "Linux source install: unbundle cssutils, it is now an external dependancy"
+
+ - title: "MOBI metadata: Fix regression that broke setting of titles in some MOBI files"
+
+ - title: "EPUB metadata: Extract the cover image from the html it is embededd in if possible, instead of rendering the html. Removes the white margins on covers and speeds up cover extraction"
+
+ - title: "Fix regression in PDB output"
+
+ - title: "News download: Remove tags automatically"
+
+ - title: "Searching on device: Ignore unicode errors"
+
+
+ new recipes:
+ - title: Courier Press
+ author: Krittika Goyal
+
+ - title: zive.sk and iliterature.cz
+ author: Abelturd
+
+ - title: El Comerico, Digital Spy UK, Gizmodo, News Straits Times, Read It Later, TidBits
+ author: Darko Miletic
+
+ improved recipes:
+ - Jerusalem Post
+ - Clarin
+ - La Nacion
+ - Harvard Business Review
+ - People US Mashup
+ - The New Republic
+ - "Pagina 12"
+ - Discover Magazine
+ - Metro Montreal
+
+- version: 0.6.37
+ date: 2010-02-01
+
+ new features:
+ - title: "E-book viewer: Add support for viewing SVG images"
+ type: major
+
+ - title: "Add category of Recently added books when generating catalog in e-book format"
+
+ - title: "OS X: Allow adding of books to calibre via drag and drop on the calibre dock icon"
+
+ - title: "Add support for masthead images when downloading news for the Kindle"
+
+ - title: "MOBI metadata: Allow setting of metadata in old PRC files without EXTH headers as well"
+
+ bug fixes:
+ - title: Changing the date in Dutch
+ tickets: [4732]
+
+ - title: "Fix regression that broke sending files to unupdated PRS 500s"
+
+ - title: "MOBI Input: Ignore width and height percentage measures for tags."
+ tickets: [4726]
+
+ - title: "EPUB Output: Remove tags that point to the internet for their images as this causes the ever delicate ADE to crash."
+ tickets: [4692]
+
+ - title: "Comic Input: Handle UTF-8 BOM when converting a cbc file"
+ tickets: [4683]
+
+ - title: "Allow rating to be cleared via the Bulk metadata edit dialog"
+ tickets: [4693]
+
+ - title: "Add workaround for broken linux systems with multiply encoded file names"
+ tickets: [4721]
+
+ - title: Fix bug preventing the the use of indices when setting save to disk templates
+ tickets: [4710]
+
+ - title: "Linux device mounting. Use filetype of auto to allow non vfat filesystems to be mounted"
+ tickets: [4707]
+
+ - title: "Catalog generation: Make sorting of numbers in title as text optional"
+
+ - title: "Fix error while sending book with non-ascii character in title/author to device on linux"
+ tickets: [4690]
+
+ - title: "Fix reset cover in edit meta information dialog does not actually remove cover"
+ tickets: [4731]
+
+ new recipes:
+ - title: Kamera Bild
+ author: Darko Miletic
+
+ - title: The Online Photographer
+ author: Darko Miletic
+
+ - title: The Luminous Landscape
+ author: Darko Miletic
+
+ - title: Slovo
+ author: Abelturd
+
+ - title: Various Danish newspapers
+ author: Darko Miletic
+
+ - title: Heraldo de Aragon
+ author: Lorenzo Vigentini
+
+ - title: Orange County Register
+ author: Lorenzi Vigentini
+
+ - title: Open Left
+ author: Xanthan Gum
+
+ - title: Michelle Malkin
+ author: Walt Anthony
+
+ - title: The Metro Montreal
+ author: Jerry Clapperton
+
+ - title: The Gazette
+ author: Jerry Clapperton
+
+ - title: Macleans Magazine
+ author: Nick Redding
+
+ - title: NY Time Sunday Book Review
+ author: Krittika Goyal
+
+ - title: Various Italian newspapers
+ author: Lorenzo Vigentini
+
+
+ improved recipes:
+ - The Irish Times
+ - Washington Post
+ - NIN
+ - The Discover Magazine
+ - Pagina 12
+
- version: 0.6.36
date: 2010-01-25
diff --git a/resources/catalog/stylesheet.css b/resources/catalog/stylesheet.css
index b5770599e6..06bbf8eaab 100644
--- a/resources/catalog/stylesheet.css
+++ b/resources/catalog/stylesheet.css
@@ -27,7 +27,7 @@ p.tags {
p.description {
text-align:left;
- font-style:italic;
+ font-style:normal;
margin-top: 0em;
}
@@ -55,6 +55,14 @@ p.author_index {
text-indent: 0em;
}
+p.series {
+ text-align: left;
+ margin-top:0px;
+ margin-bottom:0px;
+ margin-left:2em;
+ text-indent:-2em;
+ }
+
p.read_book {
text-align:left;
margin-top:0px;
@@ -71,3 +79,9 @@ p.unread_book {
text-indent:-2em;
}
+hr.series_divider {
+ width:50%;
+ margin-left:1em;
+ margin-top:0em;
+ margin-bottom:0em;
+ }
diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
new file mode 100644
index 0000000000..77cfaaedf5
--- /dev/null
+++ b/resources/default_tweaks.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+__license__ = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal '
+__docformat__ = 'restructuredtext en'
+
+'''
+Contains various tweaks that affect calibre behavior. Only edit this file if
+you know what you are dong. If you delete this file, it will be recreated from
+defaults.
+'''
+
+
+# The algorithm used to assign a new book in an existing series a series number.
+# Possible values are:
+# next - Next available number
+# const - Assign the number 1 always
+series_index_auto_increment = 'next'
+
+
+
+# The algorithm used to copy author to author_sort
+# Possible values are:
+# invert: use "fn ln" -> "ln, fn" (the original algorithm)
+# copy : copy author to author_sort without modification
+# comma : use 'copy' if there is a ',' in the name, otherwise use 'invert'
+author_sort_copy_method = 'invert'
diff --git a/resources/images/catalog.svg b/resources/images/catalog.svg
new file mode 100644
index 0000000000..724e0cf8e5
--- /dev/null
+++ b/resources/images/catalog.svg
@@ -0,0 +1,157 @@
+
+
+
+
diff --git a/resources/images/news/digitalspy_uk.png b/resources/images/news/digitalspy_uk.png
new file mode 100644
index 0000000000..28c865713d
Binary files /dev/null and b/resources/images/news/digitalspy_uk.png differ
diff --git a/resources/images/news/elcomercio.png b/resources/images/news/elcomercio.png
new file mode 100644
index 0000000000..df484860dd
Binary files /dev/null and b/resources/images/news/elcomercio.png differ
diff --git a/resources/images/news/gizmodo.png b/resources/images/news/gizmodo.png
new file mode 100644
index 0000000000..8f2e6f002b
Binary files /dev/null and b/resources/images/news/gizmodo.png differ
diff --git a/resources/images/news/kamerabild.png b/resources/images/news/kamerabild.png
new file mode 100644
index 0000000000..401d5a33a3
Binary files /dev/null and b/resources/images/news/kamerabild.png differ
diff --git a/resources/images/news/newsstraitstimes.png b/resources/images/news/newsstraitstimes.png
new file mode 100644
index 0000000000..075e2cc001
Binary files /dev/null and b/resources/images/news/newsstraitstimes.png differ
diff --git a/resources/images/news/radikal_tr.png b/resources/images/news/radikal_tr.png
new file mode 100644
index 0000000000..60932df762
Binary files /dev/null and b/resources/images/news/radikal_tr.png differ
diff --git a/resources/images/news/readitlater.png b/resources/images/news/readitlater.png
new file mode 100644
index 0000000000..439a690cd8
Binary files /dev/null and b/resources/images/news/readitlater.png differ
diff --git a/resources/images/news/sueddeutschezeitung.png b/resources/images/news/sueddeutschezeitung.png
new file mode 100644
index 0000000000..f6ed36cd91
Binary files /dev/null and b/resources/images/news/sueddeutschezeitung.png differ
diff --git a/resources/images/news/theluminouslandscape.png b/resources/images/news/theluminouslandscape.png
new file mode 100644
index 0000000000..e6d452f5d2
Binary files /dev/null and b/resources/images/news/theluminouslandscape.png differ
diff --git a/resources/images/news/tidbits.png b/resources/images/news/tidbits.png
new file mode 100644
index 0000000000..e64d71ec68
Binary files /dev/null and b/resources/images/news/tidbits.png differ
diff --git a/resources/kathemerini.recipe b/resources/kathemerini.recipe
new file mode 100644
index 0000000000..b68a35d0a8
--- /dev/null
+++ b/resources/kathemerini.recipe
@@ -0,0 +1,37 @@
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class Kathimerini(BasicNewsRecipe):
+ title = 'Kathimerini'
+ __author__ = 'Pan'
+ description = 'News from Greece'
+ max_articles_per_feed = 100
+ oldest_article = 100
+ publisher = 'Kathimerini'
+ category = 'news, GR'
+ language = 'el'
+ no_stylesheets = True
+ remove_tags_before = dict(name='td',attrs={'class':'news'})
+ remove_tags_after = dict(name='td',attrs={'class':'news'})
+ remove_attributes = ['width', 'src','header','footer']
+
+ feeds = [(u'\u03a0\u03bf\u03bb\u03b9\u03c4\u03b9\u03ba\u03ae',
+ 'http://wk.kathimerini.gr/xml_files/politics.xml'),
+ (u'\u0395\u03bb\u03bb\u03ac\u03b4\u03b1',
+ ' http://wk.kathimerini.gr/xml_files/ell.xml'),
+ (u'\u039a\u03cc\u03c3\u03bc\u03bf\u03c2',
+ ' http://wk.kathimerini.gr/xml_files/world.xml'),
+ (u'\u039f\u03b9\u03ba\u03bf\u03bd\u03bf\u03bc\u03af\u03b1',
+ 'http://wk.kathimerini.gr/xml_files/economy_1.xml'),
+ (u'\u0395\u03c0\u03b9\u03c7\u03b5\u03b9\u03c1\u03ae\u03c3\u03b5\u03b9\u03c2',
+ 'http://wk.kathimerini.gr/xml_files/economy_2.xml'),
+ (u'\u0394\u03b9\u03b5\u03b8\u03bd\u03ae\u03c2 \u039f\u03b9\u03ba\u03bf\u03bd\u03bf\u03bc\u03af\u03b1',
+ 'http://wk.kathimerini.gr/xml_files/economy_3.xml'),
+ (u'\u03a0\u03bf\u03bb\u03b9\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2',
+ 'http://wk.kathimerini.gr/xml_files/civ.xml'),
+ (u'\u039c\u03cc\u03bd\u03b9\u03bc\u03b5\u03c2 \u03a3\u03c4\u03ae\u03bb\u03b5\u03c2',
+ 'http://wk.kathimerini.gr/xml_files/st.xml')]
+
+ def print_version(self, url):
+ return url.replace('http://news.kathimerini.gr/4dcgi/', 'http://news.kathimerini.gr/4dcgi/4dcgi/')
+
+
diff --git a/resources/recipes/ZIVE.sk.recipe b/resources/recipes/ZIVE.sk.recipe
new file mode 100644
index 0000000000..e5bfd56cef
--- /dev/null
+++ b/resources/recipes/ZIVE.sk.recipe
@@ -0,0 +1,45 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+import re
+
+
+
+class ZiveRecipe(BasicNewsRecipe):
+ __license__ = 'GPL v3'
+ __author__ = 'Abelturd'
+ language = 'sk'
+ version = 1
+
+ title = u'ZIVE.sk'
+ publisher = u''
+ category = u'News, Newspaper'
+ description = u'Naj\u010d\xedtanej\u0161\xed denn\xedk opo\u010d\xedta\u010doch, IT a internete. '
+ encoding = 'UTF-8'
+
+ oldest_article = 7
+ max_articles_per_feed = 100
+ use_embedded_content = False
+ remove_empty_feeds = True
+
+ no_stylesheets = True
+ remove_javascript = True
+ cover_url = 'http://www.zive.sk/Client.Images/Logos/logo-zive-sk.gif'
+
+ feeds = []
+ feeds.append((u'V\u0161etky \u010dl\xe1nky', u'http://www.zive.sk/rss/sc-47/default.aspx'))
+
+ preprocess_regexps = [
+ (re.compile(r'