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 Input: Fix bug #9009: TOC entries specified by \x and \X not being included in TOC.

Browse Source
This commit is contained in:
John Schember 2011-02-16 20:28:09 -05:00
parent d6c25bf7f6
commit 7234c3e5f2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,8 +151,8 @@ class PML_HTMLizer(object):
def prepare_pml(self, pml): def prepare_pml(self, pml):
# Give Chapters the form \\*='text'text\\*. This is used for generating # Give Chapters the form \\*='text'text\\*. This is used for generating
# the TOC later. # the TOC later.
pml = re.sub(r'(?<=\\x)(?P<text>.*?)(?=\\x)', lambda match: '="%s"%s' % (self.strip_pml(match.group('text')), match.group('text')), pml) pml = re.sub(r'(?msu)(?P<c>\\x)(?P<text>.*?)(?P=c)', lambda match: '%s="%s"%s%s' % (match.group('c'), self.strip_pml(match.group('text')), match.group('text'), match.group('c')), pml)
pml = re.sub(r'(?<=\\X[0-4])(?P<text>.*?)(?=\\X[0-4])', lambda match: '="%s"%s' % (self.strip_pml(match.group('text')), match.group('text')), pml) pml = re.sub(r'(?msu)(?P<c>\\X[0-4])(?P<text>.*?)(?P=c)', lambda match: '%s="%s"%s%s' % (match.group('c'), self.strip_pml(match.group('text')), match.group('text'), match.group('c')), pml)
# Remove comments # Remove comments
pml = re.sub(r'(?mus)\\v(?P<text>.*?)\\v', '', pml) pml = re.sub(r'(?mus)\\v(?P<text>.*?)\\v', '', pml)
@ -190,9 +190,10 @@ class PML_HTMLizer(object):
pml = re.sub(r'\\a\d\d\d', '', pml) pml = re.sub(r'\\a\d\d\d', '', pml)
pml = re.sub(r'\\U\d\d\d\d', '', pml) pml = re.sub(r'\\U\d\d\d\d', '', pml)
pml = re.sub(r'\\.', '', pml) pml = re.sub(r'\\.', '', pml)
pml.replace('\r\n', ' ') pml = pml.replace('\r\n', ' ')
pml.replace('\n', ' ') pml = pml.replace('\n', ' ')
pml.replace('\r', ' ') pml = pml.replace('\r', ' ')
pml = pml.strip()
return pml return pml