nerdamer 1.1.9 → 1.1.13

package/package.json

@@ -1,54 +1,59 @@
 {
-  "author": {
-    "name": "Martin Donk",
-    "email": "martin.r.donk@gmail.com"
-  },
-  "description": "javascript light-weight symbolic math expression evaluator",
-  "name": "nerdamer",
-  "license": "MIT",
-  "version": "1.1.9",
-  "homepage": "http://nerdamer.com/",
-  "directory": {
-    "lib": "./"
-  },
-  "main": "nerdamer.core.js",
-  "typings": "index.d.ts",
-  "keywords": [
-    "math",
-    "matrix",
-    "complex",
-    "number",
-    "parser",
-    "expression",
-    "functions",
-    "numeric",
-    "equation solver",
-    "linear algebra",
-    "vectors",
-    "symbolic",
-    "integration",
-    "differentiation",
-    "derivative",
-    "algebra",
-    "calculus",
-    "mathematics",
-    "constants",
-    "symbolic math"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/jiggzson/nerdamer.git"
-  },
-  "bugs": {
-    "url": "https://github.com/jiggzson/nerdamer/issues"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "scripts": {
-    "test": "jasmine"
-  },
-  "devDependencies": {
-    "jasmine": "^2.99.0"
-  }
+    "author": {
+        "name": "Martin Donk",
+        "email": "martin.r.donk@gmail.com"
+    },
+    "description": "javascript light-weight symbolic math expression evaluator",
+    "name": "nerdamer",
+    "license": "MIT",
+    "version": "1.1.13",
+    "homepage": "http://nerdamer.com/",
+    "directory": {
+        "lib": "./"
+    },
+    "main": "nerdamer.core.js",
+    "typings": "index.d.ts",
+    "keywords": [
+        "math",
+        "matrix",
+        "complex",
+        "number",
+        "parser",
+        "expression",
+        "functions",
+        "numeric",
+        "equation solver",
+        "linear algebra",
+        "vectors",
+        "symbolic",
+        "integration",
+        "differentiation",
+        "derivative",
+        "algebra",
+        "calculus",
+        "mathematics",
+        "constants",
+        "symbolic math"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/jiggzson/nerdamer.git"
+    },
+    "bugs": {
+        "url": "https://github.com/jiggzson/nerdamer/issues"
+    },
+    "engines": {
+        "node": ">=0.10.0"
+    },
+    "scripts": {
+        "test": "jasmine"
+    },
+    "devDependencies": {
+        "gulp": "^4.0.2",
+        "gulp-cli": "^2.3.0",
+        "gulp-concat": "^2.6.1",
+        "gulp-uglify": "^3.0.2",
+        "gulp-watch": "^5.0.1",
+        "jasmine": "^2.99.0"
+    }
 }

package/spec/LaTeX.spec.js

@@ -184,6 +184,11 @@ describe('TeX features', function () {
                 given: 'nthroot(a,b)',
                 TeX: '\\sqrt[b]{a}',
                 decimalTeX: '\\sqrt[b]{a}'
+            },
+            {
+                given: 'x_aa_bb+y_cc_dd',
+                TeX: 'x_{aa_{bb}}+y_{cc_{dd}}',
+                decimalTeX: 'x_{aa_{bb}}+y_{cc_{dd}}'
             }
         ];
 
@@ -261,50 +266,15 @@ describe('TeX features', function () {
     });
 
     it('should explicitly convert to LaTeX', function () {
-        // given
-        var testCases = [
-            {
-                given: 'realpart(a)',
-                expected: '\\operatorname{Re}\\left(a\\right)'
-            },
-            {
-                given: 'imagpart(a)',
-                expected: '\\operatorname{Im}\\left(a\\right)'
-            },
-            {
-                given: 'diff(cos(x),x)',
-                expected: '\\frac{d}{d x}\\left({\\mathrm{cos}\\left(x\\right)}\\right)'
-            },
-            {
-                given: 'integrate(cos(x),x)',
-                expected: '\\int {\\mathrm{cos}\\left(x\\right)}\\, dx'
-            },
-            {
-                given: '2*(sqrt(3)+sqrt(2))',
-                expected: '2 \\cdot \\left(\\sqrt{3} + \\sqrt{2}\\right)'
-            },
-            // Redundant sign in powers
-            {
-                given: '(a+1)(x+a)^(-5)+1',
-                expected: '\\frac{a + 1}{{\\left(x + a\\right)}^{5}} + 1'
-            },
-            {
-                given: 'a*x^-3+1/a',
-                expected: '\\frac{a}{{x}^{3}} + \\frac{1}{a}'
-            },
-            {
-                given: 'a*x^+3+1/a',
-                expected: 'a \\cdot {x}^{3} + \\frac{1}{a}'
-            }
-        ];
-
-        for(var i = 0; i < testCases.length; ++i) {
-            // when
-            var teX = nerdamer.convertToLaTeX(testCases[i].given);
-
-            // then
-            expect(teX).toEqual(testCases[i].expected);
-        }
+        expect(nerdamer.convertToLaTeX('realpart(a)')).toEqual('\\operatorname{Re}\\left(a\\right)');
+        expect(nerdamer.convertToLaTeX('imagpart(a)')).toEqual('\\operatorname{Im}\\left(a\\right)');
+        expect(nerdamer.convertToLaTeX('diff(cos(x),x)')).toEqual('\\frac{d}{d x}\\left({\\mathrm{cos}\\left(x\\right)}\\right)');
+        expect(nerdamer.convertToLaTeX('integrate(cos(x),x)')).toEqual('\\int {\\mathrm{cos}\\left(x\\right)}\\, dx');
+        expect(nerdamer.convertToLaTeX('2*(sqrt(3)+sqrt(2))')).toEqual('2 \\cdot \\left(\\sqrt{3} + \\sqrt{2}\\right)');
+        expect(nerdamer.convertToLaTeX('(a+1)(x+a)^(-5)+1')).toEqual('\\frac{a + 1}{{\\left(x + a\\right)}^{5}} + 1');
+        expect(nerdamer.convertToLaTeX('a*x^-3+1/a')).toEqual('\\frac{a}{{x}^{3}} + \\frac{1}{a}');
+        expect(nerdamer.convertToLaTeX('a*x^+3+1/a')).toEqual('a \\cdot {x}^{3} + \\frac{1}{a}');
+        expect(nerdamer.convertToLaTeX('x^2/y-x')).toEqual('\\frac{{x}^{2}}{y} - x');
     });
 
     it('should display integrals', function () {

package/spec/TeXConvert.spec.js

@@ -1,7 +1,8 @@
 var nerdamer = require('../nerdamer.core.js');
-it('should convert from TeX', function () {
+it('Should convert from TeX', function () {
     expect(nerdamer.convertFromLaTeX('x^6 \\cdot cos(\\frac{1}{2})').toString()).toEqual('cos(1/2)*x^6');
     expect(nerdamer.convertFromLaTeX('\\sqrt[3]{1+a}+1').toString()).toEqual('(1+a)^(1/3)+1');
     expect(nerdamer.convertFromLaTeX('\\begin{matrix} \\begin{matrix}1 & 2 \\\\ 7 & 8\\end{matrix} & 2+9 \\\\ 7 & 8\\end{matrix}').toString())
-            .toEqual('matrix([matrix([1,2],[7,8]),11],[7,8])');
+        .toEqual('matrix([matrix([1,2],[7,8]),11],[7,8])');
+    expect(nerdamer.convertFromLaTeX('\\int_{0}^{\\pi}(\\sin(y)),y').toString()).toEqual('defint(sin(y),0,pi,y)');
 });