Index: gc_lang/fr/oxt/TextFormatter/tf_tabrep.py ================================================================== --- gc_lang/fr/oxt/TextFormatter/tf_tabrep.py +++ gc_lang/fr/oxt/TextFormatter/tf_tabrep.py @@ -119,14 +119,14 @@ ], "nbsp5": [ ("(?<=[0-9⁰¹²³⁴⁵⁶⁷⁸⁹]) ?([kcmµnd]?(?:[slgJKΩΩℓ]|m[²³]?|Wh?|Hz|dB)|[%‰]|°C)\\b", " $1", True, True) ], "nbsp6": [ - ("\\bM(mes?|ᵐᵉˢ?|grs?|ᵍʳˢ?|lles?|ˡˡᵉˢ?|rs?|ʳˢ?|M\\.) ", "M$1 ", True, True), - ("\\bD(re?s?|ʳᵉ?ˢ?) ", "D$1 ", True, True), - ("\\bP(re?s?|ʳᵉ?ˢ?) ", "P$1 ", True, True), - ("\\bV(ves?|ᵛᵉˢ?) ", "V$1 ", True, True), + ("M(mes?|ᵐᵉˢ?|grs?|ᵍʳˢ?|lles?|ˡˡᵉˢ?|rs?|ʳˢ?|M\\.) ", "M$1 ", True, True), + ("D(re?s?|ʳᵉ?ˢ?) ", "D$1 ", True, True), + ("P(re?s?|ʳᵉ?ˢ?) ", "P$1 ", True, True), + ("V(ves?|ᵛᵉˢ?) ", "V$1 ", True, True), ], # espaces manquants "space1": [ (";(?=[:alnum:])", "; ", True, True), @@ -253,11 +253,11 @@ ("\\bm[2²]\\.s\\b", "m²·s", True, True), ("\\bm[3³]\\.s(?=-1)\\b", "m³·s", True, True), #("\\bJ.kg-1.K-1\\b", "J·kg-1·K-1", True, True), #("\\bW.m-1.K-1\\b", "W·m-1·K-1", True, True), #("\\bW.m-2.K-1\\b", "W·m-2·K-1", True, True), - ("\\b(Y|Z|E|P|T|G|M|k|h|da|d|c|m|µ|n|p|f|a|z|y)Ω\\b", "$1Ω", True, True) + ("(Y|Z|E|P|T|G|M|k|h|da|d|c|m|µ|n|p|f|a|z|y)Ω", "$1Ω", True, True) ], "typo7": [ # ligatures: pas de majuscules ("coeur", "cœur", False, True), ("coel([aeio])", "cœl$1", True, True), @@ -295,11 +295,12 @@ (" ca\\b", " ça", True, True), ("\\bdej[aà]\\b", "déjà", True, True), ("\\bDej[aà]\\b", "Déjà", True, True), ("\\bplutot\\b", "plutôt", True, True), ("\\bPlutot\\b", "Plutôt", True, True), - ("\\b([cC]e(?:ux|lles?|lui))-la\\b", "$1-là", True, True), + ("\\b(ce(?:ux|lles?|lui))-la\\b", "$1-là", True, True), + ("\\b(Ce(?:ux|lles?|lui))-la\\b", "$1-là", True, True), ("\\bmalgre\\b", "malgré", True, True), ("\\bMalgre\\b", "Malgré", True, True), ("\\betre\\b", "être", True, True), ("\\bEtre\\b", "Être", True, True), ("\\btres\\b", "très", True, True), @@ -386,15 +387,18 @@ "misc3": [ ("[ -]t[’'](?=il\\b|elle|on\\b)", "-t-", True, True), (" t-(?=il|elle|on)", "-t-", True, True), ("[ -]t[’'-](?=ils|elles)", "-", True, True), ("(?<=[td])-t-(?=il|elle|on)", "-", True, True), - ("(celles?|celui|ceux) (ci|là)\\b", "$1-$2", True, False), - ("\\bdix (sept|huit|neuf)", "dix-$1", True, False), + (" c(elles?|elui|eux) (ci|là)\\b", " c$1-$2", True, True), + ("C(elles?|elui|eux) (ci|là)\\b", "C$1-$2", True, True), + (" dix (sept|huit|neuf)", " dix-$1", True, True), + ("Dix (sept|huit|neuf)", "Dix-$1", True, True), ("quatre vingt", "quatre-vingt", False, True), - ("(soixante|quatre-vingt) dix", "$1-dix", True, False), - ("(vingt|trente|quarante|cinquante|soixante(?:-dix|)|quatre-vingt(?:-dix|)) (deux|trois|quatre|cinq|six|sept|huit|neuf)", "$1-$2", True, False), + ("Quatre vingt", "Quatre-vingt", False, True), + ("(soixante|quatre-vingt) (deux|trois|quatre|cinq|six|sept|huit|neuf|dix|onze|douze|treize|quatorze|quinze|seize|dix-sept|dix-huit|dix-neuf)", "$1-$2", True, False), + ("(vingt|trente|quarante|cinquante) (deux|trois|quatre|cinq|six|sept|huit|neuf)", "$1-$2", True, False), ("(?