commit 309f7af597d5319c1cc63246d5883b5cbd60ca28
parent 4c6f6719f5c2ecac5b6eee75da10585afa33fbbf
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Sun, 27 Jul 2014 02:18:13 +0200
Merge branch 'master' of gitorious.org:plint/plint
Diffstat:
6 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ messages.pot
res/*.mo
diaeresis*.json
Lexique*.zip
+haspirater
diff --git a/TODO b/TODO
@@ -1,5 +1,5 @@
+- profiling
- "yole" with permissive should be one syllable only
-- "K-Fet" ; should count 'K'
- highlight possible hemistiche positions where an hemistiche could have been placed
- document expected errors of test.sh and commit necessary files
- remove kludge for invalid characters, split them in specific chunks
@@ -10,10 +10,6 @@
- apprendre les rimes à partir des cooccurrences en fin de vers (et d'un
blacklist de mots ambigus ou qch?)
-== Web ==
-
-- on web frontend, selecting a radio puts relevant template in the textarea
-
== IRC ==
- undo for irc, edit for irc
diff --git a/additions b/additions
@@ -101,3 +101,4 @@ tatata tatata tatatat haïtiens
tatata tatata tatata tatat yole
tatata tatata tatata tatat York
tatata tatata tatata tat Yuval
+tatata tatata tatata ta tue-tête
diff --git a/diaeresis.json b/diaeresis.json
@@ -1 +1 @@
-[{"2": 2880, "1": 33007}, {"\u00e9\u00e9": [{"2": 15}, {}], "io": [{"2": 485, "1": 126}, {"c": [{"2": 17}, {}], "r": [{"2": 13}, {}], "p": [{"2": 4}, {}], "g": [{"2": 4}, {}], "d": [{"2": 4}, {}], "s": [{"2": 9}, {}], "t": [{"2": 9, "1": 5}, {"b": [{"1": 5}, {}], "l": [{"2": 4}, {}], "d": [{"2": 5}, {}]}], "n": [{"2": 346, "1": 106}, {"g": [{"2": 9}, {}], "f": [{"2": 4}, {}], "d": [{"2": 9}, {}], "h": [{"2": 2}, {}], "n": [{"2": 16}, {}], "m": [{"2": 45, "1": 10}, {"s": [{"1": 5}, {}], "e": [{"2": 45, "1": 5}, {"r": [{"2": 45}, {}], "\u00e9": [{"1": 5}, {}]}]}], "l": [{"2": 58, "1": 10}, {"s": [{"2": 23, "1": 10}, {"r": [{"1": 5}, {}], "b": [{"2": 4}, {}], "p": [{"2": 4}, {}], "/": [{"2": 15}, {}], "l": [{"1": 5}, {}]}], "i": [{"2": 5}, {}], "/": [{"2": 13}, {}], "n": [{"2": 4}, {}], "-": [{"2": 13}, {}]}], "s": [{"2": 90, "1": 31}, {"s": [{"2": 64, "1": 31}, {"s": [{"2": 30, "1": 26}, {"/": [{"2": 30, "1": 26}, {"a": [{"2": 16, "1": 16}, {"/": [{"2": 16, "1": 16}, {"p": [{"2": 16}, {}], "f": [{"1": 16}, {}]}]}], "i": [{"1": 10}, {}], "e": [{"2": 14}, {}]}]}], "i": [{"2": 22, "1": 5}, {"/": [{"2": 22, "1": 5}, {"c": [{"2": 4}, {}], "v": [{"2": 14}, {}], "u": [{"2": 4}, {}], "d": [{"1": 5}, {}]}]}], "n": [{"2": 4}, {}], "u": [{"2": 8}, {}]}], "/": [{"2": 13}, {}], "n": [{"2": 9}, {}], "-": [{"2": 4}, {}]}], "r": [{"2": 13, "1": 35}, {"s": [{"2": 4, "1": 35}, {"r": [{"1": 15}, {}], "u": [{"1": 15}, {}], "e": [{"1": 5}, {}], "d": [{"2": 4}, {}]}], "a": [{"2": 4}, {}], "/": [{"2": 5}, {}]}], "p": [{"2": 14}, {}], "v": [{"2": 5, "1": 5}, {"s": [{"2": 5, "1": 5}, {"a": [{"1": 5}, {}], "n": [{"2": 5}, {}]}]}], "t": [{"2": 77, "1": 15}, {"s": [{"2": 59, "1": 15}, {"c": [{"2": 17}, {}], "a": [{"2": 13}, {}], "p": [{"2": 5}, {}], "u": [{"1": 5}, {}], "i": [{"2": 4}, {}], "o": [{"1": 5}, {}], "n": [{"2": 20, "1": 5}, {"/": [{"2": 20, "1": 5}, {"e": [{"2": 20, "1": 5}, {"/": [{"2": 20, "1": 5}, {"v": [{"2": 5}, {}], "m": [{"1": 5}, {}], "t": [{"2": 15}, {}]}]}]}]}]}], "/": [{"2": 18}, {}]}], "x": [{"2": 4}, {}]}], "m": [{"2": 34, "1": 5}, {"r": [{"2": 29}, {}], "g": [{"1": 5}, {}], "l": [{"2": 5}, {}]}], "l": [{"2": 45, "1": 10}, {"r": [{"2": 12}, {}], "f": [{"1": 5}, {}], "v": [{"2": 33, "1": 5}, {"a": [{"2": 4}, {}], "o": [{"2": 8}, {}], "e": [{"2": 21, "1": 5}, {"/": [{"2": 21, "1": 5}, {"r": [{"1": 5}, {}], "n": [{"2": 13}, {}], "-": [{"2": 4}, {}], "t": [{"2": 4}, {}]}]}]}]}]}], "u\u00e9e": [{"2": 13}, {}], "\u00e9\u00e2": [{"2": 17}, {}], "ia": [{"2": 200, "1": 85}, {"s": [{"2": 13}, {}], "r": [{"2": 5, "1": 5}, {"l": [{"1": 5}, {}], "t": [{"2": 5}, {}]}], "p": [{"2": 4}, {}], "g": [{"2": 16}, {}], "b": [{"2": 9, "1": 17}, {"c": [{"2": 9}, {}], "d": [{"1": 17}, {}]}], "t": [{"2": 17}, {}], "d": [{"2": 15}, {}], "/": [{"2": 13}, {}], "n": [{"2": 75, "1": 63}, {"c": [{"2": 4}, {}], "r": [{"2": 22}, {}], "f": [{"2": 13}, {}], "v": [{"2": 4, "1": 5}, {"t": [{"2": 4}, {}], "d": [{"1": 5}, {}]}], "d": [{"2": 5, "1": 30}, {"e": [{"1": 15}, {}], "t": [{"2": 5, "1": 15}, {"o": [{"2": 5}, {}], "/": [{"1": 15}, {}]}]}], "t": [{"2": 9, "1": 28}, {"i": [{"2": 4}, {}], "/": [{"1": 28}, {}], "t": [{"2": 5}, {}]}], "l": [{"2": 18}, {}]}], "m": [{"2": 17}, {}], "l": [{"2": 16}, {}]}], "\u00e9au": [{"2": 9}, {}], "\u00e9i": [{"2": 43}, {}], "ie": [{"2": 545, "1": 2709}, {"s": [{"2": 9, "1": 74}, {"s": [{"1": 10}, {}], "r": [{"1": 14}, {}], "f": [{"1": 10}, {}], "t": [{"1": 10}, {}], "d": [{"2": 9}, {}], "c": [{"1": 10}, {}], "h": [{"1": 10}, {}], "m": [{"1": 10}, {}]}], "r": [{"2": 235, "1": 882}, {"c": [{"2": 27, "1": 59}, {"s": [{"1": 16}, {}], "/": [{"2": 27, "1": 33}, {"s": [{"2": 9}, {}], "r": [{"2": 9}, {}], "a": [{"1": 5}, {}], "e": [{"1": 5}, {}], "i": [{"1": 15}, {}], "o": [{"2": 9}, {}], "n": [{"1": 8}, {}]}], "g": [{"1": 10}, {}]}], "b": [{"1": 16}, {}], "f": [{"2": 36, "1": 148}, {"s": [{"1": 18}, {}], "/": [{"2": 31, "1": 15}, {"i": [{"2": 18}, {}], "n": [{"2": 5}, {}], "\u00e9": [{"2": 8}, {}], "f": [{"1": 15}, {}]}], "-": [{"2": 5, "1": 97}, {"-": [{"2": 5, "1": 97}, {}]}], "t": [{"1": 18}, {}]}], "d": [{"2": 8, "1": 10}, {"s": [{"1": 5}, {}], "/": [{"2": 8, "1": 5}, {"\u00e9": [{"2": 4}, {}], "o": [{"2": 4}, {}], "u": [{"1": 5}, {}]}]}], "h": [{"2": 12, "1": 51}, {"r": [{"1": 5}, {}], "/": [{"1": 5}, {}], "-": [{"2": 12, "1": 41}, {"-": [{"2": 12, "1": 41}, {}]}]}], "n": [{"2": 20, "1": 75}, {"s": [{"1": 14}, {}], "/": [{"2": 5, "1": 61}, {"r": [{"1": 20}, {}], "a": [{"2": 5}, {}], "g": [{"1": 16}, {}], "u": [{"1": 5}, {}], "e": [{"1": 15}, {}], "\u00f4": [{"1": 5}, {}]}], "-": [{"2": 15}, {}]}], "m": [{"1": 51}, {}], "l": [{"2": 39, "1": 104}, {"s": [{"1": 16}, {}], "r": [{"1": 10}, {}], "/": [{"2": 30, "1": 73}, {"b": [{"2": 16}, {}], "a": [{"1": 17}, {}], "p": [{"2": 5}, {}], "e": [{"1": 10}, {}], "u": [{"1": 5}, {}], "\u00e9": [{"2": 5, "1": 5}, {"/": [{"2": 5, "1": 5}, {"b": [{"1": 5}, {}], "d": [{"2": 5}, {}]}]}], "o": [{"1": 15}, {}], "i": [{"1": 16}, {}], "l": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"i": [{"1": 5}, {}], "a": [{"2": 4}, {}]}]}]}], "-": [{"2": 9}, {}], "e": [{"1": 5}, {}]}], "s": [{"2": 9, "1": 59}, {"s": [{"1": 24}, {}], "/": [{"2": 9, "1": 35}, {"s": [{"1": 15}, {}], "r": [{"1": 10}, {}], "a": [{"2": 9, "1": 5}, {"/": [{"2": 9, "1": 5}, {"r": [{"1": 5}, {}], "t": [{"2": 9}, {}]}]}], "u": [{"1": 5}, {}]}]}], "r": [{"2": 46, "1": 73}, {"s": [{"1": 19}, {}], "/": [{"2": 46, "1": 54}, {"c": [{"2": 22}, {}], "r": [{"1": 24}, {}], "a": [{"1": 5}, {}], "p": [{"2": 15}, {}], "v": [{"2": 4}, {}], "u": [{"1": 15}, {}], "o": [{"2": 5, "1": 10}, {"/": [{"2": 5, "1": 10}, {"s": [{"1": 10}, {}], "m": [{"2": 5}, {}]}]}]}]}], "q": [{"1": 18}, {}], "p": [{"2": 21, "1": 48}, {"s": [{"1": 14}, {}], "r": [{"1": 14}, {}], "/": [{"2": 21, "1": 20}, {"r": [{"1": 5}, {}], "a": [{"1": 15}, {}], "x": [{"2": 13}, {}], "o": [{"2": 8}, {}]}]}], "v": [{"2": 8, "1": 25}, {"/": [{"2": 8, "1": 10}, {"a": [{"1": 5}, {}], "n": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"a": [{"1": 5}, {}], "e": [{"2": 8}, {}]}]}]}], "g": [{"1": 15}, {}]}], "t": [{"2": 9, "1": 132}, {"s": [{"1": 18}, {}], "/": [{"2": 9, "1": 114}, {"\u00e2": [{"2": 9}, {}], "e": [{"1": 18}, {}], "u": [{"1": 5}, {}], "r": [{"1": 14}, {}], "\u00ee": [{"1": 5}, {}], "\u00e9": [{"1": 16}, {}], "n": [{"1": 20}, {}], "i": [{"1": 18}, {}], "l": [{"1": 18}, {}]}]}], "z": [{"1": 13}, {}]}], "f": [{"1": 5}, {}], "d": [{"1": 61}, {}], "z": [{"2": 85, "1": 298}, {"c": [{"2": 15}, {}], "f": [{"2": 13}, {}], "d": [{"2": 8, "1": 36}, {"/": [{"2": 8, "1": 26}, {"\u00e9": [{"1": 5}, {}], "n": [{"1": 16}, {}], "u": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"t": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"\u00e9": [{"2": 8, "1": 5}, {"-": [{"2": 8, "1": 5}, {"-": [{"2": 8, "1": 5}, {}]}]}]}]}]}]}]}], "-": [{"1": 10}, {}]}], "h": [{"1": 16}, {}], "n": [{"1": 16}, {}], "m": [{"1": 15}, {}], "l": [{"2": 16, "1": 41}, {"/": [{"2": 16, "1": 36}, {"r": [{"1": 5}, {}], "l": [{"1": 10}, {}], "e": [{"1": 5}, {}], "u": [{"1": 16}, {}], "b": [{"2": 16}, {}]}], "-": [{"1": 5}, {}]}], "s": [{"1": 20}, {}], "r": [{"2": 33, "1": 114}, {"/": [{"2": 17, "1": 69}, {"r": [{"1": 18}, {}], "a": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"v": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {}]}]}]}]}], "u": [{"1": 14}, {}], "e": [{"1": 17}, {}], "d": [{"2": 13}, {}], "i": [{"1": 10}, {}], "o": [{"1": 5}, {}]}], "-": [{"2": 16, "1": 45}, {"r": [{"1": 10}, {}], "e": [{"1": 15}, {}], "u": [{"1": 10}, {}], "d": [{"2": 12}, {}], "i": [{"1": 10}, {}], "-": [{"2": 4}, {}]}]}], "p": [{"1": 5}, {}], "v": [{"1": 14}, {}], "t": [{"1": 16}, {}], "Y": [{"1": 5}, {}]}], "t": [{"2": 21, "1": 24}, {"s": [{"1": 14}, {}], "q": [{"2": 17}, {}], "v": [{"1": 5}, {}], "m": [{"2": 4, "1": 5}, {"t": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"e": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {}]}]}]}]}]}]}]}], "/": [{"1": 130}, {}], "n": [{"2": 177, "1": 1121}, {"c": [{"2": 32, "1": 10}, {"c": [{"2": 20}, {}], "/": [{"2": 12, "1": 5}, {"i": [{"2": 12}, {}], "n": [{"1": 5}, {}]}], "n": [{"1": 5}, {}]}], "b": [{"1": 405}, {}], "g": [{"2": 13}, {}], "d": [{"2": 12, "1": 9}, {"c": [{"2": 8}, {}], "s": [{"1": 4}, {}], "/": [{"2": 4, "1": 5}, {"\u00e9": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"g": [{"2": 4}, {}], "m": [{"1": 5}, {}]}]}]}]}], "h": [{"1": 14}, {}], "n": [{"2": 4}, {}], "m": [{"1": 23}, {}], "l": [{"2": 18}, {}], "s": [{"2": 9, "1": 35}, {"s": [{"2": 9, "1": 18}, {"i": [{"2": 9}, {}], "/": [{"1": 18}, {}]}], "n": [{"1": 2}, {}], "-": [{"1": 15}, {}]}], "r": [{"2": 49, "1": 150}, {"c": [{"2": 15}, {}], "s": [{"2": 8, "1": 10}, {"/": [{"1": 10}, {}], "i": [{"2": 4}, {}], "o": [{"2": 4}, {}]}], "t": [{"2": 14}, {}], "/": [{"2": 8}, {}], "n": [{"2": 4}, {}], "-": [{"1": 140}, {}]}], "v": [{"1": 257}, {}], "t": [{"2": 40, "1": 218}, {"s": [{"1": 38}, {}], "c": [{"2": 13}, {}], "d": [{"1": 14}, {}], "t": [{"2": 18, "1": 78}, {"a": [{"2": 18}, {}], "/": [{"1": 24}, {}], "e": [{"1": 20}, {}], "u": [{"1": 19}, {}], "n": [{"1": 15}, {}]}], "/": [{"2": 9, "1": 51}, {"u": [{"1": 5}, {}], "i": [{"2": 9}, {}], "\u00e9": [{"1": 16}, {}], "e": [{"1": 16}, {}], "n": [{"1": 14}, {}]}], "n": [{"1": 24}, {}], "-": [{"1": 13}, {}]}]}], "l": [{"2": 18, "1": 114}, {"c": [{"2": 9, "1": 91}, {"/": [{"2": 9}, {}], "-": [{"1": 91}, {}]}], "f": [{"1": 13}, {}], "m": [{"1": 10}, {}], "t": [{"2": 9}, {}]}]}], "uo": [{"2": 22, "1": 5}, {"s": [{"2": 9}, {}], "n": [{"2": 13, "1": 5}, {"g": [{"1": 5}, {}], "l": [{"2": 13}, {}]}]}], "ui": [{"2": 58, "1": 1478}, {"c": [{"1": 18}, {}], "g": [{"1": 13}, {}], "d": [{"1": 20}, {}], "/": [{"1": 468}, {}], "n": [{"2": 53, "1": 25}, {"j": [{"1": 5}, {}], "g": [{"1": 10}, {}], "r": [{"2": 53, "1": 10}, {"\u00e9": [{"2": 9, "1": 5}, {"/": [{"2": 9, "1": 5}, {"s": [{"2": 5}, {}], "-": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {}]}]}]}], "e": [{"2": 44, "1": 5}, {"/": [{"2": 44, "1": 5}, {"s": [{"2": 5}, {}], "-": [{"2": 35, "1": 5}, {"-": [{"2": 35, "1": 5}, {}]}], "u": [{"2": 4}, {}]}]}]}]}], "m": [{"1": 46}, {}], "l": [{"1": 14}, {}], "s": [{"1": 429}, {}], "r": [{"1": 49}, {}], "p": [{"1": 5}, {}], "v": [{"1": 76}, {}], "t": [{"2": 5, "1": 315}, {"s": [{"1": 43}, {}], "r": [{"1": 92}, {}], "p": [{"1": 10}, {}], "g": [{"1": 10}, {}], "f": [{"1": 35}, {}], "d": [{"1": 55}, {}], "c": [{"1": 5}, {}], "h": [{"1": 16}, {}], "n": [{"1": 49}, {}], "l": [{"2": 5}, {}]}]}], "eoi": [{"1": 22}, {}], "ue": [{"2": 167, "1": 196}, {"s": [{"1": 19}, {}], "r": [{"2": 67, "1": 40}, {"c": [{"2": 4}, {}], "b": [{"2": 4}, {}], "t": [{"2": 16, "1": 35}, {"a": [{"1": 15}, {}], "o": [{"1": 10}, {}], "i": [{"1": 10}, {}], "-": [{"2": 16}, {}]}], "h": [{"2": 5}, {}], "n": [{"2": 13}, {}], "m": [{"2": 12, "1": 5}, {"a": [{"2": 4, "1": 5}, {"e": [{"2": 4, "1": 5}, {"i": [{"2": 4, "1": 5}, {"r": [{"2": 4, "1": 5}, {"t": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"i": [{"1": 5}, {}], "-": [{"2": 4}, {}]}]}]}]}]}]}], "/": [{"2": 8}, {}]}], "l": [{"2": 13}, {}]}], "t": [{"2": 13}, {}], "z": [{"2": 13}, {}], "/": [{"1": 122}, {}], "n": [{"2": 9, "1": 15}, {"p": [{"1": 10}, {}], "m": [{"1": 5}, {}], "l": [{"2": 9}, {}]}], "l": [{"2": 65}, {}]}], "eue": [{"2": 5, "1": 10}, {"/": [{"1": 10}, {}], "t": [{"2": 5}, {}]}], "ua": [{"2": 19}, {}], "eo": [{"1": 17}, {}], "o\u00f9": [{"1": 213}, {}], "au": [{"1": 2293}, {}], "ee": [{"1": 10}, {}], "\u0153u": [{"1": 191}, {}], "ea": [{"1": 51}, {}], "\u0153i": [{"1": 22}, {}], "e\u00fci": [{"1": 5}, {}], "o\u00ef": [{"2": 19}, {}], "o\u00ee": [{"1": 26}, {}], "o\u00e9": [{"2": 16}, {}], "o\u00e8": [{"2": 16}, {}], "ae": [{"1": 15}, {}], "o\u00ea": [{"1": 5}, {}], "oi": [{"1": 3859}, {}], "eu": [{"1": 3738}, {}], "ao": [{"2": 12, "1": 15}, {"s": [{"2": 4}, {}], "n": [{"2": 4, "1": 15}, {"r": [{"2": 4}, {}], "p": [{"1": 15}, {}]}], "t": [{"2": 4}, {}]}], "yau": [{"2": 4}, {}], "\u00e9ai": [{"2": 5}, {}], "uaie": [{"2": 4}, {}], "oeu": [{"1": 125}, {}], "ao\u00fb": [{"1": 5}, {}], "oei": [{"1": 18}, {}], "a\u00efa": [{"2": 4}, {}], "eau": [{"1": 450}, {}], "eui": [{"1": 52}, {}], "aie": [{"1": 129}, {}], "ui\u00e8": [{"1": 5}, {}], "ai": [{"1": 5798}, {}], "oui": [{"2": 72, "1": 185}, {"s": [{"2": 25}, {}], "r": [{"2": 16}, {}], "t": [{"2": 14}, {}], "/": [{"2": 17}, {}], "-": [{"1": 134}, {}], "l": [{"1": 51}, {}]}], "ouie": [{"2": 4}, {}], "ouai": [{"2": 15}, {}], "ouo": [{"2": 4}, {}], "aeu": [{"2": 5}, {}], "oua": [{"2": 43, "1": 15}, {"h": [{"1": 15}, {}], "/": [{"2": 12}, {}], "n": [{"2": 27}, {}], "t": [{"2": 4}, {}]}], "a\u00ef": [{"2": 70, "1": 10}, {"s": [{"2": 14}, {}], "r": [{"2": 20}, {}], "f": [{"2": 13}, {}], "/": [{"2": 8}, {}], "-": [{"1": 10}, {}], "v": [{"2": 15}, {}]}], "oue": [{"2": 120, "1": 95}, {"s": [{"2": 10, "1": 12}, {"r": [{"2": 10}, {}], "j": [{"1": 12}, {}]}], "r": [{"2": 64, "1": 25}, {"r": [{"2": 8}, {}], "l": [{"2": 16}, {}], "v": [{"2": 21, "1": 10}, {"a": [{"1": 10}, {}], "/": [{"2": 17}, {}], "-": [{"2": 4}, {}]}], "n": [{"2": 4}, {}], "j": [{"2": 15, "1": 15}, {"a": [{"1": 5}, {}], "o": [{"1": 5}, {}], "e": [{"1": 5}, {}], "-": [{"2": 15}, {}]}]}], "t": [{"2": 27, "1": 5}, {"r": [{"2": 4}, {}], "l": [{"2": 9}, {}], "f": [{"1": 5}, {}], "j": [{"2": 14}, {}]}], "z": [{"2": 14}, {}], "/": [{"1": 38}, {}], "n": [{"2": 5, "1": 5}, {"r": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {}]}]}]}], "m": [{"1": 10}, {}]}], "i\u00e9e": [{"2": 16}, {}], "ei": [{"1": 751}, {}], "oueu": [{"2": 13}, {}], "eoie": [{"1": 5}, {}], "aei": [{"2": 5}, {}], "o\u00fcoi": [{"2": 5}, {}], "\u00e2i": [{"1": 16}, {}], "i\u00e9": [{"2": 125, "1": 77}, {"s": [{"2": 39, "1": 10}, {"r": [{"2": 4}, {}], "l": [{"2": 14}, {}], "f": [{"2": 8}, {}], "v": [{"2": 13}, {}], "t": [{"1": 10}, {}]}], "r": [{"1": 5}, {}], "g": [{"1": 13}, {}], "t": [{"2": 29}, {}], "d": [{"1": 15}, {}], "/": [{"2": 57, "1": 34}, {"s": [{"2": 5}, {}], "r": [{"2": 18}, {}], "p": [{"2": 5}, {}], "f": [{"2": 12}, {}], "d": [{"2": 4}, {}], "t": [{"1": 34}, {}], "l": [{"2": 13}, {}]}]}], "i\u00e8": [{"2": 59, "1": 343}, {"c": [{"1": 32}, {}], "r": [{"2": 24, "1": 231}, {"c": [{"1": 5}, {}], "f": [{"1": 15}, {}], "d": [{"1": 10}, {}], "n": [{"1": 35}, {}], "m": [{"1": 44}, {}], "l": [{"1": 13}, {}], "s": [{"1": 18}, {}], "r": [{"2": 24, "1": 31}, {"e": [{"2": 24, "1": 31}, {"r": [{"1": 26}, {}], "p": [{"2": 16}, {}], "u": [{"1": 5}, {}], "t": [{"2": 8}, {}]}]}], "q": [{"1": 10}, {}], "p": [{"1": 5}, {}], "v": [{"1": 15}, {}], "t": [{"1": 30}, {}]}], "g": [{"1": 20}, {}], "v": [{"1": 20}, {}], "t": [{"2": 18, "1": 5}, {"q": [{"2": 18}, {}], "p": [{"1": 5}, {}]}], "m": [{"2": 17, "1": 35}, {"s": [{"2": 4, "1": 10}, {"e": [{"2": 4, "1": 10}, {"i": [{"2": 4, "1": 10}, {"/": [{"2": 4, "1": 10}, {"o": [{"2": 4, "1": 10}, {"/": [{"2": 4, "1": 10}, {"r": [{"2": 4, "1": 10}, {"/": [{"2": 4, "1": 10}, {"t": [{"2": 4, "1": 10}, {"-": [{"2": 4, "1": 10}, {"-": [{"2": 4, "1": 10}, {}]}]}]}]}]}]}]}]}]}]}], "r": [{"2": 9}, {}], "q": [{"1": 5}, {}], "v": [{"1": 5}, {}], "t": [{"2": 4}, {}], "x": [{"1": 15}, {}]}]}], "\u00e9o": [{"2": 30}, {}], "e": [{"1": 42}, {}], "\u00e9a": [{"2": 48}, {}], "\u00e9e": [{"2": 27, "1": 80}, {"s": [{"2": 12}, {}], "x": [{"2": 5}, {}], "/": [{"1": 80}, {}], "n": [{"2": 5}, {}], "l": [{"2": 5}, {}]}], "u\u00ef": [{"2": 5}, {}], "u\u00ee": [{"2": 4, "1": 15}, {"t": [{"2": 4, "1": 15}, {"h": [{"2": 4, "1": 15}, {"r": [{"2": 4, "1": 15}, {"/": [{"2": 4, "1": 5}, {"i": [{"2": 4}, {}], "e": [{"1": 5}, {}]}], "l": [{"1": 10}, {}]}]}]}]}], "eai": [{"1": 22}, {}], "u\u00eb": [{"1": 16}, {}], "u\u00ea": [{"1": 10}, {}], "u\u00e9": [{"2": 8}, {}], "u\u00e8": [{"2": 8}, {}], "eaie": [{"1": 15}, {}], "\u00e9u": [{"2": 21}, {}], "euoe": [{"2": 4}, {}], "e\u00ee": [{"1": 5}, {}], "you": [{"1": 5}, {}], "iou": [{"2": 5, "1": 16}, {"s": [{"1": 16}, {}], "l": [{"2": 5}, {}]}], "ueu": [{"2": 14}, {}], "a\u00efeu": [{"2": 36}, {}], "oo": [{"2": 5, "1": 5}, {"r": [{"2": 5}, {}], "t": [{"1": 5}, {}]}], "e\u00fb": [{"1": 56}, {}], "iu": [{"2": 13}, {}], "uei": [{"1": 23}, {}], "oe": [{"2": 5, "1": 40}, {"r": [{"2": 5}, {}], "l": [{"1": 10}, {}], "f": [{"1": 5}, {}], "m": [{"1": 5}, {}], "d": [{"1": 20}, {}]}], "a\u00e8": [{"2": 4}, {}], "oa": [{"2": 16}, {}], "a\u00ee": [{"1": 269}, {}], "uau": [{"2": 20}, {}], "aou": [{"2": 5}, {}], "\u00ea\u00ea": [{"1": 5}, {}], "iai": [{"2": 15}, {}], "oie": [{"1": 133}, {}], "uia": [{"2": 4}, {}], "ouaie": [{"2": 4}, {}], "uie": [{"1": 15}, {}], "iau": [{"2": 5}, {}], "o\u00fc\u00e9": [{"2": 4}, {}], "eu\u00e2": [{"2": 4}, {}], "ou\u00e9": [{"2": 15}, {}], "a\u00efe": [{"2": 14, "1": 5}, {"n": [{"2": 14}, {}], "-": [{"1": 5}, {}]}], "o\u00fb": [{"1": 56}, {}], "ou\u00ef": [{"2": 18}, {}], "ieu": [{"2": 260, "1": 609}, {"s": [{"2": 34}, {}], "r": [{"2": 16, "1": 111}, {"s": [{"1": 111}, {}], "r": [{"2": 16}, {}]}], "x": [{"2": 210, "1": 269}, {"c": [{"2": 46, "1": 22}, {"/": [{"2": 46}, {}], "-": [{"1": 22}, {}]}], "r": [{"2": 51}, {}], "p": [{"2": 15}, {}], "g": [{"2": 9}, {}], "v": [{"2": 16, "1": 24}, {"/": [{"2": 16}, {}], "-": [{"1": 24}, {}]}], "t": [{"2": 15}, {}], "d": [{"2": 44, "1": 74}, {"/": [{"2": 44, "1": 23}, {"a": [{"2": 10, "1": 18}, {"/": [{"2": 10}, {}], "-": [{"1": 18}, {}]}], "o": [{"2": 30}, {}], "i": [{"1": 5}, {}], "u": [{"2": 4}, {}]}], "-": [{"1": 51}, {}]}], "n": [{"2": 14}, {}], "m": [{"1": 75}, {}], "l": [{"1": 74}, {}]}], "/": [{"1": 229}, {}]}], "ou": [{"1": 8130}, {}], "iei": [{"1": 31}, {}], "yeu": [{"1": 219}, {}], "yo": [{"2": 9}, {}], "ou\u00fc": [{"1": 10}, {}], "ya": [{"2": 12}, {}], "i\u00e2ou": [{"2": 4}, {}], "ye": [{"1": 5}, {}]}]
+[{"2": 2778, "1": 32901}, {"ui": [{"2": 22, "1": 1468}, {"s": [{"1": 429}, {}], "v": [{"1": 76}, {}], "c": [{"1": 18}, {}], "t": [{"2": 5, "1": 315}, {"f": [{"1": 35}, {}], "l": [{"2": 5}, {}], "s": [{"1": 43}, {}], "n": [{"1": 49}, {}], "d": [{"1": 55}, {}], "p": [{"1": 10}, {}], "g": [{"1": 10}, {}], "c": [{"1": 5}, {}], "h": [{"1": 16}, {}], "r": [{"1": 92}, {}]}], "m": [{"1": 46}, {}], "d": [{"1": 20}, {}], "r": [{"1": 49}, {}], "n": [{"2": 17, "1": 15}, {"g": [{"1": 10}, {}], "j": [{"1": 5}, {}], "r": [{"2": 17}, {}]}], "p": [{"1": 5}, {}], "g": [{"1": 13}, {}], "/": [{"1": 468}, {}], "l": [{"1": 14}, {}]}], "ui\u00e8": [{"1": 5}, {}], "eu": [{"1": 3736}, {}], "eoi": [{"1": 22}, {}], "\u0153i": [{"1": 22}, {}], "\u00e9\u00e9": [{"2": 15}, {}], "oei": [{"1": 18}, {}], "i\u00e2ou": [{"2": 4}, {}], "aeu": [{"2": 5}, {}], "oeu": [{"1": 125}, {}], "iau": [{"2": 5, "1": 5}, {"l": [{"2": 5, "1": 5}, {"m": [{"2": 5, "1": 5}, {"e": [{"2": 5, "1": 5}, {"/": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {}]}]}]}]}]}]}], "ueu": [{"2": 14}, {}], "i\u00e9e": [{"2": 16}, {}], "eoie": [{"1": 5}, {}], "iai": [{"2": 15}, {}], "ee": [{"1": 10}, {}], "ou": [{"1": 8124}, {}], "u\u00ee": [{"2": 4, "1": 15}, {"t": [{"2": 4, "1": 15}, {"h": [{"2": 4, "1": 15}, {"r": [{"2": 4, "1": 15}, {"/": [{"2": 4, "1": 5}, {"i": [{"2": 4}, {}], "e": [{"1": 5}, {}]}], "l": [{"1": 10}, {}]}]}]}]}], "aie": [{"1": 129}, {}], "u\u00e9e": [{"2": 13}, {}], "ie": [{"2": 523, "1": 2674}, {"d": [{"1": 61}, {}], "z": [{"2": 85, "1": 298}, {"f": [{"2": 13}, {}], "Y": [{"1": 5}, {}], "s": [{"1": 20}, {}], "v": [{"1": 14}, {}], "c": [{"2": 15}, {}], "t": [{"1": 16}, {}], "m": [{"1": 15}, {}], "d": [{"2": 8, "1": 36}, {"-": [{"1": 10}, {}], "/": [{"2": 8, "1": 26}, {"u": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"t": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"\u00e9": [{"2": 8, "1": 5}, {"-": [{"2": 8, "1": 5}, {"-": [{"2": 8, "1": 5}, {}]}]}]}]}]}]}], "\u00e9": [{"1": 5}, {}], "n": [{"1": 16}, {}]}]}], "r": [{"2": 33, "1": 114}, {"-": [{"2": 16, "1": 45}, {"i": [{"1": 10}, {}], "d": [{"2": 12}, {}], "u": [{"1": 10}, {}], "e": [{"1": 15}, {}], "-": [{"2": 4}, {}], "r": [{"1": 10}, {}]}], "/": [{"2": 17, "1": 69}, {"i": [{"1": 10}, {}], "d": [{"2": 13}, {}], "o": [{"1": 5}, {}], "a": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"v": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {}]}]}]}]}], "u": [{"1": 14}, {}], "e": [{"1": 17}, {}], "r": [{"1": 18}, {}]}]}], "n": [{"1": 16}, {}], "p": [{"1": 5}, {}], "h": [{"1": 16}, {}], "l": [{"2": 16, "1": 41}, {"-": [{"1": 5}, {}], "/": [{"2": 16, "1": 36}, {"u": [{"1": 16}, {}], "e": [{"1": 5}, {}], "l": [{"1": 10}, {}], "r": [{"1": 5}, {}], "b": [{"2": 16}, {}]}]}]}], "n": [{"2": 159, "1": 1083}, {"s": [{"2": 9, "1": 35}, {"-": [{"1": 15}, {}], "n": [{"1": 2}, {}], "s": [{"2": 9, "1": 18}, {"i": [{"2": 9}, {}], "/": [{"1": 18}, {}]}]}], "b": [{"1": 405}, {}], "v": [{"1": 257}, {}], "c": [{"2": 23}, {}], "t": [{"2": 31, "1": 190}, {"d": [{"1": 14}, {}], "n": [{"1": 24}, {}], "s": [{"1": 38}, {}], "c": [{"2": 13}, {}], "-": [{"1": 13}, {}], "/": [{"1": 23}, {}], "t": [{"2": 18, "1": 78}, {"u": [{"1": 19}, {}], "a": [{"2": 18}, {}], "e": [{"1": 20}, {}], "/": [{"1": 24}, {}], "n": [{"1": 15}, {}]}]}], "m": [{"1": 23}, {}], "d": [{"2": 12, "1": 9}, {"c": [{"2": 8}, {}], "/": [{"2": 4, "1": 5}, {"\u00e9": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"m": [{"1": 5}, {}], "g": [{"2": 4}, {}]}]}]}], "s": [{"1": 4}, {}]}], "r": [{"2": 49, "1": 150}, {"n": [{"2": 4}, {}], "s": [{"2": 8, "1": 10}, {"i": [{"2": 4}, {}], "o": [{"2": 4}, {}], "/": [{"1": 10}, {}]}], "-": [{"1": 140}, {}], "c": [{"2": 15}, {}], "/": [{"2": 8}, {}], "t": [{"2": 14}, {}]}], "n": [{"2": 4}, {}], "g": [{"2": 13}, {}], "h": [{"1": 14}, {}], "l": [{"2": 18}, {}]}], "s": [{"2": 9, "1": 74}, {"m": [{"1": 10}, {}], "f": [{"1": 10}, {}], "s": [{"1": 10}, {}], "d": [{"2": 9}, {}], "c": [{"1": 10}, {}], "h": [{"1": 10}, {}], "r": [{"1": 14}, {}], "t": [{"1": 10}, {}]}], "f": [{"1": 5}, {}], "l": [{"2": 9, "1": 114}, {"m": [{"1": 10}, {}], "f": [{"1": 13}, {}], "c": [{"1": 91}, {}], "t": [{"2": 9}, {}]}], "/": [{"1": 130}, {}], "r": [{"2": 240, "1": 885}, {"f": [{"2": 36, "1": 148}, {"-": [{"2": 5, "1": 97}, {"-": [{"2": 5, "1": 97}, {}]}], "/": [{"2": 31, "1": 15}, {"i": [{"2": 18}, {}], "\u00e9": [{"2": 8}, {}], "f": [{"1": 15}, {}], "n": [{"2": 5}, {}]}], "s": [{"1": 18}, {}], "t": [{"1": 18}, {}]}], "z": [{"1": 13}, {}], "s": [{"2": 9, "1": 59}, {"/": [{"2": 9, "1": 35}, {"u": [{"1": 5}, {}], "a": [{"2": 9, "1": 5}, {"/": [{"2": 9, "1": 5}, {"t": [{"2": 9}, {}], "r": [{"1": 5}, {}]}]}], "s": [{"1": 15}, {}], "r": [{"1": 10}, {}]}], "s": [{"1": 24}, {}]}], "b": [{"1": 16}, {}], "v": [{"2": 8, "1": 23}, {"g": [{"1": 13}, {}], "/": [{"2": 8, "1": 10}, {"a": [{"1": 5}, {}], "n": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"e": [{"2": 8}, {}], "a": [{"1": 5}, {}]}]}]}]}], "c": [{"2": 27, "1": 59}, {"g": [{"1": 10}, {}], "/": [{"2": 27, "1": 33}, {"i": [{"1": 15}, {}], "s": [{"2": 9}, {}], "a": [{"1": 5}, {}], "e": [{"1": 5}, {}], "o": [{"2": 9}, {}], "r": [{"2": 9}, {}], "n": [{"1": 8}, {}]}], "s": [{"1": 16}, {}]}], "q": [{"1": 18}, {}], "t": [{"2": 9, "1": 137}, {"/": [{"2": 9, "1": 114}, {"i": [{"1": 18}, {}], "\u00ee": [{"1": 5}, {}], "\u00e2": [{"2": 9}, {}], "l": [{"1": 18}, {}], "n": [{"1": 20}, {}], "\u00e9": [{"1": 16}, {}], "u": [{"1": 5}, {}], "e": [{"1": 18}, {}], "r": [{"1": 14}, {}]}], "s": [{"1": 18}, {}], "\u00e7": [{"1": 5}, {}]}], "m": [{"1": 51}, {}], "d": [{"2": 8, "1": 10}, {"/": [{"2": 8, "1": 5}, {"u": [{"1": 5}, {}], "\u00e9": [{"2": 4}, {}], "o": [{"2": 4}, {}]}], "s": [{"1": 5}, {}]}], "r": [{"2": 46, "1": 73}, {"/": [{"2": 46, "1": 54}, {"o": [{"2": 5, "1": 10}, {"/": [{"2": 5, "1": 10}, {"m": [{"2": 5}, {}], "s": [{"1": 10}, {}]}]}], "a": [{"1": 5}, {}], "u": [{"1": 15}, {}], "v": [{"2": 4}, {}], "p": [{"2": 15}, {}], "c": [{"2": 22}, {}], "r": [{"1": 24}, {}]}], "s": [{"1": 19}, {}]}], "n": [{"2": 20, "1": 75}, {"-": [{"2": 15}, {}], "/": [{"2": 5, "1": 61}, {"e": [{"1": 15}, {}], "\u00f4": [{"1": 5}, {}], "a": [{"2": 5}, {}], "u": [{"1": 5}, {}], "g": [{"1": 16}, {}], "r": [{"1": 20}, {}]}], "s": [{"1": 14}, {}]}], "p": [{"2": 21, "1": 48}, {"r": [{"1": 14}, {}], "/": [{"2": 21, "1": 20}, {"a": [{"1": 15}, {}], "x": [{"2": 13}, {}], "r": [{"1": 5}, {}], "o": [{"2": 8}, {}]}], "s": [{"1": 14}, {}]}], "h": [{"2": 12, "1": 51}, {"-": [{"2": 12, "1": 41}, {"-": [{"2": 12, "1": 41}, {}]}], "/": [{"1": 5}, {}], "r": [{"1": 5}, {}]}], "l": [{"2": 44, "1": 104}, {"e": [{"1": 5}, {}], "-": [{"2": 9}, {}], "r": [{"1": 10}, {}], "s": [{"1": 16}, {}], "/": [{"2": 35, "1": 73}, {"i": [{"1": 16}, {}], "\u00e9": [{"2": 5, "1": 5}, {"/": [{"2": 5, "1": 5}, {"d": [{"2": 5}, {}], "b": [{"1": 5}, {}]}]}], "e": [{"1": 10}, {}], "o": [{"1": 15}, {}], "a": [{"1": 17}, {}], "b": [{"2": 16}, {}], "u": [{"1": 5}, {}], "p": [{"2": 5}, {}], "g": [{"2": 5}, {}], "l": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"i": [{"1": 5}, {}], "a": [{"2": 4}, {}]}]}]}]}]}], "t": [{"2": 21, "1": 24}, {"m": [{"2": 4, "1": 5}, {"t": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"e": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {}]}]}]}]}]}]}], "v": [{"1": 5}, {}], "q": [{"2": 17}, {}], "s": [{"1": 14}, {}]}]}], "\u00e9ai": [{"2": 5}, {}], "o\u00e9": [{"2": 16}, {}], "yeu": [{"1": 219}, {}], "yu": [{"1": 5}, {}], "o\u00fc\u00e9": [{"2": 4}, {}], "ei": [{"1": 751}, {}], "\u00e9au": [{"2": 9}, {}], "ai": [{"1": 5794}, {}], "ou\u00fc": [{"1": 10}, {}], "ouie": [{"2": 4}, {}], "a\u00e9": [{"2": 5}, {}], "\u00e2i": [{"1": 16}, {}], "iou": [{"2": 5, "1": 16}, {"l": [{"2": 5}, {}], "s": [{"1": 16}, {}]}], "u\u00e9": [{"2": 8}, {}], "yo": [{"2": 9, "1": 10}, {"l": [{"1": 5}, {}], "t": [{"2": 4}, {}], "r": [{"1": 5}, {}], "n": [{"2": 5}, {}]}], "\u00e9o": [{"2": 30}, {}], "e\u00ee": [{"1": 5}, {}], "\u00e9a": [{"2": 48}, {}], "a\u00efe": [{"2": 14}, {}], "oua": [{"2": 31}, {}], "a\u00ef": [{"2": 32}, {}], "aouie": [{"2": 5}, {}], "o\u00f9": [{"1": 212}, {}], "eaie": [{"1": 15}, {}], "ya": [{"2": 12}, {}], "u\u00eb": [{"1": 16}, {}], "uo": [{"2": 22, "1": 5}, {"n": [{"2": 13, "1": 5}, {"g": [{"1": 5}, {}], "l": [{"2": 13}, {}]}], "s": [{"2": 9}, {}]}], "aei": [{"2": 5}, {}], "\u00e9u": [{"2": 21}, {}], "io": [{"2": 458, "1": 101}, {"m": [{"2": 31}, {}], "d": [{"2": 4}, {}], "l": [{"2": 21}, {}], "n": [{"2": 346, "1": 101}, {"f": [{"2": 4}, {}], "x": [{"2": 4}, {}], "s": [{"2": 90, "1": 31}, {"-": [{"2": 4}, {}], "/": [{"2": 13}, {}], "s": [{"2": 64, "1": 31}, {"i": [{"2": 22, "1": 5}, {"/": [{"2": 22, "1": 5}, {"u": [{"2": 4}, {}], "v": [{"2": 14}, {}], "d": [{"1": 5}, {}], "c": [{"2": 4}, {}]}]}], "u": [{"2": 8}, {}], "n": [{"2": 4}, {}], "s": [{"2": 30, "1": 26}, {"/": [{"2": 30, "1": 26}, {"i": [{"1": 10}, {}], "e": [{"2": 14}, {}], "a": [{"2": 16, "1": 16}, {"/": [{"2": 16, "1": 16}, {"p": [{"2": 16}, {}], "f": [{"1": 16}, {}]}]}]}]}]}], "n": [{"2": 9}, {}]}], "v": [{"2": 5, "1": 5}, {"s": [{"2": 5, "1": 5}, {"a": [{"1": 5}, {}], "n": [{"2": 5}, {}]}]}], "t": [{"2": 77, "1": 15}, {"/": [{"2": 18}, {}], "s": [{"2": 59, "1": 15}, {"i": [{"2": 4}, {}], "n": [{"2": 20, "1": 5}, {"/": [{"2": 20, "1": 5}, {"e": [{"2": 20, "1": 5}, {"/": [{"2": 20, "1": 5}, {"m": [{"1": 5}, {}], "v": [{"2": 5}, {}], "t": [{"2": 15}, {}]}]}]}]}], "a": [{"2": 13}, {}], "u": [{"1": 5}, {}], "p": [{"2": 5}, {}], "c": [{"2": 17}, {}], "o": [{"1": 5}, {}]}]}], "m": [{"2": 45, "1": 5}, {"e": [{"2": 45}, {}], "s": [{"1": 5}, {}]}], "d": [{"2": 9}, {}], "r": [{"2": 13, "1": 35}, {"a": [{"2": 4}, {}], "/": [{"2": 5}, {}], "s": [{"2": 4, "1": 35}, {"u": [{"1": 15}, {}], "d": [{"2": 4}, {}], "e": [{"1": 5}, {}], "r": [{"1": 15}, {}]}]}], "n": [{"2": 16}, {}], "p": [{"2": 14}, {}], "g": [{"2": 9}, {}], "h": [{"2": 2}, {}], "l": [{"2": 58, "1": 10}, {"i": [{"2": 5}, {}], "-": [{"2": 13}, {}], "/": [{"2": 13}, {}], "s": [{"2": 23, "1": 10}, {"p": [{"2": 4}, {}], "l": [{"1": 5}, {}], "/": [{"2": 15}, {}], "r": [{"1": 5}, {}], "b": [{"2": 4}, {}]}], "n": [{"2": 4}, {}]}]}], "s": [{"2": 9}, {}], "p": [{"2": 4}, {}], "g": [{"2": 4}, {}], "c": [{"2": 17}, {}], "t": [{"2": 9}, {}], "r": [{"2": 13}, {}]}], "i\u00e8": [{"2": 64, "1": 338}, {"m": [{"2": 17, "1": 35}, {"x": [{"1": 15}, {}], "s": [{"2": 4, "1": 10}, {"e": [{"2": 4, "1": 10}, {"i": [{"2": 4, "1": 10}, {"/": [{"2": 4, "1": 10}, {"o": [{"2": 4, "1": 10}, {"/": [{"2": 4, "1": 10}, {"r": [{"2": 4, "1": 10}, {"/": [{"2": 4, "1": 10}, {"t": [{"2": 4, "1": 10}, {"-": [{"2": 4, "1": 10}, {"-": [{"2": 4, "1": 10}, {}]}]}]}]}]}]}]}]}]}]}], "v": [{"1": 5}, {}], "q": [{"1": 5}, {}], "r": [{"2": 9}, {}], "t": [{"2": 4}, {}]}], "v": [{"1": 20}, {}], "g": [{"1": 20}, {}], "c": [{"1": 32}, {}], "t": [{"2": 18}, {}], "r": [{"2": 29, "1": 231}, {"f": [{"1": 15}, {}], "s": [{"1": 18}, {}], "v": [{"1": 15}, {}], "c": [{"1": 5}, {}], "q": [{"1": 10}, {}], "t": [{"1": 30}, {}], "m": [{"1": 44}, {}], "d": [{"1": 10}, {}], "r": [{"2": 29, "1": 31}, {"e": [{"2": 29, "1": 31}, {"u": [{"1": 5}, {}], "p": [{"2": 16}, {}], "c": [{"2": 5}, {}], "t": [{"2": 8}, {}], "r": [{"1": 26}, {}]}]}], "n": [{"1": 35}, {}], "p": [{"1": 5}, {}], "l": [{"1": 13}, {}]}]}], "i\u00e9": [{"2": 125, "1": 77}, {"d": [{"1": 15}, {}], "s": [{"2": 39, "1": 10}, {"v": [{"2": 13}, {}], "f": [{"2": 8}, {}], "l": [{"2": 14}, {}], "t": [{"1": 10}, {}], "r": [{"2": 4}, {}]}], "g": [{"1": 13}, {}], "/": [{"2": 57, "1": 34}, {"f": [{"2": 12}, {}], "l": [{"2": 13}, {}], "s": [{"2": 5}, {}], "d": [{"2": 4}, {}], "p": [{"2": 5}, {}], "t": [{"1": 34}, {}], "r": [{"2": 18}, {}]}], "r": [{"1": 5}, {}], "t": [{"2": 29}, {}]}], "eo": [{"1": 16}, {}], "ao\u00fb": [{"1": 5}, {}], "oi": [{"1": 3859}, {}], "oie": [{"1": 133}, {}], "uie": [{"1": 15}, {}], "you": [{"1": 5}, {}], "uau": [{"2": 20}, {}], "aou": [{"2": 5}, {}], "u\u00ea": [{"1": 10}, {}], "ea": [{"1": 50}, {}], "e": [{"1": 42}, {}], "oue": [{"2": 110, "1": 93}, {"m": [{"1": 10}, {}], "z": [{"2": 14}, {}], "n": [{"2": 5, "1": 5}, {"r": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {}]}]}]}], "s": [{"2": 10, "1": 12}, {"j": [{"1": 12}, {}], "r": [{"2": 10}, {}]}], "/": [{"1": 38}, {}], "r": [{"2": 64, "1": 28}, {"v": [{"2": 21, "1": 10}, {"-": [{"2": 4}, {}], "/": [{"2": 17}, {}], "a": [{"1": 10}, {}]}], "l": [{"2": 16}, {}], "j": [{"2": 15, "1": 18}, {"e": [{"1": 8}, {}], "-": [{"2": 15}, {}], "o": [{"1": 5}, {}], "a": [{"1": 5}, {}]}], "r": [{"2": 8}, {}], "n": [{"2": 4}, {}]}], "t": [{"2": 17}, {}]}], "iu": [{"2": 13}, {}], "\u00e9ie": [{"2": 5}, {}], "\u00e9i": [{"2": 43}, {}], "uia": [{"2": 4}, {}], "uei": [{"1": 23}, {}], "yau": [{"2": 4}, {}], "o\u00ea": [{"1": 5}, {}], "uaie": [{"2": 4}, {}], "ia": [{"2": 205, "1": 85}, {"m": [{"2": 17}, {}], "d": [{"2": 15}, {}], "l": [{"2": 16}, {}], "s": [{"2": 13}, {}], "n": [{"2": 75, "1": 63}, {"f": [{"2": 13}, {}], "l": [{"2": 18}, {}], "d": [{"2": 5, "1": 30}, {"e": [{"1": 15}, {}], "t": [{"2": 5, "1": 15}, {"o": [{"2": 5}, {}], "/": [{"1": 15}, {}]}]}], "v": [{"2": 4, "1": 5}, {"d": [{"1": 5}, {}], "t": [{"2": 4}, {}]}], "c": [{"2": 4}, {}], "t": [{"2": 9, "1": 28}, {"i": [{"2": 4}, {}], "/": [{"1": 28}, {}], "t": [{"2": 5}, {}]}], "r": [{"2": 22}, {}]}], "b": [{"2": 14, "1": 17}, {"c": [{"2": 9}, {}], "d": [{"1": 17}, {}], "k": [{"2": 5}, {}]}], "p": [{"2": 4}, {}], "g": [{"2": 16}, {}], "/": [{"2": 13}, {}], "r": [{"2": 5, "1": 5}, {"t": [{"2": 5}, {}], "l": [{"1": 5}, {}]}], "t": [{"2": 17}, {}]}], "eui": [{"1": 52}, {}], "o\u00e8": [{"2": 16}, {}], "eue": [{"2": 5, "1": 10}, {"/": [{"1": 10}, {}], "t": [{"2": 5}, {}]}], "ao": [{"2": 16, "1": 15}, {"t": [{"2": 8}, {}], "s": [{"2": 4}, {}], "n": [{"2": 4, "1": 15}, {"p": [{"1": 15}, {}], "r": [{"2": 4}, {}]}]}], "eai": [{"1": 22}, {}], "o\u00fb": [{"1": 56}, {}], "a\u00e8": [{"2": 4}, {}], "eu\u00e2": [{"2": 4}, {}], "\u00e9\u00e2": [{"2": 17}, {}], "ue": [{"2": 181, "1": 201}, {"z": [{"2": 13}, {}], "n": [{"2": 9, "1": 15}, {"m": [{"1": 5}, {}], "p": [{"1": 10}, {}], "l": [{"2": 9}, {}]}], "s": [{"1": 19}, {}], "l": [{"2": 65}, {}], "/": [{"1": 122}, {}], "r": [{"2": 67, "1": 40}, {"m": [{"2": 12, "1": 5}, {"/": [{"2": 8}, {}], "a": [{"2": 4, "1": 5}, {"e": [{"2": 4, "1": 5}, {"i": [{"2": 4, "1": 5}, {"r": [{"2": 4, "1": 5}, {"t": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"i": [{"1": 5}, {}], "-": [{"2": 4}, {}]}]}]}]}]}]}]}], "n": [{"2": 13}, {}], "b": [{"2": 4}, {}], "c": [{"2": 4}, {}], "h": [{"2": 5}, {}], "l": [{"2": 13}, {}], "t": [{"2": 16, "1": 35}, {"i": [{"1": 10}, {}], "-": [{"2": 16}, {}], "o": [{"1": 10}, {}], "a": [{"1": 15}, {}]}]}], "t": [{"2": 27, "1": 5}, {"m": [{"2": 18}, {}], "n": [{"2": 4}, {}], "l": [{"2": 5}, {}], "t": [{"1": 5}, {}]}]}], "u\u00e8": [{"2": 8}, {}], "oo": [{"2": 5, "1": 5}, {"t": [{"1": 5}, {}], "r": [{"2": 5}, {}]}], "ou\u00e9": [{"2": 15}, {}], "euoe": [{"2": 4}, {}], "e\u00fci": [{"1": 5}, {}], "ieu": [{"2": 260, "1": 609}, {"r": [{"2": 16, "1": 111}, {"s": [{"1": 111}, {}], "r": [{"2": 16}, {}]}], "s": [{"2": 34}, {}], "x": [{"2": 210, "1": 269}, {"m": [{"1": 75}, {}], "d": [{"2": 44, "1": 74}, {"-": [{"1": 51}, {}], "/": [{"2": 44, "1": 23}, {"i": [{"1": 5}, {}], "u": [{"2": 4}, {}], "o": [{"2": 30}, {}], "a": [{"2": 10, "1": 18}, {"-": [{"1": 18}, {}], "/": [{"2": 10}, {}]}]}]}], "r": [{"2": 51}, {}], "n": [{"2": 14}, {}], "v": [{"2": 16, "1": 24}, {"-": [{"1": 24}, {}], "/": [{"2": 16}, {}]}], "p": [{"2": 15}, {}], "g": [{"2": 9}, {}], "c": [{"2": 46, "1": 22}, {"-": [{"1": 22}, {}], "/": [{"2": 46}, {}]}], "t": [{"2": 15}, {}], "l": [{"1": 74}, {}]}], "/": [{"1": 229}, {}]}], "ye": [{"1": 5}, {}], "ou\u00ef": [{"2": 18}, {}], "\u0153u": [{"1": 190}, {}], "ae": [{"1": 15}, {}], "u\u00ef": [{"2": 5}, {}], "ouo": [{"2": 4}, {}], "o\u00fcoi": [{"2": 5}, {}], "oa": [{"2": 16}, {}], "o\u00ee": [{"1": 26}, {}], "iei": [{"1": 31}, {}], "oueu": [{"2": 13}, {}], "ua": [{"2": 19}, {}], "au": [{"1": 2290}, {}], "ouaie": [{"2": 4}, {}], "a\u00efa": [{"2": 4}, {}], "oui": [{"2": 72, "1": 185}, {"l": [{"1": 51}, {}], "s": [{"2": 25}, {}], "-": [{"1": 134}, {}], "/": [{"2": 17}, {}], "r": [{"2": 16}, {}], "t": [{"2": 14}, {}]}], "e\u00fb": [{"1": 56}, {}], "ouai": [{"2": 15}, {}], "o\u00ef": [{"2": 19}, {}], "a\u00ee": [{"1": 269}, {}], "oe": [{"2": 5, "1": 40}, {"m": [{"1": 5}, {}], "d": [{"1": 20}, {}], "l": [{"1": 10}, {}], "r": [{"2": 5}, {}], "f": [{"1": 5}, {}]}], "a\u00efeu": [{"2": 36}, {}], "eau": [{"1": 450}, {}], "\u00e9e": [{"2": 27, "1": 80}, {"n": [{"2": 5}, {}], "l": [{"2": 5}, {}], "s": [{"2": 12}, {}], "x": [{"2": 5}, {}], "/": [{"1": 80}, {}]}]}]
diff --git a/verse.py b/verse.py
@@ -83,6 +83,7 @@ class Verse:
self.phon = None
self.possible = None
+ self.hyphen_regexp = re.compile("(-*)")
whitespace_regexp = re.compile("(\s*)")
ys_regexp = re.compile("(\s*)")
all_consonants = consonants + consonants.upper()
@@ -91,7 +92,8 @@ class Verse:
words = re.split(whitespace_regexp, line)
words = remove_trivial(words, (lambda w: re.match("^\s*$", w) or
len(normalize(w, rm_all=True)) == 0))
- pre_chunks = [re.split(consonants_regexp, word) for word in words]
+ words2 = sum([self.splithyph(w) for w in words], [])
+ pre_chunks = [re.split(consonants_regexp, word) for word in words2]
pre_chunks = [remove_trivial(x, (lambda w: re.match("^\s*$", w) or
len(normalize(w, rm_all=True)) == 0)) for x in pre_chunks]
self.chunks = [[{'original': y, 'text': normalize(y, rm_apostrophe=True)}
@@ -260,6 +262,35 @@ class Verse:
# collapse words
self.chunks = sum(self.chunks, [])
+ def splithyph(self, word):
+ """split hyphen-delimited word parts into separate words if they are only
+ consonants, so that the sigle code later can deal with them (e.g. "k-way")"""
+
+ pre_chunks2 = []
+ cs = re.split(self.hyphen_regexp, word)
+ miss = ""
+ for i in range(len(cs)):
+ if re.match("^-*$", cs[i]):
+ if len(pre_chunks2) > 0:
+ pre_chunks2[-1] += cs[i]
+ continue
+ else:
+ miss = cs[i]
+ continue
+ if is_consonants(normalize(cs[i])):
+ pre_chunks2.append(miss + cs[i])
+ miss = ""
+ else:
+ pre_chunks2.append(miss + "".join(cs[i:]))
+ miss = ""
+ break
+ if miss != "":
+ if len(pre_chunks2) > 0:
+ pre_chunks2[-1] += miss
+ else:
+ pre_chunks2 = [miss]
+ return pre_chunks2
+
def annotate(self):
# annotate weights
for i, chunk in enumerate(self.chunks):
diff --git a/versetest.py b/versetest.py
@@ -91,6 +91,26 @@ class SigleCounts(Counts):
self.assertEqual(1, len(f))
self.assertEqual(self.getWeight(f[0]), 13)
+ def testResplit1(self):
+ f = self.runCount("k-fêt", limit=2)
+ self.assertEqual(1, len(f))
+ self.assertEqual(self.getWeight(f[0]), 2)
+
+ def testResplit1b(self):
+ f = self.runCount("K-Fêt", limit=2)
+ self.assertEqual(1, len(f))
+ self.assertEqual(self.getWeight(f[0]), 2)
+
+ def testResplit2(self):
+ f = self.runCount("sp-algèbre", limit=4)
+ self.assertEqual(1, len(f))
+ self.assertEqual(self.getWeight(f[0]), 4)
+
+ def testResplit3(self):
+ f = self.runCount("k-raté k-way", limit=5)
+ self.assertEqual(1, len(f))
+ self.assertEqual(self.getWeight(f[0]), 5)
+
class SimpleCounts(Counts):
def testTrivialMonovoc(self):
f = self.runCount("Ba", limit=1)