Skip to content

Conversation

@pkra
Copy link
Contributor

@pkra pkra commented Feb 10, 2015

Are we good to go? E.g., #64 seems fixed now.

Also fixes #85, #82, #70, #62, #31

@dpvc
Copy link
Member

dpvc commented Feb 11, 2015

I was planning to make the pull request myself, but was out of town all day yesterday. When I was putting the final touches on things, I checked to see what version jsdom is at, since we have a fixed version in the package.json file; they are now at 3.1.1, and I thought I'd see if MathJax-node would work with that. It turns out that something is not working (it says it can't find the MathJax.js file, but the URL is correct, and the same one that works in 1.0.2, so something else has changed. I'm not sure if they implemented some form of same-origin policy, or added restrictions on file:// URL's or what, but I haven't been able to track it down yet. I thought if was an easy fix, we could update, but it looks like it is going to be harder. I do want to make one more change before merging the branch, but that should be soon.

dpvc and others added 8 commits February 11, 2015 15:35
…the base is about:blank. This allows jsdom 3.x to be used.
This makes it easier to use on operating systems (Windows) where /tmp
does not exist (and is probably the right thing to do anyhow).
In addition to being more secure, execFile (with arguments as an array)
should work on all platforms because it does not require a hardcoded
quote character. (On windows, quoting with the single ' causes this
call to fail.)
@dpvc
Copy link
Member

dpvc commented Feb 14, 2015

OK, I think this is ready to go. I've tested in Windows and MacOS. Shall we merge and tag a release?

@dpvc
Copy link
Member

dpvc commented Feb 14, 2015

Alternatively, we could wait for the CLA for the last couple of pull requests, which look good.

@pkra
Copy link
Contributor Author

pkra commented Feb 16, 2015

I'm ok with waiting for the CLA a bit (since I made everyone wait a bit while being away).

Adds an 'extensions' option to config which takes a comma-separated
list of extensions to add to the default set. Then adds --extensions
parameter to each command-line tool to specify this value.

This allows use of MathJax features such as displaying invalid TeX
instead of failing to render (--extensions TeX/noUndefined), and
stripping out dangerous links from MathML (--extensions Safe).
@physikerwelt
Copy link
Contributor

@pkra Is there still a problem with this pull request?

@Rycochet
Copy link

Rycochet commented Mar 9, 2015

I've been using the develop branch (ie, the soon-to-be 0.3) in production for a couple of weeks now - so could this get a proper npm install too when merged?

@physikerwelt
Copy link
Contributor

@Rycochet you can specify the branch in the npm dependency (cf https://github.com/physikerwelt/mathoid-server/blob/master/package.json#L54)

@pkra
Copy link
Contributor Author

pkra commented Mar 9, 2015

@physikerwelt CLA is in the process and it's worth our time to wait for it.

@Rycochet
Copy link

Rycochet commented Mar 9, 2015

@physikerwelt I was meaning on npmjs btw - https://www.npmjs.com/ - would mean it's as simple as "npm install mathjax-node" to get this installed, rather than requiring a full url ;-)

@pkra
Copy link
Contributor Author

pkra commented Mar 9, 2015

@Rycochet this is the plan once 0.3 is done; see #64

@dpvc
Copy link
Member

dpvc commented Mar 18, 2015

@pkra, if we haven't gotten the CLA for the last few pull requests, I think we should move ahead with this one, as I'd like to see v2.5 be available.

@dpvc
Copy link
Member

dpvc commented Mar 18, 2015

PS, it would also help to update the MathJax-node-2.5 branch of MathJax to include the 2.5.1 changes.

@pkra
Copy link
Contributor Author

pkra commented Mar 18, 2015

@dpvc the CLA is almost ready (it was much more complex this time). We should be ready today or tomorrow.

I'll update the mathjax-node branch.

@pkra
Copy link
Contributor Author

pkra commented Mar 18, 2015

Actually, update or create new 2.5.1 branch?

@dpvc
Copy link
Member

dpvc commented Mar 18, 2015

I guess you can make MathJax-node-2.5.1 and change the pointer in the json file. We haven't had an official version of MathJax-node that uses the MathJax-node-2.5, so I don't see a need to keep it, do you?

@pkra
Copy link
Contributor Author

pkra commented Mar 18, 2015

CLA is all set.

@pkra
Copy link
Contributor Author

pkra commented Mar 18, 2015

By which I mean the CLA for @sammarshallou.

@pkra
Copy link
Contributor Author

pkra commented Mar 19, 2015

Ok, new mathjax-node branch is ready. Since it's hard to compare the branches:

$ git diff --name-status mathjax-node-2.5..mathjax-node-2.5.1
M       package.json
M       unpacked/MathJax.js
D       unpacked/extensions/CHTML-preview.js
D       unpacked/extensions/FontWarnings.js
D       unpacked/extensions/HTML-CSS/handle-floats.js
D       unpacked/extensions/HelpDialog.js
D       unpacked/extensions/MatchWebFonts.js
D       unpacked/extensions/MathEvents.js
M       unpacked/extensions/MathML/mml3.js
D       unpacked/extensions/MathMenu.js
D       unpacked/extensions/MathZoom.js
D       unpacked/extensions/Safe.js
M       unpacked/extensions/TeX/AMSmath.js
M       unpacked/extensions/TeX/mathchoice.js
M       unpacked/extensions/TeX/noErrors.js
M       unpacked/extensions/TeX/unicode.js
M       unpacked/jax/element/mml/jax.js
M       unpacked/jax/output/NativeMML/config.js
M       unpacked/jax/output/NativeMML/jax.js

@pkra
Copy link
Contributor Author

pkra commented Mar 19, 2015

I've updated package.json in the develop branch to use the new MathJax branch.

@dpvc
Copy link
Member

dpvc commented Mar 20, 2015

OK, great. I'll merge the pulls from @sammarshallou and then check that everything is in order, and then we can merge this pull.

dpvc added 3 commits March 20, 2015 17:04
Use OS temp directory os.tmpdir() rather than hard-coded /tmp
Changed Batik calls to use execFile instead of exec
Allow extensions to be specified on command line
@pkra pkra mentioned this pull request Mar 23, 2015
3 tasks
@physikerwelt
Copy link
Contributor

@Rycochet You are right... a npm package would be nice. I can not build the mathoid debian package from source without a proper npm package. ppa complains that it is not allowed to fetch npm packages from github

@pkra
Copy link
Contributor Author

pkra commented Apr 1, 2015

The MathJax branch has been updated and I've merged in the MathEvents fix.

@pkra
Copy link
Contributor Author

pkra commented Apr 1, 2015

Updated readme and batik readme.

pkra added a commit that referenced this pull request Apr 1, 2015
@pkra pkra merged commit e69475e into master Apr 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

missing MathEvents extension

6 participants