From 75aabd983da29023b8423bd44d565202aad6b664 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 14 Oct 2021 21:26:53 -0400
Subject: String frequency support (#1989)

* Restore support for string frequency values

* Add support for {value, displayValue} frequencies

* Update test data

* Improve number parsing of string frequencies

* Improve reading detection

* Expose a displayValue property for frequency information

* Update docs

* Expose displayValue to Anki note data

* Fix translator

* Update display generation

* Update test data

* Update counts
---
 .../valid-dictionary1/kanji_meta_bank_1.json       |  6 +++-
 .../valid-dictionary1/term_meta_bank_1.json        | 39 ++++++++++++++++++----
 2 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'test/data/dictionaries')

diff --git a/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json b/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json
index 73e75b8a..56b91713 100644
--- a/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json
@@ -1,4 +1,8 @@
 [
     ["打", "freq", 1],
-    ["込", "freq", 2]
+    ["込", "freq", 2],
+    ["打", "freq", "three"],
+    ["込", "freq", "four (4)"],
+    ["打", "freq", {"value": 5}],
+    ["込", "freq", {"value": 6, "displayValue": "six"}]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
index 877e5107..069ea16b 100644
--- a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
@@ -2,12 +2,39 @@
     ["打", "freq", 1],
     ["打つ", "freq", 2],
     ["打ち込む", "freq", 3],
-    ["打", "freq", {"reading": "だ", "frequency": 4}],
-    ["打", "freq", {"reading": "ダース", "frequency": 5}],
-    ["打つ", "freq", {"reading": "うつ", "frequency": 6}],
-    ["打つ", "freq", {"reading": "ぶつ", "frequency": 7}],
-    ["打ち込む", "freq", {"reading": "うちこむ", "frequency": 8}],
-    ["打ち込む", "freq", {"reading": "ぶちこむ", "frequency": 9}],
+    ["打", "freq", "four"],
+    ["打", "freq", "five (5)"],
+    ["打つ", "freq", {"value": 6}],
+    ["打ち込む", "freq", {"value": 7, "displayValue": "seven"}],
+
+    ["打", "freq", {"reading": "だ", "frequency": 8}],
+    ["打", "freq", {"reading": "ダース", "frequency": 9}],
+    ["打つ", "freq", {"reading": "うつ", "frequency": 10}],
+    ["打つ", "freq", {"reading": "ぶつ", "frequency": 11}],
+    ["打ち込む", "freq", {"reading": "うちこむ", "frequency": 12}],
+    ["打ち込む", "freq", {"reading": "ぶちこむ", "frequency": 13}],
+
+    ["打", "freq", {"reading": "だ", "frequency": "fourteen"}],
+    ["打", "freq", {"reading": "ダース", "frequency": "fifteen"}],
+    ["打つ", "freq", {"reading": "うつ", "frequency": "sixteen"}],
+    ["打つ", "freq", {"reading": "ぶつ", "frequency": "seventeen"}],
+    ["打ち込む", "freq", {"reading": "うちこむ", "frequency": "eighteen"}],
+    ["打ち込む", "freq", {"reading": "ぶちこむ", "frequency": "nineteen"}],
+
+    ["打", "freq", {"reading": "だ", "frequency": "twenty (20)"}],
+    ["打", "freq", {"reading": "ダース", "frequency": "twenty-one (21)"}],
+    ["打つ", "freq", {"reading": "うつ", "frequency": "twenty-two (22)"}],
+    ["打つ", "freq", {"reading": "ぶつ", "frequency": "twenty-three (23)"}],
+    ["打ち込む", "freq", {"reading": "うちこむ", "frequency": "twenty-four (24)"}],
+    ["打ち込む", "freq", {"reading": "ぶちこむ", "frequency": "twenty-five (25)"}],
+
+    ["打", "freq", {"reading": "だ", "frequency": {"value": 26}}],
+    ["打", "freq", {"reading": "ダース", "frequency": {"value": 27, "displayValue": "twenty-seven"}}],
+    ["打つ", "freq", {"reading": "うつ", "frequency": {"value": 28}}],
+    ["打つ", "freq", {"reading": "ぶつ", "frequency": {"value": 29, "displayValue": "twenty-nine"}}],
+    ["打ち込む", "freq", {"reading": "うちこむ", "frequency": {"value": 30}}],
+    ["打ち込む", "freq", {"reading": "ぶちこむ", "frequency": {"value": 31, "displayValue": "thirty-one"}}],
+
     [
         "打ち込む",
         "pitch",
-- 
cgit v1.2.3