Index: gc_lang/fr/modules-js/textformatter.js ================================================================== --- gc_lang/fr/modules-js/textformatter.js +++ gc_lang/fr/modules-js/textformatter.js @@ -85,15 +85,15 @@ [/ [-—],/g, " –,"] ], "ts_m_dash_middle": [ [/ [-–] /g, " — "], [/ [-–],/g, " —,"] ], "ts_n_dash_start": [ [/^[-—][  ]/gm, "– "], [/^– /gm, "– "], - [/^[-–—](?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ])/gm, "– "] ], + [/^[-–—](?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ.…])/gm, "– "] ], "ts_m_dash_start": [ [/^[-–][  ]/gm, "— "], [/^— /gm, "— "], [/^«[  ][—–-][  ]/gm, "« — "], - [/^[-–—](?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ])/gm, "— "] ], + [/^[-–—](?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ.…])/gm, "— "] ], "ts_quotation_marks": [ [/"([a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ]+)"/g, "“$1”"], [/''([a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ]+)''/g, "“$1”"], [/'([a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ]+)'/g, "“$1”"], [/^(?:"|'')(?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ…])/gm, "« "], [/ (?:"|'')(?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ…])/g, " « "], Index: gc_lang/fr/modules/textformatter.py ================================================================== --- gc_lang/fr/modules/textformatter.py +++ gc_lang/fr/modules/textformatter.py @@ -68,15 +68,15 @@ (" [-—],", " –,") ], "ts_m_dash_middle": [ (" [-–] ", " — "), (" [-–],", " —,") ], "ts_n_dash_start": [ ("^[-—][  ]", "– "), ("^– ", "– "), - ("^[-–—](?=\\w)", "– ") ], + ("^[-–—](?=[\\w.…])", "– ") ], "ts_m_dash_start": [ ("^[-–][  ]", "— "), ("^— ", "— "), ("^«[  ][—–-][  ]", "« — "), - ("^[-–—](?=\\w)", "— ") ], + ("^[-–—](?=[\\w.…])", "— ") ], "ts_quotation_marks": [ (u'"(\\w+)"', "“$1”"), ("''(\\w+)''", "“$1”"), ("'(\\w+)'", "“$1”"), ("^(?:\"|'')(?=\\w)", "« "), (" (?:\"|'')(?=\\w)", " « "), 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 @@ -199,18 +199,20 @@ "typo4a": [ # cadratin ("^-[  ]", "— ", True, True), ("^–[  ]", "— ", True, True), ("^— ", "— ", True, True), ("^«[  ][—–-][  ]", "« — ", True, True), - ("^[-–—](?=[:alnum:])", "— ", True, False) + ("^[-–—](?=[:alnum:])", "— ", True, False), + ("^[-–—](?=[.…])", "— ", True, True) ], "typo4b": [ # demin-cadratin ("^-[  ]", "– ", True, True), ("^—[  ]", "– ", True, True), ("^– ", "– ", True, True), ("^«[  ][—–-][  ]", "« – ", True, True), - ("^[-–—](?=[:alnum:])", "– ", True, False) + ("^[-–—](?=[:alnum:])", "– ", True, False), + ("^[-–—](?=[.…])", "– ", True, True) ], "typo5": [ ('"([:alpha:]+)"', "“$1”", True, False), ("''([:alpha:]+)''", "“$1”", True, False), ("'([:alpha:]+)'", "“$1”", True, False),