From 6b327e0b7a7e8c91f1a7d99520c8769863228074 Mon Sep 17 00:00:00 2001
From: StefanVukovic99 <stefanvukovic44@gmail.com>
Date: Sun, 4 Feb 2024 08:14:22 +0100
Subject: allow inflection rule chains with "polite" (#627)

* fix deinflection bug

* add test

* fix polite te and past

* expand verb flag

* fix polite negative

* fix polite volitional

* fix polite past negative

* remove unneeded rules in

* new deinflector format

* make nicer

* lint

* remove extra line
---
 test/data/anki-note-builder-test-results.json     | 10 +++++-----
 test/data/translator-test-results-note-data1.json | 19 ++++++++++++++-----
 test/data/translator-test-results.json            | 19 ++++++++++++++-----
 3 files changed, 33 insertions(+), 15 deletions(-)

(limited to 'test/data')

diff --git a/test/data/anki-note-builder-test-results.json b/test/data/anki-note-builder-test-results.json
index 526beec7..364c4ee9 100644
--- a/test/data/anki-note-builder-test-results.json
+++ b/test/data/anki-note-builder-test-results.json
@@ -1692,7 +1692,7 @@
         "cloze-body": "打ち込んでいませんでした",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-te « progressive or perfect « polite past negative",
+        "conjugation": "-te « progressive or perfect « polite « negative « past",
         "dictionary": "Test Dictionary 2",
         "document-title": "title",
         "expression": "打ち込む",
@@ -1727,7 +1727,7 @@
         "cloze-body": "打ち込んでいませんでした",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-te « progressive or perfect « polite past negative",
+        "conjugation": "-te « progressive or perfect « polite « negative « past",
         "dictionary": "Test Dictionary 2",
         "document-title": "title",
         "expression": "打ち込む",
@@ -1762,7 +1762,7 @@
         "cloze-body": "打ち込んでいませんでした",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-te « progressive or perfect « polite past negative",
+        "conjugation": "-te « progressive or perfect « polite « negative « past",
         "dictionary": "Test Dictionary 2",
         "document-title": "title",
         "expression": "打ち込む",
@@ -1797,7 +1797,7 @@
         "cloze-body": "打ち込んでいませんでした",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "-te « progressive or perfect « polite past negative",
+        "conjugation": "-te « progressive or perfect « polite « negative « past",
         "dictionary": "Test Dictionary 2",
         "document-title": "title",
         "expression": "打ち込む",
@@ -2837,7 +2837,7 @@
         "cloze-body": "testました",
         "cloze-prefix": "cloze-prefix",
         "cloze-suffix": "cloze-suffix",
-        "conjugation": "polite past",
+        "conjugation": "polite « past",
         "dictionary": "Test Dictionary 2",
         "document-title": "title",
         "expression": "読む",
diff --git a/test/data/translator-test-results-note-data1.json b/test/data/translator-test-results-note-data1.json
index 510b1bb5..5f140902 100644
--- a/test/data/translator-test-results-note-data1.json
+++ b/test/data/translator-test-results-note-data1.json
@@ -15851,7 +15851,9 @@
               "inflectionRules": [
                 "-te",
                 "progressive or perfect",
-                "polite past negative"
+                "polite",
+                "negative",
+                "past"
               ]
             }
           ],
@@ -16276,7 +16278,9 @@
               "inflectionRules": [
                 "-te",
                 "progressive or perfect",
-                "polite past negative"
+                "polite",
+                "negative",
+                "past"
               ]
             }
           ],
@@ -16701,7 +16705,9 @@
               "inflectionRules": [
                 "-te",
                 "progressive or perfect",
-                "polite past negative"
+                "polite",
+                "negative",
+                "past"
               ]
             }
           ],
@@ -17126,7 +17132,9 @@
               "inflectionRules": [
                 "-te",
                 "progressive or perfect",
-                "polite past negative"
+                "polite",
+                "negative",
+                "past"
               ]
             }
           ],
@@ -26937,7 +26945,8 @@
             {
               "source": "algorithm",
               "inflectionRules": [
-                "polite past"
+                "polite",
+                "past"
               ]
             }
           ],
diff --git a/test/data/translator-test-results.json b/test/data/translator-test-results.json
index 2b43e4bc..925d36cf 100644
--- a/test/data/translator-test-results.json
+++ b/test/data/translator-test-results.json
@@ -9424,7 +9424,9 @@
             "inflectionRules": [
               "-te",
               "progressive or perfect",
-              "polite past negative"
+              "polite",
+              "negative",
+              "past"
             ]
           }
         ],
@@ -9622,7 +9624,9 @@
             "inflectionRules": [
               "-te",
               "progressive or perfect",
-              "polite past negative"
+              "polite",
+              "negative",
+              "past"
             ]
           }
         ],
@@ -9820,7 +9824,9 @@
             "inflectionRules": [
               "-te",
               "progressive or perfect",
-              "polite past negative"
+              "polite",
+              "negative",
+              "past"
             ]
           }
         ],
@@ -10018,7 +10024,9 @@
             "inflectionRules": [
               "-te",
               "progressive or perfect",
-              "polite past negative"
+              "polite",
+              "negative",
+              "past"
             ]
           }
         ],
@@ -15113,7 +15121,8 @@
           {
             "source": "algorithm",
             "inflectionRules": [
-              "polite past"
+              "polite",
+              "past"
             ]
           }
         ],
-- 
cgit v1.2.3