Fix API site build (#8551)

This commit is contained in:
Paul Ouellette 2019-05-21 13:37:10 -04:00 committed by SmallJoker
parent cfef466d4e
commit 920bd3b16f
3 changed files with 11 additions and 34 deletions

@ -1,9 +1,7 @@
#!/bin/sh -e #!/bin/sh -e
# Patch Pygments and Python-Markdown # Patch Python-Markdown
PYGMENTS_FILE=$(pip show pygments | awk '/Location/ { print $2 }')/pygments/formatters/html.py
MARKDOWN_FILE=$(pip show markdown | awk '/Location/ { print $2 }')/markdown/extensions/codehilite.py MARKDOWN_FILE=$(pip show markdown | awk '/Location/ { print $2 }')/markdown/extensions/codehilite.py
patch -N -r - $PYGMENTS_FILE code_tag.patch || true
patch -N -r - $MARKDOWN_FILE lua_highlight.patch || true patch -N -r - $MARKDOWN_FILE lua_highlight.patch || true
# Split lua_api.txt on top level headings # Split lua_api.txt on top level headings

@ -1,31 +0,0 @@
@@ -691,7 +691,7 @@
yield tup
yield 0, '</div>\n'
- def _wrap_pre(self, inner):
+ def _wrap_pre_code(self, inner):
style = []
if self.prestyles:
style.append(self.prestyles)
@@ -704,10 +704,10 @@
# the empty span here is to keep leading empty lines from being
# ignored by HTML parsers
- yield 0, ('<pre' + (style and ' style="%s"' % style) + '><span></span>')
+ yield 0, ('<pre' + (style and ' style="%s"' % style) + '><code><span></span>')
for tup in inner:
yield tup
- yield 0, '</pre>'
+ yield 0, '</code></pre>'
def _format_lines(self, tokensource):
"""
@@ -815,7 +815,7 @@
individual lines, in custom generators. See docstring
for `format`. Can be overridden.
"""
- return self._wrap_div(self._wrap_pre(source))
+ return self._wrap_div(self._wrap_pre_code(source))
def format_unencoded(self, tokensource, outfile):
"""

@ -7,3 +7,13 @@
self.linenums = linenums self.linenums = linenums
self.guess_lang = guess_lang self.guess_lang = guess_lang
self.css_class = css_class self.css_class = css_class
@@ -119,7 +119,8 @@
cssclass=self.css_class,
style=self.style,
noclasses=self.noclasses,
- hl_lines=self.hl_lines)
+ hl_lines=self.hl_lines,
+ wrapcode=True)
return highlight(self.src, lexer, formatter)
else:
# just escape and build markup usable by JS highlighting libs