Release v0.5.0-rc.1 #165
Release v0.5.0-rc.1 #165
Conversation
… horizontal lines from being properly displayed. We also need to add controls for scaling and possibly for setting the em size.
Improve examples
Move to stable nodejs releases for testing; fixes #138
… extenion names, for example); Don't call resetEquationNumbers if AMSmath hasn't been loaded; Fix a problem with in MathML for producing speech text; reomve mml from result if not needed after creating speech text.
Fix typo.
Update Readme
Update travis.yml
…rary problems. This provides a nice means of updating mathjax-node without needing to wait for jsdom or cssstyle to merge pull requests.
…on't need to set role any more
… (changed in jsdom 7.1.0)
Handle jsdom update in either node4 or node5 directory layout
Fix file check to work with node4.
Add more patches for padding and margin
Fix file check to work with node4.
* Update MathJax dependency to point to npm * update libs to match this change * Clean up dependecy versions
update .travis.yml
Update package.json to MathJax from npm
…line tools for AsciiMath and MathML to HTML.
|
Huh? We have a merge problem? |
|
It's the travis file; I don't see why but oh well. |
More CHTML support.
…h current develop branch
|
The issue seems to be the pull request #128, which was to master rather than to develop, and was never merged into develop. It changed the node version in travis tests to 4.1. The current travis file has set that back to 4, so that line is different in the two branches and is the source of the conflict. I merged 128 into develop, and tested it by hand first to be sure that develop would then merge cleanly, and it did when I do the merge by hand. But it still says that it doesn't merge here. I also tried changing that line back to 4.1, and seeing that that allowed the merge. Again, it does by hand, but not here. So I'm unsure what is going on with GitHub's PR that makes it different from standard merges. We may have to do the merge by hand rather than here. The only other thing I could think of is to use git rebase to remove PR #155, then merge with 128 again, then reapply #155. That can be done, but it would require unprotecting develop temporarily since it will require a forced push. I guess we have to be more careful about not making changes to master that aren't reflected in develop. |
package.json: update version for release candidate
package.json: point "main" to mj-single
|
Merged manually as discussed. |
No description provided.