Devoice and nasal pronunciation info (#1832)

* Update schema to support information about nasal and devoiced mora

* Expose nasalPositions and devoicePositions in dictionary entry data

* Expose nasalPositions, devoicePositions in grouped pitch info

* Update display generator

* Update test dictionary data

* Update test data

3 files changed, 136 insertions, 2 deletions

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 829f5eeb..faa1d216 100644
--- a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
@@ -41,5 +41,35 @@
                 {"position": 0, "tags": ["P2"]}
             ]
         }
+    ],
+    [
+        "番号",
+        "pitch",
+        {
+            "reading": "ばんごう",
+            "pitches": [
+                {"position": 3, "nasal": 3}
+            ]
+        }
+    ],
+    [
+        "中腰",
+        "pitch",
+        {
+            "reading": "ちゅうごし",
+            "pitches": [
+                {"position": 0, "nasal": 3}
+            ]
+        }
+    ],
+    [
+        "土木工事",
+        "pitch",
+        {
+            "reading": "どぼくこうじ",
+            "pitches": [
+                {"position": 4, "devoice": 3}
+            ]
+        }
     ]
 ]
\ No newline at end of file
diff --git a/test/data/translator-test-results.json b/test/data/translator-test-results.json
index e363c901..3ef1999f 100644
--- a/test/data/translator-test-results.json
+++ b/test/data/translator-test-results.json
@@ -1235,10 +1235,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -1366,10 +1370,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -1497,10 +1505,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -1628,10 +1640,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -3236,10 +3252,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -3367,10 +3387,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -3734,10 +3758,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -3865,10 +3893,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -4942,10 +4974,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -5120,10 +5156,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -5966,10 +6006,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -5983,10 +6027,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -6660,10 +6708,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -6795,10 +6847,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -6930,10 +6986,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -7065,10 +7125,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -7875,10 +7939,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -8006,10 +8074,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -8137,10 +8209,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -8268,10 +8344,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -9078,10 +9158,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -9209,10 +9293,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -9340,10 +9428,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -9471,10 +9563,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -10754,10 +10850,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
@@ -10771,10 +10871,14 @@
             "pitches": [
               {
                 "position": 0,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               },
               {
                 "position": 3,
+                "nasalPositions": [],
+                "devoicePositions": [],
                 "tags": []
               }
             ]
diff --git a/test/test-database.js b/test/test-database.js
index d4005364..d43f88b1 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -162,8 +162,8 @@ async function testDatabase1() {
             true
         );
         vm.assert.deepStrictEqual(counts, {
-            counts: [{kanji: 2, kanjiMeta: 2, terms: 15, termMeta: 12, tagMeta: 15, media: 2}],
-            total: {kanji: 2, kanjiMeta: 2, terms: 15, termMeta: 12, tagMeta: 15, media: 2}
+            counts: [{kanji: 2, kanjiMeta: 2, terms: 15, termMeta: 15, tagMeta: 15, media: 2}],
+            total: {kanji: 2, kanjiMeta: 2, terms: 15, termMeta: 15, tagMeta: 15, media: 2}
         });
 
         // Test find* functions