q&d conversion to KaTeX

getnikola · Apr 24, 2015 · e0e1698 · e0e1698
1 parent 4e983b8
commit e0e1698
Show file tree

Hide file tree

Showing 26 changed files with 319 additions and 368 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* Switched from MathJax to KaTeX
 * New translations (az, fil, tl, uk, zh_TW)
 * Add reStructuredText transform support (Issue #1647)
 * Produce Unicode output in ``nikola init`` (via Issue #1644)

diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -50,18 +50,21 @@ lang="{{ lang }}">
         <link rel="next" href="{{ nextlink }}" type="text/html">
     {% endif %}
 
-    {{ mathjax_config }}
     {% if use_cdn %}
         <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
     {% else %}
         <!--[if lt IE 9]><script src="{{ url_replacer(permalink, '/assets/js/html5.js', lang) }}"></script><![endif]-->
     {% endif %}
-
+    <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.2.0/katex.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/contrib/auto-render.min.js"></script>
     {{ extra_head_data }}
 {% endmacro %}
 
 {% macro late_load_js() %}
     {{ social_buttons_code }}
+    <script>
+        renderMathInElement(document.body);
+    </script>
 {% endmacro %}
 
 {% macro html_stylesheets() %}
@@ -79,6 +82,7 @@ lang="{{ lang }}">
             <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
         {% endif %}
     {% endif %}
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.2.0/katex.min.css">
 {% endmacro %}
 
 {% macro html_feedlinks() %}

diff --git a/nikola/data/themes/base-jinja/templates/index.tmpl b/nikola/data/themes/base-jinja/templates/index.tmpl
@@ -37,5 +37,4 @@
 </div>
 {{ helper.html_pager() }}
 {{ comments.comment_link_script() }}
-{{ helper.mathjax_script(posts) }}
 {% endblock %}
diff --git a/nikola/data/themes/base-jinja/templates/index_helper.tmpl b/nikola/data/themes/base-jinja/templates/index_helper.tmpl
@@ -17,11 +17,3 @@
         </nav>
     {% endif %}
 {% endmacro %}
-
-{% macro mathjax_script(posts) %}
-    {% if posts|selectattr("is_mathjax")|list %}
-        <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script>
-        <script src="/assets/js/mathjax.js"></script>
-    {% endif %}
-{% endmacro %}
diff --git a/nikola/data/themes/base-jinja/templates/post.tmpl b/nikola/data/themes/base-jinja/templates/post.tmpl
@@ -45,7 +45,6 @@
         {{ comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path) }}
         </section>
     {% endif %}
-    {{ helper.mathjax_script(post) }}
 </article>
 {{ comments.comment_link_script() }}
 {% endblock %}
diff --git a/nikola/data/themes/base-jinja/templates/post_helper.tmpl b/nikola/data/themes/base-jinja/templates/post_helper.tmpl
@@ -83,11 +83,3 @@
     {% endif %}
 {% endif %}
 {% endmacro %}
-
-{% macro mathjax_script(post) %}
-    {% if post.is_mathjax %}
-        <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script>
-        <script src="/assets/js/mathjax.js"></script>
-    {% endif %}
-{% endmacro %}
diff --git a/nikola/data/themes/base-jinja/templates/story.tmpl b/nikola/data/themes/base-jinja/templates/story.tmpl
@@ -19,6 +19,5 @@
         {{ comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path) }}
         </section>
     {% endif %}
-    {{ helper.mathjax_script(post) }}
 </article>
 {% endblock %}
diff --git a/nikola/data/themes/base/assets/js/mathjax.js b/nikola/data/themes/base/assets/js/mathjax.js
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -50,18 +50,21 @@ lang="${lang}">
         <link rel="next" href="${nextlink}" type="text/html">
     %endif
 
-    ${mathjax_config}
     %if use_cdn:
         <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
     %else:
         <!--[if lt IE 9]><script src="${url_replacer(permalink, '/assets/js/html5.js', lang)}"></script><![endif]-->
     %endif
-
+    <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.2.0/katex.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/contrib/auto-render.min.js"></script>
     ${extra_head_data}
 </%def>
 
 <%def name="late_load_js()">
     ${social_buttons_code}
+    <script>
+        renderMathInElement(document.body);
+    </script>
 </%def>
 
 <%def name="html_stylesheets()">
@@ -79,6 +82,7 @@ lang="${lang}">
             <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
         %endif
     %endif
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.2.0/katex.min.css">
 </%def>
 
 <%def name="html_feedlinks()">

diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl
@@ -37,5 +37,4 @@
 </div>
 ${helper.html_pager()}
 ${comments.comment_link_script()}
-${helper.mathjax_script(posts)}
 </%block>
diff --git a/nikola/data/themes/base/templates/index_helper.tmpl b/nikola/data/themes/base/templates/index_helper.tmpl
@@ -17,11 +17,3 @@
         </nav>
     %endif
 </%def>
-
-<%def name="mathjax_script(posts)">
-    %if any(post.is_mathjax for post in posts):
-        <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script>
-        <script src="/assets/js/mathjax.js"></script>
-    %endif
-</%def>
diff --git a/nikola/data/themes/base/templates/post.tmpl b/nikola/data/themes/base/templates/post.tmpl
@@ -45,7 +45,6 @@
         ${comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path)}
         </section>
     % endif
-    ${helper.mathjax_script(post)}
 </article>
 ${comments.comment_link_script()}
 </%block>
diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl
@@ -83,11 +83,3 @@
     %endif
 %endif
 </%def>
-
-<%def name="mathjax_script(post)">
-    %if post.is_mathjax:
-        <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script>
-        <script src="/assets/js/mathjax.js"></script>
-    %endif
-</%def>
diff --git a/nikola/data/themes/base/templates/story.tmpl b/nikola/data/themes/base/templates/story.tmpl
@@ -19,6 +19,5 @@
         ${comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path)}
         </section>
     %endif
-    ${helper.mathjax_script(post)}
 </article>
 </%block>
diff --git a/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
@@ -55,13 +55,13 @@ lang="{{ lang }}">
         <link rel="next" href="{{ nextlink }}" type="text/html">
     {% endif %}
 
-    {{ mathjax_config }}
     {% if use_cdn %}
         <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
     {% else %}
         <!--[if lt IE 9]><script src="{{ url_replacer(permalink, '/assets/js/html5.js', lang) }}"></script><![endif]-->
     {% endif %}
-
+    <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.2.0/katex.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/contrib/auto-render.min.js"></script>
     {{ extra_head_data }}
 {% endmacro %}
 
@@ -91,6 +91,9 @@ lang="{{ lang }}">
         <script src="/assets/js/colorbox-i18n/jquery.colorbox-{{ colorbox_locales[lang] }}.js"></script>
     {% endif %}
     {{ social_buttons_code }}
+    <script>
+        renderMathInElement(document.body);
+    </script>
 {% endmacro %}
 
 
@@ -122,6 +125,7 @@ lang="{{ lang }}">
     {% elif not annotations and post and post.meta('annotations') %}
         {{ notes.css() }}
     {% endif %}
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.2.0/katex.min.css">
 {% endmacro %}
 
 

diff --git a/nikola/data/themes/bootstrap-jinja/templates/post.tmpl b/nikola/data/themes/bootstrap-jinja/templates/post.tmpl
@@ -45,7 +45,6 @@
         {{ comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path) }}
         </section>
     {% endif %}
-    {{ helper.mathjax_script(post) }}
 </article>
 {{ comments.comment_link_script() }}
 {% endblock %}

diff --git a/nikola/data/themes/bootstrap/README.md b/nikola/data/themes/bootstrap/README.md
@@ -1,23 +1,8 @@
-A "website-done-with-bootstrap" theme, so to speak. 
+A bootstrap3 version of the bootstrap theme.
 
-Has a fixed navigation bar at top that displays the NAVIGATION_LINKS
-setting and supports nested menus.
+There is a variant called bootstrap3-gradients which uses an extra CSS
+file for a *visually enhanced experience* (according to Bootstrap
+developers at least).  This one uses the default bootstrap3 flat look.
 
-This theme is used in Nikola's website: http://getnikola.com
-
-Important: To fit in the bootstrap navigation bar, the search form needs the
-navbar-form and pull-left CSS classes applied. Here is an example with Nikola's
-default duckduckgo search form:
-
-    SEARCH_FORM = """
-        <!-- Custom search -->
-        <form method="get" id="search" action="http://duckduckgo.com/" class="navbar-form pull-left">
-            <input type="hidden" name="sites" value="%s"/>
-            <input type="hidden" name="k8" value="#444444"/>
-            <input type="hidden" name="k9" value="#D51920"/>
-            <input type="hidden" name="kt" value="h"/>
-            <input type="text" name="q" maxlength="255" placeholder="Search&hellip;" class="span2" style="margin-top: 4px;"/>
-            <input type="submit" value="DuckDuckGo Search" style="visibility: hidden;" />
-        </form>
-        <!-- End of custom search -->
-    """ % SITE_URL
+This theme supports Bootswtach font/color schemes (unlike
+bootstrap3-gradients) through the `nikola bootswatch_theme` command.
diff --git a/nikola/data/themes/bootstrap/engine b/nikola/data/themes/bootstrap/engine
@@ -1 +1 @@
-mako
+jinja
diff --git a/nikola/data/themes/bootstrap/parent b/nikola/data/themes/bootstrap/parent
@@ -1 +1 @@
-base
+bootstrap3