Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream changes

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2008-07-15 17:30:21 -04:00
commit acac7bb0d1
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/mobi/huffcdic.py
View File

@ -32,7 +32,7 @@ class BitReader(object):
class HuffReader(object): class HuffReader(object):
def __init__(self, huffs, extra_flags): def __init__(self, huffs):
self.huffs = huffs self.huffs = huffs
if huffs[0][0:4] != 'HUFF' or huffs[0][4:8] != '\x00\x00\x00\x18': if huffs[0][0:4] != 'HUFF' or huffs[0][4:8] != '\x00\x00\x00\x18':

17
src/calibre/ebooks/mobi/reader.py
View File

@ -167,15 +167,9 @@ class MobiReader(object):
self.replace_page_breaks() self.replace_page_breaks()
self.cleanup_html() self.cleanup_html()
self.processed_html = \ self.processed_html = re.compile('<head>', re.IGNORECASE).sub(
re.compile('<head>', re.IGNORECASE).sub( '<head>\n<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\n',
'<head>\n' self.processed_html)
'<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\n'
'<style type="text/css">\n'
'blockquote { margin: 0em 0em 0em 1em; text-align: justify; }\n'
'p { margin: 0em; text-align: justify; }\n'
'</style>\n',
self.processed_html)
soup = BeautifulSoup(self.processed_html.replace('> <', '>\n<')) soup = BeautifulSoup(self.processed_html.replace('> <', '>\n<'))
self.cleanup_soup(soup) self.cleanup_soup(soup)
@ -220,11 +214,6 @@ class MobiReader(object):
del tag['width'] del tag['width']
except KeyError: except KeyError:
pass pass
try:
styles.append('text-align: %s' % tag['align'])
del tag['align']
except KeyError:
pass
if styles: if styles:
tag['style'] = '; '.join(styles) tag['style'] = '; '.join(styles)

10
src/calibre/gui2/main.py
View File

@ -1259,12 +1259,12 @@ path_to_ebook to the database.
if __name__ == '__main__': if __name__ == '__main__':
try: try:
sys.exit(main()) sys.exit(main())
except: except Exception, err:
if not iswindows: raise if not iswindows: raise
tb = traceback.format_exc()
from PyQt4.QtGui import QErrorMessage from PyQt4.QtGui import QErrorMessage
logfile = os.path.join(os.path.expanduser('~'), 'calibre.log') logfile = os.path.join(os.path.expanduser('~'), 'calibre.log')
if os.path.exists(logfile): if os.path.exists(logfile):
log = open(logfile).read() log = open(logfile).read().decode('utf-8', 'ignore')
if log.strip(): d = QErrorMessage('<b>Error:</b>%s<br><b>Traceback:</b><br>%s<b>Log:</b><br>'%(unicode(err), unicode(tb), log))
d = QErrorMessage() d.exec_()
d.showMessage(log)

9
src/calibre/manual/faq.rst
View File

@ -131,7 +131,14 @@ Why does |app| show only some of my fonts on OS X?
The graphical user interface of |app| is not starting on Windows? The graphical user interface of |app| is not starting on Windows?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you've never used the graphical user interface before, try deleting the file library1.db (it will be somewhere under :file:`C:\\Documents and Settings` on Windows XP and :file:`C:\\Users` on Windows Vista. If that doesn't fix the problem, locate the file calibre.log (in the same places as library1.db) and post its contents in a help message on the `Forums <http://calibre.kovidgoyal.net/discussion>`_. If you've never used the graphical user interface before, try deleting the file library1.db (it will be somewhere under :file:`C:\\Documents and Settings` on Windows XP and :file:`C:\\Users` on Windows Vista. If that doesn't fix the problem, locate the file calibre.log (in the same places as library1.db) and post its contents in a help message on the `Forums <http://calibre.kovidgoyal.net/discussion>`_. If you can't find either file, try using the windows find feature to search for them. If the files dont exist on your system, try the following:
Start a command prompt (press the windows key and R and type cmd.exe in the run dialog). At the command prompt type the command `calibre-debug` and press enter. You will se a new, green prompt. At theis prompt, type the following two lines::
from calibre.gui2.main import main
main()
Post any output you see when asking for help.
I want some feature added to |app|. What can I do? I want some feature added to |app|. What can I do?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~