Merge branch 'wip-newTextInk'

Author: torebo

test/lib/configuration.js

@@ -5,6 +5,7 @@ const system = require('./inks/system.json');
 const one = require('./inks/one.json');
 const equation = require('./inks/equation.json');
 const equation2 = require('./inks/equation2.json');
+const equation3 = require('./inks/equation3.json');
 const hello = require('./inks/hello.json');
 const helloHow = require('./inks/helloHowAreYou.json');
 const shape = require('./inks/shape.json');
@@ -25,23 +26,23 @@ const inks = [{
 }, {
   name: 'equation',
   type: 'MATH',
-  strokes: equation,
+  strokes: equation2,
   exports: {
-    LATEX: ['r', '\\sqrt {2}', '\\sqrt', '\\sqrt']
+    LATEX: ['-', '\\sqrt {2}', 'r', '']
   }
 }, {
   name: 'equation2',
   type: 'MATH',
   strokes: equation2,
   exports: {
-    LATEX: ['-', '\\sqrt {2}', 'r', '']
+    LATEX: ['\\sqrt', '\\sqrt {2}', 'r', '']
   }
 }, {
   name: 'equation3',
   type: 'MATH',
-  strokes: equation2,
+  strokes: equation3,
   exports: {
-    LATEX: ['\\sqrt', '\\sqrt {2}', '\\sqrt', '']
+    LATEX: ['y', 'y-', 'y=', 'y=3', 'y=33', 'y=3x', 'y=3x-', 'y=3x+', 'y=3x+2']
   }
 }, {
   name: 'system',
@@ -87,7 +88,7 @@ const inks = [{
   type: 'TEXT',
   strokes: helloHow,
   exports: {
-    TEXT: ['1', '11', 'H', 'Hello', 'Hello how', 'Hello how 0', 'Hello how are', 'Hello how are you', 'Hello how are you?', 'Hello how are you?']
+    TEXT: ['hello', 'hello how', 'hello how 0', 'hello how are', 'hello how are you', 'hello how are you?', 'hello how are you?']
   }
 }, {
   name: 'shape',

test/lib/inks/equation3.json

@@ -0,0 +1,280 @@
+[[[459,
+459,
+459,
+459,
+465,
+470,
+475,
+479,
+482,
+484,
+486,
+486,
+487,
+486,
+485,
+484,
+484,
+484,
+485,
+488,
+489,
+489,
+486,
+483,
+477,
+471,
+467,
+467,
+467,
+473,
+480,
+492,
+502,
+507
+],[186,
+196,
+199,
+202,
+204,
+204,
+204,
+204,
+203,
+200,
+195,
+192,
+189,
+194,
+202,
+212,
+223,
+232,
+240,
+249,
+257,
+268,
+275,
+276,
+276,
+273,
+264,
+259,
+252,
+244,
+237,
+233,
+230,
+228]],
+[[526,
+539,
+549,
+557,
+561
+],[200,
+195,
+195,
+195,
+195]],
+[[539,
+547,
+556,
+564,
+570,
+573],
+[206,
+206,
+206,
+206,
+206,
+206]],
+[[640,
+641,
+645,
+649,
+654,
+658,
+660,
+661,
+657,
+646,
+643,
+646,
+649,
+652,
+658,
+663,
+664,
+664,
+664,
+660,
+653,
+643,
+631,
+624],
+[171,
+166,
+166,
+166,
+168,
+172,
+175,
+178,
+185,
+189,
+190,
+192,
+193,
+195,
+199,
+203,
+207,
+210,
+214,
+217,
+217,
+218,
+218,
+218]],
+[[701,
+701,
+702,
+705,
+710,
+717,
+723,
+728,
+730,
+730,
+729,
+724,
+718,
+708,
+706,
+706],
+[207,
+200,
+195,
+194,
+192,
+192,
+192,
+193,
+198,
+205,
+212,
+216,
+218,
+216,
+213,
+210]],
+[[742,
+733,
+729,
+729,
+729,
+729,
+728,
+728,
+729,
+735,
+740,
+748,
+759,
+769,
+773],
+[198,
+195,
+197,
+201,
+205,
+208,
+211,
+214,
+218,
+218,
+218,
+218,
+218,
+218,
+218]],
+[[785,
+794,
+800,
+809,
+821,
+836,
+844,
+849],
+[205,
+203,
+203,
+203,
+203,
+201,
+200,
+198]],
+[[824,
+823,
+823,
+823,
+823,
+823],
+[191,
+199,
+205,
+211,
+216,
+220]],
+[[884,
+884,
+887,
+892,
+895,
+904,
+909,
+912,
+913,
+913,
+913,
+910,
+902,
+897,
+894,
+894,
+893,
+896,
+900,
+904,
+915,
+925,
+931,
+940,
+946,
+949],
+[188,
+181,
+175,
+165,
+161,
+158,
+158,
+161,
+167,
+174,
+183,
+195,
+207,
+215,
+218,
+221,
+225,
+225,
+225,
+225,
+225,
+225,
+228,
+229,
+231,
+231]]]