OpenSourceArk/mkdocs-material
1
0
Fork 0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-06-14 11:52:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improved collapsing of adjacent whitespace and removal of empty elements in search plugin

Browse Source
This commit is contained in:
squidfunk 2023-01-08 10:23:28 +01:00
parent 7484b19e9a
commit 68257348b8
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
material/plugins/search/plugin.py
View File

@ -444,8 +444,21 @@ class Parser(HTMLParser):
if self.section.el in self.context:
data = self.section.title
# Search for corresponding opening tag
index = data.index(f"<{tag}>")
for i in range(index + 1, len(data)):
if not data[i].isspace():
index = len(data)
break
# Remove element if empty (or only whitespace)
if len(data) > index:
while len(data) > index:
data.pop()
# Append to section title or text
data.append(f"</{tag}>")
else:
data.append(f"</{tag}>")
# Called for the text contents of each tag
def handle_data(self, data):
@ -477,6 +490,11 @@ class Parser(HTMLParser):
escape(data, quote = False)
)
# Collapse adjacent whitespace
elif data.isspace():
if not self.section.text or not self.section.text[-1].isspace():
self.section.text.append(data)
# Handle everything else
else:
self.section.text.append(

20
src/plugins/search/plugin.py
View File

@ -444,8 +444,21 @@ class Parser(HTMLParser):
if self.section.el in self.context:
data = self.section.title
# Search for corresponding opening tag
index = data.index(f"<{tag}>")
for i in range(index + 1, len(data)):
if not data[i].isspace():
index = len(data)
break
# Remove element if empty (or only whitespace)
if len(data) > index:
while len(data) > index:
data.pop()
# Append to section title or text
data.append(f"</{tag}>")
else:
data.append(f"</{tag}>")
# Called for the text contents of each tag
def handle_data(self, data):
@ -477,6 +490,11 @@ class Parser(HTMLParser):
escape(data, quote = False)
)
# Collapse adjacent whitespace
elif data.isspace():
if not self.section.text or not self.section.text[-1].isspace():
self.section.text.append(data)
# Handle everything else
else:
self.section.text.append(