Changes In Branch dicfac Through [3ebde2f15f] Excluding Merge-Ins
This is equivalent to a diff from 37ac74a3bb to 3ebde2f15f
| 2020-05-30 | ||
| 17:00 | [fr] merge dicfac branch: dictionary update and new affixation rules check-in: 33eba8eb3d user: olr tags: trunk, fr | |
| 2020-05-28 | ||
| 19:18 | [fr] affixe: permettre les combinaisons pour le drapeau S. -> nécessaire pour Um check-in: 491532d554 user: olr tags: fr, dicfac | |
| 18:21 | merge trunk check-in: 3ebde2f15f user: olr tags: dicfac | |
| 18:09 | [fr] mise à jour du dictionnaire (dictionnaire avec affixes factorisés) check-in: 5a7f3c6402 user: olr tags: fr, dicfac | |
| 17:28 | [graphspell][py] remove deprecated code check-in: 37ac74a3bb user: olr tags: trunk, graphspell | |
| 15:20 | [graphspell] suggestions: end of experiment -> aborted, too slow check-in: 4cd155b03e user: olr tags: trunk, graphspell | |
Deleted gc_lang/fr/dictionnaire/_templates/moz/install.rdf version [95b4de5d2f].
| 
 | 
 | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 
Added gc_lang/fr/dictionnaire/_templates/moz/manifest.json version [2b859e0ab8].
| > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | 
{
    "name": "Dictionnaire français",
    "short_name": "French Dict.",
    "version": "${version}",
    "description": "Dictionnaire orthographique pour la langue française.",
    "dictionaries": {
        "fr": "dictionaries/fr-classic.dic"
    },
    "homepage_url": "https://grammalecte.net",
    "browser_specific_settings": {
        "gecko": {
            "id": "fr-dicollecte@dictionaries.addons.mozilla.org"
        }
    },
    "manifest_version": 2
}
 | 
Modified gc_lang/fr/dictionnaire/genfrdic.py from [9dbea97923] to [284dd6c8e1].
| ︙ | ︙ | |||
| 586 587 588 589 590 591 592 | 
    def createMozillaExtensions (self, spBuild, dTplVars, lDictVars, spDestGL=""):
        # Mozilla extension 1
        echo(" * Dictionnaire >> extension pour Mozilla")
        dTplVars['version'] = self.sVersion
        sExtensionName = EXT_PREFIX_MOZ + self.sVersion
        spExt = spBuild + '/' + sExtensionName
        dir_util.mkpath(spExt+'/dictionaries')
 | | | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 | 
    def createMozillaExtensions (self, spBuild, dTplVars, lDictVars, spDestGL=""):
        # Mozilla extension 1
        echo(" * Dictionnaire >> extension pour Mozilla")
        dTplVars['version'] = self.sVersion
        sExtensionName = EXT_PREFIX_MOZ + self.sVersion
        spExt = spBuild + '/' + sExtensionName
        dir_util.mkpath(spExt+'/dictionaries')
        copyTemplate('_templates/moz', spExt, 'manifest.json', dTplVars)
        spDict = spBuild + '/' + PREFIX_DICT_PATH + self.sVersion
        file_util.copy_file(spDict+'/fr-classique.dic', spExt+'/dictionaries/fr-classic.dic')
        file_util.copy_file(spDict+'/fr-classique.aff', spExt+'/dictionaries/fr-classic.aff')
        copyTemplate('orthographe', spExt, 'README_dict_fr.txt', dTplVars)
        createZipFiles(spExt, spBuild, sExtensionName + '.xpi')
        # Grammalecte
        if spDestGL:
 | 
| ︙ | ︙ | |||
| 808 809 810 811 812 813 814 | 
            sErr += 'lemme vide'
        if re.match(r"^\s", self.lemma):
            sErr += 'premier caractère un espace dans <' + self.lemma + '>'
        if re.search(r"\s$", self.lemma):
            sErr += 'espace en fin de lemme'
        if re.match(r"v[0123]", self.po) and not re.match(r"[eas_][ix_][tx_][nx_][pqreuvx_][mx_][ex_z][ax_z]\b", self.po[2:]):
            sErr += 'verbe inconnu: ' + self.po
 | | < < < < < | 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 | 
            sErr += 'lemme vide'
        if re.match(r"^\s", self.lemma):
            sErr += 'premier caractère un espace dans <' + self.lemma + '>'
        if re.search(r"\s$", self.lemma):
            sErr += 'espace en fin de lemme'
        if re.match(r"v[0123]", self.po) and not re.match(r"[eas_][ix_][tx_][nx_][pqreuvx_][mx_][ex_z][ax_z]\b", self.po[2:]):
            sErr += 'verbe inconnu: ' + self.po
        if (re.match(r"S[.]", self.flags) and re.search("[sxz]$", self.lemma)) or (re.match(r"X[.]", self.flags) and not re.search("[ul]$", self.lemma)):
            sErr += 'drapeau inutile'
        if self.iz == '' and re.match(r"[SXAI](?!=)", self.flags) and self.po:
            sErr += '[is] vide'
        if re.match(r"pl|sg|inv", self.iz):
            sErr += '[is] incomplet'
        if re.match(r"[FW]", self.flags) and re.search(r"epi|mas|fem|inv|sg|pl", self.iz):
            sErr += '[is] incohérent'
        if re.search(r"pl|sg|inv", self.iz) and re.match(r"[SXAIFW](?!=)", self.flags):
            sErr += '[is] incohérent'
        if self.iz.endswith(("mas", "fem", "epi")) and (not self.flags or not self.flags.startswith(("S", "X", "F", "W", "A", "I", "U"))):
            sErr += '[is] incomplet'
        if self.flags.startswith(("a", "b", "c", "d")) and not self.lemma.endswith("er"):
            sErr += "drapeau pour verbe du 1ᵉʳ groupe sur un lemme non conforme"
        if self.flags.startswith("f") and not self.lemma.endswith(("ir", "ïr")):
            sErr += "drapeau pour verbe du 2ᵉ groupe sur un lemme non conforme"
        if sErr:
 | 
| ︙ | ︙ | |||
| 938 939 940 941 942 943 944 | 
            morph = self.lexMorph()
        lFlexions = [(self.lemma, morph, self.di)]  if iPR == 0 and not self.flags.endswith('()')  else []
        lFlexPrefix = []
        lFlexSuffix = []
        for sFlag in makeLongFlags(self.flags):
            if sFlag not in dFlags:
                if sFlag not in ['**', '()', '||', '--']:
 | | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 | 
            morph = self.lexMorph()
        lFlexions = [(self.lemma, morph, self.di)]  if iPR == 0 and not self.flags.endswith('()')  else []
        lFlexPrefix = []
        lFlexSuffix = []
        for sFlag in makeLongFlags(self.flags):
            if sFlag not in dFlags:
                if sFlag not in ['**', '()', '||', '--']:
                    lFlexions.append( (self.lemma, '[unknown flag: {}]'.format(sFlag), self.di) )
                    echo("ERROR: "  + self.lemma + ' - unknown flag: ' + sFlag)
            else:
                oFlag = dFlags[sFlag]
                if not oFlag.bSfx:
                    # cas des préfixes
                    for oRule in oFlag.lRules:
                        if oRule.motif.search(self.lemma):
 | 
| ︙ | ︙ | 
Modified gc_lang/fr/dictionnaire/orthographe/FRANCAIS.dic from [3ea594acba] to [76f883f0c7].
more than 10,000 changes
Modified gc_lang/fr/dictionnaire/orthographe/FRANCAIS_5.aff from [72dbf0e245] to [c1a902b87e].
more than 10,000 changes