Skip to content

Merge develop into master for v0.5.1 release #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pkra merged 5 commits into from
Feb 22, 2016
Merged

Merge develop into master for v0.5.1 release #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29a934b
Update README.md
Pomax Feb 19, 2016
117d5b8
Make test for node hierarchy more robust. Resolves issues #172 and #…
dpvc Feb 21, 2016
46350d0
Merge pull request #178 from Pomax/patch-3
pkra Feb 22, 2016
9fe6bc8
Merge pull request #182 from mathjax/issue172
dpvc Feb 22, 2016
ca0eb23
Update package.json
pkra Feb 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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