commit 993ed8d175eaeaa4b30c5819a901ba96bb35c849
parent c5648a413e45a05fbd341d03bd6c2e93e4353860
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Mon, 11 Aug 2014 00:07:46 +0200
Merge branch 'master' of gitorious.org:plint/plint
Diffstat:
12 files changed, 86 insertions(+), 20 deletions(-)
diff --git a/additions b/additions
@@ -107,3 +107,4 @@ tatata tatata tatata tat ruolz
tatata tatata tatatat œufrier
tatata tatata tatatat tat Peone
tatata tatata tatatat tat Péone
+tatata tatata tatatata s'allient
diff --git a/additions_cyrano.tpl b/additions_cyrano.tpl
@@ -0,0 +1 @@
+12 A x
diff --git a/diaeresis.json b/diaeresis.json
@@ -1 +1 @@
-[{"2": 2799, "1": 32909}, {"eoie": [{"1": 5}, {}], "u\u00ef": [{"2": 5}, {}], "io": [{"2": 463, "1": 101}, {"t": [{"2": 9}, {}], "g": [{"2": 4}, {}], "m": [{"2": 31}, {}], "d": [{"2": 4}, {}], "r": [{"2": 13}, {}], "n": [{"2": 346, "1": 101}, {"h": [{"2": 2}, {}], "t": [{"2": 77, "1": 15}, {"s": [{"2": 59, "1": 15}, {"a": [{"2": 13}, {}], "o": [{"1": 5}, {}], "n": [{"2": 20, "1": 5}, {"/": [{"2": 20, "1": 5}, {"e": [{"2": 20, "1": 5}, {"/": [{"2": 20, "1": 5}, {"v": [{"2": 5}, {}], "t": [{"2": 15}, {}], "m": [{"1": 5}, {}]}]}]}]}], "c": [{"2": 17}, {}], "i": [{"2": 4}, {}], "p": [{"2": 5}, {}], "u": [{"1": 5}, {}]}], "/": [{"2": 18}, {}]}], "m": [{"2": 45, "1": 5}, {"s": [{"1": 5}, {}], "e": [{"2": 45}, {}]}], "n": [{"2": 16}, {}], "x": [{"2": 4}, {}], "l": [{"2": 58, "1": 10}, {"s": [{"2": 23, "1": 10}, {"b": [{"2": 4}, {}], "p": [{"2": 4}, {}], "l": [{"1": 5}, {}], "r": [{"1": 5}, {}], "/": [{"2": 15}, {}]}], "i": [{"2": 5}, {}], "-": [{"2": 13}, {}], "/": [{"2": 13}, {}], "n": [{"2": 4}, {}]}], "f": [{"2": 4}, {}], "v": [{"2": 5, "1": 5}, {"s": [{"2": 5, "1": 5}, {"a": [{"1": 5}, {}], "n": [{"2": 5}, {}]}]}], "d": [{"2": 9}, {}], "r": [{"2": 13, "1": 35}, {"a": [{"2": 4}, {}], "s": [{"2": 4, "1": 35}, {"e": [{"1": 5}, {}], "d": [{"2": 4}, {}], "r": [{"1": 15}, {}], "u": [{"1": 15}, {}]}], "/": [{"2": 5}, {}]}], "g": [{"2": 9}, {}], "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}, {"v": [{"2": 14}, {}], "c": [{"2": 4}, {}], "d": [{"1": 5}, {}], "u": [{"2": 4}, {}]}]}], "u": [{"2": 8}, {}], "n": [{"2": 4}, {}]}], "-": [{"2": 4}, {}], "/": [{"2": 13}, {}], "n": [{"2": 9}, {}]}], "p": [{"2": 14}, {}]}], "p": [{"2": 4}, {}], "s": [{"2": 9}, {}], "x": [{"2": 5}, {}], "c": [{"2": 17}, {}], "l": [{"2": 21}, {}]}], "ei": [{"1": 751}, {}], "yo": [{"2": 9, "1": 10}, {"t": [{"2": 4}, {}], "l": [{"1": 5}, {}], "r": [{"1": 5}, {}], "n": [{"2": 5}, {}]}], "\u0153i": [{"1": 22}, {}], "\u00e9o": [{"2": 32}, {}], "e": [{"1": 42}, {}], "ou\u00e9": [{"2": 15}, {}], "\u00e9e": [{"2": 27, "1": 80}, {"n": [{"2": 5}, {}], "x": [{"2": 5}, {}], "l": [{"2": 5}, {}], "/": [{"1": 80}, {}], "s": [{"2": 12}, {}]}], "uo": [{"2": 27, "1": 5}, {"n": [{"2": 13, "1": 5}, {"g": [{"1": 5}, {}], "l": [{"2": 13}, {}]}], "l": [{"2": 5}, {}], "s": [{"2": 9}, {}]}], "iu": [{"2": 13}, {}], "e\u00fci": [{"1": 5}, {}], "ue": [{"2": 181, "1": 201}, {"t": [{"2": 27, "1": 5}, {"t": [{"1": 5}, {}], "m": [{"2": 18}, {}], "l": [{"2": 5}, {}], "n": [{"2": 4}, {}]}], "z": [{"2": 13}, {}], "r": [{"2": 67, "1": 40}, {"h": [{"2": 5}, {}], "t": [{"2": 16, "1": 35}, {"a": [{"1": 15}, {}], "o": [{"1": 10}, {}], "i": [{"1": 10}, {}], "-": [{"2": 16}, {}]}], "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}, {}]}], "b": [{"2": 4}, {}], "n": [{"2": 13}, {}], "c": [{"2": 4}, {}], "l": [{"2": 13}, {}]}], "/": [{"1": 122}, {}], "n": [{"2": 9, "1": 15}, {"p": [{"1": 10}, {}], "m": [{"1": 5}, {}], "l": [{"2": 9}, {}]}], "s": [{"1": 19}, {}], "l": [{"2": 65}, {}]}], "ou": [{"1": 8124}, {}], "eo": [{"2": 5, "1": 24}, {"n": [{"2": 5, "1": 14}, {"g": [{"1": 14}, {}], "p": [{"2": 5}, {}]}], "r": [{"1": 10}, {}]}], "oueu": [{"2": 13}, {}], "aie": [{"1": 129}, {}], "o\u00f9": [{"1": 212}, {}], "o\u00fc\u00e9": [{"2": 4}, {}], "i\u00e9": [{"2": 125, "1": 77}, {"t": [{"2": 29}, {}], "d": [{"1": 15}, {}], "/": [{"2": 57, "1": 34}, {"t": [{"1": 34}, {}], "d": [{"2": 4}, {}], "r": [{"2": 18}, {}], "s": [{"2": 5}, {}], "p": [{"2": 5}, {}], "l": [{"2": 13}, {}], "f": [{"2": 12}, {}]}], "g": [{"1": 13}, {}], "s": [{"2": 39, "1": 10}, {"v": [{"2": 13}, {}], "t": [{"1": 10}, {}], "r": [{"2": 4}, {}], "l": [{"2": 14}, {}], "f": [{"2": 8}, {}]}], "r": [{"1": 5}, {}]}], "aei": [{"2": 5}, {}], "ouaie": [{"2": 4}, {}], "eaie": [{"1": 15}, {}], "oe": [{"2": 5, "1": 40}, {"f": [{"1": 5}, {}], "m": [{"1": 5}, {}], "l": [{"1": 10}, {}], "r": [{"2": 5}, {}], "d": [{"1": 20}, {}]}], "ya": [{"2": 12}, {}], "aou": [{"2": 5}, {}], "\u00e9\u00e2": [{"2": 17}, {}], "eui": [{"1": 52}, {}], "uaie": [{"2": 4}, {}], "aeu": [{"2": 5}, {}], "ouo": [{"2": 4}, {}], "u\u00eb": [{"1": 16}, {}], "a\u00ee": [{"1": 269}, {}], "ye": [{"1": 5}, {}], "yau": [{"2": 4}, {}], "ia": [{"2": 205, "1": 85}, {"t": [{"2": 17}, {}], "m": [{"2": 17}, {}], "d": [{"2": 15}, {}], "/": [{"2": 13}, {}], "s": [{"2": 13}, {}], "g": [{"2": 16}, {}], "n": [{"2": 75, "1": 63}, {"v": [{"2": 4, "1": 5}, {"t": [{"2": 4}, {}], "d": [{"1": 5}, {}]}], "t": [{"2": 9, "1": 28}, {"t": [{"2": 5}, {}], "i": [{"2": 4}, {}], "/": [{"1": 28}, {}]}], "d": [{"2": 5, "1": 30}, {"t": [{"2": 5, "1": 15}, {"o": [{"2": 5}, {}], "/": [{"1": 15}, {}]}], "e": [{"1": 15}, {}]}], "r": [{"2": 22}, {}], "c": [{"2": 4}, {}], "l": [{"2": 18}, {}], "f": [{"2": 13}, {}]}], "b": [{"2": 14, "1": 17}, {"c": [{"2": 9}, {}], "k": [{"2": 5}, {}], "d": [{"1": 17}, {}]}], "p": [{"2": 4}, {}], "l": [{"2": 16}, {}], "r": [{"2": 5, "1": 5}, {"t": [{"2": 5}, {}], "l": [{"1": 5}, {}]}]}], "ouie": [{"2": 4}, {}], "a\u00e9": [{"2": 5}, {}], "ai": [{"1": 5794}, {}], "a\u00ef": [{"2": 32}, {}], "oui": [{"2": 72, "1": 185}, {"t": [{"2": 14}, {}], "-": [{"1": 134}, {}], "/": [{"2": 17}, {}], "s": [{"2": 25}, {}], "l": [{"1": 51}, {}], "r": [{"2": 16}, {}]}], "uei": [{"1": 23}, {}], "ao": [{"2": 16, "1": 15}, {"n": [{"2": 4, "1": 15}, {"p": [{"1": 15}, {}], "r": [{"2": 4}, {}]}], "s": [{"2": 4}, {}], "t": [{"2": 8}, {}]}], "oua": [{"2": 31}, {}], "o\u00ef": [{"2": 19}, {}], "\u00e2i": [{"1": 16}, {}], "o\u00ea": [{"1": 5}, {}], "o\u00fcoi": [{"2": 5}, {}], "oa": [{"2": 16}, {}], "\u00e9\u00e9": [{"2": 15}, {}], "o\u00e9": [{"2": 16}, {}], "i\u00e8": [{"2": 64, "1": 338}, {"v": [{"1": 20}, {}], "t": [{"2": 18}, {}], "m": [{"2": 17, "1": 35}, {"v": [{"1": 5}, {}], "t": [{"2": 4}, {}], "q": [{"1": 5}, {}], "r": [{"2": 9}, {}], "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}, {}]}]}]}]}]}]}]}]}]}]}], "x": [{"1": 15}, {}]}], "r": [{"2": 29, "1": 231}, {"v": [{"1": 15}, {}], "t": [{"1": 30}, {}], "m": [{"1": 44}, {}], "n": [{"1": 35}, {}], "l": [{"1": 13}, {}], "f": [{"1": 15}, {}], "q": [{"1": 10}, {}], "d": [{"1": 10}, {}], "r": [{"2": 29, "1": 31}, {"e": [{"2": 29, "1": 31}, {"t": [{"2": 8}, {}], "p": [{"2": 16}, {}], "c": [{"2": 5}, {}], "u": [{"1": 5}, {}], "r": [{"1": 26}, {}]}]}], "s": [{"1": 18}, {}], "p": [{"1": 5}, {}], "c": [{"1": 5}, {}]}], "g": [{"1": 20}, {}], "c": [{"1": 32}, {}]}], "i\u00e2ou": [{"2": 4}, {}], "u\u00e8": [{"2": 8}, {}], "au": [{"1": 2290}, {}], "uau": [{"2": 20}, {}], "a\u00e8": [{"2": 4}, {}], "\u0153u": [{"1": 190}, {}], "ea": [{"1": 50}, {}], "ui": [{"2": 22, "1": 1468}, {"v": [{"1": 76}, {}], "t": [{"2": 5, "1": 315}, {"h": [{"1": 16}, {}], "d": [{"1": 55}, {}], "r": [{"1": 92}, {}], "s": [{"1": 43}, {}], "g": [{"1": 10}, {}], "n": [{"1": 49}, {}], "p": [{"1": 10}, {}], "l": [{"2": 5}, {}], "f": [{"1": 35}, {}], "c": [{"1": 5}, {}]}], "m": [{"1": 46}, {}], "/": [{"1": 468}, {}], "p": [{"1": 5}, {}], "l": [{"1": 14}, {}], "d": [{"1": 20}, {}], "r": [{"1": 49}, {}], "n": [{"2": 17, "1": 15}, {"g": [{"1": 10}, {}], "j": [{"1": 5}, {}], "r": [{"2": 17}, {}]}], "g": [{"1": 13}, {}], "s": [{"1": 429}, {}], "c": [{"1": 18}, {}]}], "oue": [{"2": 110, "1": 93}, {"t": [{"2": 17}, {}], "z": [{"2": 14}, {}], "m": [{"1": 10}, {}], "r": [{"2": 64, "1": 28}, {"v": [{"2": 21, "1": 10}, {"a": [{"1": 10}, {}], "-": [{"2": 4}, {}], "/": [{"2": 17}, {}]}], "n": [{"2": 4}, {}], "j": [{"2": 15, "1": 18}, {"a": [{"1": 5}, {}], "o": [{"1": 5}, {}], "e": [{"1": 8}, {}], "-": [{"2": 15}, {}]}], "l": [{"2": 16}, {}], "r": [{"2": 8}, {}]}], "/": [{"1": 38}, {}], "s": [{"2": 10, "1": 12}, {"j": [{"1": 12}, {}], "r": [{"2": 10}, {}]}], "n": [{"2": 5, "1": 5}, {"r": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {}]}]}]}]}], "\u00e9i": [{"2": 43}, {}], "\u00e9u": [{"2": 21}, {}], "eoi": [{"1": 22}, {}], "o\u00fb": [{"1": 56}, {}], "ae": [{"1": 15}, {}], "oeu": [{"1": 125}, {}], "ouai": [{"2": 15}, {}], "yeu": [{"1": 219}, {}], "aouie": [{"2": 5}, {}], "ie": [{"2": 527, "1": 2674}, {"t": [{"2": 21, "1": 24}, {"v": [{"1": 5}, {}], "s": [{"1": 14}, {}], "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}, {}]}]}]}]}]}]}], "q": [{"2": 17}, {}]}], "z": [{"2": 85, "1": 298}, {"h": [{"1": 16}, {}], "t": [{"1": 16}, {}], "Y": [{"1": 5}, {}], "m": [{"1": 15}, {}], "n": [{"1": 16}, {}], "l": [{"2": 16, "1": 41}, {"-": [{"1": 5}, {}], "/": [{"2": 16, "1": 36}, {"b": [{"2": 16}, {}], "e": [{"1": 5}, {}], "l": [{"1": 10}, {}], "r": [{"1": 5}, {}], "u": [{"1": 16}, {}]}]}], "f": [{"2": 13}, {}], "v": [{"1": 14}, {}], "d": [{"2": 8, "1": 36}, {"-": [{"1": 10}, {}], "/": [{"2": 8, "1": 26}, {"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}, {}]}]}]}]}]}]}], "\u00e9": [{"1": 5}, {}]}]}], "r": [{"2": 33, "1": 114}, {"-": [{"2": 16, "1": 45}, {"e": [{"1": 15}, {}], "-": [{"2": 4}, {}], "r": [{"1": 10}, {}], "i": [{"1": 10}, {}], "u": [{"1": 10}, {}], "d": [{"2": 12}, {}]}], "/": [{"2": 17, "1": 69}, {"a": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"v": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {}]}]}]}]}], "e": [{"1": 17}, {}], "d": [{"2": 13}, {}], "r": [{"1": 18}, {}], "o": [{"1": 5}, {}], "i": [{"1": 10}, {}], "u": [{"1": 14}, {}]}]}], "s": [{"1": 20}, {}], "p": [{"1": 5}, {}], "c": [{"2": 15}, {}]}], "r": [{"2": 244, "1": 885}, {"h": [{"2": 12, "1": 51}, {"/": [{"1": 5}, {}], "-": [{"2": 12, "1": 41}, {"-": [{"2": 12, "1": 41}, {}]}], "r": [{"1": 5}, {}]}], "t": [{"2": 9, "1": 137}, {"s": [{"1": 18}, {}], "\u00e7": [{"1": 5}, {}], "/": [{"2": 9, "1": 114}, {"\u00e2": [{"2": 9}, {}], "e": [{"1": 18}, {}], "r": [{"1": 14}, {}], "\u00e9": [{"1": 16}, {}], "n": [{"1": 20}, {}], "i": [{"1": 18}, {}], "u": [{"1": 5}, {}], "\u00ee": [{"1": 5}, {}], "l": [{"1": 18}, {}]}]}], "m": [{"1": 51}, {}], "b": [{"1": 16}, {}], "c": [{"2": 27, "1": 59}, {"g": [{"1": 10}, {}], "s": [{"1": 16}, {}], "/": [{"2": 27, "1": 33}, {"a": [{"1": 5}, {}], "e": [{"1": 5}, {}], "r": [{"2": 9}, {}], "s": [{"2": 9}, {}], "n": [{"1": 8}, {}], "i": [{"1": 15}, {}], "o": [{"2": 9}, {}]}]}], "l": [{"2": 44, "1": 104}, {"s": [{"1": 16}, {}], "e": [{"1": 5}, {}], "-": [{"2": 9}, {}], "r": [{"1": 10}, {}], "/": [{"2": 35, "1": 73}, {"a": [{"1": 17}, {}], "e": [{"1": 10}, {}], "o": [{"1": 15}, {}], "b": [{"2": 16}, {}], "\u00e9": [{"2": 5, "1": 5}, {"/": [{"2": 5, "1": 5}, {"d": [{"2": 5}, {}], "b": [{"1": 5}, {}]}]}], "g": [{"2": 5}, {}], "i": [{"1": 16}, {}], "p": [{"2": 5}, {}], "u": [{"1": 5}, {}], "l": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"a": [{"2": 4}, {}], "i": [{"1": 5}, {}]}]}]}]}], "f": [{"2": 36, "1": 148}, {"t": [{"1": 18}, {}], "-": [{"2": 5, "1": 97}, {"-": [{"2": 5, "1": 97}, {}]}], "/": [{"2": 31, "1": 15}, {"n": [{"2": 5}, {}], "i": [{"2": 18}, {}], "f": [{"1": 15}, {}], "\u00e9": [{"2": 8}, {}]}], "s": [{"1": 18}, {}]}], "v": [{"2": 8, "1": 23}, {"g": [{"1": 13}, {}], "/": [{"2": 8, "1": 10}, {"a": [{"1": 5}, {}], "n": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"a": [{"1": 5}, {}], "e": [{"2": 8}, {}]}]}]}]}], "z": [{"1": 13}, {}], "q": [{"1": 18}, {}], "d": [{"2": 8, "1": 10}, {"s": [{"1": 5}, {}], "/": [{"2": 8, "1": 5}, {"o": [{"2": 4}, {}], "u": [{"1": 5}, {}], "\u00e9": [{"2": 4}, {}]}]}], "r": [{"2": 50, "1": 73}, {"s": [{"1": 19}, {}], "/": [{"2": 50, "1": 54}, {"a": [{"1": 5}, {}], "v": [{"2": 4}, {}], "r": [{"1": 24}, {}], "p": [{"2": 15}, {}], "o": [{"2": 5, "1": 10}, {"/": [{"2": 5, "1": 10}, {"s": [{"1": 10}, {}], "m": [{"2": 5}, {}]}]}], "c": [{"2": 22}, {}], "u": [{"1": 15}, {}], "f": [{"2": 4}, {}]}]}], "n": [{"2": 20, "1": 75}, {"s": [{"1": 14}, {}], "-": [{"2": 15}, {}], "/": [{"2": 5, "1": 61}, {"a": [{"2": 5}, {}], "e": [{"1": 15}, {}], "r": [{"1": 20}, {}], "g": [{"1": 16}, {}], "\u00f4": [{"1": 5}, {}], "u": [{"1": 5}, {}]}]}], "s": [{"2": 9, "1": 59}, {"s": [{"1": 24}, {}], "/": [{"2": 9, "1": 35}, {"a": [{"2": 9, "1": 5}, {"/": [{"2": 9, "1": 5}, {"t": [{"2": 9}, {}], "r": [{"1": 5}, {}]}]}], "s": [{"1": 15}, {}], "u": [{"1": 5}, {}], "r": [{"1": 10}, {}]}]}], "p": [{"2": 21, "1": 48}, {"s": [{"1": 14}, {}], "/": [{"2": 21, "1": 20}, {"a": [{"1": 15}, {}], "o": [{"2": 8}, {}], "x": [{"2": 13}, {}], "r": [{"1": 5}, {}]}], "r": [{"1": 14}, {}]}]}], "/": [{"1": 130}, {}], "n": [{"2": 159, "1": 1083}, {"h": [{"1": 14}, {}], "t": [{"2": 31, "1": 190}, {"t": [{"2": 18, "1": 78}, {"a": [{"2": 18}, {}], "n": [{"1": 15}, {}], "e": [{"1": 20}, {}], "u": [{"1": 19}, {}], "/": [{"1": 24}, {}]}], "d": [{"1": 14}, {}], "/": [{"1": 23}, {}], "s": [{"1": 38}, {}], "n": [{"1": 24}, {}], "c": [{"2": 13}, {}], "-": [{"1": 13}, {}]}], "m": [{"1": 23}, {}], "b": [{"1": 405}, {}], "n": [{"2": 4}, {}], "l": [{"2": 18}, {}], "v": [{"1": 257}, {}], "d": [{"2": 12, "1": 9}, {"s": [{"1": 4}, {}], "c": [{"2": 8}, {}], "/": [{"2": 4, "1": 5}, {"\u00e9": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"g": [{"2": 4}, {}], "m": [{"1": 5}, {}]}]}]}]}], "r": [{"2": 49, "1": 150}, {"t": [{"2": 14}, {}], "-": [{"1": 140}, {}], "/": [{"2": 8}, {}], "s": [{"2": 8, "1": 10}, {"o": [{"2": 4}, {}], "i": [{"2": 4}, {}], "/": [{"1": 10}, {}]}], "n": [{"2": 4}, {}], "c": [{"2": 15}, {}]}], "g": [{"2": 13}, {}], "s": [{"2": 9, "1": 35}, {"s": [{"2": 9, "1": 18}, {"i": [{"2": 9}, {}], "/": [{"1": 18}, {}]}], "-": [{"1": 15}, {}], "n": [{"1": 2}, {}]}], "c": [{"2": 23}, {}]}], "s": [{"2": 9, "1": 74}, {"h": [{"1": 10}, {}], "t": [{"1": 10}, {}], "m": [{"1": 10}, {}], "d": [{"2": 9}, {}], "r": [{"1": 14}, {}], "s": [{"1": 10}, {}], "c": [{"1": 10}, {}], "f": [{"1": 10}, {}]}], "l": [{"2": 9, "1": 114}, {"t": [{"2": 9}, {}], "m": [{"1": 10}, {}], "f": [{"1": 13}, {}], "c": [{"1": 91}, {}]}], "f": [{"1": 5}, {}], "d": [{"1": 61}, {}]}], "eau": [{"1": 450}, {}], "e\u00fb": [{"1": 56}, {}], "\u00e9ai": [{"2": 5}, {}], "iai": [{"2": 15}, {}], "eai": [{"1": 22}, {}], "eu\u00e2": [{"2": 4}, {}], "u\u00e9e": [{"2": 13}, {}], "o\u00ee": [{"1": 26}, {}], "oei": [{"1": 18}, {}], "oie": [{"1": 133}, {}], "yu": [{"1": 5}, {}], "e\u00ee": [{"1": 5}, {}], "oo": [{"2": 5, "1": 5}, {"t": [{"1": 5}, {}], "r": [{"2": 5}, {}]}], "eu": [{"1": 3736}, {}], "i\u00e9e": [{"2": 16}, {}], "o\u00e8": [{"2": 16}, {}], "u\u00e9": [{"2": 8}, {}], "a\u00efeu": [{"2": 36}, {}], "\u00e9au": [{"2": 9}, {}], "eue": [{"2": 5, "1": 10}, {"t": [{"2": 5}, {}], "/": [{"1": 10}, {}]}], "ui\u00e8": [{"1": 5}, {}], "oi": [{"1": 3859}, {}], "euoe": [{"2": 4}, {}], "ieu": [{"2": 260, "1": 609}, {"s": [{"2": 34}, {}], "x": [{"2": 210, "1": 269}, {"v": [{"2": 16, "1": 24}, {"-": [{"1": 24}, {}], "/": [{"2": 16}, {}]}], "t": [{"2": 15}, {}], "m": [{"1": 75}, {}], "d": [{"2": 44, "1": 74}, {"-": [{"1": 51}, {}], "/": [{"2": 44, "1": 23}, {"a": [{"2": 10, "1": 18}, {"-": [{"1": 18}, {}], "/": [{"2": 10}, {}]}], "o": [{"2": 30}, {}], "i": [{"1": 5}, {}], "u": [{"2": 4}, {}]}]}], "r": [{"2": 51}, {}], "n": [{"2": 14}, {}], "g": [{"2": 9}, {}], "p": [{"2": 15}, {}], "c": [{"2": 46, "1": 22}, {"-": [{"1": 22}, {}], "/": [{"2": 46}, {}]}], "l": [{"1": 74}, {}]}], "/": [{"1": 229}, {}], "r": [{"2": 16, "1": 111}, {"s": [{"1": 111}, {}], "r": [{"2": 16}, {}]}]}], "ao\u00fb": [{"1": 5}, {}], "uie": [{"1": 15}, {}], "\u00e9ie": [{"2": 5}, {}], "u\u00ea": [{"1": 10}, {}], "uia": [{"2": 4}, {}], "u\u00ee": [{"2": 4, "1": 15}, {"t": [{"2": 4, "1": 15}, {"h": [{"2": 4, "1": 15}, {"r": [{"2": 4, "1": 15}, {"l": [{"1": 10}, {}], "/": [{"2": 4, "1": 5}, {"i": [{"2": 4}, {}], "e": [{"1": 5}, {}]}]}]}]}]}], "ua": [{"2": 19}, {}], "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}, {}]}]}]}]}]}]}], "a\u00efe": [{"2": 14}, {}], "ee": [{"1": 10}, {}], "\u00e9a": [{"2": 48}, {}], "you": [{"1": 5}, {}], "ou\u00fc": [{"1": 10}, {}], "iou": [{"2": 5, "1": 16}, {"s": [{"1": 16}, {}], "l": [{"2": 5}, {}]}], "a\u00efa": [{"2": 4}, {}], "ueu": [{"2": 14}, {}], "iei": [{"1": 31}, {}], "ou\u00ef": [{"2": 18}, {}]}]
+[{"2": 2811, "1": 32914}, {"o\u00fcoi": [{"2": 5}, {}], "eo": [{"2": 5, "1": 24}, {"r": [{"1": 10}, {}], "n": [{"2": 5, "1": 14}, {"p": [{"2": 5}, {}], "g": [{"1": 14}, {}]}]}], "\u0153i": [{"1": 22}, {}], "iai": [{"2": 15}, {}], "ou\u00fc": [{"1": 10}, {}], "eui": [{"1": 52}, {}], "eue": [{"2": 5, "1": 10}, {"/": [{"1": 10}, {}], "t": [{"2": 5}, {}]}], "iei": [{"1": 31}, {}], "ao": [{"2": 16, "1": 15}, {"n": [{"2": 4, "1": 15}, {"r": [{"2": 4}, {}], "p": [{"1": 15}, {}]}], "s": [{"2": 4}, {}], "t": [{"2": 8}, {}]}], "ee": [{"1": 10}, {}], "\u00e9o": [{"2": 32}, {}], "ieu": [{"2": 260, "1": 609}, {"r": [{"2": 16, "1": 111}, {"r": [{"2": 16}, {}], "s": [{"1": 111}, {}]}], "/": [{"1": 229}, {}], "x": [{"2": 210, "1": 269}, {"v": [{"2": 16, "1": 24}, {"/": [{"2": 16}, {}], "-": [{"1": 24}, {}]}], "c": [{"2": 46, "1": 22}, {"/": [{"2": 46}, {}], "-": [{"1": 22}, {}]}], "m": [{"1": 75}, {}], "r": [{"2": 51}, {}], "l": [{"1": 74}, {}], "t": [{"2": 15}, {}], "p": [{"2": 15}, {}], "d": [{"2": 44, "1": 74}, {"/": [{"2": 44, "1": 23}, {"o": [{"2": 30}, {}], "a": [{"2": 10, "1": 18}, {"/": [{"2": 10}, {}], "-": [{"1": 18}, {}]}], "i": [{"1": 5}, {}], "u": [{"2": 4}, {}]}], "-": [{"1": 51}, {}]}], "g": [{"2": 9}, {}], "n": [{"2": 14}, {}]}], "s": [{"2": 34}, {}]}], "yo": [{"2": 9, "1": 10}, {"r": [{"1": 5}, {}], "n": [{"2": 5}, {}], "l": [{"1": 5}, {}], "t": [{"2": 4}, {}]}], "ai": [{"1": 5794}, {}], "a\u00e8": [{"2": 4}, {}], "eoi": [{"1": 22}, {}], "oua": [{"2": 31}, {}], "a\u00ef": [{"2": 32}, {}], "ui\u00e8": [{"1": 5}, {}], "uie": [{"1": 15}, {}], "\u0153u": [{"1": 190}, {}], "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}, {"e": [{"1": 5}, {}], "i": [{"2": 4}, {}]}], "l": [{"1": 10}, {}]}]}]}]}], "\u00e9\u00e2": [{"2": 17}, {}], "o\u00f9": [{"1": 212}, {}], "ui": [{"2": 22, "1": 1468}, {"v": [{"1": 76}, {}], "r": [{"1": 49}, {}], "d": [{"1": 20}, {}], "l": [{"1": 14}, {}], "g": [{"1": 13}, {}], "t": [{"2": 5, "1": 315}, {"r": [{"1": 92}, {}], "c": [{"1": 5}, {}], "s": [{"1": 43}, {}], "l": [{"2": 5}, {}], "f": [{"1": 35}, {}], "h": [{"1": 16}, {}], "p": [{"1": 10}, {}], "d": [{"1": 55}, {}], "g": [{"1": 10}, {}], "n": [{"1": 49}, {}]}], "/": [{"1": 468}, {}], "c": [{"1": 18}, {}], "m": [{"1": 46}, {}], "p": [{"1": 5}, {}], "s": [{"1": 429}, {}], "n": [{"2": 17, "1": 15}, {"r": [{"2": 17}, {}], "g": [{"1": 10}, {}], "j": [{"1": 5}, {}]}]}], "o\u00e9": [{"2": 16}, {}], "\u00e9ai": [{"2": 5}, {}], "o\u00ef": [{"2": 19}, {}], "eu": [{"1": 3736}, {}], "ei": [{"1": 751}, {}], "uau": [{"2": 20}, {}], "aouie": [{"2": 5}, {}], "iou": [{"2": 5, "1": 16}, {"l": [{"2": 5}, {}], "s": [{"1": 16}, {}]}], "yeu": [{"1": 219}, {}], "e": [{"1": 42}, {}], "u\u00e9": [{"2": 8}, {}], "\u00e9au": [{"2": 9}, {}], "uei": [{"1": 23}, {}], "eau": [{"1": 450}, {}], "a\u00ee": [{"1": 269}, {}], "aeu": [{"2": 5}, {}], "yu": [{"1": 5}, {}], "eai": [{"1": 22}, {}], "you": [{"1": 5}, {}], "eu\u00e2": [{"2": 4}, {}], "euoe": [{"2": 4}, {}], "uo": [{"2": 27, "1": 5}, {"l": [{"2": 5}, {}], "s": [{"2": 9}, {}], "n": [{"2": 13, "1": 5}, {"l": [{"2": 13}, {}], "g": [{"1": 5}, {}]}]}], "aou": [{"2": 5}, {}], "a\u00efe": [{"2": 14}, {}], "oue": [{"2": 110, "1": 93}, {"r": [{"2": 64, "1": 28}, {"r": [{"2": 8}, {}], "v": [{"2": 21, "1": 10}, {"/": [{"2": 17}, {}], "-": [{"2": 4}, {}], "a": [{"1": 10}, {}]}], "j": [{"2": 15, "1": 18}, {"o": [{"1": 5}, {}], "e": [{"1": 8}, {}], "-": [{"2": 15}, {}], "a": [{"1": 5}, {}]}], "l": [{"2": 16}, {}], "n": [{"2": 4}, {}]}], "/": [{"1": 38}, {}], "m": [{"1": 10}, {}], "t": [{"2": 17}, {}], "z": [{"2": 14}, {}], "s": [{"2": 10, "1": 12}, {"r": [{"2": 10}, {}], "j": [{"1": 12}, {}]}], "n": [{"2": 5, "1": 5}, {"r": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {}]}]}]}]}], "i\u00e2ou": [{"2": 4}, {}], "u\u00eb": [{"1": 16}, {}], "ia": [{"2": 205, "1": 85}, {"/": [{"2": 13}, {}], "d": [{"2": 15}, {}], "m": [{"2": 17}, {}], "r": [{"2": 5, "1": 5}, {"l": [{"1": 5}, {}], "t": [{"2": 5}, {}]}], "s": [{"2": 13}, {}], "l": [{"2": 16}, {}], "t": [{"2": 17}, {}], "p": [{"2": 4}, {}], "b": [{"2": 14, "1": 17}, {"c": [{"2": 9}, {}], "d": [{"1": 17}, {}], "k": [{"2": 5}, {}]}], "g": [{"2": 16}, {}], "n": [{"2": 75, "1": 63}, {"v": [{"2": 4, "1": 5}, {"d": [{"1": 5}, {}], "t": [{"2": 4}, {}]}], "c": [{"2": 4}, {}], "r": [{"2": 22}, {}], "d": [{"2": 5, "1": 30}, {"e": [{"1": 15}, {}], "t": [{"2": 5, "1": 15}, {"o": [{"2": 5}, {}], "/": [{"1": 15}, {}]}]}], "f": [{"2": 13}, {}], "l": [{"2": 18}, {}], "t": [{"2": 9, "1": 28}, {"/": [{"1": 28}, {}], "i": [{"2": 4}, {}], "t": [{"2": 5}, {}]}]}]}], "\u00e9a": [{"2": 48}, {}], "eoie": [{"1": 5}, {}], "oeu": [{"1": 125}, {}], "oo": [{"2": 5, "1": 5}, {"r": [{"2": 5}, {}], "t": [{"1": 5}, {}]}], "a\u00efa": [{"2": 4}, {}], "oa": [{"2": 16}, {}], "eaie": [{"1": 15}, {}], "i\u00e8": [{"2": 64, "1": 338}, {"v": [{"1": 20}, {}], "c": [{"1": 32}, {}], "m": [{"2": 17, "1": 35}, {"v": [{"1": 5}, {}], "x": [{"1": 15}, {}], "q": [{"1": 5}, {}], "r": [{"2": 9}, {}], "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}, {}]}]}]}]}]}]}]}]}]}]}], "t": [{"2": 4}, {}]}], "r": [{"2": 29, "1": 231}, {"v": [{"1": 15}, {}], "q": [{"1": 10}, {}], "r": [{"2": 29, "1": 31}, {"e": [{"2": 29, "1": 31}, {"r": [{"1": 26}, {}], "u": [{"1": 5}, {}], "c": [{"2": 5}, {}], "p": [{"2": 16}, {}], "t": [{"2": 8}, {}]}]}], "d": [{"1": 10}, {}], "l": [{"1": 13}, {}], "t": [{"1": 30}, {}], "c": [{"1": 5}, {}], "m": [{"1": 44}, {}], "f": [{"1": 15}, {}], "p": [{"1": 5}, {}], "s": [{"1": 18}, {}], "n": [{"1": 35}, {}]}], "g": [{"1": 20}, {}], "t": [{"2": 18}, {}]}], "ie": [{"2": 539, "1": 2679}, {"/": [{"1": 130}, {}], "r": [{"2": 244, "1": 885}, {"v": [{"2": 8, "1": 23}, {"/": [{"2": 8, "1": 10}, {"a": [{"1": 5}, {}], "n": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"e": [{"2": 8}, {}], "a": [{"1": 5}, {}]}]}]}], "g": [{"1": 13}, {}]}], "h": [{"2": 12, "1": 51}, {"r": [{"1": 5}, {}], "/": [{"1": 5}, {}], "-": [{"2": 12, "1": 41}, {"-": [{"2": 12, "1": 41}, {}]}]}], "q": [{"1": 18}, {}], "r": [{"2": 50, "1": 73}, {"/": [{"2": 50, "1": 54}, {"o": [{"2": 5, "1": 10}, {"/": [{"2": 5, "1": 10}, {"m": [{"2": 5}, {}], "s": [{"1": 10}, {}]}]}], "c": [{"2": 22}, {}], "a": [{"1": 5}, {}], "v": [{"2": 4}, {}], "r": [{"1": 24}, {}], "u": [{"1": 15}, {}], "f": [{"2": 4}, {}], "p": [{"2": 15}, {}]}], "s": [{"1": 19}, {}]}], "p": [{"2": 21, "1": 48}, {"r": [{"1": 14}, {}], "/": [{"2": 21, "1": 20}, {"r": [{"1": 5}, {}], "o": [{"2": 8}, {}], "x": [{"2": 13}, {}], "a": [{"1": 15}, {}]}], "s": [{"1": 14}, {}]}], "z": [{"1": 13}, {}], "l": [{"2": 44, "1": 104}, {"r": [{"1": 10}, {}], "/": [{"2": 35, "1": 73}, {"o": [{"1": 15}, {}], "l": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"a": [{"2": 4}, {}], "i": [{"1": 5}, {}]}]}], "a": [{"1": 17}, {}], "i": [{"1": 16}, {}], "u": [{"1": 5}, {}], "\u00e9": [{"2": 5, "1": 5}, {"/": [{"2": 5, "1": 5}, {"d": [{"2": 5}, {}], "b": [{"1": 5}, {}]}]}], "e": [{"1": 10}, {}], "p": [{"2": 5}, {}], "b": [{"2": 16}, {}], "g": [{"2": 5}, {}]}], "e": [{"1": 5}, {}], "s": [{"1": 16}, {}], "-": [{"2": 9}, {}]}], "b": [{"1": 16}, {}], "t": [{"2": 9, "1": 137}, {"/": [{"2": 9, "1": 114}, {"u": [{"1": 5}, {}], "i": [{"1": 18}, {}], "\u00ee": [{"1": 5}, {}], "\u00e9": [{"1": 16}, {}], "r": [{"1": 14}, {}], "l": [{"1": 18}, {}], "e": [{"1": 18}, {}], "\u00e2": [{"2": 9}, {}], "n": [{"1": 20}, {}]}], "\u00e7": [{"1": 5}, {}], "s": [{"1": 18}, {}]}], "c": [{"2": 27, "1": 59}, {"/": [{"2": 27, "1": 33}, {"o": [{"2": 9}, {}], "a": [{"1": 5}, {}], "i": [{"1": 15}, {}], "r": [{"2": 9}, {}], "e": [{"1": 5}, {}], "s": [{"2": 9}, {}], "n": [{"1": 8}, {}]}], "s": [{"1": 16}, {}], "g": [{"1": 10}, {}]}], "m": [{"1": 51}, {}], "f": [{"2": 36, "1": 148}, {"/": [{"2": 31, "1": 15}, {"\u00e9": [{"2": 8}, {}], "f": [{"1": 15}, {}], "i": [{"2": 18}, {}], "n": [{"2": 5}, {}]}], "s": [{"1": 18}, {}], "-": [{"2": 5, "1": 97}, {"-": [{"2": 5, "1": 97}, {}]}], "t": [{"1": 18}, {}]}], "d": [{"2": 8, "1": 10}, {"/": [{"2": 8, "1": 5}, {"\u00e9": [{"2": 4}, {}], "u": [{"1": 5}, {}], "o": [{"2": 4}, {}]}], "s": [{"1": 5}, {}]}], "s": [{"2": 9, "1": 59}, {"/": [{"2": 9, "1": 35}, {"r": [{"1": 10}, {}], "u": [{"1": 5}, {}], "s": [{"1": 15}, {}], "a": [{"2": 9, "1": 5}, {"/": [{"2": 9, "1": 5}, {"r": [{"1": 5}, {}], "t": [{"2": 9}, {}]}]}]}], "s": [{"1": 24}, {}]}], "n": [{"2": 20, "1": 75}, {"/": [{"2": 5, "1": 61}, {"\u00f4": [{"1": 5}, {}], "a": [{"2": 5}, {}], "r": [{"1": 20}, {}], "u": [{"1": 5}, {}], "e": [{"1": 15}, {}], "g": [{"1": 16}, {}]}], "s": [{"1": 14}, {}], "-": [{"2": 15}, {}]}]}], "s": [{"2": 9, "1": 74}, {"c": [{"1": 10}, {}], "m": [{"1": 10}, {}], "r": [{"1": 14}, {}], "d": [{"2": 9}, {}], "f": [{"1": 10}, {}], "h": [{"1": 10}, {}], "s": [{"1": 10}, {}], "t": [{"1": 10}, {}]}], "f": [{"1": 5}, {}], "z": [{"2": 85, "1": 298}, {"v": [{"1": 14}, {}], "r": [{"2": 33, "1": 114}, {"/": [{"2": 17, "1": 69}, {"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}, {}]}]}]}]}], "i": [{"1": 10}, {}], "r": [{"1": 18}, {}], "u": [{"1": 14}, {}], "e": [{"1": 17}, {}], "d": [{"2": 13}, {}]}], "-": [{"2": 16, "1": 45}, {"i": [{"1": 10}, {}], "r": [{"1": 10}, {}], "u": [{"1": 10}, {}], "e": [{"1": 15}, {}], "d": [{"2": 12}, {}], "-": [{"2": 4}, {}]}]}], "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}, {}], "l": [{"2": 16, "1": 41}, {"/": [{"2": 16, "1": 36}, {"r": [{"1": 5}, {}], "u": [{"1": 16}, {}], "e": [{"1": 5}, {}], "l": [{"1": 10}, {}], "b": [{"2": 16}, {}]}], "-": [{"1": 5}, {}]}], "t": [{"1": 16}, {}], "c": [{"2": 15}, {}], "Y": [{"1": 5}, {}], "m": [{"1": 15}, {}], "f": [{"2": 13}, {}], "p": [{"1": 5}, {}], "s": [{"1": 20}, {}], "n": [{"1": 16}, {}]}], "l": [{"2": 9, "1": 114}, {"f": [{"1": 13}, {}], "m": [{"1": 10}, {}], "c": [{"1": 91}, {}], "t": [{"2": 9}, {}]}], "d": [{"1": 61}, {}], "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}, {}], "s": [{"1": 14}, {}], "q": [{"2": 17}, {}]}], "n": [{"2": 171, "1": 1088}, {"v": [{"1": 257}, {}], "r": [{"2": 49, "1": 150}, {"/": [{"2": 8}, {}], "c": [{"2": 15}, {}], "t": [{"2": 14}, {}], "s": [{"2": 8, "1": 10}, {"o": [{"2": 4}, {}], "i": [{"2": 4}, {}], "/": [{"1": 10}, {}]}], "-": [{"1": 140}, {}], "n": [{"2": 4}, {}]}], "s": [{"2": 9, "1": 35}, {"s": [{"2": 9, "1": 18}, {"/": [{"1": 18}, {}], "i": [{"2": 9}, {}]}], "-": [{"1": 15}, {}], "n": [{"1": 2}, {}]}], "h": [{"1": 14}, {}], "l": [{"2": 30, "1": 5}, {"/": [{"2": 4}, {}], "n": [{"2": 5}, {}], "s": [{"2": 4}, {}], "-": [{"2": 13}, {}], "t": [{"2": 4, "1": 5}, {"c": [{"2": 4}, {}], "l": [{"1": 5}, {}]}]}], "b": [{"1": 405}, {}], "g": [{"2": 13}, {}], "t": [{"2": 31, "1": 190}, {"/": [{"1": 23}, {}], "c": [{"2": 13}, {}], "d": [{"1": 14}, {}], "n": [{"1": 24}, {}], "s": [{"1": 38}, {}], "-": [{"1": 13}, {}], "t": [{"2": 18, "1": 78}, {"u": [{"1": 19}, {}], "e": [{"1": 20}, {}], "a": [{"2": 18}, {}], "/": [{"1": 24}, {}], "n": [{"1": 15}, {}]}]}], "c": [{"2": 23}, {}], "m": [{"1": 23}, {}], "d": [{"2": 12, "1": 9}, {"/": [{"2": 4, "1": 5}, {"\u00e9": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"m": [{"1": 5}, {}], "g": [{"2": 4}, {}]}]}]}], "c": [{"2": 8}, {}], "s": [{"1": 4}, {}]}], "n": [{"2": 4}, {}]}]}], "ouo": [{"2": 4}, {}], "o\u00e8": [{"2": 16}, {}], "ae": [{"1": 15}, {}], "i\u00e9": [{"2": 125, "1": 77}, {"/": [{"2": 57, "1": 34}, {"r": [{"2": 18}, {}], "l": [{"2": 13}, {}], "f": [{"2": 12}, {}], "p": [{"2": 5}, {}], "d": [{"2": 4}, {}], "s": [{"2": 5}, {}], "t": [{"1": 34}, {}]}], "r": [{"1": 5}, {}], "d": [{"1": 15}, {}], "s": [{"2": 39, "1": 10}, {"r": [{"2": 4}, {}], "v": [{"2": 13}, {}], "f": [{"2": 8}, {}], "l": [{"2": 14}, {}], "t": [{"1": 10}, {}]}], "g": [{"1": 13}, {}], "t": [{"2": 29}, {}]}], "aie": [{"1": 129}, {}], "au": [{"1": 2290}, {}], "o\u00ee": [{"1": 26}, {}], "u\u00ea": [{"1": 10}, {}], "o\u00ea": [{"1": 5}, {}], "ea": [{"1": 50}, {}], "\u00e9e": [{"2": 27, "1": 80}, {"l": [{"2": 5}, {}], "x": [{"2": 5}, {}], "s": [{"2": 12}, {}], "/": [{"1": 80}, {}], "n": [{"2": 5}, {}]}], "oueu": [{"2": 13}, {}], "\u00e9i": [{"2": 43}, {}], "e\u00ee": [{"1": 5}, {}], "oie": [{"1": 133}, {}], "ouaie": [{"2": 4}, {}], "ueu": [{"2": 14}, {}], "ou\u00ef": [{"2": 18}, {}], "i\u00e9e": [{"2": 16}, {}], "oi": [{"1": 3859}, {}], "a\u00efeu": [{"2": 36}, {}], "ua": [{"2": 19}, {}], "\u00e9u": [{"2": 21}, {}], "uaie": [{"2": 4}, {}], "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}, {}]}]}]}]}]}]}], "u\u00ef": [{"2": 5}, {}], "ya": [{"2": 12}, {}], "ao\u00fb": [{"1": 5}, {}], "oui": [{"2": 72, "1": 185}, {"/": [{"2": 17}, {}], "r": [{"2": 16}, {}], "s": [{"2": 25}, {}], "l": [{"1": 51}, {}], "-": [{"1": 134}, {}], "t": [{"2": 14}, {}]}], "u\u00e9e": [{"2": 13}, {}], "a\u00e9": [{"2": 5}, {}], "aei": [{"2": 5}, {}], "ou": [{"1": 8124}, {}], "uia": [{"2": 4}, {}], "iu": [{"2": 13}, {}], "yau": [{"2": 4}, {}], "ou\u00e9": [{"2": 15}, {}], "ue": [{"2": 181, "1": 201}, {"/": [{"1": 122}, {}], "r": [{"2": 67, "1": 40}, {"c": [{"2": 4}, {}], "h": [{"2": 5}, {}], "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}, {"-": [{"2": 4}, {}], "i": [{"1": 5}, {}]}]}]}]}]}]}]}], "t": [{"2": 16, "1": 35}, {"o": [{"1": 10}, {}], "-": [{"2": 16}, {}], "i": [{"1": 10}, {}], "a": [{"1": 15}, {}]}], "l": [{"2": 13}, {}], "b": [{"2": 4}, {}], "n": [{"2": 13}, {}]}], "t": [{"2": 27, "1": 5}, {"m": [{"2": 18}, {}], "n": [{"2": 4}, {}], "l": [{"2": 5}, {}], "t": [{"1": 5}, {}]}], "l": [{"2": 65}, {}], "z": [{"2": 13}, {}], "s": [{"1": 19}, {}], "n": [{"2": 9, "1": 15}, {"p": [{"1": 10}, {}], "l": [{"2": 9}, {}], "m": [{"1": 5}, {}]}]}], "\u00e9ie": [{"2": 5}, {}], "oe": [{"2": 5, "1": 40}, {"r": [{"2": 5}, {}], "d": [{"1": 20}, {}], "f": [{"1": 5}, {}], "l": [{"1": 10}, {}], "m": [{"1": 5}, {}]}], "u\u00e8": [{"2": 8}, {}], "ouai": [{"2": 15}, {}], "e\u00fci": [{"1": 5}, {}], "o\u00fb": [{"1": 56}, {}], "ye": [{"1": 5}, {}], "\u00e9\u00e9": [{"2": 15}, {}], "\u00e2i": [{"1": 16}, {}], "oei": [{"1": 18}, {}], "io": [{"2": 463, "1": 101}, {"x": [{"2": 5}, {}], "r": [{"2": 13}, {}], "c": [{"2": 17}, {}], "m": [{"2": 31}, {}], "s": [{"2": 9}, {}], "l": [{"2": 21}, {}], "t": [{"2": 9}, {}], "p": [{"2": 4}, {}], "d": [{"2": 4}, {}], "g": [{"2": 4}, {}], "n": [{"2": 346, "1": 101}, {"v": [{"2": 5, "1": 5}, {"s": [{"2": 5, "1": 5}, {"a": [{"1": 5}, {}], "n": [{"2": 5}, {}]}]}], "x": [{"2": 4}, {}], "r": [{"2": 13, "1": 35}, {"/": [{"2": 5}, {}], "s": [{"2": 4, "1": 35}, {"r": [{"1": 15}, {}], "u": [{"1": 15}, {}], "e": [{"1": 5}, {}], "d": [{"2": 4}, {}]}], "a": [{"2": 4}, {}]}], "d": [{"2": 9}, {}], "h": [{"2": 2}, {}], "l": [{"2": 58, "1": 10}, {"/": [{"2": 13}, {}], "s": [{"2": 23, "1": 10}, {"r": [{"1": 5}, {}], "p": [{"2": 4}, {}], "l": [{"1": 5}, {}], "b": [{"2": 4}, {}], "/": [{"2": 15}, {}]}], "-": [{"2": 13}, {}], "i": [{"2": 5}, {}], "n": [{"2": 4}, {}]}], "g": [{"2": 9}, {}], "t": [{"2": 77, "1": 15}, {"/": [{"2": 18}, {}], "s": [{"2": 59, "1": 15}, {"o": [{"1": 5}, {}], "c": [{"2": 17}, {}], "a": [{"2": 13}, {}], "i": [{"2": 4}, {}], "u": [{"1": 5}, {}], "p": [{"2": 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}, {}]}]}]}]}]}]}], "m": [{"2": 45, "1": 5}, {"e": [{"2": 45}, {}], "s": [{"1": 5}, {}]}], "f": [{"2": 4}, {}], "p": [{"2": 14}, {}], "s": [{"2": 90, "1": 31}, {"/": [{"2": 13}, {}], "s": [{"2": 64, "1": 31}, {"u": [{"2": 8}, {}], "s": [{"2": 30, "1": 26}, {"/": [{"2": 30, "1": 26}, {"e": [{"2": 14}, {}], "a": [{"2": 16, "1": 16}, {"/": [{"2": 16, "1": 16}, {"f": [{"1": 16}, {}], "p": [{"2": 16}, {}]}]}], "i": [{"1": 10}, {}]}]}], "i": [{"2": 22, "1": 5}, {"/": [{"2": 22, "1": 5}, {"u": [{"2": 4}, {}], "c": [{"2": 4}, {}], "d": [{"1": 5}, {}], "v": [{"2": 14}, {}]}]}], "n": [{"2": 4}, {}]}], "-": [{"2": 4}, {}], "n": [{"2": 9}, {}]}], "n": [{"2": 16}, {}]}]}], "ouie": [{"2": 4}, {}], "e\u00fb": [{"1": 56}, {}], "o\u00fc\u00e9": [{"2": 4}, {}]}]
diff --git a/diaeresis_cyrano.json b/diaeresis_cyrano.json
@@ -1 +1 @@
-[{"2": 2949, "1": 33045}, {"\u00e9ai": [{"2": 5}, {}], "yeu": [{"1": 219}, {}], "iu": [{"2": 13}, {}], "o\u00fcoi": [{"2": 5}, {}], "a\u00efa": [{"2": 4}, {}], "oie": [{"1": 133}, {}], "o\u00ef": [{"2": 19}, {}], "aei": [{"2": 5}, {}], "ou\u00e9": [{"2": 15}, {}], "\u00e2i": [{"1": 16}, {}], "a\u00efeu": [{"2": 36}, {}], "eai": [{"1": 22}, {}], "oeu": [{"1": 125}, {}], "yau": [{"2": 4}, {}], "u\u00eb": [{"1": 16}, {}], "ouai": [{"2": 15}, {}], "aou": [{"2": 5}, {}], "oa": [{"2": 16}, {}], "ei": [{"1": 751}, {}], "i\u00e2ou": [{"2": 4}, {}], "\u00e9e": [{"2": 27, "1": 80}, {"n": [{"2": 5}, {}], "s": [{"2": 12}, {}], "x": [{"2": 5}, {}], "l": [{"2": 5}, {}], "/": [{"1": 80}, {}]}], "\u00e9a": [{"2": 48}, {}], "ie": [{"2": 554, "1": 2714}, {"n": [{"2": 177, "1": 1121}, {"g": [{"2": 13}, {}], "c": [{"2": 32, "1": 10}, {"n": [{"1": 5}, {}], "c": [{"2": 20}, {}], "/": [{"2": 12, "1": 5}, {"n": [{"1": 5}, {}], "i": [{"2": 12}, {}]}]}], "v": [{"1": 257}, {}], "s": [{"2": 9, "1": 35}, {"n": [{"1": 2}, {}], "s": [{"2": 9, "1": 18}, {"/": [{"1": 18}, {}], "i": [{"2": 9}, {}]}], "-": [{"1": 15}, {}]}], "t": [{"2": 40, "1": 218}, {"n": [{"1": 24}, {}], "s": [{"1": 38}, {}], "c": [{"2": 13}, {}], "/": [{"2": 9, "1": 51}, {"n": [{"1": 14}, {}], "\u00e9": [{"1": 16}, {}], "e": [{"1": 16}, {}], "u": [{"1": 5}, {}], "i": [{"2": 9}, {}]}], "-": [{"1": 13}, {}], "t": [{"2": 18, "1": 78}, {"a": [{"2": 18}, {}], "n": [{"1": 15}, {}], "e": [{"1": 20}, {}], "u": [{"1": 19}, {}], "/": [{"1": 24}, {}]}], "d": [{"1": 14}, {}]}], "m": [{"1": 23}, {}], "b": [{"1": 405}, {}], "r": [{"2": 49, "1": 150}, {"n": [{"2": 4}, {}], "s": [{"2": 8, "1": 10}, {"i": [{"2": 4}, {}], "/": [{"1": 10}, {}], "o": [{"2": 4}, {}]}], "c": [{"2": 15}, {}], "/": [{"2": 8}, {}], "-": [{"1": 140}, {}], "t": [{"2": 14}, {}]}], "n": [{"2": 4}, {}], "h": [{"1": 14}, {}], "l": [{"2": 18}, {}], "d": [{"2": 12, "1": 9}, {"s": [{"1": 4}, {}], "c": [{"2": 8}, {}], "/": [{"2": 4, "1": 5}, {"\u00e9": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"g": [{"2": 4}, {}], "m": [{"1": 5}, {}]}]}]}]}]}], "s": [{"2": 9, "1": 74}, {"h": [{"1": 10}, {}], "s": [{"1": 10}, {}], "f": [{"1": 10}, {}], "c": [{"1": 10}, {}], "m": [{"1": 10}, {}], "t": [{"1": 10}, {}], "r": [{"1": 14}, {}], "d": [{"2": 9}, {}]}], "f": [{"1": 5}, {}], "l": [{"2": 18, "1": 114}, {"m": [{"1": 10}, {}], "f": [{"1": 13}, {}], "c": [{"2": 9, "1": 91}, {"-": [{"1": 91}, {}], "/": [{"2": 9}, {}]}], "t": [{"2": 9}, {}]}], "/": [{"1": 130}, {}], "z": [{"2": 85, "1": 298}, {"s": [{"1": 20}, {}], "f": [{"2": 13}, {}], "c": [{"2": 15}, {}], "m": [{"1": 15}, {}], "p": [{"1": 5}, {}], "v": [{"1": 14}, {}], "t": [{"1": 16}, {}], "r": [{"2": 33, "1": 114}, {"-": [{"2": 16, "1": 45}, {"u": [{"1": 10}, {}], "-": [{"2": 4}, {}], "d": [{"2": 12}, {}], "e": [{"1": 15}, {}], "r": [{"1": 10}, {}], "i": [{"1": 10}, {}]}], "/": [{"2": 17, "1": 69}, {"a": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"v": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {"-": [{"2": 4, "1": 5}, {}]}]}]}]}], "o": [{"1": 5}, {}], "d": [{"2": 13}, {}], "i": [{"1": 10}, {}], "e": [{"1": 17}, {}], "r": [{"1": 18}, {}], "u": [{"1": 14}, {}]}]}], "n": [{"1": 16}, {}], "Y": [{"1": 5}, {}], "h": [{"1": 16}, {}], "l": [{"2": 16, "1": 41}, {"-": [{"1": 5}, {}], "/": [{"2": 16, "1": 36}, {"l": [{"1": 10}, {}], "e": [{"1": 5}, {}], "b": [{"2": 16}, {}], "u": [{"1": 16}, {}], "r": [{"1": 5}, {}]}]}], "d": [{"2": 8, "1": 36}, {"-": [{"1": 10}, {}], "/": [{"2": 8, "1": 26}, {"n": [{"1": 16}, {}], "\u00e9": [{"1": 5}, {}], "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}, {}]}]}]}]}]}]}]}]}]}], "t": [{"2": 21, "1": 24}, {"q": [{"2": 17}, {}], "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}, {}], "s": [{"1": 14}, {}]}], "r": [{"2": 244, "1": 887}, {"s": [{"2": 9, "1": 59}, {"s": [{"1": 24}, {}], "/": [{"2": 9, "1": 35}, {"a": [{"2": 9, "1": 5}, {"/": [{"2": 9, "1": 5}, {"t": [{"2": 9}, {}], "r": [{"1": 5}, {}]}]}], "s": [{"1": 15}, {}], "r": [{"1": 10}, {}], "u": [{"1": 5}, {}]}]}], "f": [{"2": 36, "1": 148}, {"s": [{"1": 18}, {}], "-": [{"2": 5, "1": 97}, {"-": [{"2": 5, "1": 97}, {}]}], "t": [{"1": 18}, {}], "/": [{"2": 31, "1": 15}, {"n": [{"2": 5}, {}], "f": [{"1": 15}, {}], "\u00e9": [{"2": 8}, {}], "i": [{"2": 18}, {}]}]}], "c": [{"2": 27, "1": 59}, {"s": [{"1": 16}, {}], "/": [{"2": 27, "1": 33}, {"a": [{"1": 5}, {}], "s": [{"2": 9}, {}], "o": [{"2": 9}, {}], "e": [{"1": 5}, {}], "r": [{"2": 9}, {}], "n": [{"1": 8}, {}], "i": [{"1": 15}, {}]}], "g": [{"1": 10}, {}]}], "v": [{"2": 8, "1": 25}, {"g": [{"1": 15}, {}], "/": [{"2": 8, "1": 10}, {"a": [{"1": 5}, {}], "n": [{"2": 8, "1": 5}, {"/": [{"2": 8, "1": 5}, {"a": [{"1": 5}, {}], "e": [{"2": 8}, {}]}]}]}]}], "p": [{"2": 21, "1": 48}, {"s": [{"1": 14}, {}], "r": [{"1": 14}, {}], "/": [{"2": 21, "1": 20}, {"a": [{"1": 15}, {}], "x": [{"2": 13}, {}], "r": [{"1": 5}, {}], "o": [{"2": 8}, {}]}]}], "b": [{"1": 16}, {}], "m": [{"1": 51}, {}], "t": [{"2": 9, "1": 137}, {"s": [{"1": 18}, {}], "\u00e7": [{"1": 5}, {}], "/": [{"2": 9, "1": 114}, {"n": [{"1": 20}, {}], "l": [{"1": 18}, {}], "\u00e2": [{"2": 9}, {}], "\u00ee": [{"1": 5}, {}], "\u00e9": [{"1": 16}, {}], "r": [{"1": 14}, {}], "e": [{"1": 18}, {}], "u": [{"1": 5}, {}], "i": [{"1": 18}, {}]}]}], "r": [{"2": 50, "1": 73}, {"s": [{"1": 19}, {}], "/": [{"2": 50, "1": 54}, {"a": [{"1": 5}, {}], "p": [{"2": 15}, {}], "f": [{"2": 4}, {}], "c": [{"2": 22}, {}], "v": [{"2": 4}, {}], "o": [{"2": 5, "1": 10}, {"/": [{"2": 5, "1": 10}, {"s": [{"1": 10}, {}], "m": [{"2": 5}, {}]}]}], "r": [{"1": 24}, {}], "u": [{"1": 15}, {}]}]}], "n": [{"2": 20, "1": 75}, {"s": [{"1": 14}, {}], "-": [{"2": 15}, {}], "/": [{"2": 5, "1": 61}, {"a": [{"2": 5}, {}], "g": [{"1": 16}, {}], "\u00f4": [{"1": 5}, {}], "e": [{"1": 15}, {}], "r": [{"1": 20}, {}], "u": [{"1": 5}, {}]}]}], "h": [{"2": 12, "1": 51}, {"-": [{"2": 12, "1": 41}, {"-": [{"2": 12, "1": 41}, {}]}], "r": [{"1": 5}, {}], "/": [{"1": 5}, {}]}], "q": [{"1": 18}, {}], "l": [{"2": 44, "1": 104}, {"s": [{"1": 16}, {}], "-": [{"2": 9}, {}], "e": [{"1": 5}, {}], "r": [{"1": 10}, {}], "/": [{"2": 35, "1": 73}, {"a": [{"1": 17}, {}], "g": [{"2": 5}, {}], "p": [{"2": 5}, {}], "l": [{"2": 4, "1": 5}, {"/": [{"2": 4, "1": 5}, {"a": [{"2": 4}, {}], "i": [{"1": 5}, {}]}]}], "o": [{"1": 15}, {}], "\u00e9": [{"2": 5, "1": 5}, {"/": [{"2": 5, "1": 5}, {"b": [{"1": 5}, {}], "d": [{"2": 5}, {}]}]}], "b": [{"2": 16}, {}], "e": [{"1": 10}, {}], "u": [{"1": 5}, {}], "i": [{"1": 16}, {}]}]}], "z": [{"1": 13}, {}], "d": [{"2": 8, "1": 10}, {"s": [{"1": 5}, {}], "/": [{"2": 8, "1": 5}, {"\u00e9": [{"2": 4}, {}], "u": [{"1": 5}, {}], "o": [{"2": 4}, {}]}]}]}], "d": [{"1": 61}, {}]}], "uo": [{"2": 27, "1": 5}, {"n": [{"2": 13, "1": 5}, {"g": [{"1": 5}, {}], "l": [{"2": 13}, {}]}], "s": [{"2": 9}, {}], "l": [{"2": 5}, {}]}], "\u00e9i": [{"2": 43}, {}], "e\u00fci": [{"1": 5}, {}], "io": [{"2": 490, "1": 126}, {"n": [{"2": 346, "1": 106}, {"g": [{"2": 9}, {}], "f": [{"2": 4}, {}], "m": [{"2": 45, "1": 10}, {"s": [{"1": 5}, {}], "e": [{"2": 45, "1": 5}, {"\u00e9": [{"1": 5}, {}], "r": [{"2": 45}, {}]}]}], "s": [{"2": 90, "1": 31}, {"n": [{"2": 9}, {}], "s": [{"2": 64, "1": 31}, {"n": [{"2": 4}, {}], "s": [{"2": 30, "1": 26}, {"/": [{"2": 30, "1": 26}, {"a": [{"2": 16, "1": 16}, {"/": [{"2": 16, "1": 16}, {"p": [{"2": 16}, {}], "f": [{"1": 16}, {}]}]}], "e": [{"2": 14}, {}], "i": [{"1": 10}, {}]}]}], "u": [{"2": 8}, {}], "i": [{"2": 22, "1": 5}, {"/": [{"2": 22, "1": 5}, {"c": [{"2": 4}, {}], "v": [{"2": 14}, {}], "u": [{"2": 4}, {}], "d": [{"1": 5}, {}]}]}]}], "-": [{"2": 4}, {}], "/": [{"2": 13}, {}]}], "v": [{"2": 5, "1": 5}, {"s": [{"2": 5, "1": 5}, {"a": [{"1": 5}, {}], "n": [{"2": 5}, {}]}]}], "x": [{"2": 4}, {}], "t": [{"2": 77, "1": 15}, {"s": [{"2": 59, "1": 15}, {"a": [{"2": 13}, {}], "p": [{"2": 5}, {}], "c": [{"2": 17}, {}], "o": [{"1": 5}, {}], "u": [{"1": 5}, {}], "n": [{"2": 20, "1": 5}, {"/": [{"2": 20, "1": 5}, {"e": [{"2": 20, "1": 5}, {"/": [{"2": 20, "1": 5}, {"t": [{"2": 15}, {}], "m": [{"1": 5}, {}], "v": [{"2": 5}, {}]}]}]}]}], "i": [{"2": 4}, {}]}], "/": [{"2": 18}, {}]}], "r": [{"2": 13, "1": 35}, {"a": [{"2": 4}, {}], "s": [{"2": 4, "1": 35}, {"d": [{"2": 4}, {}], "e": [{"1": 5}, {}], "u": [{"1": 15}, {}], "r": [{"1": 15}, {}]}], "/": [{"2": 5}, {}]}], "n": [{"2": 16}, {}], "h": [{"2": 2}, {}], "p": [{"2": 14}, {}], "l": [{"2": 58, "1": 10}, {"n": [{"2": 4}, {}], "s": [{"2": 23, "1": 10}, {"l": [{"1": 5}, {}], "p": [{"2": 4}, {}], "b": [{"2": 4}, {}], "r": [{"1": 5}, {}], "/": [{"2": 15}, {}]}], "-": [{"2": 13}, {}], "/": [{"2": 13}, {}], "i": [{"2": 5}, {}]}], "d": [{"2": 9}, {}]}], "g": [{"2": 4}, {}], "p": [{"2": 4}, {}], "c": [{"2": 17}, {}], "l": [{"2": 45, "1": 10}, {"f": [{"1": 5}, {}], "v": [{"2": 33, "1": 5}, {"a": [{"2": 4}, {}], "e": [{"2": 21, "1": 5}, {"/": [{"2": 21, "1": 5}, {"n": [{"2": 13}, {}], "-": [{"2": 4}, {}], "t": [{"2": 4}, {}], "r": [{"1": 5}, {}]}]}], "o": [{"2": 8}, {}]}], "r": [{"2": 12}, {}]}], "s": [{"2": 9}, {}], "m": [{"2": 34, "1": 5}, {"g": [{"1": 5}, {}], "l": [{"2": 5}, {}], "r": [{"2": 29}, {}]}], "x": [{"2": 5}, {}], "t": [{"2": 9, "1": 5}, {"l": [{"2": 4}, {}], "b": [{"1": 5}, {}], "d": [{"2": 5}, {}]}], "r": [{"2": 13}, {}], "d": [{"2": 4}, {}]}], "u\u00ef": [{"2": 5}, {}], "i\u00e9": [{"2": 125, "1": 77}, {"g": [{"1": 13}, {}], "/": [{"2": 57, "1": 34}, {"s": [{"2": 5}, {}], "f": [{"2": 12}, {}], "l": [{"2": 13}, {}], "p": [{"2": 5}, {}], "t": [{"1": 34}, {}], "r": [{"2": 18}, {}], "d": [{"2": 4}, {}]}], "s": [{"2": 39, "1": 10}, {"t": [{"1": 10}, {}], "f": [{"2": 8}, {}], "v": [{"2": 13}, {}], "r": [{"2": 4}, {}], "l": [{"2": 14}, {}]}], "t": [{"2": 29}, {}], "r": [{"1": 5}, {}], "d": [{"1": 15}, {}]}], "\u0153i": [{"1": 22}, {}], "ouie": [{"2": 4}, {}], "oi": [{"1": 3859}, {}], "ouo": [{"2": 4}, {}], "u\u00e9": [{"2": 8}, {}], "e\u00ee": [{"1": 5}, {}], "euoe": [{"2": 4}, {}], "i\u00e9e": [{"2": 16}, {}], "a\u00ee": [{"1": 269}, {}], "o\u00fb": [{"1": 56}, {}], "eaie": [{"1": 15}, {}], "ouaie": [{"2": 4}, {}], "ia": [{"2": 205, "1": 85}, {"n": [{"2": 75, "1": 63}, {"f": [{"2": 13}, {}], "c": [{"2": 4}, {}], "l": [{"2": 18}, {}], "v": [{"2": 4, "1": 5}, {"t": [{"2": 4}, {}], "d": [{"1": 5}, {}]}], "t": [{"2": 9, "1": 28}, {"t": [{"2": 5}, {}], "/": [{"1": 28}, {}], "i": [{"2": 4}, {}]}], "r": [{"2": 22}, {}], "d": [{"2": 5, "1": 30}, {"e": [{"1": 15}, {}], "t": [{"2": 5, "1": 15}, {"/": [{"1": 15}, {}], "o": [{"2": 5}, {}]}]}]}], "g": [{"2": 16}, {}], "p": [{"2": 4}, {}], "l": [{"2": 16}, {}], "/": [{"2": 13}, {}], "s": [{"2": 13}, {}], "b": [{"2": 14, "1": 17}, {"k": [{"2": 5}, {}], "c": [{"2": 9}, {}], "d": [{"1": 17}, {}]}], "m": [{"2": 17}, {}], "t": [{"2": 17}, {}], "r": [{"2": 5, "1": 5}, {"l": [{"1": 5}, {}], "t": [{"2": 5}, {}]}], "d": [{"2": 15}, {}]}], "uaie": [{"2": 4}, {}], "a\u00efe": [{"2": 14, "1": 5}, {"n": [{"2": 14}, {}], "-": [{"1": 5}, {}]}], "iou": [{"2": 5, "1": 16}, {"s": [{"1": 16}, {}], "l": [{"2": 5}, {}]}], "u\u00ea": [{"1": 10}, {}], "ea": [{"1": 51}, {}], "oua": [{"2": 43, "1": 15}, {"h": [{"1": 15}, {}], "n": [{"2": 27}, {}], "t": [{"2": 4}, {}], "/": [{"2": 12}, {}]}], "eau": [{"1": 450}, {}], "aie": [{"1": 129}, {}], "iai": [{"2": 15}, {}], "oe": [{"2": 5, "1": 40}, {"l": [{"1": 10}, {}], "f": [{"1": 5}, {}], "m": [{"1": 5}, {}], "r": [{"2": 5}, {}], "d": [{"1": 20}, {}]}], "eoi": [{"1": 22}, {}], "au": [{"1": 2293}, {}], "\u0153u": [{"1": 191}, {}], "aouie": [{"2": 5}, {}], "oei": [{"1": 18}, {}], "ueu": [{"2": 14}, {}], "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}, {}]}]}]}]}]}]}], "a\u00ef": [{"2": 74, "1": 10}, {"s": [{"2": 14}, {}], "f": [{"2": 13}, {}], "v": [{"2": 15}, {}], "/": [{"2": 8}, {}], "-": [{"1": 10}, {}], "t": [{"2": 4}, {}], "r": [{"2": 20}, {}]}], "ee": [{"1": 10}, {}], "oue": [{"2": 120, "1": 95}, {"n": [{"2": 5, "1": 5}, {"r": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {"-": [{"2": 5, "1": 5}, {}]}]}]}], "s": [{"2": 10, "1": 12}, {"r": [{"2": 10}, {}], "j": [{"1": 12}, {}]}], "m": [{"1": 10}, {}], "/": [{"1": 38}, {}], "t": [{"2": 27, "1": 5}, {"f": [{"1": 5}, {}], "l": [{"2": 9}, {}], "r": [{"2": 4}, {}], "j": [{"2": 14}, {}]}], "r": [{"2": 64, "1": 25}, {"n": [{"2": 4}, {}], "l": [{"2": 16}, {}], "v": [{"2": 21, "1": 10}, {"a": [{"1": 10}, {}], "-": [{"2": 4}, {}], "/": [{"2": 17}, {}]}], "r": [{"2": 8}, {}], "j": [{"2": 15, "1": 15}, {"a": [{"1": 5}, {}], "-": [{"2": 15}, {}], "e": [{"1": 5}, {}], "o": [{"1": 5}, {}]}]}], "z": [{"2": 14}, {}]}], "ae": [{"1": 15}, {}], "uie": [{"1": 15}, {}], "\u00e9\u00e2": [{"2": 17}, {}], "\u00e9u": [{"2": 21}, {}], "ua": [{"2": 19}, {}], "o\u00f9": [{"1": 213}, {}], "eo": [{"2": 5, "1": 25}, {"n": [{"2": 5, "1": 15}, {"g": [{"1": 15}, {}], "p": [{"2": 5}, {}]}], "r": [{"1": 10}, {}]}], "ya": [{"2": 12}, {}], "ieu": [{"2": 260, "1": 609}, {"s": [{"2": 34}, {}], "x": [{"2": 210, "1": 269}, {"n": [{"2": 14}, {}], "g": [{"2": 9}, {}], "c": [{"2": 46, "1": 22}, {"-": [{"1": 22}, {}], "/": [{"2": 46}, {}]}], "v": [{"2": 16, "1": 24}, {"-": [{"1": 24}, {}], "/": [{"2": 16}, {}]}], "p": [{"2": 15}, {}], "l": [{"1": 74}, {}], "m": [{"1": 75}, {}], "t": [{"2": 15}, {}], "r": [{"2": 51}, {}], "d": [{"2": 44, "1": 74}, {"-": [{"1": 51}, {}], "/": [{"2": 44, "1": 23}, {"a": [{"2": 10, "1": 18}, {"-": [{"1": 18}, {}], "/": [{"2": 10}, {}]}], "i": [{"1": 5}, {}], "u": [{"2": 4}, {}], "o": [{"2": 30}, {}]}]}]}], "r": [{"2": 16, "1": 111}, {"s": [{"1": 111}, {}], "r": [{"2": 16}, {}]}], "/": [{"1": 229}, {}]}], "oo": [{"2": 5, "1": 5}, {"t": [{"1": 5}, {}], "r": [{"2": 5}, {}]}], "eu\u00e2": [{"2": 4}, {}], "u\u00e8": [{"2": 8}, {}], "eui": [{"1": 52}, {}], "\u00e9ie": [{"2": 5}, {}], "ou\u00fc": [{"1": 10}, {}], "o\u00fc\u00e9": [{"2": 4}, {}], "oueu": [{"2": 13}, {}], "o\u00ea": [{"1": 5}, {}], "oui": [{"2": 72, "1": 185}, {"s": [{"2": 25}, {}], "l": [{"1": 51}, {}], "/": [{"2": 17}, {}], "-": [{"1": 134}, {}], "t": [{"2": 14}, {}], "r": [{"2": 16}, {}]}], "ao\u00fb": [{"1": 5}, {}], "o\u00e8": [{"2": 16}, {}], "e": [{"1": 42}, {}], "ai": [{"1": 5798}, {}], "i\u00e8": [{"2": 64, "1": 343}, {"g": [{"1": 20}, {}], "c": [{"1": 32}, {}], "v": [{"1": 20}, {}], "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}, {}]}]}]}]}]}]}]}]}]}]}], "v": [{"1": 5}, {}], "q": [{"1": 5}, {}], "x": [{"1": 15}, {}], "t": [{"2": 4}, {}], "r": [{"2": 9}, {}]}], "t": [{"2": 18, "1": 5}, {"q": [{"2": 18}, {}], "p": [{"1": 5}, {}]}], "r": [{"2": 29, "1": 231}, {"s": [{"1": 18}, {}], "f": [{"1": 15}, {}], "c": [{"1": 5}, {}], "l": [{"1": 13}, {}], "p": [{"1": 5}, {}], "q": [{"1": 10}, {}], "m": [{"1": 44}, {}], "t": [{"1": 30}, {}], "r": [{"2": 29, "1": 31}, {"e": [{"2": 29, "1": 31}, {"p": [{"2": 16}, {}], "c": [{"2": 5}, {}], "t": [{"2": 8}, {}], "u": [{"1": 5}, {}], "r": [{"1": 26}, {}]}]}], "n": [{"1": 35}, {}], "v": [{"1": 15}, {}], "d": [{"1": 10}, {}]}]}], "uau": [{"2": 20}, {}], "\u00e9au": [{"2": 9}, {}], "o\u00e9": [{"2": 16}, {}], "ou\u00ef": [{"2": 18}, {}], "eue": [{"2": 5, "1": 10}, {"t": [{"2": 5}, {}], "/": [{"1": 10}, {}]}], "a\u00e8": [{"2": 4}, {}], "eu": [{"1": 3738}, {}], "uia": [{"2": 4}, {}], "aeu": [{"2": 5}, {}], "ue": [{"2": 181, "1": 201}, {"n": [{"2": 9, "1": 15}, {"p": [{"1": 10}, {}], "m": [{"1": 5}, {}], "l": [{"2": 9}, {}]}], "s": [{"1": 19}, {}], "l": [{"2": 65}, {}], "/": [{"1": 122}, {}], "t": [{"2": 27, "1": 5}, {"n": [{"2": 4}, {}], "l": [{"2": 5}, {}], "m": [{"2": 18}, {}], "t": [{"1": 5}, {}]}], "r": [{"2": 67, "1": 40}, {"h": [{"2": 5}, {}], "n": [{"2": 13}, {}], "c": [{"2": 4}, {}], "l": [{"2": 13}, {}], "t": [{"2": 16, "1": 35}, {"a": [{"1": 15}, {}], "-": [{"2": 16}, {}], "i": [{"1": 10}, {}], "o": [{"1": 10}, {}]}], "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}, {"-": [{"2": 4}, {}], "i": [{"1": 5}, {}]}]}]}]}]}]}], "/": [{"2": 8}, {}]}], "b": [{"2": 4}, {}]}], "z": [{"2": 13}, {}]}], "ui": [{"2": 58, "1": 1478}, {"g": [{"1": 13}, {}], "c": [{"1": 18}, {}], "m": [{"1": 46}, {}], "/": [{"1": 468}, {}], "p": [{"1": 5}, {}], "t": [{"2": 5, "1": 315}, {"h": [{"1": 16}, {}], "s": [{"1": 43}, {}], "f": [{"1": 35}, {}], "c": [{"1": 5}, {}], "l": [{"2": 5}, {}], "g": [{"1": 10}, {}], "p": [{"1": 10}, {}], "r": [{"1": 92}, {}], "n": [{"1": 49}, {}], "d": [{"1": 55}, {}]}], "r": [{"1": 49}, {}], "n": [{"2": 53, "1": 25}, {"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}, {}]}]}]}], "j": [{"1": 5}, {}]}], "s": [{"1": 429}, {}], "v": [{"1": 76}, {}], "l": [{"1": 14}, {}], "d": [{"1": 20}, {}]}], "ou": [{"1": 8130}, {}], "yu": [{"1": 5}, {}], "ao": [{"2": 12, "1": 15}, {"n": [{"2": 4, "1": 15}, {"p": [{"1": 15}, {}], "r": [{"2": 4}, {}]}], "s": [{"2": 4}, {}], "t": [{"2": 4}, {}]}], "a\u00e9": [{"2": 5}, {}], "\u00ea\u00ea": [{"1": 5}, {}], "e\u00fb": [{"1": 56}, {}], "o\u00ee": [{"1": 26}, {}], "ui\u00e8": [{"1": 5}, {}], "\u00e9\u00e9": [{"2": 15}, {}], "iei": [{"1": 31}, {}], "u\u00e9e": [{"2": 13}, {}], "\u00e9o": [{"2": 32}, {}], "uei": [{"1": 23}, {}], "yo": [{"2": 9, "1": 10}, {"n": [{"2": 5}, {}], "l": [{"1": 5}, {}], "t": [{"2": 4}, {}], "r": [{"1": 5}, {}]}], "u\u00ee": [{"2": 4, "1": 15}, {"t": [{"2": 4, "1": 15}, {"h": [{"2": 4, "1": 15}, {"r": [{"2": 4, "1": 15}, {"l": [{"1": 10}, {}], "/": [{"2": 4, "1": 5}, {"e": [{"1": 5}, {}], "i": [{"2": 4}, {}]}]}]}]}]}], "eoie": [{"1": 5}, {}], "you": [{"1": 5}, {}], "ye": [{"1": 5}, {}]}]
+[{"1": 33050, "2": 2961}, {"\u00e9e": [{"1": 80, "2": 27}, {"x": [{"2": 5}, {}], "s": [{"2": 12}, {}], "/": [{"1": 80}, {}], "l": [{"2": 5}, {}], "n": [{"2": 5}, {}]}], "u\u00e9": [{"2": 8}, {}], "o\u00fcoi": [{"2": 5}, {}], "aouie": [{"2": 5}, {}], "ea": [{"1": 51}, {}], "\u00e9\u00e2": [{"2": 17}, {}], "i\u00e2ou": [{"2": 4}, {}], "oui": [{"1": 185, "2": 72}, {"s": [{"2": 25}, {}], "r": [{"2": 16}, {}], "/": [{"2": 17}, {}], "-": [{"1": 134}, {}], "t": [{"2": 14}, {}], "l": [{"1": 51}, {}]}], "yau": [{"2": 4}, {}], "o\u00fb": [{"1": 56}, {}], "au": [{"1": 2293}, {}], "ou\u00e9": [{"2": 15}, {}], "eoi": [{"1": 22}, {}], "euoe": [{"2": 4}, {}], "i\u00e8": [{"1": 343, "2": 64}, {"c": [{"1": 32}, {}], "m": [{"1": 35, "2": 17}, {"s": [{"1": 10, "2": 4}, {"e": [{"1": 10, "2": 4}, {"i": [{"1": 10, "2": 4}, {"/": [{"1": 10, "2": 4}, {"o": [{"1": 10, "2": 4}, {"/": [{"1": 10, "2": 4}, {"r": [{"1": 10, "2": 4}, {"/": [{"1": 10, "2": 4}, {"t": [{"1": 10, "2": 4}, {"-": [{"1": 10, "2": 4}, {"-": [{"1": 10, "2": 4}, {}]}]}]}]}]}]}]}]}]}]}], "r": [{"2": 9}, {}], "x": [{"1": 15}, {}], "v": [{"1": 5}, {}], "t": [{"2": 4}, {}], "q": [{"1": 5}, {}]}], "g": [{"1": 20}, {}], "r": [{"1": 231, "2": 29}, {"p": [{"1": 5}, {}], "m": [{"1": 44}, {}], "n": [{"1": 35}, {}], "d": [{"1": 10}, {}], "v": [{"1": 15}, {}], "q": [{"1": 10}, {}], "s": [{"1": 18}, {}], "f": [{"1": 15}, {}], "r": [{"1": 31, "2": 29}, {"e": [{"1": 31, "2": 29}, {"p": [{"2": 16}, {}], "c": [{"2": 5}, {}], "r": [{"1": 26}, {}], "t": [{"2": 8}, {}], "u": [{"1": 5}, {}]}]}], "t": [{"1": 30}, {}], "c": [{"1": 5}, {}], "l": [{"1": 13}, {}]}], "v": [{"1": 20}, {}], "t": [{"1": 5, "2": 18}, {"p": [{"1": 5}, {}], "q": [{"2": 18}, {}]}]}], "ae": [{"1": 15}, {}], "\u00e9i": [{"2": 43}, {}], "u\u00ef": [{"2": 5}, {}], "eaie": [{"1": 15}, {}], "ouai": [{"2": 15}, {}], "iau": [{"1": 5, "2": 5}, {"l": [{"1": 5, "2": 5}, {"m": [{"1": 5, "2": 5}, {"e": [{"1": 5, "2": 5}, {"/": [{"1": 5, "2": 5}, {"-": [{"1": 5, "2": 5}, {"-": [{"1": 5, "2": 5}, {}]}]}]}]}]}]}], "a\u00e9": [{"2": 5}, {}], "o\u00f9": [{"1": 213}, {}], "\u00e9au": [{"2": 9}, {}], "e\u00fci": [{"1": 5}, {}], "eau": [{"1": 450}, {}], "eoie": [{"1": 5}, {}], "ee": [{"1": 10}, {}], "uia": [{"2": 4}, {}], "aeu": [{"2": 5}, {}], "oe": [{"1": 40, "2": 5}, {"r": [{"2": 5}, {}], "m": [{"1": 5}, {}], "f": [{"1": 5}, {}], "l": [{"1": 10}, {}], "d": [{"1": 20}, {}]}], "\u00e9u": [{"2": 21}, {}], "ui\u00e8": [{"1": 5}, {}], "\u00e9a": [{"2": 48}, {}], "oie": [{"1": 133}, {}], "eui": [{"1": 52}, {}], "uo": [{"1": 5, "2": 27}, {"s": [{"2": 9}, {}], "l": [{"2": 5}, {}], "n": [{"1": 5, "2": 13}, {"g": [{"1": 5}, {}], "l": [{"2": 13}, {}]}]}], "oua": [{"1": 15, "2": 43}, {"t": [{"2": 4}, {}], "/": [{"2": 12}, {}], "n": [{"2": 27}, {}], "h": [{"1": 15}, {}]}], "i\u00e9e": [{"2": 16}, {}], "uei": [{"1": 23}, {}], "\u00e9o": [{"2": 32}, {}], "\u00ea\u00ea": [{"1": 5}, {}], "ou\u00ef": [{"2": 18}, {}], "oei": [{"1": 18}, {}], "oi": [{"1": 3859}, {}], "eu\u00e2": [{"2": 4}, {}], "oo": [{"1": 5, "2": 5}, {"r": [{"2": 5}, {}], "t": [{"1": 5}, {}]}], "a\u00efe": [{"1": 5, "2": 14}, {"-": [{"1": 5}, {}], "n": [{"2": 14}, {}]}], "oueu": [{"2": 13}, {}], "i\u00e9": [{"1": 77, "2": 125}, {"s": [{"1": 10, "2": 39}, {"r": [{"2": 4}, {}], "v": [{"2": 13}, {}], "t": [{"1": 10}, {}], "f": [{"2": 8}, {}], "l": [{"2": 14}, {}]}], "g": [{"1": 13}, {}], "/": [{"1": 34, "2": 57}, {"p": [{"2": 5}, {}], "s": [{"2": 5}, {}], "f": [{"2": 12}, {}], "r": [{"2": 18}, {}], "d": [{"2": 4}, {}], "t": [{"1": 34}, {}], "l": [{"2": 13}, {}]}], "r": [{"1": 5}, {}], "d": [{"1": 15}, {}], "t": [{"2": 29}, {}]}], "u\u00eb": [{"1": 16}, {}], "a\u00efeu": [{"2": 36}, {}], "eai": [{"1": 22}, {}], "oue": [{"1": 95, "2": 120}, {"s": [{"1": 12, "2": 10}, {"r": [{"2": 10}, {}], "j": [{"1": 12}, {}]}], "m": [{"1": 10}, {}], "t": [{"1": 5, "2": 27}, {"r": [{"2": 4}, {}], "j": [{"2": 14}, {}], "f": [{"1": 5}, {}], "l": [{"2": 9}, {}]}], "n": [{"1": 5, "2": 5}, {"r": [{"1": 5, "2": 5}, {"-": [{"1": 5, "2": 5}, {"-": [{"1": 5, "2": 5}, {}]}]}]}], "/": [{"1": 38}, {}], "r": [{"1": 25, "2": 64}, {"r": [{"2": 8}, {}], "j": [{"1": 15, "2": 15}, {"-": [{"2": 15}, {}], "o": [{"1": 5}, {}], "e": [{"1": 5}, {}], "a": [{"1": 5}, {}]}], "v": [{"1": 10, "2": 21}, {"-": [{"2": 4}, {}], "/": [{"2": 17}, {}], "a": [{"1": 10}, {}]}], "l": [{"2": 16}, {}], "n": [{"2": 4}, {}]}], "z": [{"2": 14}, {}]}], "u\u00e8": [{"2": 8}, {}], "\u0153i": [{"1": 22}, {}], "\u00e2i": [{"1": 16}, {}], "a\u00efa": [{"2": 4}, {}], "yeu": [{"1": 219}, {}], "u\u00e9e": [{"2": 13}, {}], "u\u00ea": [{"1": 10}, {}], "\u00e9\u00e9": [{"2": 15}, {}], "e": [{"1": 42}, {}], "aou": [{"2": 5}, {}], "ia": [{"1": 85, "2": 205}, {"s": [{"2": 13}, {}], "m": [{"2": 17}, {}], "g": [{"2": 16}, {}], "/": [{"2": 13}, {}], "n": [{"1": 63, "2": 75}, {"c": [{"2": 4}, {}], "f": [{"2": 13}, {}], "r": [{"2": 22}, {}], "d": [{"1": 30, "2": 5}, {"t": [{"1": 15, "2": 5}, {"o": [{"2": 5}, {}], "/": [{"1": 15}, {}]}], "e": [{"1": 15}, {}]}], "v": [{"1": 5, "2": 4}, {"d": [{"1": 5}, {}], "t": [{"2": 4}, {}]}], "t": [{"1": 28, "2": 9}, {"i": [{"2": 4}, {}], "t": [{"2": 5}, {}], "/": [{"1": 28}, {}]}], "l": [{"2": 18}, {}]}], "d": [{"2": 15}, {}], "r": [{"1": 5, "2": 5}, {"t": [{"2": 5}, {}], "l": [{"1": 5}, {}]}], "p": [{"2": 4}, {}], "t": [{"2": 17}, {}], "b": [{"1": 17, "2": 14}, {"c": [{"2": 9}, {}], "d": [{"1": 17}, {}], "k": [{"2": 5}, {}]}], "l": [{"2": 16}, {}]}], "\u00e9ie": [{"2": 5}, {}], "ua": [{"2": 19}, {}], "yu": [{"1": 5}, {}], "ao": [{"1": 15, "2": 12}, {"s": [{"2": 4}, {}], "t": [{"2": 4}, {}], "n": [{"1": 15, "2": 4}, {"p": [{"1": 15}, {}], "r": [{"2": 4}, {}]}]}], "ouo": [{"2": 4}, {}], "you": [{"1": 5}, {}], "io": [{"1": 126, "2": 490}, {"s": [{"2": 9}, {}], "m": [{"1": 5, "2": 34}, {"r": [{"2": 29}, {}], "g": [{"1": 5}, {}], "l": [{"2": 5}, {}]}], "g": [{"2": 4}, {}], "n": [{"1": 106, "2": 346}, {"p": [{"2": 14}, {}], "m": [{"1": 10, "2": 45}, {"s": [{"1": 5}, {}], "e": [{"1": 5, "2": 45}, {"r": [{"2": 45}, {}], "\u00e9": [{"1": 5}, {}]}]}], "g": [{"2": 9}, {}], "n": [{"2": 16}, {}], "x": [{"2": 4}, {}], "d": [{"2": 9}, {}], "v": [{"1": 5, "2": 5}, {"s": [{"1": 5, "2": 5}, {"n": [{"2": 5}, {}], "a": [{"1": 5}, {}]}]}], "s": [{"1": 31, "2": 90}, {"-": [{"2": 4}, {}], "s": [{"1": 31, "2": 64}, {"i": [{"1": 5, "2": 22}, {"/": [{"1": 5, "2": 22}, {"c": [{"2": 4}, {}], "d": [{"1": 5}, {}], "v": [{"2": 14}, {}], "u": [{"2": 4}, {}]}]}], "s": [{"1": 26, "2": 30}, {"/": [{"1": 26, "2": 30}, {"i": [{"1": 10}, {}], "e": [{"2": 14}, {}], "a": [{"1": 16, "2": 16}, {"/": [{"1": 16, "2": 16}, {"p": [{"2": 16}, {}], "f": [{"1": 16}, {}]}]}]}]}], "u": [{"2": 8}, {}], "n": [{"2": 4}, {}]}], "/": [{"2": 13}, {}], "n": [{"2": 9}, {}]}], "f": [{"2": 4}, {}], "r": [{"1": 35, "2": 13}, {"s": [{"1": 35, "2": 4}, {"r": [{"1": 15}, {}], "d": [{"2": 4}, {}], "e": [{"1": 5}, {}], "u": [{"1": 15}, {}]}], "/": [{"2": 5}, {}], "a": [{"2": 4}, {}]}], "t": [{"1": 15, "2": 77}, {"s": [{"1": 15, "2": 59}, {"p": [{"2": 5}, {}], "c": [{"2": 17}, {}], "u": [{"1": 5}, {}], "n": [{"1": 5, "2": 20}, {"/": [{"1": 5, "2": 20}, {"e": [{"1": 5, "2": 20}, {"/": [{"1": 5, "2": 20}, {"m": [{"1": 5}, {}], "v": [{"2": 5}, {}], "t": [{"2": 15}, {}]}]}]}]}], "a": [{"2": 13}, {}], "i": [{"2": 4}, {}], "o": [{"1": 5}, {}]}], "/": [{"2": 18}, {}]}], "l": [{"1": 10, "2": 58}, {"-": [{"2": 13}, {}], "i": [{"2": 5}, {}], "/": [{"2": 13}, {}], "n": [{"2": 4}, {}], "s": [{"1": 10, "2": 23}, {"p": [{"2": 4}, {}], "r": [{"1": 5}, {}], "b": [{"2": 4}, {}], "/": [{"2": 15}, {}], "l": [{"1": 5}, {}]}]}], "h": [{"2": 2}, {}]}], "x": [{"2": 5}, {}], "d": [{"2": 4}, {}], "t": [{"1": 5, "2": 9}, {"d": [{"2": 5}, {}], "b": [{"1": 5}, {}], "l": [{"2": 4}, {}]}], "p": [{"2": 4}, {}], "c": [{"2": 17}, {}], "r": [{"2": 13}, {}], "l": [{"1": 10, "2": 45}, {"r": [{"2": 12}, {}], "v": [{"1": 5, "2": 33}, {"o": [{"2": 8}, {}], "e": [{"1": 5, "2": 21}, {"/": [{"1": 5, "2": 21}, {"-": [{"2": 4}, {}], "r": [{"1": 5}, {}], "t": [{"2": 4}, {}], "n": [{"2": 13}, {}]}]}], "a": [{"2": 4}, {}]}], "f": [{"1": 5}, {}]}]}], "uaie": [{"2": 4}, {}], "ie": [{"1": 2719, "2": 566}, {"s": [{"1": 74, "2": 9}, {"s": [{"1": 10}, {}], "m": [{"1": 10}, {}], "h": [{"1": 10}, {}], "f": [{"1": 10}, {}], "r": [{"1": 14}, {}], "d": [{"2": 9}, {}], "t": [{"1": 10}, {}], "c": [{"1": 10}, {}]}], "t": [{"1": 24, "2": 21}, {"s": [{"1": 14}, {}], "m": [{"1": 5, "2": 4}, {"t": [{"1": 5, "2": 4}, {"/": [{"1": 5, "2": 4}, {"e": [{"1": 5, "2": 4}, {"/": [{"1": 5, "2": 4}, {"-": [{"1": 5, "2": 4}, {"-": [{"1": 5, "2": 4}, {}]}]}]}]}]}]}], "v": [{"1": 5}, {}], "q": [{"2": 17}, {}]}], "f": [{"1": 5}, {}], "/": [{"1": 130}, {}], "n": [{"1": 1126, "2": 189}, {"c": [{"1": 10, "2": 32}, {"c": [{"2": 20}, {}], "/": [{"1": 5, "2": 12}, {"i": [{"2": 12}, {}], "n": [{"1": 5}, {}]}], "n": [{"1": 5}, {}]}], "m": [{"1": 23}, {}], "g": [{"2": 13}, {}], "h": [{"1": 14}, {}], "d": [{"1": 9, "2": 12}, {"c": [{"2": 8}, {}], "s": [{"1": 4}, {}], "/": [{"1": 5, "2": 4}, {"\u00e9": [{"1": 5, "2": 4}, {"/": [{"1": 5, "2": 4}, {"m": [{"1": 5}, {}], "g": [{"2": 4}, {}]}]}]}]}], "v": [{"1": 257}, {}], "b": [{"1": 405}, {}], "s": [{"1": 35, "2": 9}, {"-": [{"1": 15}, {}], "s": [{"1": 18, "2": 9}, {"i": [{"2": 9}, {}], "/": [{"1": 18}, {}]}], "n": [{"1": 2}, {}]}], "n": [{"2": 4}, {}], "r": [{"1": 150, "2": 49}, {"c": [{"2": 15}, {}], "s": [{"1": 10, "2": 8}, {"i": [{"2": 4}, {}], "o": [{"2": 4}, {}], "/": [{"1": 10}, {}]}], "/": [{"2": 8}, {}], "n": [{"2": 4}, {}], "-": [{"1": 140}, {}], "t": [{"2": 14}, {}]}], "t": [{"1": 218, "2": 40}, {"c": [{"2": 13}, {}], "s": [{"1": 38}, {}], "/": [{"1": 51, "2": 9}, {"i": [{"2": 9}, {}], "n": [{"1": 14}, {}], "\u00e9": [{"1": 16}, {}], "u": [{"1": 5}, {}], "e": [{"1": 16}, {}]}], "n": [{"1": 24}, {}], "-": [{"1": 13}, {}], "d": [{"1": 14}, {}], "t": [{"1": 78, "2": 18}, {"u": [{"1": 19}, {}], "e": [{"1": 20}, {}], "/": [{"1": 24}, {}], "n": [{"1": 15}, {}], "a": [{"2": 18}, {}]}]}], "l": [{"1": 5, "2": 30}, {"-": [{"2": 13}, {}], "s": [{"2": 4}, {}], "t": [{"1": 5, "2": 4}, {"c": [{"2": 4}, {}], "l": [{"1": 5}, {}]}], "/": [{"2": 4}, {}], "n": [{"2": 5}, {}]}]}], "r": [{"1": 887, "2": 244}, {"p": [{"1": 48, "2": 21}, {"r": [{"1": 14}, {}], "s": [{"1": 14}, {}], "/": [{"1": 20, "2": 21}, {"x": [{"2": 13}, {}], "o": [{"2": 8}, {}], "r": [{"1": 5}, {}], "a": [{"1": 15}, {}]}]}], "c": [{"1": 59, "2": 27}, {"s": [{"1": 16}, {}], "g": [{"1": 10}, {}], "/": [{"1": 33, "2": 27}, {"s": [{"2": 9}, {}], "i": [{"1": 15}, {}], "n": [{"1": 8}, {}], "a": [{"1": 5}, {}], "r": [{"2": 9}, {}], "o": [{"2": 9}, {}], "e": [{"1": 5}, {}]}]}], "t": [{"1": 137, "2": 9}, {"s": [{"1": 18}, {}], "\u00e7": [{"1": 5}, {}], "/": [{"1": 114, "2": 9}, {"i": [{"1": 18}, {}], "\u00e9": [{"1": 16}, {}], "u": [{"1": 5}, {}], "\u00ee": [{"1": 5}, {}], "n": [{"1": 20}, {}], "r": [{"1": 14}, {}], "e": [{"1": 18}, {}], "l": [{"1": 18}, {}], "\u00e2": [{"2": 9}, {}]}]}], "n": [{"1": 75, "2": 20}, {"-": [{"2": 15}, {}], "s": [{"1": 14}, {}], "/": [{"1": 61, "2": 5}, {"g": [{"1": 16}, {}], "u": [{"1": 5}, {}], "a": [{"2": 5}, {}], "r": [{"1": 20}, {}], "\u00f4": [{"1": 5}, {}], "e": [{"1": 15}, {}]}]}], "m": [{"1": 51}, {}], "d": [{"1": 10, "2": 8}, {"s": [{"1": 5}, {}], "/": [{"1": 5, "2": 8}, {"o": [{"2": 4}, {}], "\u00e9": [{"2": 4}, {}], "u": [{"1": 5}, {}]}]}], "v": [{"1": 25, "2": 8}, {"g": [{"1": 15}, {}], "/": [{"1": 10, "2": 8}, {"n": [{"1": 5, "2": 8}, {"/": [{"1": 5, "2": 8}, {"e": [{"2": 8}, {}], "a": [{"1": 5}, {}]}]}], "a": [{"1": 5}, {}]}]}], "b": [{"1": 16}, {}], "s": [{"1": 59, "2": 9}, {"s": [{"1": 24}, {}], "/": [{"1": 35, "2": 9}, {"r": [{"1": 10}, {}], "s": [{"1": 15}, {}], "u": [{"1": 5}, {}], "a": [{"1": 5, "2": 9}, {"/": [{"1": 5, "2": 9}, {"r": [{"1": 5}, {}], "t": [{"2": 9}, {}]}]}]}]}], "q": [{"1": 18}, {}], "f": [{"1": 148, "2": 36}, {"-": [{"1": 97, "2": 5}, {"-": [{"1": 97, "2": 5}, {}]}], "s": [{"1": 18}, {}], "t": [{"1": 18}, {}], "/": [{"1": 15, "2": 31}, {"i": [{"2": 18}, {}], "f": [{"1": 15}, {}], "n": [{"2": 5}, {}], "\u00e9": [{"2": 8}, {}]}]}], "r": [{"1": 73, "2": 50}, {"s": [{"1": 19}, {}], "/": [{"1": 54, "2": 50}, {"p": [{"2": 15}, {}], "c": [{"2": 22}, {}], "u": [{"1": 15}, {}], "f": [{"2": 4}, {}], "a": [{"1": 5}, {}], "r": [{"1": 24}, {}], "o": [{"1": 10, "2": 5}, {"/": [{"1": 10, "2": 5}, {"s": [{"1": 10}, {}], "m": [{"2": 5}, {}]}]}], "v": [{"2": 4}, {}]}]}], "z": [{"1": 13}, {}], "l": [{"1": 104, "2": 44}, {"r": [{"1": 10}, {}], "-": [{"2": 9}, {}], "e": [{"1": 5}, {}], "/": [{"1": 73, "2": 35}, {"p": [{"2": 5}, {}], "g": [{"2": 5}, {}], "\u00e9": [{"1": 5, "2": 5}, {"/": [{"1": 5, "2": 5}, {"d": [{"2": 5}, {}], "b": [{"1": 5}, {}]}]}], "u": [{"1": 5}, {}], "a": [{"1": 17}, {}], "i": [{"1": 16}, {}], "o": [{"1": 15}, {}], "b": [{"2": 16}, {}], "e": [{"1": 10}, {}], "l": [{"1": 5, "2": 4}, {"/": [{"1": 5, "2": 4}, {"i": [{"1": 5}, {}], "a": [{"2": 4}, {}]}]}]}], "s": [{"1": 16}, {}]}], "h": [{"1": 51, "2": 12}, {"-": [{"1": 41, "2": 12}, {"-": [{"1": 41, "2": 12}, {}]}], "r": [{"1": 5}, {}], "/": [{"1": 5}, {}]}]}], "d": [{"1": 61}, {}], "z": [{"1": 298, "2": 85}, {"p": [{"1": 5}, {}], "c": [{"2": 15}, {}], "Y": [{"1": 5}, {}], "n": [{"1": 16}, {}], "m": [{"1": 15}, {}], "d": [{"1": 36, "2": 8}, {"-": [{"1": 10}, {}], "/": [{"1": 26, "2": 8}, {"u": [{"1": 5, "2": 8}, {"/": [{"1": 5, "2": 8}, {"t": [{"1": 5, "2": 8}, {"/": [{"1": 5, "2": 8}, {"\u00e9": [{"1": 5, "2": 8}, {"-": [{"1": 5, "2": 8}, {"-": [{"1": 5, "2": 8}, {}]}]}]}]}]}]}], "n": [{"1": 16}, {}], "\u00e9": [{"1": 5}, {}]}]}], "v": [{"1": 14}, {}], "s": [{"1": 20}, {}], "f": [{"2": 13}, {}], "r": [{"1": 114, "2": 33}, {"-": [{"1": 45, "2": 16}, {"r": [{"1": 10}, {}], "u": [{"1": 10}, {}], "-": [{"2": 4}, {}], "d": [{"2": 12}, {}], "e": [{"1": 15}, {}], "i": [{"1": 10}, {}]}], "/": [{"1": 69, "2": 17}, {"d": [{"2": 13}, {}], "u": [{"1": 14}, {}], "a": [{"1": 5, "2": 4}, {"/": [{"1": 5, "2": 4}, {"v": [{"1": 5, "2": 4}, {"-": [{"1": 5, "2": 4}, {"-": [{"1": 5, "2": 4}, {}]}]}]}]}], "i": [{"1": 10}, {}], "o": [{"1": 5}, {}], "r": [{"1": 18}, {}], "e": [{"1": 17}, {}]}]}], "t": [{"1": 16}, {}], "l": [{"1": 41, "2": 16}, {"-": [{"1": 5}, {}], "/": [{"1": 36, "2": 16}, {"r": [{"1": 5}, {}], "b": [{"2": 16}, {}], "e": [{"1": 5}, {}], "l": [{"1": 10}, {}], "u": [{"1": 16}, {}]}]}], "h": [{"1": 16}, {}]}], "l": [{"1": 114, "2": 18}, {"c": [{"1": 91, "2": 9}, {"-": [{"1": 91}, {}], "/": [{"2": 9}, {}]}], "m": [{"1": 10}, {}], "t": [{"2": 9}, {}], "f": [{"1": 13}, {}]}]}], "o\u00fc\u00e9": [{"2": 4}, {}], "iu": [{"2": 13}, {}], "a\u00ef": [{"1": 10, "2": 74}, {"s": [{"2": 14}, {}], "r": [{"2": 20}, {}], "f": [{"2": 13}, {}], "/": [{"2": 8}, {}], "-": [{"1": 10}, {}], "v": [{"2": 15}, {}], "t": [{"2": 4}, {}]}], "ou\u00fc": [{"1": 10}, {}], "aie": [{"1": 129}, {}], "uau": [{"2": 20}, {}], "ieu": [{"1": 609, "2": 260}, {"x": [{"1": 269, "2": 210}, {"c": [{"1": 22, "2": 46}, {"-": [{"1": 22}, {}], "/": [{"2": 46}, {}]}], "m": [{"1": 75}, {}], "t": [{"2": 15}, {}], "g": [{"2": 9}, {}], "n": [{"2": 14}, {}], "r": [{"2": 51}, {}], "d": [{"1": 74, "2": 44}, {"-": [{"1": 51}, {}], "/": [{"1": 23, "2": 44}, {"i": [{"1": 5}, {}], "o": [{"2": 30}, {}], "u": [{"2": 4}, {}], "a": [{"1": 18, "2": 10}, {"-": [{"1": 18}, {}], "/": [{"2": 10}, {}]}]}]}], "v": [{"1": 24, "2": 16}, {"-": [{"1": 24}, {}], "/": [{"2": 16}, {}]}], "p": [{"2": 15}, {}], "l": [{"1": 74}, {}]}], "s": [{"2": 34}, {}], "r": [{"1": 111, "2": 16}, {"s": [{"1": 111}, {}], "r": [{"2": 16}, {}]}], "/": [{"1": 229}, {}]}], "ai": [{"1": 5798}, {}], "ui": [{"1": 1478, "2": 58}, {"p": [{"1": 5}, {}], "m": [{"1": 46}, {}], "g": [{"1": 13}, {}], "/": [{"1": 468}, {}], "d": [{"1": 20}, {}], "v": [{"1": 76}, {}], "s": [{"1": 429}, {}], "n": [{"1": 25, "2": 53}, {"j": [{"1": 5}, {}], "r": [{"1": 10, "2": 53}, {"\u00e9": [{"1": 5, "2": 9}, {"/": [{"1": 5, "2": 9}, {"-": [{"1": 5, "2": 4}, {"-": [{"1": 5, "2": 4}, {}]}], "s": [{"2": 5}, {}]}]}], "e": [{"1": 5, "2": 44}, {"/": [{"1": 5, "2": 44}, {"-": [{"1": 5, "2": 35}, {"-": [{"1": 5, "2": 35}, {}]}], "s": [{"2": 5}, {}], "u": [{"2": 4}, {}]}]}]}], "g": [{"1": 10}, {}]}], "r": [{"1": 49}, {}], "t": [{"1": 315, "2": 5}, {"c": [{"1": 5}, {}], "p": [{"1": 10}, {}], "g": [{"1": 10}, {}], "f": [{"1": 35}, {}], "n": [{"1": 49}, {}], "r": [{"1": 92}, {}], "d": [{"1": 55}, {}], "s": [{"1": 43}, {}], "l": [{"2": 5}, {}], "h": [{"1": 16}, {}]}], "c": [{"1": 18}, {}], "l": [{"1": 14}, {}]}], "iei": [{"1": 31}, {}], "oeu": [{"1": 125}, {}], "aei": [{"2": 5}, {}], "a\u00ee": [{"1": 269}, {}], "oa": [{"2": 16}, {}], "e\u00ee": [{"1": 5}, {}], "iai": [{"2": 15}, {}], "o\u00ea": [{"1": 5}, {}], "o\u00ef": [{"2": 19}, {}], "a\u00e8": [{"2": 4}, {}], "ya": [{"2": 12}, {}], "eo": [{"1": 25, "2": 5}, {"r": [{"1": 10}, {}], "n": [{"1": 15, "2": 5}, {"p": [{"2": 5}, {}], "g": [{"1": 15}, {}]}]}], "\u00e9ai": [{"2": 5}, {}], "\u0153u": [{"1": 191}, {}], "uie": [{"1": 15}, {}], "e\u00fb": [{"1": 56}, {}], "o\u00e9": [{"2": 16}, {}], "o\u00ee": [{"1": 26}, {}], "ue": [{"1": 201, "2": 181}, {"s": [{"1": 19}, {}], "t": [{"1": 5, "2": 27}, {"m": [{"2": 18}, {}], "t": [{"1": 5}, {}], "n": [{"2": 4}, {}], "l": [{"2": 5}, {}]}], "n": [{"1": 15, "2": 9}, {"p": [{"1": 10}, {}], "m": [{"1": 5}, {}], "l": [{"2": 9}, {}]}], "/": [{"1": 122}, {}], "r": [{"1": 40, "2": 67}, {"c": [{"2": 4}, {}], "m": [{"1": 5, "2": 12}, {"/": [{"2": 8}, {}], "a": [{"1": 5, "2": 4}, {"e": [{"1": 5, "2": 4}, {"i": [{"1": 5, "2": 4}, {"r": [{"1": 5, "2": 4}, {"t": [{"1": 5, "2": 4}, {"/": [{"1": 5, "2": 4}, {"-": [{"2": 4}, {}], "i": [{"1": 5}, {}]}]}]}]}]}]}]}], "t": [{"1": 35, "2": 16}, {"i": [{"1": 10}, {}], "o": [{"1": 10}, {}], "-": [{"2": 16}, {}], "a": [{"1": 15}, {}]}], "h": [{"2": 5}, {}], "n": [{"2": 13}, {}], "b": [{"2": 4}, {}], "l": [{"2": 13}, {}]}], "z": [{"2": 13}, {}], "l": [{"2": 65}, {}]}], "u\u00ee": [{"1": 15, "2": 4}, {"t": [{"1": 15, "2": 4}, {"h": [{"1": 15, "2": 4}, {"r": [{"1": 15, "2": 4}, {"/": [{"1": 5, "2": 4}, {"i": [{"2": 4}, {}], "e": [{"1": 5}, {}]}], "l": [{"1": 10}, {}]}]}]}]}], "o\u00e8": [{"2": 16}, {}], "ueu": [{"2": 14}, {}], "ao\u00fb": [{"1": 5}, {}], "iou": [{"1": 16, "2": 5}, {"s": [{"1": 16}, {}], "l": [{"2": 5}, {}]}], "ouie": [{"2": 4}, {}], "ouaie": [{"2": 4}, {}], "eue": [{"1": 10, "2": 5}, {"t": [{"2": 5}, {}], "/": [{"1": 10}, {}]}], "yo": [{"1": 10, "2": 9}, {"r": [{"1": 5}, {}], "t": [{"2": 4}, {}], "l": [{"1": 5}, {}], "n": [{"2": 5}, {}]}], "ou": [{"1": 8130}, {}], "ei": [{"1": 751}, {}], "ye": [{"1": 5}, {}], "eu": [{"1": 3738}, {}]}]
diff --git a/options.py b/options.py
@@ -11,5 +11,6 @@ default_options = {
'check_occurrences': True,
'poor_eye_required': True,
'poor_eye_supposed_ok': False,
+ 'poor_eye_vocalic_ok': False,
'diaeresis': "classical"
}
diff --git a/plint_web.py b/plint_web.py
@@ -106,7 +106,11 @@ def check(poem):
@app.route('/<lang>/checkjs', method='POST')
def q(lang):
global throttle
- ip = request.environ.get('REMOTE_ADDR')
+ # necessary when serving with lighttpd proxy-core
+ ip = request.environ.get('HTTP_X_FORWARDED_FOR')
+ if not ip:
+ # fallback; this is 127.0.0.1 with proxy-core
+ ip = request.environ.get('REMOTE_ADDR')
t = time.time()
print("== %s %s ==" % (ip, t))
response.content_type = 'application/json'
diff --git a/rhyme.py b/rhyme.py
@@ -8,6 +8,7 @@ from pprint import pprint
import frhyme
import functools
from options import default_options
+from common import is_vowels, normalize
# number of possible rhymes to consider
NBEST = 5
@@ -34,6 +35,7 @@ tolerance = {
'm': 'n',
'à': 'a',
'û': 'u',
+ 'ù': 'u'
}
@@ -94,11 +96,23 @@ class Rhyme:
self.old_last_count = None
self.new_rhyme = None
+ # store if rhyme is a succession of two vowels
+ self.double_vocalic = False
+ l2 = normalize(line)
+ if len(l2) >= 2:
+ if is_vowels(l2[-2], with_y=False, with_h=False):
+ self.double_vocalic = True
+ if l2[-2] == 'h':
+ if len(l2) >= 3 and is_vowels(l2[-3], with_y=False, with_h=False):
+ self.double_vocalic = True
+ self.old_double_vocalic = False
+
def rollback(self):
self.phon = self.old_phon
self.eye = self.old_eye
self.raw_eye = self.old_raw_eye
self.last_count = self.old_last_count
+ self.double_vocalic = self.old_double_vocalic
def sufficient_phon(self):
# return the shortest accepted rhymes among old_phon
@@ -121,6 +135,8 @@ class Rhyme:
return self.eye, 1
if self.last_count == 1:
return self.eye, 1
+ if self.options['poor_eye_vocalic_ok'] and self.double_vocalic:
+ return self.eye, 1
if self.options['poor_eye_supposed_ok']:
return self.eye, 2
else:
@@ -165,10 +181,13 @@ class Rhyme:
self.old_phon = self.phon
self.old_eye = self.eye
self.old_last_count = self.last_count
+ self.old_double_vocalic = self.double_vocalic
self.old_raw_eye = self.raw_eye
# lastCount will be applied later
self.constraint.restrict(r.constraint)
self.new_rhyme = r
+ if not r.double_vocalic:
+ self.double_vocalic = False # rhyme is ok if all rhymes are double vocalic
self.match(set([self.apply_mergers(x) for x in r.phon]),
self.supposed_liaison(self.consonant_suffix(r.eye)), r.raw_eye)
diff --git a/static/script.js b/static/script.js
@@ -1,3 +1,11 @@
+function htmlentities(x) {
+ return $('<div/>').text(x).html();
+}
+
+function onlydigits(x) {
+ return String(x).replace(/[^0-9]/, '');
+}
+
function showCustom(a) {
if (a) {
document.getElementById("custom_template").style.display = "block";
@@ -70,22 +78,29 @@ function check() {
type: "post",
data: mydata,
error: function (jqxhr, stat, error) {
- reportError(stat + (error.length > 0 ? ": " + error : ""));
+ reportError(htmlentities(stat) +
+ (error.length > 0 ? ": " + htmlentities(error) : ""));
$('#check').prop( "disabled", false);
+ // do not keep old errors around lest the user may miss the problem
+ $( "#errors" ).empty();
},
success: function (data) {
if ("error" in data) {
- $( "#status" ).html("<span class=\"error\">" + data.error + "</span>");
+ $( "#status" ).html("<span class=\"error\">" + htmlentities(data.error) + "</span>");
+ $( "#errors" ).empty();
} else {
$( "#errors" ).empty();
for (var i = 0; i < data.result.length; i++) {
var err = data.result[i];
- $( "#errors" ).append("<li onclick=\"gotoLine(" + err.num + ")\">" +
+ for (var j = 0; j < err.errors.length; j++) {
+ err.errors[j] = htmlentities(err.errors[j]);
+ }
+ $( "#errors" ).append("<li onclick=\"gotoLine(" + onlydigits(err.num) + ")\">" +
"<p>" + (lang == "fr"
? "Erreurs pour la ligne "
: "Errors for line ")
- + err.num + ":</p>" +
- "<blockquote>" + err.line + "</blockquote>" +
+ + onlydigits(err.num) + ":</p>" +
+ "<blockquote>" + htmlentities(err.line) + "</blockquote>" +
"<pre>" + err.errors.join("<br />") + "</pre></li>");
}
if (data.result.length > 0) {
@@ -122,10 +137,11 @@ function loadPredef() {
url: "static/tpl/" + predef + ".tpl",
type: "get",
error: function (jqxhr, stat, error) {
- reportError(stat + (error.length > 0 ? ": " + error : ""));
+ reportError(htmlentities(stat) +
+ (error.length > 0 ? ": " + htmlentities(error) : ""));
},
success: function (data) {
- $( '#user_template' ).val(data);
+ $( '#user_template' ).val(htmlentities(data));
$('#user_template').show();
$('#customize').prop("disabled", true);
resizePoem();
diff --git a/template.py b/template.py
@@ -52,6 +52,7 @@ class Template:
'oeil_tolerance_ok': 'eye_tolerance_ok',
'pauvre_oeil_requise': 'poor_eye_required',
'pauvre_oeil_supposee_ok': 'poor_eye_supposed_ok',
+ 'pauvre_oeil_vocalique_ok': 'poor_eye_vocalic_ok',
}
diff --git a/verse.py b/verse.py
@@ -6,6 +6,7 @@ import re
import vowels
import haspirater
import error
+import sys
from pprint import pprint
# the writing is designed to make frhyme succeed
@@ -142,6 +143,7 @@ class Verse:
w[i+1]['text'] = w[i+1]['text'][1:]
if w[i+1]['text'] == '':
w[i]['original'] += w[i+1]['original']
+ w[i+1]['original'] = ''
if w[i]['text'].endswith('g') and len(w[i+1]['text']) >= 2:
if w[i+1]['text'][1] in "eéèa":
w[i+1]['text'] = w[i+1]['text'][1:]
@@ -268,7 +270,15 @@ class Verse:
for i, w in enumerate(self.chunks[:-1]):
if w[-1]['text'] != "e":
continue
- if sum([1 for chunk in w if is_vowels(chunk['text'])]) <= 1:
+ nweight = 0
+ for chunk in w[::-1]:
+ if is_vowels(chunk['text']):
+ nweight += 1
+ # "fais-le" not elidable, but "suis-je" and "est-ce" is
+ if ('-' in chunk['text'] and not chunk['text'].endswith('-j') and not
+ chunk['text'].endswith('-c')):
+ break
+ if nweight == 1:
continue
if 'elidable' not in w[-1].keys():
w[-1]['elidable'] = self.chunks[i+1][0]['elision']
@@ -281,11 +291,13 @@ class Verse:
if w[-2]['text'] in ambiguous_potential:
w[-2]['error'] = "ambiguous"
w[-1]['error'] = "ambiguous"
- if w[-1]['text'] in ambiguous_potential:
- if self.chunks[i+1][0]['text'][0] in consonants:
+ if len(w[-1]['text']) >= 2 and w[-1]['text'][-2:] in ambiguous_potential:
+ nchunk = self.chunks[i+1][0]
+ if 'elision' not in nchunk.keys() or True not in nchunk['elision']:
w[-1]['error'] = "ambiguous"
self.chunks[i+1][0]['error'] = "ambiguous"
- elif (is_vowels(w[-1]['text']) or w[-1]['text'] == 'Y') and not w[-1]['text'].endswith('e'):
+ elif ((is_vowels(w[-1]['text']) or w[-1]['text'] == 'Y') and not
+ w[-1]['text'].endswith('e')):
if (is_vowels(self.chunks[i+1][0]['text']) and 'no_hiatus' not in
self.chunks[i+1][0].keys()):
if ''.join(x['text'] for x in w) not in no_hiatus:
@@ -301,6 +313,11 @@ class Verse:
# collapse words
self.chunks = sum(self.chunks, [])
+ now_line = ''.join(x['original'] for x in self.chunks)
+ if now_line != line:
+ print("%s became %s" % (line, now_line), file=sys.stderr)
+ pprint(self.chunks, stream=sys.stderr)
+
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")
@@ -473,12 +490,12 @@ class Verse:
tot = 0
for c in self.chunks[::-1]:
- if c['original'].endswith(' '):
+ if c['original'].endswith(' ') or c['original'].endswith('-'):
if tot > 0:
break
if 'weights' in c.keys():
tot += min(c['weights'])
- if ' ' in c['original'].rstrip():
+ if ' ' in c['original'].rstrip() or '-' in c['original'].rstrip():
if tot > 0:
break
return tot
diff --git a/views/about.html b/views/about.html
@@ -190,7 +190,11 @@ options suivantes sont reconnues :</p>
rime pauvre (un seul phonème) qui ne comporte pas de mots monosyllabiques
(vrai par défaut, n'a de sens que pour les rimes classiques).</dd>
<dt>poor_eye_supposed_ok</dt>
- <dd>Autoriser la rime pour l'œil pour poor_eye_required (faux par défaut).</dd>
+ <dd>Autoriser la liaison supposée pour la rime pour l'œil pour
+ poor_eye_required (faux par défaut).</dd>
+ <dt>poor_eye_vocalic_ok</dt>
+ <dd>Ne pas imposer la rime de poor_eye_required pour des successions de deux
+ sons vocaliques (par exemple Noé/avoué).</dd>
</dl>
<p>Désolé si tout cela semble un peu obscur. Vous pouvez regarder les modèles
@@ -413,8 +417,11 @@ form option:value and separated by spaces, with the following possibilities:</p>
rhyme is poor (only one phoneme) and there are no monosyllabic words in the
rhyme (default is true, only applies to classical rhymes).</dd>
<dt>poor_eye_supposed_ok</dt>
- <dd>Allow <em>rime pour l'œil</em> for poor_eye_required (default is
- false).</dd>
+ <dd>Allow <em>liaison supposée</em> for the <em>rime pour l'œil</em> for
+ poor_eye_required (default is false).</dd>
+ <dt>poor_eye_vocalic_ok</dt>
+ <dd>Do not require the rhyme of poor_eye_required for successions of two
+ vocalic sounds (such as Noé/avoué).</dd>
</dl>
<p>Sorry if all of this is a bit obscure. You can have a look to the predefined
diff --git a/views/page.html b/views/page.html
@@ -9,7 +9,6 @@
<meta name="description" content="plint French poetry checker" />
{% endif %}
<link rel="stylesheet" href="/static/main.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="/static/js.css" type="text/css" media="screen" />
<script type="text/javascript">
var lang = "{{ lang }}";
</script>
