Skip to content

[bikeshed] Fix Bikeshed patch-up script and add debugging aids #1929

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

Merged
merged 9 commits into from
Jun 23, 2025
Merged

[bikeshed] Fix Bikeshed patch-up script and add debugging aids #1929

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e34729d
[katex] Debugging aids
rossberg Jun 18, 2025
7940145
Tweak some Math replacements
rossberg Jun 19, 2025
b8e9c83
Tweak some more Math replacements
rossberg Jun 19, 2025
0c0f380
Print exception
rossberg Jun 19, 2025
22bd1c2
Print exception correctly
rossberg Jun 19, 2025
ae73828
Tune regexp
rossberg Jun 19, 2025
c26d3e6
More regexp tuning
rossberg Jun 19, 2025
db3ae49
Recognise newlines before spans
rossberg Jun 19, 2025
867b959
Update document/core/util/mathjax2katex.py
rossberg Jun 23, 2025
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
30 changes: 18 additions & 12 deletions document/core/util/mathjax2katex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ def HasBalancedTags(s):

def ReplaceMath(cache, data):
old = data
data = re.sub('[\\\\]\\[([0-9]|-)', '\\\\DOUBLESLASH\\[\\1', data) # Messed up by Bikeshed
data = data.replace('\\\\', '\\DOUBLESLASH')
data = data.replace('\\(', '')
data = data.replace('\\)', '')
data = data.replace('\\[', '')
data = data.replace('\\]', '')
data = data.replace('\\DOUBLESLASH', '\\\\')
data = data.replace('’', '\\text{’}')
data = data.replace('‘', '\\text{‘}')
data = data.replace('\\hfill', '')
data = data.replace('\u2019', '\'') # Messed up by Bikeshed
data = data.replace('\\hfill', ' ')
data = data.replace('\\mbox', '\\text')
data = data.replace('\\begin{split}', '\\begin{aligned}')
data = data.replace('\\end{split}', '\\end{aligned}')
data = data.replace('&', '&')
data = data.replace('&lt;', '<')
data = data.replace('&gt;', '>')
data = data.replace('&amp;', '&') # Messed up by Bikeshed
data = data.replace('&lt;', '<') # Messed up by Bikeshed
data = data.replace('&gt;', '>') # Messed up by Bikeshed
data = data.replace('{array}[t]', '{array}')
data = data.replace('{array}[b]', '{array}')
data = data.replace('@{~}', '')
Expand Down Expand Up @@ -108,12 +108,17 @@ def ReplaceMath(cache, data):
data = data[:start] + v.replace('#1', data[start+len(k):end]) + data[end:]
p = subprocess.Popen(
['node', os.path.join(SCRIPT_DIR, 'katex/cli.js'), '--display-mode', '--trust'],
stdin=subprocess.PIPE, stdout=subprocess.PIPE, text=True)
ret = p.communicate(input=data)[0]
if p.returncode != 0:
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
ret, err = p.communicate(input=data)
if p.returncode != 0 or err != "":
if err != "":
sys.stderr.write('\n\n' + err + '\n')
sys.stderr.write('BEFORE:\n' + old + '\n')
sys.stderr.write('AFTER:\n' + data + '\n')
raise Exception()
if p.returncode != 0:
raise Exception()
else:
sys.stderr.write('RESULT:\n' + ret + '\n')
ret = ret.strip()
ret = ret[ret.find('<span class="katex-html"'):]
ret = '<span class="katex-display"><span class="katex">' + ret
Expand Down Expand Up @@ -207,7 +212,7 @@ def ExtractMath(match):
# Pull out math fragments.
data = re.sub(
'class="([^"]*)math([^"]*)"[^>]*>'
'((?:[ ]*<span[^>]*>[^<]*</span>)*)([^<]*)<',
'((?:[ \n]*<span[^>]*>[^<]*</span>)*)([^<]*)<',
ExtractMath, data)

sys.stderr.write('Processing %d fragments.\n' % len(fixups))
Expand All @@ -223,7 +228,8 @@ def Worker():
fixed = ('class="' + cls_before + ' ' + cls_after + '">' +
spans + ReplaceMath(cache, mth) + '<')
done_fixups.append((start, end, fixed))
except Exception:
except Exception as inst:
sys.stderr.write('\nException: ' + inst.__str__() + '\n')
success = False

q.task_done()
Expand Down
Loading