Grammalecte  Check-in [26cf74769b]

Overview
Comment:[core][fr][oxt] text formatter: another apostrophe
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | fr | core | lo
Files: files | file ages | folders
SHA3-256: 26cf74769bdf49c01a556a7f070115376e3d23821194016209aef5a05a9c79c7
User & Date: olr on 2021-02-17 10:45:59
Other Links: manifest | tags
Context
2021-02-17
13:09
[fr] mise à jour des dictionnaires [fr] ajustements check-in: c4768583e7 user: olr tags: trunk, fr
10:45
[core][fr][oxt] text formatter: another apostrophe check-in: 26cf74769b user: olr tags: trunk, fr, core, lo
2021-02-15
16:32
[core][fr] fix text formtatter check-in: f069a117e4 user: olr tags: trunk, fr, core
Changes

Modified gc_lang/fr/modules-js/textformatter.js from [920d8b7cad] to [879c3eaec1].

78
79
80
81
82
83
84
85
86


87
88
89
90
91
92
93
78
79
80
81
82
83
84


85
86
87
88
89
90
91
92
93







-
-
+
+







                                    [/([a-zA-Zà-öÀ-Öø-ÿØ-ßĀ-ʯ]),(?=[0-9])/g, "$1, "] ],
    "add_space_around_hyphens":   [ [/ [-–—](?=[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ"«“'‘])/g, "$& "],
                                    [/([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, " –,"] ],
    "ts_m_dash_middle":           [ [/ [-–] /g, " — "],
                                    [/ [-–],/g, " —,"] ],

Modified gc_lang/fr/modules/textformatter.py from [bc3ccf87ae] to [b53c40f5d0].

60
61
62
63
64
65
66
67
68


69
70
71
72
73
74
75
60
61
62
63
64
65
66


67
68
69
70
71
72
73
74
75







-
-
+
+







                                    ("(?i)([a-zàâäéèêëîïôöûüù]),(?=[0-9])", "\\1, ")],
    "add_space_around_hyphens":    [(" ([-–—])(?=[a-zàâäéèêëîïôöûüù\"«“'‘])", " \\1 "),
                                    ("(?<=[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":       [ (" [-—] ", " – "),
                                (" [-—],", " –,") ],
    "ts_m_dash_middle":       [ (" [-–] ", " — "),
                                (" [-–],", " —,") ],

Modified gc_lang/fr/oxt/TextFormatter/tf_tabrep.py from [f464a1a3f2] to [2587fa1bfe].

158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183



















184
185
186
187
188
189
190
158
159
160
161
162
163
164



















165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190







-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+







    # Suppressions
    "delete1": [
                    ("­",                               "",             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)
    ],
    "typo3a": [     # cadratin