Physikerwelt has submitted this change and it was merged.
Change subject: Make texvcjs compatible to texvc
......................................................................
Make texvcjs compatible to texvc
Change-Id: I7508b273ef9c0c9c0084e87b968af9e69d14a7e9
---
M node_modules/texvcjs/CHANGELOG.md
M node_modules/texvcjs/lib/texutil.js
M node_modules/texvcjs/node_modules/commander/package.json
M node_modules/texvcjs/package.json
M package.json
5 files changed, 38 insertions(+), 80 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/node_modules/texvcjs/CHANGELOG.md
b/node_modules/texvcjs/CHANGELOG.md
index 2554e50..7b667c7 100644
--- a/node_modules/texvcjs/CHANGELOG.md
+++ b/node_modules/texvcjs/CHANGELOG.md
@@ -1,3 +1,5 @@
+# texvcjs x.x.x (not yet released)
+
# texvcjs 0.3.1 (2014-07-29)
* Color models for \color, \definecolor, and \pagecolor are now
diff --git a/node_modules/texvcjs/lib/texutil.js
b/node_modules/texvcjs/lib/texutil.js
index a2d6e99..e36a5e8 100644
--- a/node_modules/texvcjs/lib/texutil.js
+++ b/node_modules/texvcjs/lib/texutil.js
@@ -498,31 +498,31 @@
]);
module.exports.other_literals3 = obj2map({
- "\\C": "\\mathbb {C}",
- "\\H": "\\mathbb {H}",
- "\\N": "\\mathbb {N}",
- "\\Q": "\\mathbb {Q}",
- "\\R": "\\mathbb {R}",
- "\\Z": "\\mathbb {Z}",
+ "\\C": "\\mathbb{C}",
+ "\\H": "\\mathbb{H}",
+ "\\N": "\\mathbb{N}",
+ "\\Q": "\\mathbb{Q}",
+ "\\R": "\\mathbb{R}",
+ "\\Z": "\\mathbb{Z}",
"\\alef": "\\aleph",
"\\alefsym": "\\aleph",
- "\\Alpha": "\\mathrm {A}",
+ "\\Alpha": "\\mathrm{A}",
"\\and": "\\land",
"\\ang": "\\angle",
- "\\Beta": "\\mathrm {B}",
+ "\\Beta": "\\mathrm{B}",
"\\bull": "\\bullet",
- "\\Chi": "\\mathrm {X}",
+ "\\Chi": "\\mathrm{X}",
"\\clubs": "\\clubsuit",
- "\\cnums": "\\mathbb {C}",
- "\\Complex": "\\mathbb {C}",
+ "\\cnums": "\\mathbb{C}",
+ "\\Complex": "\\mathbb{C}",
"\\Dagger": "\\ddagger",
"\\diamonds": "\\diamondsuit",
"\\Doteq": "\\doteqdot",
"\\doublecap": "\\Cap",
"\\doublecup": "\\Cup",
"\\empty": "\\emptyset",
- "\\Epsilon": "\\mathrm {E}",
- "\\Eta": "\\mathrm {H}",
+ "\\Epsilon": "\\mathrm{E}",
+ "\\Eta": "\\mathrm{H}",
"\\exist": "\\exists",
"\\ge": "\\geq",
"\\gggtr": "\\ggg",
@@ -532,9 +532,9 @@
"\\hearts": "\\heartsuit",
"\\image": "\\Im",
"\\infin": "\\infty",
- "\\Iota": "\\mathrm {I}",
+ "\\Iota": "\\mathrm{I}",
"\\isin": "\\in",
- "\\Kappa": "\\mathrm {K}",
+ "\\Kappa": "\\mathrm{K}",
"\\larr": "\\leftarrow",
"\\Larr": "\\Leftarrow",
"\\lArr": "\\Leftarrow",
@@ -542,13 +542,13 @@
"\\lrarr": "\\leftrightarrow",
"\\Lrarr": "\\Leftrightarrow",
"\\lrArr": "\\Leftrightarrow",
- "\\Mu": "\\mathrm {M}",
- "\\natnums": "\\mathbb {N}",
+ "\\Mu": "\\mathrm{M}",
+ "\\natnums": "\\mathbb{N}",
"\\ne": "\\neq",
- "\\Nu": "\\mathrm {N}",
+ "\\Nu": "\\mathrm{N}",
"\\O": "\\emptyset",
- "\\omicron": "\\mathrm {o}",
- "\\Omicron": "\\mathrm {O}",
+ "\\omicron": "\\mathrm{o}",
+ "\\Omicron": "\\mathrm{O}",
"\\or": "\\lor",
"\\part": "\\partial",
"\\plusmn": "\\pm",
@@ -556,21 +556,21 @@
"\\Rarr": "\\Rightarrow",
"\\rArr": "\\Rightarrow",
"\\real": "\\Re",
- "\\reals": "\\mathbb {R}",
- "\\Reals": "\\mathbb {R}",
+ "\\reals": "\\mathbb{R}",
+ "\\Reals": "\\mathbb{R}",
"\\restriction": "\\upharpoonright",
- "\\Rho": "\\mathrm {P}",
+ "\\Rho": "\\mathrm{P}",
"\\sdot": "\\cdot",
"\\sect": "\\S",
"\\spades": "\\spadesuit",
"\\sub": "\\subset",
"\\sube": "\\subseteq",
"\\supe": "\\supseteq",
- "\\Tau": "\\mathrm {T}",
+ "\\Tau": "\\mathrm{T}",
"\\thetasym": "\\vartheta",
"\\varcoppa": "\\mbox{\\coppa}",
"\\weierp": "\\wp",
- "\\Zeta": "\\mathrm {Z}"
+ "\\Zeta": "\\mathrm{Z}"
});
module.exports.big_literals = arr2set([
diff --git a/node_modules/texvcjs/node_modules/commander/package.json
b/node_modules/texvcjs/node_modules/commander/package.json
index 3ad8e9b..8f3f2d0 100644
--- a/node_modules/texvcjs/node_modules/commander/package.json
+++ b/node_modules/texvcjs/node_modules/commander/package.json
@@ -30,42 +30,11 @@
"files": [
"index.js"
],
- "gitHead": "7e9f407ec03d4371a478c2fe417db4998ecb6169",
+ "readme": "# Commander.js\n\n The complete solution for
[node.js](http://nodejs.org) command-line interfaces, inspired by Ruby's
[commander](https://github.com/visionmedia/commander).\n\n [](http://travis-ci.org/visionmedia/commander.js)\n\n##
Installation\n\n $ npm install commander\n\n## Option parsing\n\n Options
with commander are defined with the `.option()` method, also serving as
documentation for the options. The example below parses args and options from
`process.argv`, leaving remaining args as the `program.args` array which were
not consumed by options.\n\n```js\n#!/usr/bin/env node\n\n/**\n * Module
dependencies.\n */\n\nvar program = require('commander');\n\nprogram\n
.version('0.0.1')\n .option('-p, --peppers', 'Add peppers')\n .option('-P,
--pineapple', 'Add pineapple')\n .option('-b, --bbq', 'Add bbq sauce')\n
.option('-c, --cheese [type]', 'Add the specified type of cheese [marble]',
'marble')\n .parse(process.argv);\n\nconsole.log('you ordered a pizza
with:');\nif (program.peppers) console.log(' - peppers');\nif
(program.pineapple) console.log(' - pineapple');\nif (program.bbq)
console.log(' - bbq');\nconsole.log(' - %s cheese', program.cheese);\n```\n\n
Short flags may be passed as a single arg, for example `-abc` is equivalent to
`-a -b -c`. Multi-word options such as \"--template-engine\" are camel-cased,
becoming `program.templateEngine` etc.\n\n## Automated --help\n\n The help
information is auto-generated based on the information commander already knows
about your program, so the following `--help` info is for free:\n\n``` \n $
./examples/pizza --help\n\n Usage: pizza [options]\n\n Options:\n\n -V,
--version output the version number\n -p, --peppers Add
peppers\n -P, --pineapple Add pineapple\n -b, --bbq Add
bbq sauce\n -c, --cheese <type> Add the specified type of cheese
[marble]\n -h, --help output usage information\n\n```\n\n##
Coercion\n\n```js\nfunction range(val) {\n return
val.split('..').map(Number);\n}\n\nfunction list(val) {\n return
val.split(',');\n}\n\nfunction collect(val, memo) {\n memo.push(val);\n
return memo;\n}\n\nfunction increaseVerbosity(v, total) {\n return total +
1;\n}\n\nprogram\n .version('0.0.1')\n .usage('[options] <file ...>')\n
.option('-i, --integer <n>', 'An integer argument', parseInt)\n .option('-f,
--float <n>', 'A float argument', parseFloat)\n .option('-r, --range
<a>..<b>', 'A range', range)\n .option('-l, --list <items>', 'A list', list)\n
.option('-o, --optional [value]', 'An optional value')\n .option('-c,
--collect [value]', 'A repeatable value', collect, [])\n .option('-v,
--verbose', 'A value that can be increased', increaseVerbosity, 0)\n
.parse(process.argv);\n\nconsole.log(' int: %j',
program.integer);\nconsole.log(' float: %j', program.float);\nconsole.log('
optional: %j', program.optional);\nprogram.range = program.range ||
[];\nconsole.log(' range: %j..%j', program.range[0],
program.range[1]);\nconsole.log(' list: %j', program.list);\nconsole.log('
collect: %j', program.collect);\nconsole.log(' verbosity: %j',
program.verbose);\nconsole.log(' args: %j', program.args);\n```\n\n## Custom
help\n\n You can display arbitrary `-h, --help` information\n by listening for
\"--help\". Commander will automatically\n exit once you are done so that the
remainder of your program\n does not execute causing undesired behaviours, for
example\n in the following executable \"stuff\" will not output when\n `--help`
is used.\n\n```js\n#!/usr/bin/env node\n\n/**\n * Module dependencies.\n
*/\n\nvar program = require('../');\n\nfunction list(val) {\n return
val.split(',').map(Number);\n}\n\nprogram\n .version('0.0.1')\n .option('-f,
--foo', 'enable some foo')\n .option('-b, --bar', 'enable some bar')\n
.option('-B, --baz', 'enable some baz');\n\n// must be before .parse()
since\n// node's emit() is immediate\n\nprogram.on('--help', function(){\n
console.log(' Examples:');\n console.log('');\n console.log(' $
custom-help --help');\n console.log(' $ custom-help -h');\n
console.log('');\n});\n\nprogram.parse(process.argv);\n\nconsole.log('stuff');\n```\n\nyielding
the following help output:\n\n```\n\nUsage: custom-help
[options]\n\nOptions:\n\n -h, --help output usage information\n -V,
--version output the version number\n -f, --foo enable some foo\n -b,
--bar enable some bar\n -B, --baz enable some baz\n\nExamples:\n\n
$ custom-help --help\n $ custom-help -h\n\n```\n\n## .outputHelp()\n\n Output
help information without exiting.\n\n## .help()\n\n Output help information
and exit immediately.\n\n## Links\n\n - [API
documentation](http://visionmedia.github.com/commander.js/)\n - [ascii
tables](https://github.com/LearnBoost/cli-table)\n - [progress
bars](https://github.com/visionmedia/node-progress)\n - [more progress
bars](https://github.com/substack/node-multimeter)\n -
[examples](https://github.com/visionmedia/commander.js/tree/master/examples)\n\n##
License \n\n(The MIT License)\n\nCopyright (c) 2011 TJ Holowaychuk
<[email protected]>\n\nPermission is hereby granted, free of charge,
to any person obtaining\na copy of this software and associated documentation
files (the\n'Software'), to deal in the Software without restriction,
including\nwithout limitation the rights to use, copy, modify, merge,
publish,\ndistribute, sublicense, and/or sell copies of the Software, and
to\npermit persons to whom the Software is furnished to do so, subject to\nthe
following conditions:\n\nThe above copyright notice and this permission notice
shall be\nincluded in all copies or substantial portions of the
Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY
KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.\n",
+ "readmeFilename": "Readme.md",
"bugs": {
"url": "https://github.com/visionmedia/commander.js/issues";
},
- "homepage": "https://github.com/visionmedia/commander.js";,
"_id": "[email protected]",
- "_shasum": "fd430e889832ec353b9acd1de217c11cb3eef873",
- "_from": "commander@~2.3.0",
- "_npmVersion": "1.4.21",
- "_npmUser": {
- "name": "somekittens",
- "email": "[email protected]"
- },
- "maintainers": [
- {
- "name": "tjholowaychuk",
- "email": "[email protected]"
- },
- {
- "name": "somekittens",
- "email": "[email protected]"
- },
- {
- "name": "zhiyelee",
- "email": "[email protected]"
- },
- {
- "name": "thethomaseffect",
- "email": "[email protected]"
- }
- ],
- "dist": {
- "shasum": "fd430e889832ec353b9acd1de217c11cb3eef873",
- "tarball": "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
- },
- "directories": {},
- "_resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";,
- "readme": "ERROR: No README data found!"
+ "_from": "commander@~2.3.0"
}
diff --git a/node_modules/texvcjs/package.json
b/node_modules/texvcjs/package.json
index 0879059..3b0ef0c 100644
--- a/node_modules/texvcjs/package.json
+++ b/node_modules/texvcjs/package.json
@@ -1,6 +1,6 @@
{
"name": "texvcjs",
- "version": "0.3.1",
+ "version": "0.3.1-git",
"description": "A TeX/LaTeX validator for mediawiki.",
"main": "lib/index.js",
"scripts": {
@@ -31,25 +31,12 @@
"bin": {
"texvcjs": "./bin/texvcjs"
},
- "_id": "[email protected]",
+ "readme": "# texvcjs\n[![NPM][NPM1]][NPM2]\n\n[![Build Status][1]][2]
[![dependency status][3]][4] [![dev dependency status][5]][6]\n\nA TeX/LaTeX
validator.\n\n`texvcjs` takes user input and validates it while
replacing\nMediaWiki-specific functions. It is a JavaScript port of
[texvc],\nwhich was originally written in ocaml for the [Math
extension].\n\nThe `texvcjs` library was originally written to be used by
the\n[mw-ocg-latexer] PDF-generation backend of the mediawiki\n[Collection
extension].\n\n## Installation\n\nNode version 0.8 and 0.10 are tested to
work.\n\nInstall the node package depdendencies with:\n```\nnpm
install\n```\nEnsure everything works:\n```\nnpm test\n```\n\n## Running\n\nTo
test your installation:\n```sh\nbin/texvcjs '\\sin(x)+{}{}\\cos(x)^2
newcommand'\n```\nwhich should
emit:\n```\n+\\sin(x)+{}{}\\cos(x)^{2}newcommand\n```\n\n## API\n\nYour
programs can also use the JavaScript API exported by the\n`texvcjs` node
module:\n```js\nvar texvcjs = require('texvcjs');\n\nvar result =
texvcjs.check('\\\\sin(x)+{}{}\\\\cos(x)^2
newcommand');\nconsole.log(result.status);\nconsole.log(result.output || '');
// cleaned/validated output\n```\n\nIf the `output` field is not `undefined`,
then validation was successful.\n\nThe `status` field is a single character:\n*
`+`: Success! The result is in the `output` field.\n* `F`: A TeX function was
not recognized. The function name is in the\n `details` field.\n* `S`: A
parsing error occurred.\n* `-`: Some other problem occurred.\n\nFor status
types `F`, `S`, and `-`, the position of the error may be found\nin the `line`,
`column` and `offset` fields of the result. More information\nabout the
problem can be found in the `details` field of the result, which\nis a
string.\n\nThe fields `ams_required`, `cancel_required`,
`color_required`,\n`euro_required`, and `teubner_required` are set to `true`
iff the input\nstring requires the use of the corresponding LaTeX
packages.\nThe `ams_required` field requires the use of the `amsmath` and
`amssymb`\npackages.\n\n### Low-level API\n\nThe low level parser, abstract
syntax tree (AST), and renderer are also\nexported from the module. This
allows you to define more interesting\nqueries on the input source. An example
can be found in `lib/astutil.js`\nwhich defines a visitor function to test for
the presence of specific\nTeX functions in the input.\n\n##
License\n\nCopyright (c) 2014 C. Scott Ananian\n\nLicensed under
GPLv2.\n\n[mw-ocg-latexer]:
https://github.com/wikimedia/mediawiki-extensions-Collection-OfflineContentGenerator-latex_renderer\n[texvc]:
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FMath/REL1_23/texvccheck%2FREADME\n[Math
extension]: https://www.mediawiki.org/wiki/Extension:Math\n[Collection
extension]: https://www.mediawiki.org/wiki/Extension:Collection\n\n[NPM1]:
https://nodei.co/npm/texvcjs.svg\n[NPM2]: https://nodei.co/npm/texvcjs/\n\n[1]:
https://travis-ci.org/cscott/texvcjs.svg\n[2]:
https://travis-ci.org/cscott/texvcjs\n[3]:
https://david-dm.org/cscott/texvcjs.svg\n[4]:
https://david-dm.org/cscott/texvcjs\n[5]:
https://david-dm.org/cscott/texvcjs/dev-status.svg\n[6]:
https://david-dm.org/cscott/texvcjs#info=devDependencies\n";,
+ "readmeFilename": "README.md",
+ "_id": "[email protected]",
"dist": {
- "shasum": "11ad544276fc744bcd4fc0a81bd8fa06d861611f",
- "tarball": "http://registry.npmjs.org/texvcjs/-/texvcjs-0.3.1.tgz";
+ "shasum": "f3862de9f8900ef96f3da586861395e8fadf6675"
},
- "_from": "texvcjs@",
- "_npmVersion": "1.4.4",
- "_npmUser": {
- "name": "cscott",
- "email": "[email protected]"
- },
- "maintainers": [
- {
- "name": "cscott",
- "email": "[email protected]"
- }
- ],
- "directories": {},
- "_shasum": "11ad544276fc744bcd4fc0a81bd8fa06d861611f",
- "_resolved": "https://registry.npmjs.org/texvcjs/-/texvcjs-0.3.1.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved":
"git+http://[email protected]/physikerwelt/texvcjs#98babafc4fe7236643362859ad8d9684f9952e1b";,
+ "_from": "texvcjs@git+http://[email protected]/physikerwelt/texvcjs";
}
diff --git a/package.json b/package.json
index bc788fb..2866eac 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"querystring": "0.x.x",
"request": "2.x.x",
"speech-rule-engine": "*",
- "texvcjs": "^0.3.1",
+ "texvcjs": "git+http://[email protected]/physikerwelt/texvcjs";,
"yargs": "1.3.x"
},
"scripts": {
--
To view, visit https://gerrit.wikimedia.org/r/166353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7508b273ef9c0c9c0084e87b968af9e69d14a7e9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Frédéric Wang <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Hcohl <[email protected]>
Gerrit-Reviewer: Physikerwelt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![https://nodei.co/npm/texvcjs.svg\n[NPM2]:](https://nodei.co/npm/texvcjs.svg\n[NPM2]:){kind=link}
![https://travis-ci.org/cscott/texvcjs.svg\n[2]:](https://travis-ci.org/cscott/texvcjs.svg\n[2]:){kind=link}
![https://david-dm.org/cscott/texvcjs.svg\n[4]:](https://david-dm.org/cscott/texvcjs.svg\n[4]:){kind=link}
![https://david-dm.org/cscott/texvcjs/dev-status.svg\n[6]:](https://david-dm.org/cscott/texvcjs/dev-status.svg\n[6]:){kind=link}