Merge from trunk

This commit is contained in:
Charles Haley 2010-09-17 23:24:13 +01:00
commit 5e88ef534e
31 changed files with 32193 additions and 28488 deletions

View File

@ -4,6 +4,81 @@
# for important features/bug fixes.
# Also, each release can have new and improved recipes.
- version: 0.7.19
date: 2010-09-17
new features:
- title: "The ability to perform search and replace via regular expressions in the Bulk Edit metadata dialog"
type: major
- title: "Add an option to have calibre automatically convert straight quotes to curly quotes. Also handles em/en-dashes and ellipses. Found under 'Look & Feel' in the conversion options"
type: major
tickets: [6808]
- title: "Greatly improve sorting performance on large libraries."
type: major
- title: "Drivers for the SONY PRS-350/PRS-650 and the Sovos E-reader"
- title: "Kobo driver: Add management of the I'm Reading list on Kobo via an Im_Reading tag in calibre. See http://www.mobileread.com/forums/showthread.php?t=98906 for details"
- title: "Conversion pipeline: Add an option to control how hard line breaks are removed during preprocessing. See the Structure Detection section in the conversion options"
- title: "In the Edit metadata dialog, indicate whether the author sort value matches the author value, using a background color"
- title: "Add an option to split the toolbar into two toolbars in Preferences->Interface->Look and Feel"
- title: "EPUB Output: Improved design of the 'jacket' page created by calibre when using the 'Insert metadata at start of book' option"
- title: "PDF Input: Improve line unwrapping, handling of hyphens/dashes and quotes. Also handle more specially encoded non ASCII characters"
bug fixes:
- title: "Fix regression in filename shortening that caused loss of filename extension"
- title: "Fix various regressions that could be triggered when using search restrictions and/or multi-sorts and connecting a device"
- title: "Database: Fix possible race condition in windows when changing title/author during move of book files, that could lead to old files not being deleted"
- title: "Conversion pipeline: Don't die if rescaling of image raises an exception, just ignore and continue"
- title: "Database: Update has_cover cache when setting/removing covers so that the search returns correct results. Also fix an exception that could occur when adding books with a db that has been upgraded from very old SQL."
- title: "Workaround for bug that affects some windows installs causing white backgrounds on default covers to be rendered as yellow"
- title: "Fix handling of non-ASCII chars when rendering series in default EPUB cover"
- title: "Fix --start-in-tray switch displays hidden windows in metacity, xfwm4 and compiz"
tickets: [6806]
- title: "Conversion pipeline: When setting margins on <body> explicitly set padding to 0 to override and existing padding in the input document"
- title: "CHM Input: Ignore missing image files in the input document"
tickets: [6773]
- title: "News download: Fix bug that could break some downloads in non ASCII locales"
- title: "TXT Output: When using preserve spaces, output tab characters as a sequence of four non-breaking spaces as some readers dont handle the 09 char code."
- title: "PDB Input: Fix bug in conversion of TOC in some PML files"
new recipes:
- title: "taz.de RSS"
author: Alexander Schremmer
- title: "Brand Eins"
author: Constantin Hofstetter
improved recipes:
- Harpers (free)
- Danas
- Novosti
- ESPN
- Taz Digiabo
- Slate
- AJC
- Infobae
- NSPM
- version: 0.7.18
date: 2010-09-10

View File

@ -4,7 +4,6 @@ __copyright__ = '2008-2010, Darko Miletic <darko.miletic at gmail.com>'
harpers.org
'''
from calibre.web.feeds.news import BasicNewsRecipe
from calibre.ebooks.BeautifulSoup import Tag
class Harpers(BasicNewsRecipe):
title = u"Harper's Magazine"
@ -26,12 +25,12 @@ class Harpers(BasicNewsRecipe):
}
extra_css = '''
h1{ font-family:georgia ; color:#111111; font-size:large;}
h1{ font-family:georgia ; color:#111111; font-size:large;}
.box-of-helpful{ font-family:arial ; font-size:x-small;}
p{font-family:georgia ;}
.caption{font-family:Verdana,sans-serif;font-size:x-small;color:#666666;}
.caption{font-family:Verdana,sans-serif;font-size:x-small;color:#666666;}
'''
keep_only_tags = [ dict(name='div', attrs={'id':'cached'}) ]
remove_tags = [
dict(name='table', attrs={'class':['rcnt','rcnt topline']})
@ -47,9 +46,9 @@ class Harpers(BasicNewsRecipe):
soup = self.index_to_soup(index)
link_item = soup.find(name = 'img',attrs= {'class':"cover"})
if link_item:
cover_url = 'http://harpers.org' + link_item['src']
cover_url = 'http://harpers.org' + link_item['src']
return cover_url
def preprocess_html(self, soup):
for item in soup.findAll(style=True):
del item['style']

View File

@ -1,7 +1,7 @@
__license__ = 'GPL v3'
__copyright__ = '2010, Alexander Schremmer <alex@alexanderweb.de>'
from calibre.resources.recipes import BasicNewsRecipe
from calibre.web.feeds.news import BasicNewsRecipe
class TazRSSRecipe(BasicNewsRecipe):
title = u'Taz.de (die tageszeitung) RSS Feed - German'

View File

@ -197,7 +197,7 @@ class GetTranslations(Translations):
class ISO639(Command):
description = 'Compile translations for ISO 639 codes'
XML = '/usr/lib/python2.6/site-packages/pycountry/databases/iso639.xml'
XML = '/usr/lib/python2.7/site-packages/pycountry/databases/iso639.xml'
def run(self, opts):
src = self.XML

View File

@ -2,7 +2,7 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
__appname__ = 'calibre'
__version__ = '0.7.18'
__version__ = '0.7.19'
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
import re

View File

@ -163,7 +163,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.s_r_number_of_books = min(7, len(self.ids))
for i in range(1,self.s_r_number_of_books+1):
w = QtGui.QLabel(self.tabWidgetPage3)
w.setText(_('Book %d:'%i))
w.setText(_('Book %d:')%i)
self.gridLayout1.addWidget(w, i+offset, 0, 1, 1)
w = QtGui.QLineEdit(self.tabWidgetPage3)
w.setReadOnly(True)

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>572</width>
<height>703</height>
<width>679</width>
<height>685</height>
</rect>
</property>
<property name="windowTitle">
@ -39,7 +39,7 @@
<item>
<widget class="QTabWidget" name="central_widget">
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="tabWidgetPage1">
<attribute name="title">

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

0
src/calibre/utils/smartypants.py Executable file → Normal file
View File