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

PML Output: Fix bug #4633: Don't generate absolute paths in toc. Clean up openning tag order at the start of a new line.

Browse Source
This commit is contained in:
John Schember 2010-01-22 06:12:15 -05:00
parent f9a854672c
commit 10ab751063
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/ebooks/pml/pmlconverter.py
View File

@ -8,6 +8,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, John Schember <john@nachtimwald.com>' __copyright__ = '2009, John Schember <john@nachtimwald.com>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os
import re import re
import StringIO import StringIO
@ -198,14 +199,26 @@ class PML_HTMLizer(object):
def start_line(self): def start_line(self):
start = u'' start = u''
div = []
span = []
other = []
for key, val in self.state.items(): for key, val in self.state.items():
if val[0]: if val[0]:
if key in self.STATES_VALUE_REQ: if key in self.DIV_STATES:
start += self.STATES_TAGS[key][0] % val[1] div.append((key, val[1]))
elif key in self.STATES_VALUE_REQ_2: elif key in self.SPAN_STATES:
start += self.STATES_TAGS[key][0] % (val[1], val[1]) span.append((key, val[1]))
else: else:
start += self.STATES_TAGS[key][0] other.append((key, val[1]))
for key, val in other+div+span:
if key in self.STATES_VALUE_REQ:
start += self.STATES_TAGS[key][0] % val
elif key in self.STATES_VALUE_REQ_2:
start += self.STATES_TAGS[key][0] % (val, val)
else:
start += self.STATES_TAGS[key][0]
return u'<p>%s' % start return u'<p>%s' % start
@ -518,7 +531,7 @@ class PML_HTMLizer(object):
elif c == 'C': elif c == 'C':
line.read(1) line.read(1)
id = 'pml_toc-%s' % len(self.toc) id = 'pml_toc-%s' % len(self.toc)
self.toc.add_item(self.file_name, id, self.code_value(line)) self.toc.add_item(os.path.basename(self.file_name), id, self.code_value(line))
text = '<span id="%s"></span>' % id text = '<span id="%s"></span>' % id
elif c == 'n': elif c == 'n':
pass pass