From b17e285164bb17b920e8759ccb2891e147a0397e Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 13 Aug 2013 08:53:31 -0400 Subject: [PATCH] mathjax plugin updates #531 --- examples/math.html | 4 ++-- plugin/math/math.js | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/math.html b/examples/math.html index 7d3eba2..867c45e 100644 --- a/examples/math.html +++ b/examples/math.html @@ -182,8 +182,8 @@ transition: 'linear', math: { - // host: 'http://cdn.mathjax.org/mathjax/latest/MathJax.js', - mode: 'TeX-AMS_HTML-full' + // mathjax: 'http://cdn.mathjax.org/mathjax/latest/MathJax.js', + dialect: 'TeX-AMS_HTML-full' }, dependencies: [ diff --git a/plugin/math/math.js b/plugin/math/math.js index d021fdc..104d0e5 100755 --- a/plugin/math/math.js +++ b/plugin/math/math.js @@ -7,25 +7,26 @@ var RevealMath = window.RevealMath || (function(){ var config = Reveal.getConfig().math || {}; - config.host = config.host || 'http://cdn.mathjax.org/mathjax/latest/MathJax.js'; - config.mode = config.mode || 'TeX-AMS_HTML-full'; + config.mathjax = config.mathjax || 'http://cdn.mathjax.org/mathjax/latest/MathJax.js'; + config.dialect = config.dialect || 'TeX-AMS_HTML-full'; - loadScript( config.host + '?config=' + config.mode, function() { + loadScript( config.mathjax + '?config=' + config.dialect, function() { MathJax.Hub.Config({ messageStyle: 'none', - tex2jax: { inlineMath: [['$','$'],['\\(','\\)']] } + tex2jax: { inlineMath: [['$','$'],['\\(','\\)']] }, + skipStartupTypeset: true }); - // Process any math inside of the current slide when navigating, - // this is needed since it's not possible to typeset equations - // within invisible elements (far future or past). + // Typeset followed by an immediate reveal.js layout since + // the typesetting process could affect slide height + MathJax.Hub.Queue( [ 'Typeset', MathJax.Hub ] ); + MathJax.Hub.Queue( Reveal.layout ); + + // Reprocess equations in slides when they turn visible Reveal.addEventListener( 'slidechanged', function( event ) { - // This will only typeset equations that have not yet been - // processed, as well as equations that have change since - // last being processed. - MathJax.Hub.Update( event.currentSlide ); + MathJax.Hub.Queue( [ 'Typeset', MathJax.Hub, event.currentSlide ] ); } );