Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401926 )
Change subject: Update mathoid to bad5ec8d4
......................................................................
Update mathoid to bad5ec8d4
List of changes:
xxxxxxx Update node module dependencies
Change-Id: I8f8a682834a1dc0026f671736f3b5eca7c90f247
---
A node_modules/.bin/texvcinfo
M node_modules/.bin/texvcjs
M node_modules/commander/package.json
M node_modules/kad/package.json
R node_modules/mathoid-texvcjs/.istanbul.yml
R node_modules/mathoid-texvcjs/.jshintignore
R node_modules/mathoid-texvcjs/.jshintrc
R node_modules/mathoid-texvcjs/.npmignore
R node_modules/mathoid-texvcjs/.travis.yml
R node_modules/mathoid-texvcjs/bin/texvcjs
R node_modules/mathoid-texvcjs/lib/ast.js
R node_modules/mathoid-texvcjs/lib/astutil.js
R node_modules/mathoid-texvcjs/lib/build-parser.js
R node_modules/mathoid-texvcjs/lib/index.js
R node_modules/mathoid-texvcjs/lib/parser.js
R node_modules/mathoid-texvcjs/lib/parser.pegjs
R node_modules/mathoid-texvcjs/lib/render.js
R node_modules/mathoid-texvcjs/lib/texutil.js
R node_modules/mathoid-texvcjs/package.json
R node_modules/mathoid-texvcjs/test/all.js
R node_modules/mathoid-texvcjs/test/api.js
R node_modules/mathoid-texvcjs/test/ast.js
R node_modules/mathoid-texvcjs/test/chem-regression.js
R node_modules/mathoid-texvcjs/test/chem-regression.json
R node_modules/mathoid-texvcjs/test/chemtest.tex
R node_modules/mathoid-texvcjs/test/contains.js
R node_modules/mathoid-texvcjs/test/en-wiki-formulae.js
R node_modules/mathoid-texvcjs/test/en-wiki-formulae.json
R node_modules/mathoid-texvcjs/test/mathjax-texvc.js
R node_modules/mathoid-texvcjs/test/mathjax-texvc.json
R node_modules/mathoid-texvcjs/test/mocha.opts
R node_modules/mathoid-texvcjs/test/parser.js
R node_modules/mathoid-texvcjs/test/render.js
M node_modules/swagger-ui/package.json
M node_modules/texvcinfo/.codeclimate.yml
M node_modules/texvcinfo/.eslintignore
M node_modules/texvcinfo/.eslintrc
M node_modules/texvcinfo/.jshintignore
M node_modules/texvcinfo/.jshintrc
M node_modules/texvcinfo/.npmignore
M node_modules/texvcinfo/.travis.yml
M node_modules/texvcinfo/doc/commands.tex
M node_modules/texvcinfo/doc/literals.tex
M node_modules/texvcinfo/doc/main.pdf
M node_modules/texvcinfo/doc/main.tex
M node_modules/texvcinfo/lib/arrayTree.js
M node_modules/texvcinfo/lib/d3json.js
M node_modules/texvcinfo/lib/extractors/mods.js
M node_modules/texvcinfo/lib/extractors/subscripts.js
M node_modules/texvcinfo/lib/feedback.js
M node_modules/texvcinfo/lib/flatList.js
M node_modules/texvcinfo/lib/identifier.js
M node_modules/texvcinfo/lib/index.js
M node_modules/texvcinfo/lib/letterMods.json
M node_modules/texvcinfo/lib/literals.json
M node_modules/texvcinfo/lib/tokenTypes.js
D node_modules/texvcinfo/node_modules/.bin/texvcjs
M node_modules/texvcinfo/package.json
M node_modules/texvcinfo/test/feedback.js
M node_modules/texvcinfo/test/gold.js
M node_modules/texvcinfo/test/goldData.js
M node_modules/texvcinfo/test/identifier.js
M node_modules/texvcinfo/test/index.js
M node_modules/texvcinfo/test/mocha.opts
M node_modules/texvcinfo/test/tokenizer.js
M node_modules/texvcinfo/test/tree2d3json.js
M node_modules/texvcinfo/test/treeWriter.js
M node_modules/texvcinfo/utils/createDoc.js
M node_modules/texvcinfo/vis/index.html
69 files changed, 106 insertions(+), 95 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy
refs/changes/26/401926/1
diff --git a/node_modules/.bin/texvcinfo b/node_modules/.bin/texvcinfo
new file mode 120000
index 0000000..c04501a
--- /dev/null
+++ b/node_modules/.bin/texvcinfo
@@ -0,0 +1 @@
+../texvcinfo/bin/texvcinfo
\ No newline at end of file
diff --git a/node_modules/.bin/texvcjs b/node_modules/.bin/texvcjs
index c04501a..5f7e9a4 120000
--- a/node_modules/.bin/texvcjs
+++ b/node_modules/.bin/texvcjs
@@ -1 +1 @@
-../texvcinfo/bin/texvcinfo
\ No newline at end of file
+../mathoid-texvcjs/bin/texvcjs
\ No newline at end of file
diff --git a/node_modules/commander/package.json
b/node_modules/commander/package.json
index 24a31d7..9d7038b 100644
--- a/node_modules/commander/package.json
+++ b/node_modules/commander/package.json
@@ -39,9 +39,9 @@
},
"_requiredBy": [
"#DEV:/",
+ "/mathoid-texvcjs",
"/speech-rule-engine",
- "/texvcinfo",
- "/texvcinfo/mathoid-texvcjs"
+ "/texvcinfo"
],
"_resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz";,
"_shasum": "0f5946c427ed9ec0d91a46bb9def53e54650e555",
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 5d8d870..e07d9da 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";,
- "_shasum": "6def549a4e39b5cbb43e008cf91234548769407f",
+ "_shasum": "cffb35582d9f2ce2d2bc4fac01dd14e94361da98",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/.istanbul.yml
b/node_modules/mathoid-texvcjs/.istanbul.yml
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/.istanbul.yml
rename to node_modules/mathoid-texvcjs/.istanbul.yml
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/.jshintignore
b/node_modules/mathoid-texvcjs/.jshintignore
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/.jshintignore
rename to node_modules/mathoid-texvcjs/.jshintignore
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/.jshintrc
b/node_modules/mathoid-texvcjs/.jshintrc
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/.jshintrc
rename to node_modules/mathoid-texvcjs/.jshintrc
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/.npmignore
b/node_modules/mathoid-texvcjs/.npmignore
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/.npmignore
rename to node_modules/mathoid-texvcjs/.npmignore
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/.travis.yml
b/node_modules/mathoid-texvcjs/.travis.yml
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/.travis.yml
rename to node_modules/mathoid-texvcjs/.travis.yml
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/bin/texvcjs
b/node_modules/mathoid-texvcjs/bin/texvcjs
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/bin/texvcjs
rename to node_modules/mathoid-texvcjs/bin/texvcjs
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/ast.js
b/node_modules/mathoid-texvcjs/lib/ast.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/ast.js
rename to node_modules/mathoid-texvcjs/lib/ast.js
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/astutil.js
b/node_modules/mathoid-texvcjs/lib/astutil.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/astutil.js
rename to node_modules/mathoid-texvcjs/lib/astutil.js
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/build-parser.js
b/node_modules/mathoid-texvcjs/lib/build-parser.js
similarity index 100%
rename from
node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/build-parser.js
rename to node_modules/mathoid-texvcjs/lib/build-parser.js
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/index.js
b/node_modules/mathoid-texvcjs/lib/index.js
similarity index 77%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/index.js
rename to node_modules/mathoid-texvcjs/lib/index.js
index fe914a3..2d41f93 100644
--- a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/index.js
+++ b/node_modules/mathoid-texvcjs/lib/index.js
@@ -18,27 +18,33 @@
var astutil = require('./astutil');
module.exports.contains_func = astutil.contains_func;
+/*
+ Gets the location information of an error object, or returns default error
location if no location information was
+ specified.
+ */
+function getLocationInfo(e){
+ try {
+ return { offset: e.location.start.offset, line: e.location.start.line,
column: e.location.start.column };
+ } catch (err) {
+ return {offset:0, line: 0, column:0};
+ }
+}
+
function handleTexError(e, options) {
if (options && options.debug) {
throw e;
}
- /* istanbul ignore else */
+ var report = {error:e, success:false, warnings:[]};
if (e instanceof Parser.SyntaxError) {
if (e.message === 'Illegal TeX function') {
- return {
- status: 'F', details: e.found,
- offset: e.offset, line: e.line, column: e.column,
- warnings: []
- };
+ report = Object.assign(report, {status: 'F', details: e.found},
getLocationInfo(e));
+ } else {
+ report = Object.assign(report, {status: 'S', details:
e.toString()}, getLocationInfo(e));
}
- return {
- status: 'S', details: e.toString(),
- offset: e.offset, line: e.line, column: e.column,
- warnings: []
- };
} else { // this else statement is superfluous and was inserted for the
coverage reporter
- return { status: '-', details: e.toString(), warnings: [] };
+ report = Object.assign(report, {status: '-', details: e.toString() });
}
+ return report;
}
var check = module.exports.check = function(input, options, warnings) {
@@ -65,7 +71,7 @@
input = Parser.parse(input, options);
}
var output = render(input);
- var result = { status: '+', output: output, warnings: warnings };
+ var result = { status: '+', output: output, warnings: warnings,
input:input };
['ams', 'cancel', 'color', 'euro', 'teubner', 'mhchem',
'mathoid'].forEach(function(pkg) {
pkg = pkg + '_required';
result[pkg] = astutil.contains_func(input, tu[pkg]);
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
b/node_modules/mathoid-texvcjs/lib/parser.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
rename to node_modules/mathoid-texvcjs/lib/parser.js
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.pegjs
b/node_modules/mathoid-texvcjs/lib/parser.pegjs
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.pegjs
rename to node_modules/mathoid-texvcjs/lib/parser.pegjs
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/render.js
b/node_modules/mathoid-texvcjs/lib/render.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/render.js
rename to node_modules/mathoid-texvcjs/lib/render.js
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/texutil.js
b/node_modules/mathoid-texvcjs/lib/texutil.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/texutil.js
rename to node_modules/mathoid-texvcjs/lib/texutil.js
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json
b/node_modules/mathoid-texvcjs/package.json
similarity index 76%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json
rename to node_modules/mathoid-texvcjs/package.json
index 42894bd..dff15e8 100644
--- a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json
+++ b/node_modules/mathoid-texvcjs/package.json
@@ -2,25 +2,25 @@
"_args": [
[
{
- "raw": "mathoid-texvcjs@^0.3.3",
+ "raw": "mathoid-texvcjs@^0.3.6",
"scope": null,
"escapedName": "mathoid-texvcjs",
"name": "mathoid-texvcjs",
- "rawSpec": "^0.3.3",
- "spec": ">=0.3.3 <0.4.0",
+ "rawSpec": "^0.3.6",
+ "spec": ">=0.3.6 <0.4.0",
"type": "range"
},
"/opt/service/node_modules/texvcinfo"
]
],
- "_from": "mathoid-texvcjs@>=0.3.3 <0.4.0",
- "_id": "mathoid-texvcjs@0.3.5",
+ "_from": "mathoid-texvcjs@>=0.3.6 <0.4.0",
+ "_id": "mathoid-texvcjs@0.3.6",
"_inCache": true,
- "_location": "/texvcinfo/mathoid-texvcjs",
+ "_location": "/mathoid-texvcjs",
"_nodeVersion": "6.11.1",
"_npmOperationalInternal": {
"host": "s3://npm-registry-packages",
- "tmp": "tmp/mathoid-texvcjs-0.3.5.tgz_1514978184857_0.008520072558894753"
+ "tmp": "tmp/mathoid-texvcjs-0.3.6.tgz_1515001344596_0.972505681682378"
},
"_npmUser": {
"name": "doorman",
@@ -29,21 +29,21 @@
"_npmVersion": "3.10.10",
"_phantomChildren": {},
"_requested": {
- "raw": "mathoid-texvcjs@^0.3.3",
+ "raw": "mathoid-texvcjs@^0.3.6",
"scope": null,
"escapedName": "mathoid-texvcjs",
"name": "mathoid-texvcjs",
- "rawSpec": "^0.3.3",
- "spec": ">=0.3.3 <0.4.0",
+ "rawSpec": "^0.3.6",
+ "spec": ">=0.3.6 <0.4.0",
"type": "range"
},
"_requiredBy": [
"/texvcinfo"
],
- "_resolved":
"https://registry.npmjs.org/mathoid-texvcjs/-/mathoid-texvcjs-0.3.5.tgz";,
- "_shasum": "5055c5683932b44ef7584c494f8db33bbea6af17",
+ "_resolved":
"https://registry.npmjs.org/mathoid-texvcjs/-/mathoid-texvcjs-0.3.6.tgz";,
+ "_shasum": "a7e52625a7a3cf2953e4020ffdaffa13ff6ade21",
"_shrinkwrap": null,
- "_spec": "mathoid-texvcjs@^0.3.3",
+ "_spec": "mathoid-texvcjs@^0.3.6",
"_where": "/opt/service/node_modules/texvcinfo",
"bin": {
"texvcjs": "./bin/texvcjs"
@@ -65,10 +65,10 @@
},
"directories": {},
"dist": {
- "shasum": "5055c5683932b44ef7584c494f8db33bbea6af17",
- "tarball":
"https://registry.npmjs.org/mathoid-texvcjs/-/mathoid-texvcjs-0.3.5.tgz";
+ "shasum": "a7e52625a7a3cf2953e4020ffdaffa13ff6ade21",
+ "tarball":
"https://registry.npmjs.org/mathoid-texvcjs/-/mathoid-texvcjs-0.3.6.tgz";
},
- "gitHead": "e86c8d91e7dbadc32a119ed0d531c95c437d3511",
+ "gitHead": "4eba919c216caae9607a953301643ce757bd02b0",
"homepage": "https://github.com/wikimedia/texvcjs#readme";,
"keywords": [
"tex",
@@ -102,5 +102,5 @@
"report-coverage": "cat ./coverage/lcov.info | coveralls",
"test": "node -e 'require(\"./lib/build-parser\")' && jshint . && mocha"
},
- "version": "0.3.5"
+ "version": "0.3.6"
}
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/all.js
b/node_modules/mathoid-texvcjs/test/all.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/all.js
rename to node_modules/mathoid-texvcjs/test/all.js
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/api.js
b/node_modules/mathoid-texvcjs/test/api.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/api.js
rename to node_modules/mathoid-texvcjs/test/api.js
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/ast.js
b/node_modules/mathoid-texvcjs/test/ast.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/ast.js
rename to node_modules/mathoid-texvcjs/test/ast.js
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.js
b/node_modules/mathoid-texvcjs/test/chem-regression.js
similarity index 95%
rename from
node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.js
rename to node_modules/mathoid-texvcjs/test/chem-regression.js
index e91dd02..299b5bd 100644
---
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.js
+++ b/node_modules/mathoid-texvcjs/test/chem-regression.js
@@ -6,7 +6,7 @@
// run them in chunks in order to speed up reporting.
var CHUNKSIZE = 1000;
-describe.skip('All formulae from chem regression dataset:', function() {
+describe('All formulae from chem regression dataset:', function() {
this.timeout(0);
// read test cases
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.json
b/node_modules/mathoid-texvcjs/test/chem-regression.json
similarity index 100%
rename from
node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.json
rename to node_modules/mathoid-texvcjs/test/chem-regression.json
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chemtest.tex
b/node_modules/mathoid-texvcjs/test/chemtest.tex
similarity index 100%
rename from
node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chemtest.tex
rename to node_modules/mathoid-texvcjs/test/chemtest.tex
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/contains.js
b/node_modules/mathoid-texvcjs/test/contains.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/contains.js
rename to node_modules/mathoid-texvcjs/test/contains.js
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/en-wiki-formulae.js
b/node_modules/mathoid-texvcjs/test/en-wiki-formulae.js
similarity index 100%
rename from
node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/en-wiki-formulae.js
rename to node_modules/mathoid-texvcjs/test/en-wiki-formulae.js
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/en-wiki-formulae.json
b/node_modules/mathoid-texvcjs/test/en-wiki-formulae.json
similarity index 100%
rename from
node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/en-wiki-formulae.json
rename to node_modules/mathoid-texvcjs/test/en-wiki-formulae.json
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.js
b/node_modules/mathoid-texvcjs/test/mathjax-texvc.js
similarity index 100%
rename from
node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.js
rename to node_modules/mathoid-texvcjs/test/mathjax-texvc.js
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.json
b/node_modules/mathoid-texvcjs/test/mathjax-texvc.json
similarity index 100%
rename from
node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.json
rename to node_modules/mathoid-texvcjs/test/mathjax-texvc.json
diff --git
a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mocha.opts
b/node_modules/mathoid-texvcjs/test/mocha.opts
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mocha.opts
rename to node_modules/mathoid-texvcjs/test/mocha.opts
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/parser.js
b/node_modules/mathoid-texvcjs/test/parser.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/parser.js
rename to node_modules/mathoid-texvcjs/test/parser.js
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/render.js
b/node_modules/mathoid-texvcjs/test/render.js
similarity index 100%
rename from node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/render.js
rename to node_modules/mathoid-texvcjs/test/render.js
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index f004177..33d7d09 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "9938014ebe2fa9b285e5d6f0498cc69a48d0d5ab",
+ "_shasum": "89fb36bbe3f6f65d079b8024e6c017c2b07b58e5",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/texvcinfo/.codeclimate.yml
b/node_modules/texvcinfo/.codeclimate.yml
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/.eslintignore
b/node_modules/texvcinfo/.eslintignore
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/.eslintrc b/node_modules/texvcinfo/.eslintrc
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/.jshintignore
b/node_modules/texvcinfo/.jshintignore
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/.jshintrc b/node_modules/texvcinfo/.jshintrc
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/.npmignore
b/node_modules/texvcinfo/.npmignore
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/.travis.yml
b/node_modules/texvcinfo/.travis.yml
old mode 100755
new mode 100644
index 3ac81f0..c711647
--- a/node_modules/texvcinfo/.travis.yml
+++ b/node_modules/texvcinfo/.travis.yml
@@ -1,8 +1,8 @@
language: node_js
node_js:
- - "0.10"
- - "0.12"
- - "4.1"
- - "iojs"
+ - "4"
+ - "6"
+ - "8"
+ - "node"
script: npm run-script coverage
after_success: npm run coveralls
\ No newline at end of file
diff --git a/node_modules/texvcinfo/doc/commands.tex
b/node_modules/texvcinfo/doc/commands.tex
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/doc/literals.tex
b/node_modules/texvcinfo/doc/literals.tex
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/doc/main.pdf
b/node_modules/texvcinfo/doc/main.pdf
old mode 100755
new mode 100644
Binary files differ
diff --git a/node_modules/texvcinfo/doc/main.tex
b/node_modules/texvcinfo/doc/main.tex
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/arrayTree.js
b/node_modules/texvcinfo/lib/arrayTree.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/d3json.js
b/node_modules/texvcinfo/lib/d3json.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/extractors/mods.js
b/node_modules/texvcinfo/lib/extractors/mods.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/extractors/subscripts.js
b/node_modules/texvcinfo/lib/extractors/subscripts.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/feedback.js
b/node_modules/texvcinfo/lib/feedback.js
old mode 100755
new mode 100644
index f9213e8..62abddd
--- a/node_modules/texvcinfo/lib/feedback.js
+++ b/node_modules/texvcinfo/lib/feedback.js
@@ -7,29 +7,24 @@
var out = {
success: true
};
- try {
- // allow user to pass a parsed AST as input, as well as a string
- if (typeof(input) === 'string') {
- input = texvcjs.parse(input, {usemathrm: true});
- }
- } catch (e) {
- out.success = false;
- out.error = e;
- return out;
- }
options = options || {};
- var texvcres = texvcjs.check(input, options);
- if (texvcres.status !== '+') {
- out.success = false;
- out.error = {
- status: texvcres.status,
- message: "Attempting to use the $\\ce$ command outside of a
chemistry environment.",
- detail: texvcres.details,
- found: "\\ce", // ce is the only command that can trigger this
problem
- name: "SyntaxError"
- };
- return out;
+ var texvcres = texvcjs.check(input, Object.assign(options,
{usemathrm:true}));
+ //TODO: Backwards compatibility consider to remove in the next update
+ if (texvcres.status === 'C') {
+ out.success = false;
+ out.error = {
+ status: texvcres.status,
+ message: "Attempting to use the $\\ce$ command outside of a chemistry
environment.",
+ detail: texvcres.details,
+ found: "\\ce", // ce is the only command that can trigger this problem
+ name: "SyntaxError"
+ };
+ return out;
}
+ if (texvcres.status !== '+') {
+ return texvcres;
+ }
+ input = texvcres.input;
out.checked = texvcres.output;
out.requiredPackages = [];
packageList.forEach(function (pkg) {
diff --git a/node_modules/texvcinfo/lib/flatList.js
b/node_modules/texvcinfo/lib/flatList.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/identifier.js
b/node_modules/texvcinfo/lib/identifier.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/index.js
b/node_modules/texvcinfo/lib/index.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/letterMods.json
b/node_modules/texvcinfo/lib/letterMods.json
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/literals.json
b/node_modules/texvcinfo/lib/literals.json
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/lib/tokenTypes.js
b/node_modules/texvcinfo/lib/tokenTypes.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/node_modules/.bin/texvcjs
b/node_modules/texvcinfo/node_modules/.bin/texvcjs
deleted file mode 120000
index 5f7e9a4..0000000
--- a/node_modules/texvcinfo/node_modules/.bin/texvcjs
+++ /dev/null
@@ -1 +0,0 @@
-../mathoid-texvcjs/bin/texvcjs
\ No newline at end of file
diff --git a/node_modules/texvcinfo/package.json
b/node_modules/texvcinfo/package.json
old mode 100755
new mode 100644
index 16ace6f..eaad57e
--- a/node_modules/texvcinfo/package.json
+++ b/node_modules/texvcinfo/package.json
@@ -14,22 +14,20 @@
]
],
"_from": "texvcinfo@>=0.5.1 <0.6.0",
- "_id": "texvcinfo@0.5.1",
+ "_id": "texvcinfo@0.5.2",
"_inCache": true,
"_location": "/texvcinfo",
"_nodeVersion": "6.11.4",
"_npmOperationalInternal": {
"host": "s3://npm-registry-packages",
- "tmp": "tmp/texvcinfo-0.5.1.tgz_1510323352826_0.021044683875516057"
+ "tmp": "tmp/texvcinfo-0.5.2.tgz_1515029756596_0.3769943295046687"
},
"_npmUser": {
"name": "physikerwelt",
"email": "git...@ckurs.de"
},
"_npmVersion": "3.10.10",
- "_phantomChildren": {
- "commander": "2.12.2"
- },
+ "_phantomChildren": {},
"_requested": {
"raw": "texvcinfo@^0.5.1",
"scope": null,
@@ -42,20 +40,20 @@
"_requiredBy": [
"/"
],
- "_resolved": "https://registry.npmjs.org/texvcinfo/-/texvcinfo-0.5.1.tgz";,
- "_shasum": "c63973c564a2c8c7c280f936c661baa13ca43508",
+ "_resolved": "https://registry.npmjs.org/texvcinfo/-/texvcinfo-0.5.2.tgz";,
+ "_shasum": "5da6bcaeac9af9e0a41a59d3d58684dfafae0008",
"_shrinkwrap": null,
"_spec": "texvcinfo@^0.5.1",
"_where": "/opt/service",
"bin": {
- "texvcjs": "./bin/texvcinfo"
+ "texvcinfo": "./bin/texvcinfo"
},
"bugs": {
"url": "https://github.com/physikerwelt/texvcinfo/issues";
},
"dependencies": {
"commander": "^2.11.0",
- "mathoid-texvcjs": "^0.3.3"
+ "mathoid-texvcjs": "^0.3.6"
},
"description": "Extracts information from texvc code.",
"devDependencies": {
@@ -68,10 +66,10 @@
},
"directories": {},
"dist": {
- "shasum": "c63973c564a2c8c7c280f936c661baa13ca43508",
- "tarball": "https://registry.npmjs.org/texvcinfo/-/texvcinfo-0.5.1.tgz";
+ "shasum": "5da6bcaeac9af9e0a41a59d3d58684dfafae0008",
+ "tarball": "https://registry.npmjs.org/texvcinfo/-/texvcinfo-0.5.2.tgz";
},
- "gitHead": "0d971c774aecfd29589045e68d8b5dee41d09b91",
+ "gitHead": "a1137ff7213a75c4bba25906a52b359d49869477",
"homepage": "https://github.com/physikerwelt/texvcinfo#readme";,
"keywords": [
"tex",
@@ -102,5 +100,5 @@
"coveralls": "npm run coverage && cat ./coverage/lcov.info | coveralls",
"test": "jshint . && mocha"
},
- "version": "0.5.1"
+ "version": "0.5.2"
}
diff --git a/node_modules/texvcinfo/test/feedback.js
b/node_modules/texvcinfo/test/feedback.js
old mode 100755
new mode 100644
index 79bfcc1..2073fd5
--- a/node_modules/texvcinfo/test/feedback.js
+++ b/node_modules/texvcinfo/test/feedback.js
@@ -47,32 +47,44 @@
{
input: 'a+\\badfunc-b',
out: {
- "error": {
- "expected": [],
- "found": "\\badfunc",
- "location": {
- "end": {
- "column": 11,
- "line": 1,
- "offset": 10
- },
- "start": {
- "column": 3,
- "line": 1,
- "offset": 2
- }
- },
- "message": "Illegal TeX function",
- "name": "SyntaxError"
+ "column": 3,
+ "details": "\\badfunc",
+ "error": {
+ "expected": [],
+ "found": "\\badfunc",
+ "location": {
+ "end": {
+ "column": 11,
+ "line": 1,
+ "offset": 10
+ },
+ "start": {
+ "column": 3,
+ "line": 1,
+ "offset": 2
+ }
},
- "success": false
+ "message": "Illegal TeX function",
+ "name": "SyntaxError"
+ },
+ "line": 1,
+ "offset": 2,
+ "status": "F",
+ "success": false,
+ "warnings": []
}
},
{
input: '\\sin\\left(x)',
out: {
- "success": false,
- "error": {
+ "line": 1,
+ "offset": 12,
+ "status": "S",
+ "success": false,
+ "warnings": [],
+ "column": 13,
+ "details": "SyntaxError: Expected \"-\", \"[\", \"\\\\\",
\"\\\\begin\", \"\\\\begin{\", \"]\", \"^\", \"_\", \"{\", [ \\t\\n\\r], [%$],
[().], [,:;?!'], [/|], [0-9], [><~], [\\-+*=], or [a-zA-Z] but end of input
found.",
+ "error": {
"message": "Expected \"-\", \"[\", \"\\\\\", \"\\\\begin\",
\"\\\\begin{\", \"]\", \"^\", \"_\", \"{\", [ \\t\\n\\r], [%$], [().],
[,:;?!'], [/|], [0-9], [><~], [\\-+*=], or [a-zA-Z] but end of input found.",
"expected": [
{
diff --git a/node_modules/texvcinfo/test/gold.js
b/node_modules/texvcinfo/test/gold.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/test/goldData.js
b/node_modules/texvcinfo/test/goldData.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/test/identifier.js
b/node_modules/texvcinfo/test/identifier.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/test/index.js
b/node_modules/texvcinfo/test/index.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/test/mocha.opts
b/node_modules/texvcinfo/test/mocha.opts
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/test/tokenizer.js
b/node_modules/texvcinfo/test/tokenizer.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/test/tree2d3json.js
b/node_modules/texvcinfo/test/tree2d3json.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/test/treeWriter.js
b/node_modules/texvcinfo/test/treeWriter.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/utils/createDoc.js
b/node_modules/texvcinfo/utils/createDoc.js
old mode 100755
new mode 100644
diff --git a/node_modules/texvcinfo/vis/index.html
b/node_modules/texvcinfo/vis/index.html
old mode 100755
new mode 100644
--
To view, visit https://gerrit.wikimedia.org/r/401926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f8a682834a1dc0026f671736f3b5eca7c90f247
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
