eUgEntOptIc44/docutils
1
0
Fork 0
mirror of git://repo.or.cz/docutils.git synced 2025-10-06 00:32:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Catch invalid node.parent when switching section levels.

Browse Source 
Better error report for problems with the new section parsing algorithm.
See [bugs:#] and [bugs:#].

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@10197 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
This commit is contained in:
milde
2025-08-08 18:23:50 +00:00
parent 461654094f
commit 84f94d74c1
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
docutils/docutils/parsers/rst/states.py
View File

@@ -331,30 +331,42 @@ class RSTState(StateWS):
title_styles = self.memo.title_styles
parent_sections = self.parent.section_hierarchy()
# current section level: (0 document, 1 section, 2 subsection, ...)
mylevel = len(parent_sections)
# Determine the level of the new section:
oldlevel = len(parent_sections)
# new section level:
try: # check for existing title style
level = title_styles.index(style) + 1
newlevel = title_styles.index(style) + 1
except ValueError: # new title style
title_styles.append(style)
level = len(title_styles)
newlevel = len(title_styles)
# The new level must not be deeper than an immediate child
# of the current level:
if level > mylevel + 1:
styles = " ".join("/".join(s for s in style)
for style in title_styles)
if newlevel > oldlevel + 1:
styles = ' '.join('/'.join(style) for style in title_styles)
self.parent += self.reporter.severe(
'Inconsistent title style:'
f' skip from level {mylevel} to {level}.',
f' skip from level {oldlevel} to {newlevel}.',
nodes.literal_block('', source),
nodes.paragraph('', f'Established title styles: {styles}'),
line=lineno)
return False
# Update parent state:
self.memo.section_level = level
if level <= mylevel:
self.memo.section_level = newlevel
if newlevel <= oldlevel:
# new section is sibling or higher up in the section hierarchy
self.parent = parent_sections[level-1].parent
new_parent = parent_sections[newlevel-1].parent
if new_parent is None:
styles = ' '.join('/'.join(style) for style in title_styles)
self.parent += self.reporter.severe(
f'Cannot skip from level {oldlevel} to {newlevel}.'
' Current element has only {len(self.parent_sections)'
' parent sections.'
' (Mismatch of `memo.section_styles`,'
' and the root node of a nested parser?)',
nodes.literal_block('', source),
nodes.paragraph('', f'Established title styles: {styles}'),
line=lineno)
return False
self.parent = new_parent
return True
def title_inconsistent(self, sourcetext, lineno):