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

Sync to trunk.

Browse Source
This commit is contained in:
John Schember 2009-08-08 08:25:55 -04:00
commit 99c516d852
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/oeb/base.py
View File

@ -1010,7 +1010,10 @@ class Manifest(object):
def __str__(self): def __str__(self):
data = self.data data = self.data
if isinstance(data, etree._Element): if isinstance(data, etree._Element):
return xml2str(data, pretty_print=self.oeb.pretty_print) ans = xml2str(data, pretty_print=self.oeb.pretty_print)
if self.media_type in OEB_DOCS:
ans = re.sub(r'<(div|a)([^>]*)/>', r'<\1\2></\1>', ans)
return ans
if isinstance(data, unicode): if isinstance(data, unicode):
return data.encode('utf-8') return data.encode('utf-8')
if hasattr(data, 'cssText'): if hasattr(data, 'cssText'):

1
src/calibre/ebooks/oeb/transforms/structure.py
View File

@ -78,6 +78,7 @@ class DetectStructure(object):
page_break_after = 'display: block; page-break-after: always' page_break_after = 'display: block; page-break-after: always'
for item, elem in self.detected_chapters: for item, elem in self.detected_chapters:
text = u' '.join([t.strip() for t in elem.xpath('descendant::text()')]) text = u' '.join([t.strip() for t in elem.xpath('descendant::text()')])
text = text.strip()
self.log('\tDetected chapter:', text[:50]) self.log('\tDetected chapter:', text[:50])
if chapter_mark == 'none': if chapter_mark == 'none':
continue continue

2
src/calibre/manual/conversion.rst
View File

@ -4,3 +4,5 @@
E-book Conversion E-book Conversion
=================== ===================
This section is under construction. In the meantime, you can see some documentation of the command line interface to conversion at :ref:`ebook-convert`.

13
src/calibre/manual/custom.py
View File

@ -123,7 +123,9 @@ def generate_ebook_convert_help():
''') ''')
c = 0 c = 0
sections = [] sections = []
toc = {}
for ip in input_format_plugins(): for ip in input_format_plugins():
toc[ip.name] = []
for op in output_format_plugins(): for op in output_format_plugins():
c += 1 c += 1
idr = 'ebook-convert-sec-'+str(c) idr = 'ebook-convert-sec-'+str(c)
@ -131,7 +133,7 @@ def generate_ebook_convert_help():
section = '.. _'+idr+':||||' section = '.. _'+idr+':||||'
section += title+'||'+\ section += title+'||'+\
'-------------------------------------------------------' '-------------------------------------------------------'
#ans += ' * :ref:`'+idr+'`\n' toc[ip.name].append([idr, op.name])
parser, plumber = create_option_parser(['ebook-convert', parser, plumber = create_option_parser(['ebook-convert',
'dummyi.'+list(ip.file_types)[0], 'dummyi.'+list(ip.file_types)[0],
'dummyo.'+op.file_type, '-h'], default_log) 'dummyo.'+op.file_type, '-h'], default_log)
@ -144,7 +146,14 @@ def generate_ebook_convert_help():
sections.append(section) sections.append(section)
ans += '||||'+'||||'.join(sections) toct = '||||'
for ip in sorted(toc):
toct += ' * '+ip+'||||'
for idr, name in toc[ip]:
toct += ' * :ref:`'+name +' <'+idr+'>`||'
toct += '||'
ans += toct+'||||'+'||||'.join(sections)
return ans return ans