From: Vladimír Vondruš Date: Mon, 11 Dec 2017 01:50:34 +0000 (+0100) Subject: Move the latex2svg code out of "m" plugins, as it is not a plugin. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=e8288ff00cfb0a5de93d1f29cd3367f76d38481b;p=blog.git Move the latex2svg code out of "m" plugins, as it is not a plugin. --- diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py index b9c68ea0..492a9a35 100755 --- a/doxygen/dox2html5.py +++ b/doxygen/dox2html5.py @@ -45,7 +45,7 @@ from pygments.formatters import HtmlFormatter from pygments.lexers import TextLexer, BashSessionLexer, get_lexer_by_name, find_lexer_class_for_filename sys.path.append("../pelican-plugins") -import m.latex2svg +import latex2svg import m.math import ansilexer @@ -558,7 +558,7 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET. elif i.tag == 'formula': # Inline formula if i.text.startswith('$ ') and i.text.endswith(' $'): - rendered = m.latex2svg.latex2svg('${}$'.format(i.text[2:-2]), params=m.math.latex2svg_params) + rendered = latex2svg.latex2svg('${}$'.format(i.text[2:-2]), params=m.math.latex2svg_params) # CSS classes and styling for proper vertical alignment. Depth is relative # to font size, describes how below the line the text is. Scaling it back @@ -570,7 +570,7 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET. else: assert i.text.startswith('\[ ') and i.text.endswith(' \]') has_block_elements = True - rendered = m.latex2svg.latex2svg('$${}$$'.format(i.text[3:-3]), params=m.math.latex2svg_params) + rendered = latex2svg.latex2svg('$${}$$'.format(i.text[3:-3]), params=m.math.latex2svg_params) out.parsed += '
{}
'.format(m.math._patch(i.text, rendered, '')) # Inline elements diff --git a/pelican-plugins/m/latex2svg.py b/pelican-plugins/latex2svg.py similarity index 100% rename from pelican-plugins/m/latex2svg.py rename to pelican-plugins/latex2svg.py diff --git a/pelican-plugins/m/math.py b/pelican-plugins/m/math.py index afe510b3..5d8ef026 100644 --- a/pelican-plugins/m/math.py +++ b/pelican-plugins/m/math.py @@ -31,7 +31,7 @@ from docutils.parsers.rst.roles import set_classes import pelican.signals -from . import latex2svg +import latex2svg latex2svg_params = latex2svg.default_params.copy() latex2svg_params.update({