diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | plugin/math/math.js | 39 | ||||
| -rw-r--r-- | test/examples/math.html | 24 |
3 files changed, 53 insertions, 12 deletions
@@ -1286,6 +1286,8 @@ Reveal.initialize({ math: { mathjax: 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js', config: 'TeX-AMS_HTML-full' // See http://docs.mathjax.org/en/latest/config-files.html + // pass other options into `MathJax.Hub.Config()` + TeX: { Macros: macros } }, dependencies: [ diff --git a/plugin/math/math.js b/plugin/math/math.js index 7867376..29445cd 100755 --- a/plugin/math/math.js +++ b/plugin/math/math.js @@ -7,19 +7,26 @@ var RevealMath = window.RevealMath || (function(){ var options = Reveal.getConfig().math || {}; - options.mathjax = options.mathjax || 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js'; - options.config = options.config || 'TeX-AMS_HTML-full'; - options.tex2jax = options.tex2jax || { - inlineMath: [['$','$'],['\\(','\\)']] , - skipTags: ['script','noscript','style','textarea','pre'] }; + var mathjax = options.mathjax || 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js'; + var config = options.config || 'TeX-AMS_HTML-full'; + var url = mathjax + '?config=' + config; - loadScript( options.mathjax + '?config=' + options.config, function() { + var defaultOptions = { + messageStyle: 'none', + tex2jax: { + inlineMath: [ [ '$', '$' ], [ '\\(', '\\)' ] ], + skipTags: [ 'script', 'noscript', 'style', 'textarea', 'pre' ] + }, + skipStartupTypeset: true + }; - MathJax.Hub.Config({ - messageStyle: 'none', - tex2jax: options.tex2jax, - skipStartupTypeset: true - }); + defaults( options, defaultOptions ); + defaults( options.tex2jax, defaultOptions.tex2jax ); + options.mathjax = options.config = null; + + loadScript( url, function() { + + MathJax.Hub.Config( options ); // Typeset followed by an immediate reveal.js layout since // the typesetting process could affect slide height @@ -35,6 +42,16 @@ var RevealMath = window.RevealMath || (function(){ } ); + function defaults( options, defaultOptions ) { + + for ( var i in defaultOptions ) { + if ( !options.hasOwnProperty( i ) ) { + options[i] = defaultOptions[i]; + } + } + + } + function loadScript( url, callback ) { var head = document.querySelector( 'head' ); diff --git a/test/examples/math.html b/test/examples/math.html index 6b879be..0f74a8f 100644 --- a/test/examples/math.html +++ b/test/examples/math.html @@ -83,6 +83,14 @@ </section> <section> + <h3>TeX Macros</h3> + + Here is a common vector space: + \[L^2(\R) = \set{u : \R \to \R}{\int_\R |u|^2 < +\infty}\] + used in functional analysis. + </section> + + <section> <section> <h3>The Lorenz Equations</h3> @@ -153,6 +161,14 @@ \] </div> </section> + + <section> + <h3>TeX Macros</h3> + + Here is a common vector space: + \[L^2(\R) = \set{u : \R \to \R}{\int_\R |u|^2 < +\infty}\] + used in functional analysis. + </section> </section> </div> @@ -169,7 +185,13 @@ math: { // mathjax: 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js', - config: 'TeX-AMS_HTML-full' + config: 'TeX-AMS_HTML-full', + TeX: { + Macros: { + R: '\\mathbb{R}', + set: [ '\\left\\{#1 \\; ; \\; #2\\right\\}', 2 ] + } + } }, dependencies: [ |