tpmkms_4wp 8.9.1-beta.0 → 8.9.1-beta.1

package/common/dialogues.js

@@ -101,6 +101,7 @@ let config = {
     positive: [
       // [['is', 0], ['unknown', 1]],
       // [['isEd', 0], ['means', 0]],
+      [['thatVerb', 0], ['verb', 0]],
       [['isEdee', 0], ['isEd', 0], ['isEder', 0], ['by', 0]],
       [['isEdee', 0], ['isEd', 0], ['isEdAble', 0]],
       [['unknown', 1], ['isEd', 0], ['isEdAble', 0]],
@@ -112,7 +113,7 @@ let config = {
   bridges: [
     {
       id: 'thatVerb',
-      // before: ['verb'],
+      before: ['verb'],
       bridge: "{ ...after[0], verb: after[0], that: operator, generate: ['that', 'verb'], localPriorities: { before: [\"verb\"] }, bridge_override: { operator: after[0].marker, bridge: '{ ...bridge.subject, postModifiers: [\"condition\"], condition: bridge }' } }",
     },
 
@@ -326,6 +327,7 @@ let config = {
 
   floaters: ['query'],
   priorities: [
+    { "context": [['is', 0], ['means', 0], ], "choose": [0] },
     { "context": [['is', 0], ['means', 0], ], "choose": [0] },
     { "context": [["what",0], ["does",0],], "choose": [0] },
     { "context": [["is",0], ["is",1],], "choose": [0] },

package/common/pos.js

@@ -7,6 +7,7 @@ let config = {
   name: 'pos',
   operators: [
     "([adjective])",
+    "([adverb])",
     "([articlePOS])",
     "([preposition])",
     "([pronoun])",
@@ -17,6 +18,7 @@ let config = {
   ],
   bridges: [
     { "id": "adjective" },
+    { "id": "adverb" },
     { "id": "articlePOS" },
     { "id": "preposition" },
     { "id": "pronoun" },
@@ -30,6 +32,7 @@ let config = {
     { "context": [['endOfSentence', 0], ['verb', 0], ], "choose": [1] },
     { "context": [['pronoun', 0], ['ingVerb', 0], ], "choose": [0] },
     { "context": [['preposition', 0], ['ingVerb', 0], ], "choose": [0] },
+    { "context": [['adverb', 0], ['ingVerb', 0], ], "choose": [0] },
     { "context": [['preposition', 0], ['adjective', 0], ], "choose": [1] },
     { "context": [['preposition', 0], ['articlePOS', 0], ], "choose": [1] },
     { "context": [['adjective', 0], ['ingVerb', 0], ], "choose": [0] },

package/common/wp.js

@@ -92,9 +92,14 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
     scope = 'all'
   } else if (context.element.condition) {
     const condition = context.element.condition
-    if (condition.marker == 'wordComparison_wp') {
+    if (condition.marker == 'wordComparisonWith_wp') {
+      // with or not with that is the question
       const letters = condition.letters.letters.text
       conditions.push({ comparison: condition.comparison, letters })
+    } else if (condition.marker == 'wordComparison_wp') {
+      // with or not with that is the question
+      const letters = condition.letters.text
+      conditions.push({ comparison: condition.comparison, letters })
     }
   } else {
     scope = context.element.quantity.quantity
@@ -116,33 +121,44 @@ template = {
     'uppercase means capitalize',
     'italicize means italic',
     'italicized means italic',
-    // 'start end and contain are wordComparisons',
+    // 'start end and contain are wordComparisonWiths',
     // 'styles are negatable',
     "resetIdSuffix",
     {
       operators: [
         "([changeState_wp|make] ([statefulElement_wp]) ([stateValue_wp|]))",
         "((style_wp/*) [applyStyle_wp] ([statefulElement_wp|]))",
-        "((word_wp/*) [wordComparison_wp] ([startsWith_wp|with] (a/0)? (letters)))",
+        "((word_wp/*) [wordComparisonWith_wp] ([comparisonWith_wp|with] (a/0)? (letters)))",
+        "((word_wp/*) [wordComparison_wp] (a/0)? (letters))",
       ],
       bridges: [
         { 
-          id: 'wordComparison_wp',
+          id: 'wordComparisonWith_wp',
           parents: ['verb'],
           words: [ 
             { word: 'start', comparison: 'prefix' }, 
             { word: 'starts', comparison: 'prefix', },
             { word: 'end', comparison: 'suffix' },
             { word: 'ends', comparison: 'suffix' },
+          ],
+          bridge: "{ ...next(operator), element: before[0], subject: before[0], letters: after[0], verb: operator, generate: ['element', 'verb', 'letters'] }",
+        },
+        { 
+          id: 'wordComparison_wp',
+          parents: ['verb'],
+          words: [ 
             { word: 'contain', comparison: 'include' }, 
             { word: 'contains', comparison: 'include' },
             { word: 'include', comparison: 'include' }, 
             { word: 'includes', comparison: 'include' },
           ],
-          bridge: "{ ...next(operator), element: before[0], subject: before[0], letters: after[0], verb: operator, generate: ['element', 'verb', 'letters'] }",
+          optional: {
+            1: "{ marker: 'a' }",
+          },
+          bridge: "{ ...next(operator), element: before[0], subject: before[0], letters: after[1], verb: operator, generate: ['element', 'verb', 'letters'] }",
         },
         { 
-          id: 'startsWith_wp',
+          id: 'comparisonWith_wp',
           parents: ['preposition'],
           optional: {
             1: "{ marker: 'a' }",
@@ -204,7 +220,7 @@ template = {
       ],
       priorities: [
         { "context": [['changeState_wp',0], ['statefulElement_wp', 0], ['list', 0]], ordered: true, choose: [0] },
-        { "context": [['startsWith_wp',0], ['unknown', 0], ['list', 1]], ordered: true, choose: [0] },
+        { "context": [['comparisonWith_wp',0], ['unknown', 0], ['list', 1]], ordered: true, choose: [0] },
       ],
     },
     // "([changeState_wp|make] ([statefulElement_wp]) ([stateValue_wp|]))",