Skip to content

Add support to flat-table to remove a potential empty paragraph and fix the flat-table iterator #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tim-nordell-nimbelink wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support to flat-table to remove a potential empty paragraph and fix the flat-table iterator #43

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a33ed1
[fix] Fix cspan/rspan iterator in flat-table to be stable across remo…
tim-nordell-nimbelink May 11, 2026
6beb8f4
[mod] In flat-table remove whitespace surrounding cspan/rspan nodes
tim-nordell-nimbelink May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions linuxdoc/rstFlatTable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,15 +327,33 @@ def parseCellItem(self, cellItem):
cspan = rspan = 0
if not len(cellItem): # pylint: disable=len-as-condition
return cspan, rspan, []
for elem in cellItem[0]:
if isinstance(elem, colSpan):
cspan = elem.get("span")
elem.parent.remove(elem)
continue
if isinstance(elem, rowSpan):
rspan = elem.get("span")
elem.parent.remove(elem)
for elem in cellItem[0][:]:
if isinstance(elem, colSpan) or isinstance(elem, rowSpan):
if isinstance(elem, colSpan):
cspan = elem.get("span")
if isinstance(elem, rowSpan):
rspan = elem.get("span")

# Trim leading whitespace in the following element
parent = elem.parent
if parent.index(elem) == 0 and len(parent) > 1:
sibling = parent[1]
if isinstance(sibling, nodes.Text):
new_text = sibling.lstrip()
if len(new_text) != 0:
parent.replace(sibling, nodes.Text(new_text))
else:
parent.remove(sibling)

# Finally remove target element from parent
parent.remove(elem)

# And if the parent paragraph is now empty, remove it
if len(parent) == 0:
parent.replace_self([])

continue

return cspan, rspan, cellItem[:]


Expand Down