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

Fix handling of <pre> and re-organize for easier integration with web2lrf

Browse Source
This commit is contained in:
Kovid Goyal 2007-07-13 19:19:16 +00:00
parent 5189cc25c7
commit a601c9c11e
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/libprs500/ebooks/lrf/html/convert_from.py
View File

@ -39,7 +39,8 @@ from libprs500.ebooks.lrf.pylrs.pylrs import Paragraph, CR, Italic, ImageStream,
Plot, Image, BlockSpace, RuledLine, BookSetting, Canvas, DropCaps, \ Plot, Image, BlockSpace, RuledLine, BookSetting, Canvas, DropCaps, \
LrsError LrsError
from libprs500.ebooks.lrf.pylrs.pylrs import Span as _Span from libprs500.ebooks.lrf.pylrs.pylrs import Span as _Span
from libprs500.ebooks.lrf import option_parser, Book, PRS500_PROFILE from libprs500.ebooks.lrf import Book, PRS500_PROFILE
from libprs500.ebooks.lrf import option_parser as lrf_option_parser
from libprs500.ebooks import ConversionError from libprs500.ebooks import ConversionError
from libprs500.ebooks.lrf.html.table import Table from libprs500.ebooks.lrf.html.table import Table
from libprs500 import extract, filename_to_utf8 from libprs500 import extract, filename_to_utf8
@ -1032,6 +1033,8 @@ class HTMLConverter(object):
if ncss: if ncss:
update_css(ncss) update_css(ncss)
elif tagname == 'pre': elif tagname == 'pre':
for c in tag.findAll(True):
c.replaceWith(self.get_text(c))
self.end_current_para() self.end_current_para()
self.current_block.append_to(self.current_page) self.current_block.append_to(self.current_page)
attrs = Span.translate_attrs(tag_css, self.profile.dpi, self.fonts, self.font_delta, self.memory) attrs = Span.translate_attrs(tag_css, self.profile.dpi, self.fonts, self.font_delta, self.memory)
@ -1144,7 +1147,7 @@ class HTMLConverter(object):
self.current_block.append(CR()) self.current_block.append(CR())
if tag.has_key('id'): if tag.has_key('id'):
self.targets[tag['id']] = self.current_block self.targets[tag['id']] = self.current_block
elif tagname in ['b', 'strong', 'i', 'em', 'span', 'tt', 'big']: elif tagname in ['b', 'strong', 'i', 'em', 'span', 'tt', 'big', 'code']:
self.process_children(tag, tag_css) self.process_children(tag, tag_css)
elif tagname == 'font': elif tagname == 'font':
if tag.has_key('face'): if tag.has_key('face'):
@ -1269,6 +1272,7 @@ def process_file(path, options):
conv.writeto(oname, lrs=options.lrs) conv.writeto(oname, lrs=options.lrs)
print 'Output written to', oname print 'Output written to', oname
conv.cleanup() conv.cleanup()
return oname
finally: finally:
os.chdir(cwd) os.chdir(cwd)
if dirpath: if dirpath:
@ -1337,15 +1341,11 @@ def try_opf(path, options):
pass pass
def option_parser(parser=None, usage='''Usage: %prog [options] mybook.[html|rar|zip]\n\n'''
def parse_options(argv=None, cli=True, parser=None): '''%prog converts mybook.html to mybook.lrf'''
""" CLI for html -> lrf conversions """ ):
if not argv:
argv = sys.argv[1:]
if not parser: if not parser:
parser = option_parser("""usage: %prog [options] mybook.[html|rar|zip] parser = lrf_option_parser(usage)
%prog converts mybook.html to mybook.lrf""")
link = parser.add_option_group('LINK PROCESSING OPTIONS') link = parser.add_option_group('LINK PROCESSING OPTIONS')
link.add_option('--link-levels', action='store', type='int', default=sys.maxint, \ link.add_option('--link-levels', action='store', type='int', default=sys.maxint, \
dest='link_levels', dest='link_levels',
@ -1379,6 +1379,15 @@ def parse_options(argv=None, cli=True, parser=None):
prepro = parser.add_option_group('PREPROCESSING OPTIONS') prepro = parser.add_option_group('PREPROCESSING OPTIONS')
prepro.add_option('--baen', action='store_true', default=False, dest='baen', prepro.add_option('--baen', action='store_true', default=False, dest='baen',
help='''Preprocess Baen HTML files to improve generated LRF.''') help='''Preprocess Baen HTML files to improve generated LRF.''')
return parser
def parse_options(argv=None, cli=True, parser=None):
""" CLI for html -> lrf conversions """
parser = option_parser(parser)
if not argv:
argv = sys.argv[1:]
options, args = parser.parse_args(args=argv) options, args = parser.parse_args(args=argv)
if len(args) != 1: if len(args) != 1:
if cli: if cli: