diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index 5fec4cd4e..661f56873 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { sh 'mkdir -p /tmp/jenkins' sh 'latexmk -pdf MLS.tex' sh 'latexml --path=media MLS.tex --dest MLS.xml' - sh 'latexmlpost MLS.xml -format html -pmml --splitat=chapter --splitnaming=labelrelative --javascript=css/LaTeXML-maybeMathJax.js --navigationtoc=context --css=css/MLS.css --css=css/LaTeXML-navbar-left.css --dest MLS.html' + sh 'latexmlpost MLS.xml -format html -pmml --splitat=chapter --splitnaming=labelrelative --javascript=LaTeXML-maybeMathjax.js --navigationtoc=context --css=css/MLS.css --css=css/LaTeXML-navbar-left.css --dest MLS.html' sh 'ln -s preface.html Chx1.html' sh 'ln -s lexical-structure.html Ch2.html' sh 'ln -s operators-and-expressions.html Ch3.html' @@ -58,10 +58,10 @@ pipeline { sh 'ln -s modelica-revision-history.html A5.html' sh 'ln -s literature.html A6.html' sh script: '! (find . -type l -xtype l | egrep \'.*\')', label: 'Verify symbolic links work' - sh 'tar czf MLS.tar.gz *.html *.css media css/' + sh 'tar czf MLS.tar.gz *.html *.css *.js media/ css/' archiveArtifacts artifacts: 'MLS.tar.gz', fingerprint: true archiveArtifacts artifacts: 'MLS.pdf', fingerprint: true - stash name: 'MLS', includes: '*.html,*.css,MLS.pdf,media/**,css/**,MLS.tar.gz' + stash name: 'MLS', includes: '*.html,*.css,*.js,MLS.pdf,media/**,css/**,MLS.tar.gz' } } stage('upload') { @@ -85,7 +85,7 @@ pipeline { steps { unstash name: 'MLS' sh "test ! -z ${env.GIT_BRANCH}" - sshPublisher(publishers: [sshPublisherDesc(configName: 'ModelicaSpecification', transfers: [sshTransfer(remoteDirectory: "${env.GIT_BRANCH}", sourceFiles: '*.html,*.css,MLS.pdf,media/**,css/**')])]) + sshPublisher(publishers: [sshPublisherDesc(configName: 'ModelicaSpecification', transfers: [sshTransfer(remoteDirectory: "${env.GIT_BRANCH}", sourceFiles: '*.html,*.css,*.js,MLS.pdf,media/**,css/**')])]) } } stage('index') { diff --git a/.gitignore b/.gitignore index 82afade50..2c65a355a 100644 --- a/.gitignore +++ b/.gitignore @@ -148,10 +148,12 @@ sympy-plots-for-*.tex/ MLS\.pdf LaTeXML.css -MLS.tar.gz ltx-article.css ltx-listings.css ltx-report.css +LaTeXML-maybeMathjax.js + +MLS.tar.gz # Directories belonging to the LaTeXML build /annotations/ diff --git a/Makefile b/Makefile index 01b9cd858..5a56e6d70 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ clean-pdf: .PHONY: clean-html clean-html: - -rm MLS.xml LaTeXML.cache *.html + -rm MLS.xml LaTeXML.cache *.html *.css *.js .PHONY: clean clean: clean-pdf clean-html @@ -24,4 +24,4 @@ MLS.pdf: *.tex chapters/*.tex # Not using %.html since nmake does not support it (instead using old-style suffix rules) MLS.html: MLS.tex chapters/*.tex $(LATEXMLPREFIX)latexml MLS.tex --path=media --dest MLS.xml - $(LATEXMLPREFIX)latexmlpost MLS.xml -format html -pmml --splitat=chapter --splitnaming=labelrelative --javascript=css/LaTeXML-maybeMathJax.js --navigationtoc=context --css=css/MLS.css --css=css/MLS-navbar-left.css --dest $@ + $(LATEXMLPREFIX)latexmlpost MLS.xml -format html -pmml --splitat=chapter --splitnaming=labelrelative --javascript=LaTeXML-maybeMathjax.js --navigationtoc=context --css=css/MLS.css --css=css/MLS-navbar-left.css --dest $@ diff --git a/css/LaTeXML-maybeMathJax.js b/css/LaTeXML-maybeMathJax.js deleted file mode 100644 index 18c27582f..000000000 --- a/css/LaTeXML-maybeMathJax.js +++ /dev/null @@ -1,34 +0,0 @@ -//====================================================================== -// Load MathJax, IFF the current browser can't handle MathML natively. - -(function() { - var mathjax_url = - "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=MML_HTMLorMML"; - - function refreshMath() { - // Maybe unnecessary, or overkill, but... - if (typeof MathJax != "undefined") { - MathJax.Hub.Queue(["Typeset", MathJax.Hub]); - } - } - - // Add script element loading MathJax unless we can handle MathML - var agent = navigator.userAgent; - var is_gecko = (agent.indexOf("Gecko") > -1 && - agent.indexOf("KHTML") === -1 && - agent.indexOf("Trident") === -1); - // Check for MathPlayer, but only IE's before IE 10 when it was disabled. - var has_mathplayer = (agent.indexOf("MathPlayer") > -1 && - agent.indexOf("rv:1") === -1); /* till ie 20! */ - if (!is_gecko && !has_mathplayer) { - var head = document.getElementsByTagName("head")[0]; - if (head != null) { - var script = document.createElement("script"); - script.type = "text/javascript"; - script.src = mathjax_url; - script.onreadystatechange = refreshMath; - script.onload = refreshMath; - head.appendChild(script); - } - } -}()); diff --git a/edit/Sublime/config.sublime-project b/edit/Sublime/config.sublime-project index c6efc894b..1cd0b3dd9 100644 --- a/edit/Sublime/config.sublime-project +++ b/edit/Sublime/config.sublime-project @@ -20,6 +20,7 @@ "ltx-article.css", "ltx-listings.css", "ltx-report.css", + "LaTeXML-maybeMathjax.js", "MLS.fdb_latexmk", "MLS.synctex.gz", ],