Index: gc_lang/fr/modules-js/textformatter.js ================================================================== --- gc_lang/fr/modules-js/textformatter.js +++ gc_lang/fr/modules-js/textformatter.js @@ -80,12 +80,12 @@ [/([a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ"»”'’])([-–—]) /g, "$1 $2 "] ], "add_space_repair": [ [/DnT, ([wA])\b/g, "DnT,$1"] ], //// erase "erase_non_breaking_hyphens": [ [/­/g, ""] ], //// typographic signs - "ts_apostrophe": [ [/\b([ldnjmtscç])['´‘′`](?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ])/ig, "$1’"], - [/\b(qu|jusqu|lorsqu|puisqu|quoiqu|quelqu|presqu|entr|aujourd|prud)['´‘′`]/ig, "$1’"] ], + "ts_apostrophe": [ [/\b([ldnjmtscç])['´‘′`ʼ](?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ])/ig, "$1’"], + [/\b(qu|jusqu|lorsqu|puisqu|quoiqu|quelqu|presqu|entr|aujourd|prud)['´‘′`ʼ]/ig, "$1’"] ], "ts_ellipsis": [ [/\.\.\./g, "…"], [/…\.\./g, "……"], [/…\.(?!\.)/g, "…"] ], "ts_n_dash_middle": [ [/ [-—] /g, " – "], [/ [-—],/g, " –,"] ], Index: gc_lang/fr/modules/textformatter.py ================================================================== --- gc_lang/fr/modules/textformatter.py +++ gc_lang/fr/modules/textformatter.py @@ -62,12 +62,12 @@ ("(?<=[a-zàâäéèêëîïôöûüù\"»”'’])([-–—]) ", " \\1 ")], "add_space_repair": [("DnT, ([wA])\\b", "DnT,\\1")], ## erase "erase_non_breaking_hyphens": [("­", "")], ## typographic signs - "ts_apostrophe": [ ("(?i)\\b([ldnjmtscç])['´‘′`](?=\\w)", "\\1’"), - ("(?i)(qu|jusqu|lorsqu|puisqu|quoiqu|quelqu|presqu|entr|aujourd|prud)['´‘′`]", "\\1’") ], + "ts_apostrophe": [ ("(?i)\\b([ldnjmtscç])['´‘′`ʼ](?=\\w)", "\\1’"), + ("(?i)(qu|jusqu|lorsqu|puisqu|quoiqu|quelqu|presqu|entr|aujourd|prud)['´‘′`ʼ]", "\\1’") ], "ts_ellipsis": [ ("\\.\\.\\.", "…"), ("(?<=…)[.][.]", "…"), ("…[.](?![.])", "…") ], "ts_n_dash_middle": [ (" [-—] ", " – "), (" [-—],", " –,") ], 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 @@ -160,29 +160,29 @@ ("­", "", False, True) ], # Signes typographiques "typo1": [ - ("\\bl['´‘′`](?=[:alnum:])", "l’", True, True), - ("\\bj['´‘′`](?=[:alnum:])", "j’", True, True), - ("\\bm['´‘′`](?=[:alnum:])", "m’", True, True), - ("\\bt['´‘′`](?=[:alnum:])", "t’", True, True), - ("\\bs['´‘′`](?=[:alnum:])", "s’", True, True), - ("\\bc['´‘′`](?=[:alnum:])", "c’", True, True), - ("\\bd['´‘′`](?=[:alnum:])", "d’", True, True), - ("\\bn['´‘′`](?=[:alnum:])", "n’", True, True), - ("\\bç['´‘′`](?=[:alnum:])", "ç’", True, True), - ("\\bL['´‘′`](?=[:alnum:])", "L’", True, True), - ("\\bJ['´‘′`](?=[:alnum:])", "J’", True, True), - ("\\bM['´‘′`](?=[:alnum:])", "M’", True, True), - ("\\bT['´‘′`](?=[:alnum:])", "T’", True, True), - ("\\bS['´‘′`](?=[:alnum:])", "S’", True, True), - ("\\bC['´‘′`](?=[:alnum:])", "C’", True, True), - ("\\bD['´‘′`](?=[:alnum:])", "D’", True, True), - ("\\bN['´‘′`](?=[:alnum:])", "N’", True, True), - ("\\bÇ['´‘′`](?=[:alnum:])", "Ç’", True, True), - ("(qu|jusqu|lorsqu|puisqu|quoiqu|quelqu|presqu|entr|aujourd|prud)['´‘′`]", "$1’", True, False) + ("\\bl['´‘′`ʼ](?=[:alnum:])", "l’", True, True), + ("\\bj['´‘′`ʼ](?=[:alnum:])", "j’", True, True), + ("\\bm['´‘′`ʼ](?=[:alnum:])", "m’", True, True), + ("\\bt['´‘′`ʼ](?=[:alnum:])", "t’", True, True), + ("\\bs['´‘′`ʼ](?=[:alnum:])", "s’", True, True), + ("\\bc['´‘′`ʼ](?=[:alnum:])", "c’", True, True), + ("\\bd['´‘′`ʼ](?=[:alnum:])", "d’", True, True), + ("\\bn['´‘′`ʼ](?=[:alnum:])", "n’", True, True), + ("\\bç['´‘′`ʼ](?=[:alnum:])", "ç’", True, True), + ("\\bL['´‘′`ʼ](?=[:alnum:])", "L’", True, True), + ("\\bJ['´‘′`ʼ](?=[:alnum:])", "J’", True, True), + ("\\bM['´‘′`ʼ](?=[:alnum:])", "M’", True, True), + ("\\bT['´‘′`ʼ](?=[:alnum:])", "T’", True, True), + ("\\bS['´‘′`ʼ](?=[:alnum:])", "S’", True, True), + ("\\bC['´‘′`ʼ](?=[:alnum:])", "C’", True, True), + ("\\bD['´‘′`ʼ](?=[:alnum:])", "D’", True, True), + ("\\bN['´‘′`ʼ](?=[:alnum:])", "N’", True, True), + ("\\bÇ['´‘′`ʼ](?=[:alnum:])", "Ç’", True, True), + ("(qu|jusqu|lorsqu|puisqu|quoiqu|quelqu|presqu|entr|aujourd|prud)['´‘′`ʼ]", "$1’", True, False) ], "typo2": [ ("...", "…", False, True), ("(?<=…)[.][.]", "…", True, True), ("…[.](?![.])", "…", True, True)