Skip to content

Commit

Permalink
Merge pull request #183 from mathjax/develop
Browse files Browse the repository at this point in the history
Merge develop into master for v0.5.1 release
  • Loading branch information
pkra committed Feb 22, 2016
2 parents f3f9342 + ca0eb23 commit 83e67a2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# mathjax-node [![Build Status](https://travis-ci.org/mathjax/MathJax-node.svg?branch=develop)](https://travis-ci.org/mathjax/MathJax-node)

This repository contains files that provide APIs to call MathJax from
This repository contains files that provide APIs to call [MathJax](https://github.com/mathjax/mathjax) from
node.js programs. There is an API for converting individual math
expressions (in any of MathJax's input formats) into SVG images or MathML
code, and there is an API for converting HTML snippets containing any of
Expand Down
8 changes: 2 additions & 6 deletions lib/patch/jsdom.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@
// between node 4 and node 5, so check which one we have.
//

var fs = require('fs');

var PARSERS = 'jsdom/node_modules/cssstyle/lib/parsers.js'; // node 4 hierarchy
try {fs.accessSync('node_modules/'+PARSERS, fs.F_OK)} catch (e) {
PARSERS = 'cssstyle/lib/parsers.js'; // node 5 heirarchy
}
var PARSERS = 'jsdom/node_modules/cssstyle/lib/parsers.js'; // node 4 hierarchy
try {require(PARSERS)} catch (e) {PARSERS = 'cssstyle/lib/parsers.js'} // node 5 heirarchy

//
// Companion to implicitSetter, but for the individual parts.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mathjax-node",
"version": "0.5.0",
"version": "0.5.1",
"description": "API's for calling MathJax from node.js",
"keywords": [
"MathJax",
Expand Down

0 comments on commit 83e67a2

Please sign in to comment.