Skip to content

Commit

Permalink
Merge branch 'master' into mhchem_package
Browse files Browse the repository at this point in the history
  • Loading branch information
zorkow authored Nov 25, 2018
2 parents eeac420 + 3402173 commit adcd610
Show file tree
Hide file tree
Showing 5 changed files with 2,714 additions and 1 deletion.
1 change: 1 addition & 0 deletions lib/TeX-lab.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import 'mathjax3/input/tex/noundefined/NoUndefinedConfiguration.js';
import 'mathjax3/input/tex/boldsymbol/BoldsymbolConfiguration.js';
import 'mathjax3/input/tex/newcommand/NewcommandConfiguration.js';
import 'mathjax3/input/tex/mhchem/MhchemConfiguration.js';
import 'mathjax3/input/tex/noerrors/NoErrorsConfiguration.js';


let tex = new TeX();
Expand Down
3 changes: 2 additions & 1 deletion mathjax3-ts/input/tex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ export class TeX<N, T, D> extends AbstractInputJax<N, T, D> {
*/
protected formatError(err: TexError): MmlNode {
let message = err.message.replace(/\n.*/, '');
return this.parseOptions.nodeFactory.create('error', message);
return this.parseOptions.nodeFactory.create(
'error', message, err.id, this.latex);
};

}
46 changes: 46 additions & 0 deletions mathjax3-ts/input/tex/noerrors/NoErrorsConfiguration.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*************************************************************
*
* Copyright (c) 2018 The MathJax Consortium
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


/**
* @fileoverview Configuration file for the NoErrors package.
*
* @author [email protected] (Volker Sorge)
*/

import {Configuration} from '../Configuration.js';
import TexParser from '../TexParser.js';
import {NodeFactory} from '../NodeFactory.js';

/**
* Generates an error node containing the erroneous expression.
* @param {TexParser} parser The node factory.
* @param {string} message The error message (which is ignored).
* @param {string} id The error id (which is ignored).
* @param {string} expr The original LaTeX expression.
*/
function noErrors(factory: NodeFactory,
message: string, id: string, expr: string) {
let mtext = factory.create('token', 'mtext', {}, expr.replace(/\n/g, ' '));
let error = factory.create('node', 'merror', [mtext]);
return error;
};

export const NoErrorsConfiguration = Configuration.create(
'noerrors', {nodes: {'error': noErrors}});


2 changes: 2 additions & 0 deletions tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ if [ $# -eq 0 ]; then
node load.js tests/parser-mhchem7-tests.js
node load.js tests/parser-mhchem8-tests.js
node load.js tests/parser-mhchem9-tests.js

node load.js tests/parser-noerrors-tests.js
exit 0
else
repeat=$1
Expand Down
Loading

0 comments on commit adcd610

Please sign in to comment.