From 1345a053395532fb243a3e0697f7a14ea2fff0e7 Mon Sep 17 00:00:00 2001 From: John Schember Date: Thu, 17 Feb 2011 07:45:57 -0500 Subject: [PATCH] PMLML: Don't write \Cn tags when we are within a heading. --- src/calibre/ebooks/pml/pmlml.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/pml/pmlml.py b/src/calibre/ebooks/pml/pmlml.py index 12f84e5a5b..779e75d713 100644 --- a/src/calibre/ebooks/pml/pmlml.py +++ b/src/calibre/ebooks/pml/pmlml.py @@ -258,7 +258,12 @@ class PMLMLizer(object): # TOC markers. toc_name = elem.attrib.get('name', None) toc_id = elem.attrib.get('id', None) - if (toc_id or toc_name) and tag not in ('h1', 'h2','h3','h4','h5','h6',): + # Only write the TOC marker if the tag isn't a heading and we aren't in one. + if (toc_id or toc_name) and tag not in ('h1', 'h2','h3','h4','h5','h6') and \ + 'x' not in tag_stack+tags and 'X0' not in tag_stack+tags and \ + 'X1' not in tag_stack+tags and 'X2' not in tag_stack+tags and \ + 'X3' not in tag_stack+tags and 'X4' not in tag_stack+tags: + toc_page = page.href if self.toc.get(toc_page, None): for toc_x in (toc_name, toc_id): @@ -267,8 +272,8 @@ class PMLMLizer(object): toc_depth = max(min(toc_depth, 4), 0) text.append('\\C%s="%s"' % (toc_depth, toc_title)) - # Process style information that needs holds a single tag - # Commented out because every page in an OEB book starts with this style + # Process style information that needs holds a single tag. + # Commented out because every page in an OEB book starts with this style. if style['page-break-before'] == 'always': text.append('\\p')