Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2497 from fehiepsi/master
update KaTeX version and introduce KATEX_AUTO_RENDER label
  • Loading branch information
Kwpolska committed Sep 11, 2016
2 parents 4a2044e + e168c63 commit f858f1c
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 21 deletions.
1 change: 1 addition & 0 deletions AUTHORS.txt
Expand Up @@ -31,6 +31,7 @@
* `Dhruv Baldawa <https://github.com/dhruvbaldawa>`_
* `Dirk Engling <https://github.com/erdgeist>`_
* `Dmitry Verkhoturov <https://github.com/paskal>`_
* `Du Phan <https://github.com/fehiepsi>`_
* `Duncan Lock <https://github.com/dflock>`_
* `Edinei Cavalcanti <https://github.com/neiesc>`_
* `Eduardo Schettino <https://github.com/schettino72>`_
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.txt
Expand Up @@ -10,6 +10,8 @@ Bugfixes
Features
--------

* Introduce the new KATEX_AUTO_RENDER label
* Update KaTeX version to 0.6.0: support aligned math display
* Better support for a tree of files in ``data/``

New in v7.8.0
Expand Down
13 changes: 12 additions & 1 deletion nikola/conf.py.in
Expand Up @@ -904,9 +904,20 @@ PRETTY_URLS = ${PRETTY_URLS}
# it's faster and the output looks better.
# If you set USE_KATEX to True, you also need to add an extra CSS file
# like this:
# EXTRA_HEAD_DATA = """<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.css">"""
# EXTRA_HEAD_DATA = """<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.css">"""
# USE_KATEX = False

# If you want to use the old (buggy) inline math $.$ with KaTeX, then
# you might want to use this feature.
# KATEX_AUTO_RENDER = """
# delimiters: [
# {left: "$$", right: "$$", display: true},
# {left: "\\\[", right: "\\\]", display: true},
# {left: "$", right: "$", display: false},
# {left: "\\\(", right: "\\\)", display: false}
# ]
# """

# Do you want to customize the nbconversion of your IPython notebook?
# IPYNB_CONFIG = {}
# With the following example configuration you can use a custom jinja template
Expand Down
20 changes: 15 additions & 5 deletions nikola/data/themes/base-jinja/templates/index_helper.tmpl
Expand Up @@ -21,11 +21,21 @@
{% macro mathjax_script(posts) %}
{% if posts|selectattr("is_mathjax")|list %}
{% if use_katex %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/contrib/auto-render.min.js"></script>
<script>
renderMathInElement(document.body);
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/contrib/auto-render.min.js"></script>
{% if katex_auto_render %}
<script>
renderMathInElement(document.body,
{
{{ katex_auto_render }}
}
);
</script>
{% else %}
<script>
renderMathInElement(document.body);
</script>
{% endif %}
{% else %}
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
{% if mathjax_config %}
Expand Down
20 changes: 15 additions & 5 deletions nikola/data/themes/base-jinja/templates/post_helper.tmpl
Expand Up @@ -87,11 +87,21 @@
{% macro mathjax_script(post) %}
{% if post.is_mathjax %}
{% if use_katex %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/contrib/auto-render.min.js"></script>
<script>
renderMathInElement(document.body);
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/contrib/auto-render.min.js"></script>
{% if katex_auto_render %}
<script>
renderMathInElement(document.body,
{
{{ katex_auto_render }}
}
);
</script>
{% else %}
<script>
renderMathInElement(document.body);
</script>
{% endif %}
{% else %}
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
{% if mathjax_config %}
Expand Down
20 changes: 15 additions & 5 deletions nikola/data/themes/base/templates/index_helper.tmpl
Expand Up @@ -21,11 +21,21 @@
<%def name="mathjax_script(posts)">
%if any(post.is_mathjax for post in posts):
%if use_katex:
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/contrib/auto-render.min.js"></script>
<script>
renderMathInElement(document.body);
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/contrib/auto-render.min.js"></script>
% if katex_auto_render:
<script>
renderMathInElement(document.body,
{
${katex_auto_render}
}
);
</script>
% else:
<script>
renderMathInElement(document.body);
</script>
% endif
%else:
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
% if mathjax_config:
Expand Down
20 changes: 15 additions & 5 deletions nikola/data/themes/base/templates/post_helper.tmpl
Expand Up @@ -87,11 +87,21 @@
<%def name="mathjax_script(post)">
%if post.is_mathjax:
%if use_katex:
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/contrib/auto-render.min.js"></script>
<script>
renderMathInElement(document.body);
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/contrib/auto-render.min.js"></script>
% if katex_auto_render:
<script>
renderMathInElement(document.body,
{
${katex_auto_render}
}
);
</script>
% else:
<script>
renderMathInElement(document.body);
</script>
% endif
%else:
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
% if mathjax_config:
Expand Down
2 changes: 2 additions & 0 deletions nikola/nikola.py
Expand Up @@ -497,6 +497,7 @@ def __init__(self, **config):
'INDEXES_STATIC': True,
'INDEX_PATH': '',
'IPYNB_CONFIG': {},
'KATEX_AUTO_RENDER': '',
'LESS_COMPILER': 'lessc',
'LESS_OPTIONS': [],
'LICENSE': '',
Expand Down Expand Up @@ -1090,6 +1091,7 @@ def _set_global_context_from_config(self):
self._GLOBAL_CONTEXT['mathjax_config'] = self.config.get(
'MATHJAX_CONFIG')
self._GLOBAL_CONTEXT['use_katex'] = self.config.get('USE_KATEX')
self._GLOBAL_CONTEXT['katex_auto_render'] = self.config.get('KATEX_AUTO_RENDER')
self._GLOBAL_CONTEXT['subtheme'] = self.config.get('THEME_REVEAL_CONFIG_SUBTHEME')
self._GLOBAL_CONTEXT['transition'] = self.config.get('THEME_REVEAL_CONFIG_TRANSITION')
self._GLOBAL_CONTEXT['content_footer'] = self.config.get(
Expand Down

0 comments on commit f858f1c

Please sign in to comment.