Comment: | [core][graphspell][fx][cli] new lexicographer |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | cli | core | fx | graphspell |
Files: | files | file ages | folders |
SHA3-256: |
4fdd6a933713d643442e24bc83115c08 |
User & Date: | olr on 2020-09-10 15:30:12 |
Other Links: | manifest | tags |
2020-09-10
| ||
18:15 | [fr] ajustements check-in: 6a6ad52cca user: olr tags: trunk, fr | |
15:30 | [core][graphspell][fx][cli] new lexicographer check-in: 4fdd6a9337 user: olr tags: trunk, cli, core, fx, graphspell | |
13:15 | [graphspell][fx] lexicographer update: same code for Python and JavaScript (remove deprecated code) Closed-Leaf check-in: 891500b92a user: olr tags: fx, graphspell, salxg | |
2020-09-09
| ||
11:37 | [fr] add perf_memo.txt file check-in: 88998f6977 user: olr tags: trunk, fr | |
Modified gc_core/js/lang_core/gc_engine.js from [2bae51d547] to [5b16fd7058].
︙ | ︙ | |||
193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | // parse paragraph try { this.parseText(this.sText, this.sText0, true, 0, sCountry, dOpt, bShowRuleId, bDebug, bContext); } catch (e) { console.error(e); } let lParagraphErrors = null; if (bFullInfo) { lParagraphErrors = Array.from(this.dError.values()); this.dSentenceError.clear(); } // parse sentence let sText = this._getCleanText(); let lSentences = []; let oSentence = null; for (let [iStart, iEnd] of text.getSentenceBoundaries(sText)) { try { this.sSentence = sText.slice(iStart, iEnd); this.sSentence0 = this.sText0.slice(iStart, iEnd); this.nOffsetWithinParagraph = iStart; | > > | | | < < < < < | | > > | > > > > > > | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | // parse paragraph try { this.parseText(this.sText, this.sText0, true, 0, sCountry, dOpt, bShowRuleId, bDebug, bContext); } catch (e) { console.error(e); } this.lTokens = null; this.lTokens0 = null; let lParagraphErrors = null; if (bFullInfo) { lParagraphErrors = Array.from(this.dError.values()); this.dSentenceError.clear(); } // parse sentence let sText = this._getCleanText(); let lSentences = []; let oSentence = null; for (let [iStart, iEnd] of text.getSentenceBoundaries(sText)) { try { this.sSentence = sText.slice(iStart, iEnd); this.sSentence0 = this.sText0.slice(iStart, iEnd); this.nOffsetWithinParagraph = iStart; this.lTokens = Array.from(gc_engine.oTokenizer.genTokens(this.sSentence, true)); this.dTokenPos.clear(); for (let dToken of this.lTokens) { if (dToken["sType"] != "INFO") { this.dTokenPos.set(dToken["nStart"], dToken); } } if (bFullInfo) { this.lTokens0 = Array.from(this.lTokens); // the list of tokens is duplicated, to keep tokens from being deleted when analysis } this.parseText(this.sSentence, this.sSentence0, false, iStart, sCountry, dOpt, bShowRuleId, bDebug, bContext); if (bFullInfo) { for (let oToken of this.lTokens0) { gc_engine.oSpellChecker.setLabelsOnToken(oToken); } lSentences.push({ "nStart": iStart, "nEnd": iEnd, "sSentence": this.sSentence0, "lTokens": this.lTokens0, "lGrammarErrors": Array.from(this.dSentenceError.values()) }); this.dSentenceError.clear(); } } catch (e) { console.error(e); } } |
︙ | ︙ | |||
371 372 373 374 375 376 377 | if (this.dTokenPos.gl_get(oToken["nStart"], {}).hasOwnProperty("lMorph")) { oToken["lMorph"] = this.dTokenPos.get(oToken["nStart"])["lMorph"]; } if (this.dTokenPos.gl_get(oToken["nStart"], {}).hasOwnProperty("aTags")) { oToken["aTags"] = this.dTokenPos.get(oToken["nStart"])["aTags"]; } } | | | | 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | if (this.dTokenPos.gl_get(oToken["nStart"], {}).hasOwnProperty("lMorph")) { oToken["lMorph"] = this.dTokenPos.get(oToken["nStart"])["lMorph"]; } if (this.dTokenPos.gl_get(oToken["nStart"], {}).hasOwnProperty("aTags")) { oToken["aTags"] = this.dTokenPos.get(oToken["nStart"])["aTags"]; } } this.lTokens = lNewToken; this.dTokenPos.clear(); for (let oToken of this.lTokens) { if (oToken["sType"] != "INFO") { this.dTokenPos.set(oToken["nStart"], oToken); } } if (bDebug) { console.log("UPDATE:"); console.log(this.asString()); |
︙ | ︙ | |||
613 614 615 616 617 618 619 | } parseGraph (oGraph, sCountry="${country_default}", dOptions=null, bShowRuleId=false, bDebug=false, bContext=false) { // parse graph with tokens from the text and execute actions encountered let lPointer = []; let bTagAndRewrite = false; try { | | | 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 | } parseGraph (oGraph, sCountry="${country_default}", dOptions=null, bShowRuleId=false, bDebug=false, bContext=false) { // parse graph with tokens from the text and execute actions encountered let lPointer = []; let bTagAndRewrite = false; try { for (let [iToken, oToken] of this.lTokens.entries()) { if (bDebug) { console.log("TOKEN: " + oToken["sValue"]); } // check arcs for each existing pointer let lNextPointer = []; for (let oPointer of lPointer) { lNextPointer.push(...this._getNextPointers(oToken, oGraph, oPointer, bDebug)); |
︙ | ︙ | |||
665 666 667 668 669 670 671 | // Suggestion [ option, condition, "-", replacement/suggestion/action, iTokenStart, iTokenEnd, cStartLimit, cEndLimit, bCaseSvty, nPriority, sMessage, iURL ] // TextProcessor [ option, condition, "~", replacement/suggestion/action, iTokenStart, iTokenEnd, bCaseSvty ] // Disambiguator [ option, condition, "=", replacement/suggestion/action ] // Tag [ option, condition, "/", replacement/suggestion/action, iTokenStart, iTokenEnd ] // Immunity [ option, condition, "!", "", iTokenStart, iTokenEnd ] // Test [ option, condition, ">", "" ] if (!sOption || dOptions.gl_get(sOption, false)) { | | | | | | | | | | | | | | | | | | | 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 | // Suggestion [ option, condition, "-", replacement/suggestion/action, iTokenStart, iTokenEnd, cStartLimit, cEndLimit, bCaseSvty, nPriority, sMessage, iURL ] // TextProcessor [ option, condition, "~", replacement/suggestion/action, iTokenStart, iTokenEnd, bCaseSvty ] // Disambiguator [ option, condition, "=", replacement/suggestion/action ] // Tag [ option, condition, "/", replacement/suggestion/action, iTokenStart, iTokenEnd ] // Immunity [ option, condition, "!", "", iTokenStart, iTokenEnd ] // Test [ option, condition, ">", "" ] if (!sOption || dOptions.gl_get(sOption, false)) { bCondMemo = !sFuncCond || gc_functions[sFuncCond](this.lTokens, nTokenOffset, nLastToken, sCountry, bCondMemo, this.dTags, this.sSentence, this.sSentence0); //bCondMemo = !sFuncCond || oEvalFunc[sFuncCond](this.lTokens, nTokenOffset, nLastToken, sCountry, bCondMemo, this.dTags, this.sSentence, this.sSentence0); if (bCondMemo) { if (cActionType == "-") { // grammar error let [iTokenStart, iTokenEnd, cStartLimit, cEndLimit, bCaseSvty, nPriority, sMessage, iURL] = eAct; let nTokenErrorStart = (iTokenStart > 0) ? nTokenOffset + iTokenStart : nLastToken + iTokenStart; if (!this.lTokens[nTokenErrorStart].hasOwnProperty("bImmune")) { let nTokenErrorEnd = (iTokenEnd > 0) ? nTokenOffset + iTokenEnd : nLastToken + iTokenEnd; let nErrorStart = this.nOffsetWithinParagraph + ((cStartLimit == "<") ? this.lTokens[nTokenErrorStart]["nStart"] : this.lTokens[nTokenErrorStart]["nEnd"]); let nErrorEnd = this.nOffsetWithinParagraph + ((cEndLimit == ">") ? this.lTokens[nTokenErrorEnd]["nEnd"] : this.lTokens[nTokenErrorEnd]["nStart"]); if (!this.dError.has(nErrorStart) || nPriority > this.dErrorPriority.gl_get(nErrorStart, -1)) { this.dError.set(nErrorStart, this._createErrorFromTokens(sWhat, nTokenOffset, nLastToken, nTokenErrorStart, nErrorStart, nErrorEnd, sLineId, sRuleId, bCaseSvty, sMessage, gc_rules_graph.dURL[iURL], bShowRuleId, sOption, bContext)); this.dErrorPriority.set(nErrorStart, nPriority); this.dSentenceError.set(nErrorStart, this.dError.get(nErrorStart)); if (bDebug) { console.log(" NEW_ERROR: ", this.dError.get(nErrorStart)); } } } } else if (cActionType == "~") { // text processor let nTokenStart = (eAct[0] > 0) ? nTokenOffset + eAct[0] : nLastToken + eAct[0]; let nTokenEnd = (eAct[1] > 0) ? nTokenOffset + eAct[1] : nLastToken + eAct[1]; this._tagAndPrepareTokenForRewriting(sWhat, nTokenStart, nTokenEnd, nTokenOffset, nLastToken, eAct[2], bDebug); bChange = true; if (bDebug) { console.log(` TEXT_PROCESSOR: [${this.lTokens[nTokenStart]["sValue"]}:${this.lTokens[nTokenEnd]["sValue"]}] > ${sWhat}`); } } else if (cActionType == "=") { // disambiguation gc_functions[sWhat](this.lTokens, nTokenOffset, nLastToken); //oEvalFunc[sWhat](this.lTokens, nTokenOffset, nLastToken); if (bDebug) { console.log(` DISAMBIGUATOR: (${sWhat}) [${this.lTokens[nTokenOffset+1]["sValue"]}:${this.lTokens[nLastToken]["sValue"]}]`); } } else if (cActionType == ">") { // we do nothing, this test is just a condition to apply all following actions if (bDebug) { console.log(" COND_OK"); } } else if (cActionType == "/") { // Tag let nTokenStart = (eAct[0] > 0) ? nTokenOffset + eAct[0] : nLastToken + eAct[0]; let nTokenEnd = (eAct[1] > 0) ? nTokenOffset + eAct[1] : nLastToken + eAct[1]; for (let i = nTokenStart; i <= nTokenEnd; i++) { if (this.lTokens[i].hasOwnProperty("aTags")) { this.lTokens[i]["aTags"].add(...sWhat.split("|")) } else { this.lTokens[i]["aTags"] = new Set(sWhat.split("|")); } } if (bDebug) { console.log(` TAG: ${sWhat} > [${this.lTokens[nTokenStart]["sValue"]}:${this.lTokens[nTokenEnd]["sValue"]}]`); } for (let sTag of sWhat.split("|")) { if (!this.dTags.has(sTag)) { this.dTags.set(sTag, [nTokenStart, nTokenEnd]); } else { this.dTags.set(sTag, [Math.min(nTokenStart, this.dTags.get(sTag)[0]), Math.max(nTokenEnd, this.dTags.get(sTag)[1])]); } } } else if (cActionType == "!") { // immunity if (bDebug) { console.log(" IMMUNITY: " + sLineId + " / " + sRuleId); } let nTokenStart = (eAct[0] > 0) ? nTokenOffset + eAct[0] : nLastToken + eAct[0]; let nTokenEnd = (eAct[1] > 0) ? nTokenOffset + eAct[1] : nLastToken + eAct[1]; if (nTokenEnd - nTokenStart == 0) { this.lTokens[nTokenStart]["bImmune"] = true; let nErrorStart = this.nOffsetWithinParagraph + this.lTokens[nTokenStart]["nStart"]; if (this.dError.has(nErrorStart)) { this.dError.delete(nErrorStart); } } else { for (let i = nTokenStart; i <= nTokenEnd; i++) { this.lTokens[i]["bImmune"] = true; let nErrorStart = this.nOffsetWithinParagraph + this.lTokens[i]["nStart"]; if (this.dError.has(nErrorStart)) { this.dError.delete(nErrorStart); } } } } else { console.log("# error: unknown action at " + sLineId); |
︙ | ︙ | |||
807 808 809 810 811 812 813 | return this._createError(nStart, nEnd, sLineId, sRuleId, sOption, sMessage, lSugg, sURL, bContext); } _createErrorFromTokens (sSugg, nTokenOffset, nLastToken, iFirstToken, nStart, nEnd, sLineId, sRuleId, bCaseSvty, sMsg, sURL, bShowRuleId, sOption, bContext) { // suggestions let lSugg = []; if (sSugg.startsWith("=")) { | | | | | | | 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 | return this._createError(nStart, nEnd, sLineId, sRuleId, sOption, sMessage, lSugg, sURL, bContext); } _createErrorFromTokens (sSugg, nTokenOffset, nLastToken, iFirstToken, nStart, nEnd, sLineId, sRuleId, bCaseSvty, sMsg, sURL, bShowRuleId, sOption, bContext) { // suggestions let lSugg = []; if (sSugg.startsWith("=")) { sSugg = gc_functions[sSugg.slice(1)](this.lTokens, nTokenOffset, nLastToken); //sSugg = oEvalFunc[sSugg.slice(1)](this.lTokens, nTokenOffset, nLastToken); lSugg = (sSugg) ? sSugg.split("|") : []; } else if (sSugg == "_") { lSugg = []; } else { lSugg = this._expand(sSugg, nTokenOffset, nLastToken).split("|"); } if (bCaseSvty && lSugg.length > 0 && this.lTokens[iFirstToken]["sValue"].slice(0,1).gl_isUpperCase()) { lSugg = (this.sSentence.slice(nStart, nEnd).gl_isUpperCase()) ? lSugg.map((s) => s.toUpperCase()) : capitalizeArray(lSugg); } // Message let sMessage = (sMsg.startsWith("=")) ? gc_functions[sMsg.slice(1)](this.lTokens, nTokenOffset, nLastToken) : this._expand(sMsg, nTokenOffset, nLastToken); //let sMessage = (sMsg.startsWith("=")) ? oEvalFunc[sMsg.slice(1)](this.lTokens, nTokenOffset, nLastToken) : this._expand(sMsg, nTokenOffset, nLastToken); if (bShowRuleId) { sMessage += " #" + sLineId + " / " + sRuleId; } // return this._createError(nStart, nEnd, sLineId, sRuleId, sOption, sMessage, lSugg, sURL, bContext); } |
︙ | ︙ | |||
852 853 854 855 856 857 858 | return oErr; } _expand (sText, nTokenOffset, nLastToken) { let m; while ((m = /\\(-?[0-9]+)/.exec(sText)) !== null) { if (m[1].slice(0,1) == "-") { | | | | 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 | return oErr; } _expand (sText, nTokenOffset, nLastToken) { let m; while ((m = /\\(-?[0-9]+)/.exec(sText)) !== null) { if (m[1].slice(0,1) == "-") { sText = sText.replace(m[0], this.lTokens[nLastToken+parseInt(m[1],10)+1]["sValue"]); } else { sText = sText.replace(m[0], this.lTokens[nTokenOffset+parseInt(m[1],10)]["sValue"]); } } return sText; } rewriteText (sText, sRepl, iGroup, m, bUppercase) { // text processor: write sRepl in sText at iGroup position" |
︙ | ︙ | |||
893 894 895 896 897 898 899 | } _tagAndPrepareTokenForRewriting (sWhat, nTokenRewriteStart, nTokenRewriteEnd, nTokenOffset, nLastToken, bCaseSvty, bDebug) { // text processor: rewrite tokens between <nTokenRewriteStart> and <nTokenRewriteEnd> position if (sWhat === "*") { // purge text if (nTokenRewriteEnd - nTokenRewriteStart == 0) { | | | | | | | | | | | | | > | 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 | } _tagAndPrepareTokenForRewriting (sWhat, nTokenRewriteStart, nTokenRewriteEnd, nTokenOffset, nLastToken, bCaseSvty, bDebug) { // text processor: rewrite tokens between <nTokenRewriteStart> and <nTokenRewriteEnd> position if (sWhat === "*") { // purge text if (nTokenRewriteEnd - nTokenRewriteStart == 0) { this.lTokens[nTokenRewriteStart]["bToRemove"] = true; } else { for (let i = nTokenRewriteStart; i <= nTokenRewriteEnd; i++) { this.lTokens[i]["bToRemove"] = true; } } } else if (sWhat === "␣") { // merge tokens this.lTokens[nTokenRewriteStart]["nMergeUntil"] = nTokenRewriteEnd; } else if (sWhat === "_") { // neutralized token if (nTokenRewriteEnd - nTokenRewriteStart == 0) { this.lTokens[nTokenRewriteStart]["sNewValue"] = "_"; } else { for (let i = nTokenRewriteStart; i <= nTokenRewriteEnd; i++) { this.lTokens[i]["sNewValue"] = "_"; } } } else { if (sWhat.startsWith("=")) { sWhat = gc_functions[sWhat.slice(1)](this.lTokens, nTokenOffset, nLastToken); //sWhat = oEvalFunc[sWhat.slice(1)](this.lTokens, nTokenOffset, nLastToken); } else { sWhat = this._expand(sWhat, nTokenOffset, nLastToken); } let bUppercase = bCaseSvty && this.lTokens[nTokenRewriteStart]["sValue"].slice(0,1).gl_isUpperCase(); if (nTokenRewriteEnd - nTokenRewriteStart == 0) { // one token if (bUppercase) { sWhat = sWhat.gl_toCapitalize(); } this.lTokens[nTokenRewriteStart]["sNewValue"] = sWhat; } else { // several tokens let lTokenValue = sWhat.split("|"); if (lTokenValue.length != (nTokenRewriteEnd - nTokenRewriteStart + 1)) { if (bDebug) { console.log("Error. Text processor: number of replacements != number of tokens."); } return; } let j = 0; for (let i = nTokenRewriteStart; i <= nTokenRewriteEnd; i++) { let sValue = lTokenValue[j]; if (!sValue || sValue === "*") { this.lTokens[i]["bToRemove"] = true; } else { if (bUppercase) { sValue = sValue.gl_toCapitalize(); } this.lTokens[i]["sNewValue"] = sValue; } j++; } } } } rewriteFromTags (bDebug=false) { // rewrite the sentence, modify tokens, purge the token list if (bDebug) { console.log("REWRITE"); } let lNewToken = []; let nMergeUntil = 0; let oMergingToken = null; for (let [iToken, oToken] of this.lTokens.entries()) { let bKeepToken = true; if (oToken["sType"] != "INFO") { if (nMergeUntil && iToken <= nMergeUntil) { oMergingToken["sValue"] += " ".repeat(oToken["nStart"] - oMergingToken["nEnd"]) + oToken["sValue"]; oMergingToken["nEnd"] = oToken["nEnd"]; if (bDebug) { console.log(" MERGED TOKEN: " + oMergingToken["sValue"]); } oToken["bMerged"] = true; bKeepToken = false; } if (oToken.hasOwnProperty("nMergeUntil")) { if (iToken > nMergeUntil) { // this token is not already merged with a previous token oMergingToken = oToken; } if (oToken["nMergeUntil"] > nMergeUntil) { |
︙ | ︙ | |||
1011 1012 1013 1014 1015 1016 1017 | delete oToken["sNewValue"]; } } } if (bDebug) { console.log(" TEXT REWRITED: " + this.sSentence); } | | | | 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 | delete oToken["sNewValue"]; } } } if (bDebug) { console.log(" TEXT REWRITED: " + this.sSentence); } this.lTokens.length = 0; this.lTokens = lNewToken; } }; if (typeof(exports) !== 'undefined') { exports.lang = gc_engine.lang; exports.locales = gc_engine.locales; |
︙ | ︙ |
Modified gc_core/py/lang_core/gc_engine.py from [31a9f5bc44] to [20a4e92e8f].
︙ | ︙ | |||
231 232 233 234 235 236 237 | def __init__ (self, sText): self.sText = sText self.sText0 = sText self.sSentence = "" self.sSentence0 = "" self.nOffsetWithinParagraph = 0 | | | > > | | < < < < | | > | > > > > > > | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 | def __init__ (self, sText): self.sText = sText self.sText0 = sText self.sSentence = "" self.sSentence0 = "" self.nOffsetWithinParagraph = 0 self.lTokens = [] self.dTokenPos = {} # {position: token} self.dTags = {} # {position: tags} self.dError = {} # {position: error} self.dSentenceError = {} # {position: error} (for the current sentence only) self.dErrorPriority = {} # {position: priority of the current error} def __str__ (self): s = "===== TEXT =====\n" s += "sentence: " + self.sSentence0 + "\n" s += "now: " + self.sSentence + "\n" for dToken in self.lTokens: s += '#{i}\t{nStart}:{nEnd}\t{sValue}\t{sType}'.format(**dToken) if "lMorph" in dToken: s += "\t" + str(dToken["lMorph"]) if "aTags" in dToken: s += "\t" + str(dToken["aTags"]) s += "\n" #for nPos, dToken in self.dTokenPos.items(): # s += "{}\t{}\n".format(nPos, dToken) return s def parse (self, sCountry="${country_default}", bDebug=False, dOptions=None, bContext=False, bFullInfo=False): "analyses <sText> and returns an iterable of errors or (with option <bFullInfo>) paragraphs errors and sentences with tokens and errors" #sText = unicodedata.normalize("NFC", sText) dOpt = dOptions or gc_options.dOptions bShowRuleId = gc_options.dOptions.get('idrule', False) # parse paragraph try: self.parseText(self.sText, self.sText0, True, 0, sCountry, dOpt, bShowRuleId, bDebug, bContext) except: raise self.lTokens = None self.lTokens0 = None if bFullInfo: lParagraphErrors = list(self.dError.values()) lSentences = [] self.dSentenceError.clear() # parse sentences sText = self._getCleanText() for iStart, iEnd in text.getSentenceBoundaries(sText): if 4 < (iEnd - iStart) < 2000: try: self.sSentence = sText[iStart:iEnd] self.sSentence0 = self.sText0[iStart:iEnd] self.nOffsetWithinParagraph = iStart self.lTokens = list(_oTokenizer.genTokens(self.sSentence, True)) self.dTokenPos = { dToken["nStart"]: dToken for dToken in self.lTokens if dToken["sType"] != "INFO" } if bFullInfo: self.lTokens0 = list(self.lTokens) # the list of tokens is duplicated, to keep tokens from being deleted when analysis self.parseText(self.sSentence, self.sSentence0, False, iStart, sCountry, dOpt, bShowRuleId, bDebug, bContext) if bFullInfo: for dToken in self.lTokens0: _oSpellChecker.setLabelsOnToken(dToken) lSentences.append({ "nStart": iStart, "nEnd": iEnd, "sSentence": self.sSentence0, "lTokens": self.lTokens0, "lGrammarErrors": list(self.dSentenceError.values()) }) self.dSentenceError.clear() except: raise if bFullInfo: # Grammar checking and sentence analysis return lParagraphErrors, lSentences else: |
︙ | ︙ | |||
378 379 380 381 382 383 384 | self.sText = sText else: self.sSentence = sText def update (self, sSentence, bDebug=False): "update <sSentence> and retokenize" self.sSentence = sSentence | | | | | | 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 | self.sText = sText else: self.sSentence = sText def update (self, sSentence, bDebug=False): "update <sSentence> and retokenize" self.sSentence = sSentence lNewTokens = list(_oTokenizer.genTokens(sSentence, True)) for dToken in lNewTokens: if "lMorph" in self.dTokenPos.get(dToken["nStart"], {}): dToken["lMorph"] = self.dTokenPos[dToken["nStart"]]["lMorph"] if "aTags" in self.dTokenPos.get(dToken["nStart"], {}): dToken["aTags"] = self.dTokenPos[dToken["nStart"]]["aTags"] self.lTokens = lNewTokens self.dTokenPos = { dToken["nStart"]: dToken for dToken in self.lTokens if dToken["sType"] != "INFO" } if bDebug: echo("UPDATE:") echo(self) def _getNextPointers (self, dToken, dGraph, dPointer, bDebug=False): "generator: return nodes where <dToken> “values” match <dNode> arcs" dNode = dGraph[dPointer["iNode"]] |
︙ | ︙ | |||
549 550 551 552 553 554 555 | dPointer2 = { "iToken1": iToken1, "iNode": dNode["<>"], "bKeep": True } yield from self._getNextPointers(dToken, dGraph, dPointer2, bDebug) def parseGraph (self, dGraph, sCountry="${country_default}", dOptions=None, bShowRuleId=False, bDebug=False, bContext=False): "parse graph with tokens from the text and execute actions encountered" lPointer = [] bTagAndRewrite = False | | | 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 | dPointer2 = { "iToken1": iToken1, "iNode": dNode["<>"], "bKeep": True } yield from self._getNextPointers(dToken, dGraph, dPointer2, bDebug) def parseGraph (self, dGraph, sCountry="${country_default}", dOptions=None, bShowRuleId=False, bDebug=False, bContext=False): "parse graph with tokens from the text and execute actions encountered" lPointer = [] bTagAndRewrite = False for iToken, dToken in enumerate(self.lTokens): if bDebug: echo("TOKEN: " + dToken["sValue"]) # check arcs for each existing pointer lNextPointer = [] for dPointer in lPointer: lNextPointer.extend(self._getNextPointers(dToken, dGraph, dPointer, bDebug)) lPointer = lNextPointer |
︙ | ︙ | |||
590 591 592 593 594 595 596 | # Suggestion [ option, condition, "-", replacement/suggestion/action, iTokenStart, iTokenEnd, cStartLimit, cEndLimit, bCaseSvty, nPriority, sMessage, iURL ] # TextProcessor [ option, condition, "~", replacement/suggestion/action, iTokenStart, iTokenEnd, bCaseSvty ] # Disambiguator [ option, condition, "=", replacement/suggestion/action ] # Tag [ option, condition, "/", replacement/suggestion/action, iTokenStart, iTokenEnd ] # Immunity [ option, condition, "!", "", iTokenStart, iTokenEnd ] # Test [ option, condition, ">", "" ] if not sOption or dOptions.get(sOption, False): | | | | | | | | | | | | | | | | | 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 | # Suggestion [ option, condition, "-", replacement/suggestion/action, iTokenStart, iTokenEnd, cStartLimit, cEndLimit, bCaseSvty, nPriority, sMessage, iURL ] # TextProcessor [ option, condition, "~", replacement/suggestion/action, iTokenStart, iTokenEnd, bCaseSvty ] # Disambiguator [ option, condition, "=", replacement/suggestion/action ] # Tag [ option, condition, "/", replacement/suggestion/action, iTokenStart, iTokenEnd ] # Immunity [ option, condition, "!", "", iTokenStart, iTokenEnd ] # Test [ option, condition, ">", "" ] if not sOption or dOptions.get(sOption, False): bCondMemo = not sFuncCond or getattr(gc_functions, sFuncCond)(self.lTokens, nTokenOffset, nLastToken, sCountry, bCondMemo, self.dTags, self.sSentence, self.sSentence0) if bCondMemo: if cActionType == "-": # grammar error iTokenStart, iTokenEnd, cStartLimit, cEndLimit, bCaseSvty, nPriority, sMessage, iURL = eAct nTokenErrorStart = nTokenOffset + iTokenStart if iTokenStart > 0 else nLastToken + iTokenStart if "bImmune" not in self.lTokens[nTokenErrorStart]: nTokenErrorEnd = nTokenOffset + iTokenEnd if iTokenEnd > 0 else nLastToken + iTokenEnd nErrorStart = self.nOffsetWithinParagraph + (self.lTokens[nTokenErrorStart]["nStart"] if cStartLimit == "<" else self.lTokens[nTokenErrorStart]["nEnd"]) nErrorEnd = self.nOffsetWithinParagraph + (self.lTokens[nTokenErrorEnd]["nEnd"] if cEndLimit == ">" else self.lTokens[nTokenErrorEnd]["nStart"]) if nErrorStart not in self.dError or nPriority > self.dErrorPriority.get(nErrorStart, -1): self.dError[nErrorStart] = self._createErrorFromTokens(sWhat, nTokenOffset, nLastToken, nTokenErrorStart, nErrorStart, nErrorEnd, sLineId, sRuleId, bCaseSvty, \ sMessage, _rules_graph.dURL.get(iURL, ""), bShowRuleId, sOption, bContext) self.dErrorPriority[nErrorStart] = nPriority self.dSentenceError[nErrorStart] = self.dError[nErrorStart] if bDebug: echo(" NEW_ERROR: {}".format(self.dError[nErrorStart])) elif cActionType == "~": # text processor nTokenStart = nTokenOffset + eAct[0] if eAct[0] > 0 else nLastToken + eAct[0] nTokenEnd = nTokenOffset + eAct[1] if eAct[1] > 0 else nLastToken + eAct[1] self._tagAndPrepareTokenForRewriting(sWhat, nTokenStart, nTokenEnd, nTokenOffset, nLastToken, eAct[2], bDebug) bChange = True if bDebug: echo(" TEXT_PROCESSOR: [{}:{}] > {}".format(self.lTokens[nTokenStart]["sValue"], self.lTokens[nTokenEnd]["sValue"], sWhat)) elif cActionType == "=": # disambiguation getattr(gc_functions, sWhat)(self.lTokens, nTokenOffset, nLastToken) if bDebug: echo(" DISAMBIGUATOR: ({}) [{}:{}]".format(sWhat, self.lTokens[nTokenOffset+1]["sValue"], self.lTokens[nLastToken]["sValue"])) elif cActionType == ">": # we do nothing, this test is just a condition to apply all following actions if bDebug: echo(" COND_OK") elif cActionType == "/": # Tag nTokenStart = nTokenOffset + eAct[0] if eAct[0] > 0 else nLastToken + eAct[0] nTokenEnd = nTokenOffset + eAct[1] if eAct[1] > 0 else nLastToken + eAct[1] for i in range(nTokenStart, nTokenEnd+1): if "aTags" in self.lTokens[i]: self.lTokens[i]["aTags"].update(sWhat.split("|")) else: self.lTokens[i]["aTags"] = set(sWhat.split("|")) if bDebug: echo(" TAG: {} > [{}:{}]".format(sWhat, self.lTokens[nTokenStart]["sValue"], self.lTokens[nTokenEnd]["sValue"])) for sTag in sWhat.split("|"): if sTag not in self.dTags: self.dTags[sTag] = [nTokenStart, nTokenEnd] else: self.dTags[sTag][0] = min(nTokenStart, self.dTags[sTag][0]) self.dTags[sTag][1] = max(nTokenEnd, self.dTags[sTag][1]) elif cActionType == "!": # immunity if bDebug: echo(" IMMUNITY: " + sLineId + " / " + sRuleId) nTokenStart = nTokenOffset + eAct[0] if eAct[0] > 0 else nLastToken + eAct[0] nTokenEnd = nTokenOffset + eAct[1] if eAct[1] > 0 else nLastToken + eAct[1] if nTokenEnd - nTokenStart == 0: self.lTokens[nTokenStart]["bImmune"] = True nErrorStart = self.nOffsetWithinParagraph + self.lTokens[nTokenStart]["nStart"] if nErrorStart in self.dError: del self.dError[nErrorStart] else: for i in range(nTokenStart, nTokenEnd+1): self.lTokens[i]["bImmune"] = True nErrorStart = self.nOffsetWithinParagraph + self.lTokens[i]["nStart"] if nErrorStart in self.dError: del self.dError[nErrorStart] else: echo("# error: unknown action at " + sLineId) elif cActionType == ">": if bDebug: echo(" COND_BREAK") |
︙ | ︙ | |||
693 694 695 696 697 698 699 | if _bWriterError: return self._createErrorForWriter(nStart, nEnd - nStart, sRuleId, sOption, sMessage, lSugg, sURL) return self._createErrorAsDict(nStart, nEnd, sLineId, sRuleId, sOption, sMessage, lSugg, sURL, bContext) def _createErrorFromTokens (self, sSugg, nTokenOffset, nLastToken, iFirstToken, nStart, nEnd, sLineId, sRuleId, bCaseSvty, sMsg, sURL, bShowRuleId, sOption, bContext): # suggestions if sSugg[0:1] == "=": | | | | | 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 | if _bWriterError: return self._createErrorForWriter(nStart, nEnd - nStart, sRuleId, sOption, sMessage, lSugg, sURL) return self._createErrorAsDict(nStart, nEnd, sLineId, sRuleId, sOption, sMessage, lSugg, sURL, bContext) def _createErrorFromTokens (self, sSugg, nTokenOffset, nLastToken, iFirstToken, nStart, nEnd, sLineId, sRuleId, bCaseSvty, sMsg, sURL, bShowRuleId, sOption, bContext): # suggestions if sSugg[0:1] == "=": sSugg = getattr(gc_functions, sSugg[1:])(self.lTokens, nTokenOffset, nLastToken) lSugg = sSugg.split("|") if sSugg else [] elif sSugg == "_": lSugg = [] else: lSugg = self._expand(sSugg, nTokenOffset, nLastToken).split("|") if bCaseSvty and lSugg and self.lTokens[iFirstToken]["sValue"][0:1].isupper(): lSugg = list(map(lambda s: s.upper(), lSugg)) if self.sSentence[nStart:nEnd].isupper() else list(map(lambda s: s[0:1].upper()+s[1:], lSugg)) # Message sMessage = getattr(gc_functions, sMsg[1:])(self.lTokens, nTokenOffset, nLastToken) if sMsg[0:1] == "=" else self._expand(sMsg, nTokenOffset, nLastToken) if bShowRuleId: sMessage += " #" + sLineId + " / " + sRuleId # if _bWriterError: return self._createErrorForWriter(nStart, nEnd - nStart, sRuleId, sOption, sMessage, lSugg, sURL) return self._createErrorAsDict(nStart, nEnd, sLineId, sRuleId, sOption, sMessage, lSugg, sURL, bContext) |
︙ | ︙ | |||
751 752 753 754 755 756 757 | dErr['sBefore'] = self.sText0[max(0,nStart-80):nStart] dErr['sAfter'] = self.sText0[nEnd:nEnd+80] return dErr def _expand (self, sText, nTokenOffset, nLastToken): for m in re.finditer(r"\\(-?[0-9]+)", sText): if m.group(1)[0:1] == "-": | | | | 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 | dErr['sBefore'] = self.sText0[max(0,nStart-80):nStart] dErr['sAfter'] = self.sText0[nEnd:nEnd+80] return dErr def _expand (self, sText, nTokenOffset, nLastToken): for m in re.finditer(r"\\(-?[0-9]+)", sText): if m.group(1)[0:1] == "-": sText = sText.replace(m.group(0), self.lTokens[nLastToken+int(m.group(1))+1]["sValue"]) else: sText = sText.replace(m.group(0), self.lTokens[nTokenOffset+int(m.group(1))]["sValue"]) return sText def rewriteText (self, sText, sRepl, iGroup, m, bUppercase): "text processor: write <sRepl> in <sText> at <iGroup> position" nLen = m.end(iGroup) - m.start(iGroup) if sRepl == "*": sNew = " " * nLen |
︙ | ︙ | |||
780 781 782 783 784 785 786 | return sText[0:m.start(iGroup)] + sNew + sText[m.end(iGroup):] def _tagAndPrepareTokenForRewriting (self, sWhat, nTokenRewriteStart, nTokenRewriteEnd, nTokenOffset, nLastToken, bCaseSvty, bDebug): "text processor: rewrite tokens between <nTokenRewriteStart> and <nTokenRewriteEnd> position" if sWhat == "*": # purge text if nTokenRewriteEnd - nTokenRewriteStart == 0: | | | | | | | | | | | > | | > > > | > | | | | 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 | return sText[0:m.start(iGroup)] + sNew + sText[m.end(iGroup):] def _tagAndPrepareTokenForRewriting (self, sWhat, nTokenRewriteStart, nTokenRewriteEnd, nTokenOffset, nLastToken, bCaseSvty, bDebug): "text processor: rewrite tokens between <nTokenRewriteStart> and <nTokenRewriteEnd> position" if sWhat == "*": # purge text if nTokenRewriteEnd - nTokenRewriteStart == 0: self.lTokens[nTokenRewriteStart]["bToRemove"] = True else: for i in range(nTokenRewriteStart, nTokenRewriteEnd+1): self.lTokens[i]["bToRemove"] = True elif sWhat == "␣": # merge tokens self.lTokens[nTokenRewriteStart]["nMergeUntil"] = nTokenRewriteEnd elif sWhat == "_": # neutralized token if nTokenRewriteEnd - nTokenRewriteStart == 0: self.lTokens[nTokenRewriteStart]["sNewValue"] = "_" else: for i in range(nTokenRewriteStart, nTokenRewriteEnd+1): self.lTokens[i]["sNewValue"] = "_" else: if sWhat.startswith("="): sWhat = getattr(gc_functions, sWhat[1:])(self.lTokens, nTokenOffset, nLastToken) else: sWhat = self._expand(sWhat, nTokenOffset, nLastToken) bUppercase = bCaseSvty and self.lTokens[nTokenRewriteStart]["sValue"][0:1].isupper() if nTokenRewriteEnd - nTokenRewriteStart == 0: # one token if bUppercase: sWhat = sWhat[0:1].upper() + sWhat[1:] self.lTokens[nTokenRewriteStart]["sNewValue"] = sWhat else: # several tokens lTokenValue = sWhat.split("|") if len(lTokenValue) != (nTokenRewriteEnd - nTokenRewriteStart + 1): if (bDebug): echo("Error. Text processor: number of replacements != number of tokens.") return for i, sValue in zip(range(nTokenRewriteStart, nTokenRewriteEnd+1), lTokenValue): if not sValue or sValue == "*": self.lTokens[i]["bToRemove"] = True else: if bUppercase: sValue = sValue[0:1].upper() + sValue[1:] self.lTokens[i]["sNewValue"] = sValue def rewriteFromTags (self, bDebug=False): "rewrite the sentence, modify tokens, purge the token list" if bDebug: echo("REWRITE") lNewTokens = [] lNewTokens0 = [] nMergeUntil = 0 dTokenMerger = {} for iToken, dToken in enumerate(self.lTokens): bKeepToken = True if dToken["sType"] != "INFO": if nMergeUntil and iToken <= nMergeUntil: # token to merge dTokenMerger["sValue"] += " " * (dToken["nStart"] - dTokenMerger["nEnd"]) + dToken["sValue"] dTokenMerger["nEnd"] = dToken["nEnd"] if bDebug: echo(" MERGED TOKEN: " + dTokenMerger["sValue"]) dToken["bMerged"] = True bKeepToken = False if "nMergeUntil" in dToken: # first token to be merge with if iToken > nMergeUntil: # this token is not to be merged with a previous token dTokenMerger = dToken if dToken["nMergeUntil"] > nMergeUntil: nMergeUntil = dToken["nMergeUntil"] del dToken["nMergeUntil"] elif "bToRemove" in dToken: # deletion required if bDebug: echo(" REMOVED: " + dToken["sValue"]) self.sSentence = self.sSentence[:dToken["nStart"]] + " " * (dToken["nEnd"] - dToken["nStart"]) + self.sSentence[dToken["nEnd"]:] bKeepToken = False # if bKeepToken: lNewTokens.append(dToken) if "sNewValue" in dToken: # rewrite token and sentence if bDebug: echo(dToken["sValue"] + " -> " + dToken["sNewValue"]) dToken["sRealValue"] = dToken["sValue"] dToken["sValue"] = dToken["sNewValue"] nDiffLen = len(dToken["sRealValue"]) - len(dToken["sNewValue"]) sNewRepl = (dToken["sNewValue"] + " " * nDiffLen) if nDiffLen >= 0 else dToken["sNewValue"][:len(dToken["sRealValue"])] self.sSentence = self.sSentence[:dToken["nStart"]] + sNewRepl + self.sSentence[dToken["nEnd"]:] del dToken["sNewValue"] if bDebug: echo(" TEXT REWRITED: " + self.sSentence) self.lTokens.clear() self.lTokens = lNewTokens |
Modified gc_lang/fr/webext/content_scripts/init.js from [d6a977e5a7] to [b54947b0d1].
︙ | ︙ | |||
340 341 342 343 344 345 346 | this.send("parseAndSpellcheck", { sText: sText, sCountry: "FR", bDebug: false, bContext: false }, { sDestination: sDestination }); }, parseAndSpellcheck1: function (sText, sDestination, sParagraphId) { this.send("parseAndSpellcheck1", { sText: sText, sCountry: "FR", bDebug: false, bContext: false }, { sDestination: sDestination, sParagraphId: sParagraphId }); }, | | | | | | 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 | this.send("parseAndSpellcheck", { sText: sText, sCountry: "FR", bDebug: false, bContext: false }, { sDestination: sDestination }); }, parseAndSpellcheck1: function (sText, sDestination, sParagraphId) { this.send("parseAndSpellcheck1", { sText: sText, sCountry: "FR", bDebug: false, bContext: false }, { sDestination: sDestination, sParagraphId: sParagraphId }); }, parseFull: function (sText, sDestination, sParagraphId) { this.send("parseFull", { sText: sText, sCountry: "FR", bDebug: false, bContext: false }, { sDestination: sDestination }); }, getListOfTokens: function (sText, sDestination) { this.send("getListOfTokens", { sText: sText }, { sDestination: sDestination }); }, getVerb: function (sVerb, bStart=true, bPro=false, bNeg=false, bTpsCo=false, bInt=false, bFem=false) { this.send("getVerb", { sVerb: sVerb, bPro: bPro, bNeg: bNeg, bTpsCo: bTpsCo, bInt: bInt, bFem: bFem }, { bStart: bStart }); }, getSpellSuggestions: function (sWord, sDestination, sErrorId) { |
︙ | ︙ | |||
418 419 420 421 422 423 424 | break; case "parseAndSpellcheck1": if (oInfo.sDestination == "__GrammalectePanel__") { oGrammalecte.oGCPanel.refreshParagraph(oInfo.sParagraphId, result); } break; case "parseFull": | | > > > | | | | | > | 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 | break; case "parseAndSpellcheck1": if (oInfo.sDestination == "__GrammalectePanel__") { oGrammalecte.oGCPanel.refreshParagraph(oInfo.sParagraphId, result); } break; case "parseFull": if (oInfo.sDestination == "__GrammalectePanel__") { oGrammalecte.oGCPanel.showParagraphAnalysis(result); } break; case "getListOfTokens": if (oInfo.sDestination == "__GrammalectePanel__") { if (!bEnd) { oGrammalecte.oGCPanel.addListOfTokens(result); } else { oGrammalecte.oGCPanel.stopWaitIcon(); oGrammalecte.oGCPanel.endTimer(); } } break; case "getSpellSuggestions": if (oInfo.sDestination == "__GrammalectePanel__") { oGrammalecte.oGCPanel.oTooltip.setSpellSuggestionsFor(result.sWord, result.aSugg, result.iSuggBlock, oInfo.sErrorId); } else if (oInfo.sDestination && document.getElementById(oInfo.sDestination)) { |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_gc.css from [9a73dd19f8] to [89a25fc756].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | /* Grammar checker */ div#grammalecte_gc_panel_content { position: absolute; height: 100%; width: 100%; margin: 0; overflow: auto; } div.grammalecte_paragraph_block { margin: 5px 5px 0 5px; } | > > < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | /* Grammar checker */ div#grammalecte_gc_panel_content { position: absolute; height: 100%; width: 100%; margin: 0; overflow: auto; } div.grammalecte_paragraph_block { margin: 5px 5px 0 5px; background-color: hsl(0, 0%, 96%); border-radius: 2px; } p.grammalecte_paragraph { margin: 0; padding: 12px; line-height: 1.3; text-align: left; font-size: 14px; font-family: "Courier New", Courier, "Lucida Sans Typewriter", "Lucida Typewriter", monospace; color: hsl(0, 0%, 0%); hyphens: none; } /* Action buttons */ div.grammalecte_paragraph_actions { float: right; margin: 0 0 5px 10px; |
︙ | ︙ | |||
43 44 45 46 47 48 49 50 51 52 53 54 55 56 | cursor: pointer; font-family: "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; font-size: 14px; color: hsl(0, 0%, 96%); border-radius: 2px; } div.grammalecte_paragraph_actions .grammalecte_green { color: hsl(0, 0%, 80%); } div.grammalecte_paragraph_actions .grammalecte_green:hover { background-color: hsl(120, 50%, 40%); color: hsl(0, 0%, 100%); } | > > > > > > > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | cursor: pointer; font-family: "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; font-size: 14px; color: hsl(0, 0%, 96%); border-radius: 2px; } div.grammalecte_paragraph_actions .grammalecte_blue { color: hsl(0, 0%, 80%); } div.grammalecte_paragraph_actions .grammalecte_blue:hover { background-color: hsl(210, 50%, 40%); color: hsl(0, 0%, 100%); } div.grammalecte_paragraph_actions .grammalecte_green { color: hsl(0, 0%, 80%); } div.grammalecte_paragraph_actions .grammalecte_green:hover { background-color: hsl(120, 50%, 40%); color: hsl(0, 0%, 100%); } |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_gc.js from [5158e88aeb] to [6fa57d1aea].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | // JavaScript /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, oGrammalecte, oGrammalecteBackgroundPort, showError, window, document, console */ "use strict"; function onGrammalecteGCPanelClick (xEvent) { try { let xElem = xEvent.target; if (xElem.id) { if (xElem.id.startsWith("grammalecte_sugg")) { oGrammalecte.oGCPanel.applySuggestion(xElem.id); } else if (xElem.id === "grammalecte_tooltip_ignore") { oGrammalecte.oGCPanel.ignoreError(xElem.id); } else if (xElem.id.startsWith("grammalecte_check")) { oGrammalecte.oGCPanel.recheckParagraph(parseInt(xElem.dataset.para_num, 10)); } else if (xElem.id.startsWith("grammalecte_hide")) { xElem.parentNode.parentNode.style.display = "none"; } else if (xElem.id.startsWith("grammalecte_err") && xElem.className !== "grammalecte_error_corrected" && xElem.className !== "grammalecte_error_ignored") { | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | // JavaScript /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, oGrammalecte, oGrammalecteBackgroundPort, showError, window, document, console */ "use strict"; function onGrammalecteGCPanelClick (xEvent) { try { let xElem = xEvent.target; if (xElem.id) { if (xElem.id.startsWith("grammalecte_sugg")) { oGrammalecte.oGCPanel.applySuggestion(xElem.id); } else if (xElem.id === "grammalecte_tooltip_ignore") { oGrammalecte.oGCPanel.ignoreError(xElem.id); } else if (xElem.id.startsWith("grammalecte_analysis")) { oGrammalecte.oGCPanel.sendParagraphToGrammaticalAnalysis(parseInt(xElem.dataset.para_num, 10)); } else if (xElem.id.startsWith("grammalecte_check")) { oGrammalecte.oGCPanel.recheckParagraph(parseInt(xElem.dataset.para_num, 10)); } else if (xElem.id.startsWith("grammalecte_hide")) { xElem.parentNode.parentNode.style.display = "none"; } else if (xElem.id.startsWith("grammalecte_err") && xElem.className !== "grammalecte_error_corrected" && xElem.className !== "grammalecte_error_ignored") { |
︙ | ︙ | |||
62 63 64 65 66 67 68 69 70 71 72 73 74 75 | this.oTextControl = null; this.nLastResult = 0; this.iLastEditedParagraph = -1; this.nParagraph = 0; // Lexicographer this.nLxgCount = 0; this.xLxgPanelContent = oGrammalecte.createNode("div", {id: "grammalecte_lxg_panel_content"}); this.xPanelContent.appendChild(this.xLxgPanelContent); // Conjugueur this.xConjPanelContent = oGrammalecte.createNode("div", {id: "grammalecte_conj_panel_content"}); this.xConjPanelContent.innerHTML = sGrammalecteConjugueurHTML; // @Reviewers: sGrammalecteConjugueurHTML is a const value defined in <content_scripts/html_src.js> this.xPanelContent.appendChild(this.xConjPanelContent); this.sVerb = ""; this.bListenConj = false; | > > > > > > > > > > > > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | this.oTextControl = null; this.nLastResult = 0; this.iLastEditedParagraph = -1; this.nParagraph = 0; // Lexicographer this.nLxgCount = 0; this.xLxgPanelContent = oGrammalecte.createNode("div", {id: "grammalecte_lxg_panel_content"}); this.xLxgInputBlock = oGrammalecte.createNode("div", {id: "grammalecte_lxg_input_block"}); this.xLxgInput = oGrammalecte.createNode("div", {id: "grammalecte_lxg_input", lang: "fr", contentEditable: "true"}); this.xLxgInputButton = oGrammalecte.createNode("div", {id: "grammalecte_lxg_input_button", textContent: "Analyse grammaticale"}); this.xLxgInputButton.addEventListener("click", () => { this.grammaticalAnalysis(); }, false); this.xLxgInputButton2 = oGrammalecte.createNode("div", {id: "grammalecte_lxg_input_button", textContent: "Analyse lexicale"}); this.xLxgInputButton2.addEventListener("click", () => { this.getListOfTokens(); }, false); this.xLxgInputBlock.appendChild(this.xLxgInput); this.xLxgInputBlock.appendChild(this.xLxgInputButton); this.xLxgInputBlock.appendChild(this.xLxgInputButton2); this.xLxgPanelContent.appendChild(this.xLxgInputBlock); this.xLxgResultZone = oGrammalecte.createNode("div", {id: "grammalecte_lxg_result_zone"}); this.xLxgPanelContent.appendChild(this.xLxgResultZone); this.xPanelContent.appendChild(this.xLxgPanelContent); // Conjugueur this.xConjPanelContent = oGrammalecte.createNode("div", {id: "grammalecte_conj_panel_content"}); this.xConjPanelContent.innerHTML = sGrammalecteConjugueurHTML; // @Reviewers: sGrammalecteConjugueurHTML is a const value defined in <content_scripts/html_src.js> this.xPanelContent.appendChild(this.xConjPanelContent); this.sVerb = ""; this.bListenConj = false; |
︙ | ︙ | |||
110 111 112 113 114 115 116 | oGrammalecte.bAutoRefresh = this.bAutoRefresh; browser.storage.local.set({"autorefresh_option": this.bAutoRefresh}); this.setAutoRefreshButton(); } this.xLxgButton.onclick = () => { if (!this.bWorking) { this.showLexicographer(); | < < < < | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | oGrammalecte.bAutoRefresh = this.bAutoRefresh; browser.storage.local.set({"autorefresh_option": this.bAutoRefresh}); this.setAutoRefreshButton(); } this.xLxgButton.onclick = () => { if (!this.bWorking) { this.showLexicographer(); } }; this.xConjButton.onclick = () => { if (!this.bWorking) { this.showConjugueur(); } }; |
︙ | ︙ | |||
236 237 238 239 240 241 242 | this.oTextControl.clear(); } addParagraphResult (oResult) { try { this.resetTimer(); if (oResult && (oResult.sParagraph.trim() !== "" || oResult.aGrammErr.length > 0 || oResult.aSpellErr.length > 0)) { | < > > | | | | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | this.oTextControl.clear(); } addParagraphResult (oResult) { try { this.resetTimer(); if (oResult && (oResult.sParagraph.trim() !== "" || oResult.aGrammErr.length > 0 || oResult.aSpellErr.length > 0)) { // actions let xActionsBar = oGrammalecte.createNode("div", {className: "grammalecte_paragraph_actions"}); xActionsBar.appendChild(oGrammalecte.createNode("div", {id: "grammalecte_check" + oResult.iParaNum, className: "grammalecte_paragraph_button grammalecte_green", textContent: "↻", title: "Réanalyser…"}, {para_num: oResult.iParaNum})); xActionsBar.appendChild(oGrammalecte.createNode("div", {id: "grammalecte_analysis" + oResult.iParaNum, className: "grammalecte_paragraph_button grammalecte_blue", textContent: "»", title: "Analyse grammaticale…"}, {para_num: oResult.iParaNum})); xActionsBar.appendChild(oGrammalecte.createNode("div", {id: "grammalecte_hide" + oResult.iParaNum, className: "grammalecte_paragraph_button grammalecte_red", textContent: "×", title: "Cacher", style: "font-weight: bold;"})); // paragraph let xParagraph = oGrammalecte.createNode("p", {id: "grammalecte_paragraph"+oResult.iParaNum, className: "grammalecte_paragraph", lang: "fr", contentEditable: "true"}, {para_num: oResult.iParaNum}); xParagraph.setAttribute("spellcheck", "false"); // doesn’t seem possible to use “spellcheck” as a common attribute. xParagraph.dataset.timer_id = "0"; xParagraph.addEventListener("input", function (xEvent) { if (this.bAutoRefresh) { // timer for refreshing analysis window.clearTimeout(parseInt(xParagraph.dataset.timer_id, 10)); xParagraph.dataset.timer_id = window.setTimeout(this.recheckParagraph.bind(this), 3000, oResult.iParaNum); this.iLastEditedParagraph = oResult.iParaNum; } // write text this.oTextControl.setParagraph(parseInt(xEvent.target.dataset.para_num, 10), xEvent.target.textContent); }.bind(this) , true); this._tagParagraph(xParagraph, oResult.sParagraph, oResult.iParaNum, oResult.aGrammErr, oResult.aSpellErr); // creation let xParagraphBlock = oGrammalecte.createNode("div", {className: "grammalecte_paragraph_block"}); xParagraphBlock.appendChild(xActionsBar); xParagraphBlock.appendChild(xParagraph); this.xParagraphList.appendChild(xParagraphBlock); this.nParagraph += 1; } } catch (e) { showError(e); } } |
︙ | ︙ | |||
528 529 530 531 532 533 534 | } } // Lexicographer clearLexicographer () { this.nLxgCount = 0; | | | > | > > > > > > | > > > > > > > > > > > > > > > > > > > > | > > > > > > | > | | > > > > > > > > > > | | > | > > > | > > > > > | > | | | | > > | | > > > | | > | > < < < | > > | | > | | | | | > > > < < < < < < | 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 | } } // Lexicographer clearLexicographer () { this.nLxgCount = 0; while (this.xLxgResultZone.firstChild) { this.xLxgResultZone.removeChild(this.xLxgResultZone.firstChild); } } // Grammatical analysis sendParagraphToGrammaticalAnalysis (iParaNum) { let xParagraph = this.xParent.getElementById("grammalecte_paragraph" + iParaNum); this.xLxgInput.textContent = xParagraph.textContent; this.grammaticalAnalysis(); this.showLexicographer(); } grammaticalAnalysis (iParaNum) { if (!this.bOpened || this.bWorking) { return; } this.startWaitIcon(); this.clearLexicographer(); let sText = this.xLxgInput.innerText.replace(/\n/g, " "); console.log(sText); oGrammalecteBackgroundPort.parseFull(sText, "__GrammalectePanel__"); } showParagraphAnalysis (oResult) { if (!this.bOpened || oResult === null) { return; } try { for (let oSentence of oResult.lSentences) { this.nLxgCount += 1; if (oSentence.sSentence.trim() !== "") { let xSentenceBlock = oGrammalecte.createNode("div", {className: "grammalecte_lxg_paragraph_sentence_block"}); xSentenceBlock.appendChild(oGrammalecte.createNode("div", {className: "grammalecte_lxg_list_num", textContent: this.nLxgCount})); xSentenceBlock.appendChild(oGrammalecte.createNode("p", {className: "grammalecte_lxg_paragraph_sentence", textContent: oSentence.sSentence})); let xTokenList = oGrammalecte.createNode("div", {className: "grammalecte_lxg_list_of_tokens"}); for (let oToken of oSentence.lTokens) { if (oToken["sType"] != "INFO" && !oToken.hasOwnProperty("bMerged")) { if (oToken["sType"] == "WORD" && !oToken["bValidToken"]) { oToken["sType"] = "UNKNOWN_WORD"; } xTokenList.appendChild(this._createTokenBlock(oToken)); } } xSentenceBlock.appendChild(xTokenList); this.xLxgResultZone.appendChild(xSentenceBlock); } } } catch (e) { showError(e); } this.stopWaitIcon(); } // Lexical analysis getListOfTokens () { if (!this.bOpened || this.bWorking) { return; } this.startWaitIcon(); this.clearLexicographer(); let sText = this.xLxgInput.innerText; // to get carriage return (\n) console.log(sText); oGrammalecteBackgroundPort.getListOfTokens(sText, "__GrammalectePanel__"); } addListOfTokens (oResult) { try { if (oResult && oResult.sParagraph != "") { this.nLxgCount += 1; let xSentenceBlock = oGrammalecte.createNode("div", {className: "grammalecte_lxg_paragraph_sentence_block"}); xSentenceBlock.appendChild(oGrammalecte.createNode("div", {className: "grammalecte_lxg_list_num", textContent: this.nLxgCount})); xSentenceBlock.appendChild(oGrammalecte.createNode("p", {className: "grammalecte_lxg_paragraph_sentence", textContent: oResult.sParagraph})); let xTokenList = oGrammalecte.createNode("div", {className: "grammalecte_lxg_list_of_tokens"}); for (let oToken of oResult.lTokens) { xTokenList.appendChild(this._createTokenBlock(oToken)); } xSentenceBlock.appendChild(xTokenList); this.xLxgResultZone.appendChild(xSentenceBlock); } } catch (e) { showError(e); } } _createTokenBlock (oToken) { let xTokenBlock = oGrammalecte.createNode("div", {className: "grammalecte_lxg_token_block"}); // token description xTokenBlock.appendChild(this._createTokenDescr(oToken)); // subtokens if (oToken.hasOwnProperty("lSubTokens")) { let xSubBlock = oGrammalecte.createNode("div", {className: "grammalecte_lxg_token_subblock"}); for (let oSubToken of oToken["lSubTokens"]) { if (oSubToken["sValue"] != "") { xSubBlock.appendChild(this._createTokenDescr(oSubToken)); } } xTokenBlock.appendChild(xSubBlock); } return xTokenBlock; } _createTokenDescr (oToken) { try { let xTokenDescr = oGrammalecte.createNode("div", {className: "grammalecte_lxg_token_descr"}); xTokenDescr.appendChild(oGrammalecte.createNode("div", {className: "grammalecte_lxg_token grammalecte_lxg_token_" + oToken.sType, textContent: oToken.sValue})); xTokenDescr.appendChild(oGrammalecte.createNode("div", {className: "grammalecte_lxg_token_colon", textContent: ":"})); if (oToken.aLabels) { if (oToken.aLabels.length < 2) { // one morphology only xTokenDescr.appendChild(oGrammalecte.createNode("div", {className: "grammalecte_lxg_morph_elem_inline", textContent: oToken.aLabels[0]})); } else { // several morphology let xMorphList = oGrammalecte.createNode("div", {className: "grammalecte_lxg_morph_list"}); for (let sLabel of oToken.aLabels) { xMorphList.appendChild(oGrammalecte.createNode("div", {className: "grammalecte_lxg_morph_elem", textContent: "• " + sLabel})); } xTokenDescr.appendChild(xMorphList); } } else { xTokenDescr.appendChild(oGrammalecte.createNode("div", {className: "grammalecte_lxg_morph_elem_inline", textContent: "étiquettes non décrites : [" + oToken.lMorph + "]" })); } return xTokenDescr; } catch (e) { showError(e); } } // Conjugueur listenConj () { if (!this.bListenConj) { // button this.xParent.getElementById('grammalecte_conj_button').addEventListener("click", (e) => { this.conjugateVerb(); }); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_lxg.css from [ae4f6ddf8d] to [b335aa8c9f].
1 2 3 4 5 6 7 8 9 10 11 | /* Lexicographer */ div#grammalecte_lxg_panel_content { display: none; position: absolute; height: 100%; width: 100%; font-size: 13px; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | /* Lexicographer */ div#grammalecte_lxg_panel_content { display: none; position: absolute; height: 100%; width: 100%; font-size: 13px; } div#grammalecte_lxg_input_block { padding: 10px; /*background-color: hsl(210, 50%, 95%);*/ /*border-bottom: solid 1px hsl(210, 0%, 90%);*/ text-align: right; } div#grammalecte_lxg_result_zone { } div#grammalecte_lxg_input { min-height: 100px; padding: 10px; background-color: hsl(210, 0%, 100%); border: solid 1px hsl(210, 20%, 80%); border-radius: 3px; font-family: "Courier New", Courier, "Lucida Sans Typewriter", "Lucida Typewriter", monospace; text-align: left; } div#grammalecte_lxg_input_button { display: inline-block; margin: 0 10px 0 0; padding: 3px 10px; background-color: hsl(210, 50%, 50%); color: hsl(210, 50%, 98%); text-align: center; cursor: pointer; border-radius: 0 0 3px 3px; } div.grammalecte_lxg_paragraph_sentence_block { margin: 5px 0px 20px 0px; background-color: hsl(210, 50%, 95%); border-radius: 3px; border-top: solid 1px hsl(210, 50%, 90%); border-bottom: solid 1px hsl(210, 50%, 90%); hyphens: none; } p.grammalecte_lxg_paragraph_sentence { padding: 3px 10px; font-weight: bold; color: hsl(210, 50%, 40%); } div.grammalecte_lxg_list_of_tokens { padding: 10px; background-color: hsl(210, 50%, 99%); border-radius: 5px; } div.grammalecte_lxg_list_num { float: right; margin: -2px 5px 5px 10px; padding: 5px 10px; font-family: "Trebuchet MS", "Fira Sans", "Ubuntu Condensed", "Liberation Sans", sans-serif; font-size: 14px; font-weight: bold; border-radius: 0 0 4px 4px; background-color: hsl(0, 50%, 50%); color: hsl(0, 10%, 96%); |
︙ | ︙ | |||
40 41 42 43 44 45 46 | div.grammalecte_lxg_token_block { margin: 4px 0; } div.grammalecte_lxg_token_subblock { margin: 2px 0 2px 20px; padding: 5px; | | | | | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | div.grammalecte_lxg_token_block { margin: 4px 0; } div.grammalecte_lxg_token_subblock { margin: 2px 0 2px 20px; padding: 5px; border-left: 4px solid hsl(210, 50%, 80%); background-color: hsl(210, 50%, 94%); border-radius: 3px; } div.grammalecte_lxg_token_descr { margin: 1px; padding: 1px; } div.grammalecte_lxg_token { display: inline-block; |
︙ | ︙ | |||
83 84 85 86 87 88 89 90 91 92 93 94 95 96 | font-family: "Trebuchet MS", "Fira Sans", "Ubuntu Condensed", "Liberation Sans", sans-serif; color: hsl(0, 0%, 0%); } div.grammalecte_lxg_morph_elem { font-family: "Trebuchet MS", "Fira Sans", "Ubuntu Condensed", "Liberation Sans", sans-serif; color: hsl(0, 0%, 0%); } div.grammalecte_lxg_token_LOC { background-color: hsla(150, 50%, 30%, 1); } div.grammalecte_lxg_token_WORD { background-color: hsla(150, 50%, 50%, 1); } div.grammalecte_lxg_token_WORD_ELIDED { | > > > > > > | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | font-family: "Trebuchet MS", "Fira Sans", "Ubuntu Condensed", "Liberation Sans", sans-serif; color: hsl(0, 0%, 0%); } div.grammalecte_lxg_morph_elem { font-family: "Trebuchet MS", "Fira Sans", "Ubuntu Condensed", "Liberation Sans", sans-serif; color: hsl(0, 0%, 0%); } div.grammalecte_lxg_other_tags { padding-left: 20px; font-family: "Trebuchet MS", "Fira Sans", "Ubuntu Condensed", "Liberation Sans", sans-serif; color: hsl(0, 0%, 50%); } div.grammalecte_lxg_token_LOC { background-color: hsla(150, 50%, 30%, 1); } div.grammalecte_lxg_token_WORD { background-color: hsla(150, 50%, 50%, 1); } div.grammalecte_lxg_token_WORD_ELIDED { |
︙ | ︙ |
Modified gc_lang/fr/webext/gce_worker.js from [e351d5e6fd] to [879c183120].
︙ | ︙ | |||
227 228 229 230 231 232 233 | function parseAndSpellcheck1 (sParagraph, sCountry, bDebug, bContext, oInfo={}) { sParagraph = sParagraph.replace(//g, "").normalize("NFC"); let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext); let aSpellErr = oSpellChecker.parseParagraph(sParagraph); postMessage(createResponse("parseAndSpellcheck1", {sParagraph: sParagraph, aGrammErr: aGrammErr, aSpellErr: aSpellErr}, oInfo, true)); } | | < | < | | < < < | > > > > | | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 | function parseAndSpellcheck1 (sParagraph, sCountry, bDebug, bContext, oInfo={}) { sParagraph = sParagraph.replace(//g, "").normalize("NFC"); let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext); let aSpellErr = oSpellChecker.parseParagraph(sParagraph); postMessage(createResponse("parseAndSpellcheck1", {sParagraph: sParagraph, aGrammErr: aGrammErr, aSpellErr: aSpellErr}, oInfo, true)); } function parseFull (sParagraph, sCountry, bDebug, bContext, oInfo={}) { sParagraph = sParagraph.replace(//g, "").normalize("NFC"); let [lParagraphErrors, lSentences] = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext, true); //console.log(lSentences); postMessage(createResponse("parseFull", { lParagraphErrors: lParagraphErrors, lSentences: lSentences }, oInfo, true)); } function getListOfTokens (sText, oInfo={}) { // lexicographer try { sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { if (sParagraph.trim() !== "") { let lTokens = [ ...oTokenizer.genTokens(sParagraph) ]; for (let oToken of lTokens) { oSpellChecker.setLabelsOnToken(oToken); } postMessage(createResponse("getListOfTokens", { sParagraph: sParagraph, lTokens: lTokens }, oInfo, false)); } } postMessage(createResponse("getListOfTokens", null, oInfo, true)); } catch (e) { console.error(e); postMessage(createResponse("getListOfTokens", createErrorResult(e, "no tokens"), oInfo, true, true)); |
︙ | ︙ |
Modified grammalecte-cli.py from [0e5de0a660] to [4b02966a37].
︙ | ︙ | |||
128 129 130 131 132 133 134 135 136 137 138 139 140 141 | else: vSugg = m.group(2)[1:] return (nError, cAction, vSugg) def main (): "launch the CLI (command line interface)" xParser = argparse.ArgumentParser() xParser.add_argument("-f", "--file", help="parse file (UTF-8 required!) [on Windows, -f is similar to -ff]", type=str) xParser.add_argument("-ff", "--file_to_file", help="parse file (UTF-8 required!) and create a result file (*.res.txt)", type=str) xParser.add_argument("-iff", "--interactive_file_to_file", help="parse file (UTF-8 required!) and create a result file (*.res.txt)", type=str) xParser.add_argument("-owe", "--only_when_errors", help="display results only when there are errors", action="store_true") xParser.add_argument("-j", "--json", help="generate list of errors in JSON (only with option --file or --file_to_file)", action="store_true") xParser.add_argument("-cl", "--concat_lines", help="concatenate lines not separated by an empty paragraph (only with option --file or --file_to_file)", action="store_true") | > > > > | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | else: vSugg = m.group(2)[1:] return (nError, cAction, vSugg) def main (): "launch the CLI (command line interface)" if sys.version < "3.7": print("Python 3.7+ required") return xParser = argparse.ArgumentParser() xParser.add_argument("-f", "--file", help="parse file (UTF-8 required!) [on Windows, -f is similar to -ff]", type=str) xParser.add_argument("-ff", "--file_to_file", help="parse file (UTF-8 required!) and create a result file (*.res.txt)", type=str) xParser.add_argument("-iff", "--interactive_file_to_file", help="parse file (UTF-8 required!) and create a result file (*.res.txt)", type=str) xParser.add_argument("-owe", "--only_when_errors", help="display results only when there are errors", action="store_true") xParser.add_argument("-j", "--json", help="generate list of errors in JSON (only with option --file or --file_to_file)", action="store_true") xParser.add_argument("-cl", "--concat_lines", help="concatenate lines not separated by an empty paragraph (only with option --file or --file_to_file)", action="store_true") |
︙ | ︙ | |||
334 335 336 337 338 339 340 | # reload (todo) pass elif sText.startswith("$"): for sParagraph in txt.getParagraph(sText[1:]): if xArgs.textformatter: sParagraph = oTextFormatter.formatText(sParagraph) lParagraphErrors, lSentences = oGrammarChecker.gce.parse(sParagraph, bDebug=xArgs.debug, bFullInfo=True) | | | < | > > | | | | | > > > > > > > > | | 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 | # reload (todo) pass elif sText.startswith("$"): for sParagraph in txt.getParagraph(sText[1:]): if xArgs.textformatter: sParagraph = oTextFormatter.formatText(sParagraph) lParagraphErrors, lSentences = oGrammarChecker.gce.parse(sParagraph, bDebug=xArgs.debug, bFullInfo=True) #echo(txt.getReadableErrors(lParagraphErrors, xArgs.width)) for dSentence in lSentences: echo("{nStart}:{nEnd} <{sSentence}>".format(**dSentence)) for dToken in dSentence["lTokens"]: if dToken["sType"] == "INFO" or "bMerged" in dToken: continue echo(" {0[nStart]:>3}:{0[nEnd]:<3} {1} {0[sType]:<14} {2} {0[sValue]:<16} {3}".format(dToken, \ "×" if dToken.get("bToRemove", False) else " ", "!" if dToken["sType"] == "WORD" and not dToken.get("bValidToken", False) else " ", " ".join(dToken.get("aTags", "")) ) ) if "lMorph" in dToken: for sMorph, sLabel in zip(dToken["lMorph"], dToken["aLabels"]): echo(" {0:40} {1}".format(sMorph, sLabel)) if "lSubTokens" in dToken: for dSubToken in dToken["lSubTokens"]: if dSubToken["sValue"]: echo(" · {0:20}".format(dSubToken["sValue"])) for sMorph, sLabel in zip(dSubToken["lMorph"], dSubToken["aLabels"]): echo(" {0:40} {1}".format(sMorph, sLabel)) #echo(txt.getReadableErrors(dSentence["lGrammarErrors"], xArgs.width)) else: for sParagraph in txt.getParagraph(sText): if xArgs.textformatter: sParagraph = oTextFormatter.formatText(sParagraph) sRes, _ = oGrammarChecker.getParagraphWithErrors(sParagraph, bEmptyIfNoErrors=xArgs.only_when_errors, nWidth=xArgs.width, bDebug=xArgs.debug) if sRes: echo("\n" + sRes) |
︙ | ︙ |
Modified graphspell-js/ibdawg.js from [544f660d8a] to [80e916efdb].
︙ | ︙ | |||
309 310 311 312 313 314 315 316 317 318 319 320 321 322 | } } return Boolean(this._convBytesToInteger(this.byDic.slice(iAddr, iAddr+this.nBytesArc)) & this._finalNodeMask); } getMorph (sWord) { // retrieves morphologies list, different casing allowed sWord = str_transform.spellingNormalization(sWord); let l = this.morph(sWord); if (sWord[0].gl_isUpperCase()) { l.push(...this.morph(sWord.toLowerCase())); if (sWord.gl_isUpperCase() && sWord.length > 1) { l.push(...this.morph(sWord.gl_toCapitalize())); } | > > > | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 | } } return Boolean(this._convBytesToInteger(this.byDic.slice(iAddr, iAddr+this.nBytesArc)) & this._finalNodeMask); } getMorph (sWord) { // retrieves morphologies list, different casing allowed if (!sWord) { return []; } sWord = str_transform.spellingNormalization(sWord); let l = this.morph(sWord); if (sWord[0].gl_isUpperCase()) { l.push(...this.morph(sWord.toLowerCase())); if (sWord.gl_isUpperCase() && sWord.length > 1) { l.push(...this.morph(sWord.gl_toCapitalize())); } |
︙ | ︙ |
Modified graphspell-js/lexgraph_fr.js from [9858773647] to [816b039883].
︙ | ︙ | |||
162 163 164 165 166 167 168 | [':e', [" épicène", "épicène"]], [':m', [" masculin", "masculin"]], [':f', [" féminin", "féminin"]], [':s', [" singulier", "singulier"]], [':p', [" pluriel", "pluriel"]], [':i', [" invariable", "invariable"]], | | | | > > > | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | [':e', [" épicène", "épicène"]], [':m', [" masculin", "masculin"]], [':f', [" féminin", "féminin"]], [':s', [" singulier", "singulier"]], [':p', [" pluriel", "pluriel"]], [':i', [" invariable", "invariable"]], [':V1_', [" verbe (1ᵉʳ gr.),", "Verbe du 1ᵉʳ groupe"]], [':V2_', [" verbe (2ᵉ gr.),", "Verbe du 2ᵉ groupe"]], [':V3_', [" verbe (3ᵉ gr.),", "Verbe du 3ᵉ groupe"]], [':V1e', [" verbe (1ᵉʳ gr.),", "Verbe du 1ᵉʳ groupe"]], [':V2e', [" verbe (2ᵉ gr.),", "Verbe du 2ᵉ groupe"]], [':V3e', [" verbe (3ᵉ gr.),", "Verbe du 3ᵉ groupe"]], [':V0e', [" verbe,", "Verbe auxiliaire être"]], [':V0a', [" verbe,", "Verbe auxiliaire avoir"]], [':Y', [" infinitif,", "infinitif"]], [':P', [" participe présent,", "participe présent"]], [':Q', [" participe passé,", "participe passé"]], [':Ip', [" présent,", "indicatif présent"]], |
︙ | ︙ | |||
209 210 211 212 213 214 215 | [':Oi', [" pronom indéfini,", "Pronom indéfini"]], [':On', [" pronom indéfini négatif,", "Pronom indéfini négatif"]], [':Ot', [" pronom interrogatif,", "Pronom interrogatif"]], [':Or', [" pronom relatif,", "Pronom relatif"]], [':Ow', [" pronom adverbial,", "Pronom adverbial"]], [':Os', [" pronom personnel sujet,", "Pronom personnel sujet"]], [':Oo', [" pronom personnel objet,", "Pronom personnel objet"]], | | < < > > | | | | | | | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | [':Oi', [" pronom indéfini,", "Pronom indéfini"]], [':On', [" pronom indéfini négatif,", "Pronom indéfini négatif"]], [':Ot', [" pronom interrogatif,", "Pronom interrogatif"]], [':Or', [" pronom relatif,", "Pronom relatif"]], [':Ow', [" pronom adverbial,", "Pronom adverbial"]], [':Os', [" pronom personnel sujet,", "Pronom personnel sujet"]], [':Oo', [" pronom personnel objet,", "Pronom personnel objet"]], [':Ov', [" préverbe,", "Préverbe"]], [':O1', [" 1ʳᵉ pers.,", "Pronom : 1ʳᵉ personne"]], [':O2', [" 2ᵉ pers.,", "Pronom : 2ᵉ personne"]], [':O3', [" 3ᵉ pers.,", "Pronom : 3ᵉ personne"]], [':C', [" conjonction,", "Conjonction"]], [':Cc', [" conjonction de coordination,", "Conjonction de coordination"]], [':Cs', [" conjonction de subordination,", "Conjonction de subordination"]], [':ÉC', [" élément de conjonction,", "Élément de conjonction"]], [':ÉCs', [" élément de conjonction de subordination,", "Élément de conjonction de subordination"]], [':ÉN', [" élément de locution nominale,", "Élément de locution nominale"]], [':ÉA', [" élément de locution adjectivale,", "Élément de locution adjectivale"]], [':ÉV', [" élément de locution verbale,", "Élément de locution verbale"]], [':ÉW', [" élément de locution adverbiale,", "Élément de locution adverbiale"]], [':ÉR', [" élément de locution prépositive,", "Élément de locution prépositive"]], [':ÉJ', [" élément de locution interjective,", "Élément de locution interjective"]], [':Zp', [" préfixe,", "Préfixe"]], [':Zs', [" suffixe,", "Suffixe"]], [':H', ["", "<Hors-norme, inclassable>"]], [':@', ["", "<Caractère non alpha-numérique>"]], |
︙ | ︙ | |||
275 276 277 278 279 280 281 | ['i', " intransitive"], ['n', " transitive indirecte"], ['t', " transitive directe"], ['p', " pronominale"], ['m', " impersonnelle"], ]), | | | | | | | | | | | | | | | < < | | | > | | > > > > | | | | > | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > | | | | | | | | < < | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 | ['i', " intransitive"], ['n', " transitive indirecte"], ['t', " transitive directe"], ['p', " pronominale"], ['m', " impersonnelle"], ]), dValues: new Map([ ['d’', "(de), préposition ou déterminant épicène invariable"], ['l’', "(le/la), déterminant ou pronom personnel objet, masculin/féminin singulier"], ['j’', "(je), pronom personnel sujet, 1ʳᵉ pers., épicène singulier"], ['m’', "(me), pronom personnel objet, 1ʳᵉ pers., épicène singulier"], ['t’', "(te), pronom personnel objet, 2ᵉ pers., épicène singulier"], ['s’', "(se), pronom personnel objet, 3ᵉ pers., épicène singulier/pluriel"], ['n’', "(ne), adverbe de négation"], ['c’', "(ce), pronom démonstratif, masculin singulier/pluriel"], ['ç’', "(ça), pronom démonstratif, masculin singulier"], ['qu', "(que), conjonction de subordination"], ['lorsqu’', "(lorsque), conjonction de subordination"], ['puisqu’', "(lorsque), conjonction de subordination"], ['quoiqu’', "(quoique), conjonction de subordination"], ['jusqu’', "(jusque), préposition"], ['-je', " pronom personnel sujet, 1ʳᵉ pers. sing."], ['-tu', " pronom personnel sujet, 2ᵉ pers. sing."], ['-il', " pronom personnel sujet, 3ᵉ pers. masc. sing."], ['-iel', " pronom personnel sujet, 3ᵉ pers. sing."], ['-on', " pronom personnel sujet, 3ᵉ pers. sing. ou plur."], ['-elle', " pronom personnel sujet, 3ᵉ pers. fém. sing."], ['-t-il', " “t” euphonique + pronom personnel sujet, 3ᵉ pers. masc. sing."], ['-t-on', " “t” euphonique + pronom personnel sujet, 3ᵉ pers. sing. ou plur."], ['-t-elle', " “t” euphonique + pronom personnel sujet, 3ᵉ pers. fém. sing."], ['-t-iel', " “t” euphonique + pronom personnel sujet, 3ᵉ pers. sing."], ['-nous', " pronom personnel sujet/objet, 1ʳᵉ pers. plur. ou COI (à nous), plur."], ['-vous', " pronom personnel sujet/objet, 2ᵉ pers. plur. ou COI (à vous), plur."], ['-ils', " pronom personnel sujet, 3ᵉ pers. masc. plur."], ['-elles', " pronom personnel sujet, 3ᵉ pers. masc. plur."], ['-iels', " pronom personnel sujet, 3ᵉ pers. plur."], ["-là", " particule démonstrative (là)"], ["-ci", " particule démonstrative (ci)"], ['-le', " COD, masc. sing."], ['-la', " COD, fém. sing."], ['-les', " COD, plur."], ['-moi', " COI (à moi), sing."], ['-toi', " COI (à toi), sing."], ['-lui', " COI (à lui ou à elle), sing."], ['-nous2', " COI (à nous), plur."], ['-vous2', " COI (à vous), plur."], ['-leur', " COI (à eux ou à elles), plur."], ['-le-moi', " COD, masc. sing. + COI (à moi), sing."], ['-le-toi', " COD, masc. sing. + COI (à toi), sing."], ['-le-lui', " COD, masc. sing. + COI (à lui ou à elle), sing."], ['-le-nous', " COD, masc. sing. + COI (à nous), plur."], ['-le-vous', " COD, masc. sing. + COI (à vous), plur."], ['-le-leur', " COD, masc. sing. + COI (à eux ou à elles), plur."], ['-la-moi', " COD, fém. sing. + COI (à moi), sing."], ['-la-toi', " COD, fém. sing. + COI (à toi), sing."], ['-la-lui', " COD, fém. sing. + COI (à lui ou à elle), sing."], ['-la-nous', " COD, fém. sing. + COI (à nous), plur."], ['-la-vous', " COD, fém. sing. + COI (à vous), plur."], ['-la-leur', " COD, fém. sing. + COI (à eux ou à elles), plur."], ['-les-moi', " COD, plur. + COI (à moi), sing."], ['-les-toi', " COD, plur. + COI (à toi), sing."], ['-les-lui', " COD, plur. + COI (à lui ou à elle), sing."], ['-les-nous', " COD, plur. + COI (à nous), plur."], ['-les-vous', " COD, plur. + COI (à vous), plur."], ['-les-leur', " COD, plur. + COI (à eux ou à elles), plur."], ['-y', " pronom adverbial"], ["-m’y", " (me) pronom personnel objet + (y) pronom adverbial"], ["-t’y", " (te) pronom personnel objet + (y) pronom adverbial"], ["-s’y", " (se) pronom personnel objet + (y) pronom adverbial"], ['-en', " pronom adverbial"], ["-m’en", " (me) pronom personnel objet + (en) pronom adverbial"], ["-t’en", " (te) pronom personnel objet + (en) pronom adverbial"], ["-s’en", " (se) pronom personnel objet + (en) pronom adverbial"], ['.', "point"], ['·', "point médian"], ['…', "points de suspension"], [':', "deux-points"], [';', "point-virgule"], [',', "virgule"], ['?', "point d’interrogation"], |
︙ | ︙ | |||
365 366 367 368 369 370 371 | ['>', "supérieur à"], ['⩽', "inférieur ou égal à"], ['⩾', "supérieur ou égal à"], ['%', "signe de pourcentage"], ['‰', "signe pour mille"], ]), | < < < < | | < < < < < < < | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < < < | < < < < | < < < < | < < < < | < < < < | < < < < | < < < < | < < < < | < < < < < | < < < < | < < < < | < < < < | < < < < | < | | | | > > > > > | < > | | < < < | < < < < < < < < < < < | | < < < | < < < < < > | | < < < | > | | < < < > > | < | | > | < > > | < < < | < > > > < < < | < < < < < < | < < < < < | < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 | ['>', "supérieur à"], ['⩽', "inférieur ou égal à"], ['⩾', "supérieur ou égal à"], ['%', "signe de pourcentage"], ['‰', "signe pour mille"], ]), _zPartDemForm: new RegExp("([a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ]+)-(là|ci)$", "i"), _aPartDemExceptList: new Set(["celui", "celle", "ceux", "celles", "de", "jusque", "par", "marie-couche-toi"]), _zInterroVerb: new RegExp("([a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ]+)(-(?:t-(?:ie?l|elle|on)|je|tu|ie?ls?|elles?|on|[nv]ous))$", "i"), _zImperatifVerb: new RegExp("([a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ]+)(-(?:l(?:es?|a)-(?:moi|toi|lui|[nv]ous|leur)|y|en|[mts]['’ʼ‘‛´`′‵՚ꞌꞋ](?:y|en)|les?|la|[mt]oi|leur|lui))$", "i"), _zTag: new RegExp("[:;/][a-zA-Z0-9ÑÂĴĈŔÔṼŴ!][^:;/]*", "g"), split: function (sWord) { // returns an arry of strings (prefix, trimed_word, suffix) let sPrefix = ""; let sSuffix = ""; // préfixe élidé let m = /^([ldmtsnjcç]|lorsqu|presqu|jusqu|puisqu|quoiqu|quelqu|qu)['’ʼ‘‛´`′‵՚ꞌꞋ]([a-zA-Zà-öÀ-Ö0-9_ø-ÿØ-ßĀ-ʯfi-st-]+)/i.exec(sWord); if (m) { sPrefix = m[1] + "’"; sWord = m[2]; } // mots composés m = /^([a-zA-Zà-öÀ-Ö0-9_ø-ÿØ-ßĀ-ʯfi-st]+)(-(?:(?:les?|la)-(?:moi|toi|lui|[nv]ous|leur)|t-(?:il|elle|on)|y|en|[mts]’(?:y|en)|les?|l[aà]|[mt]oi|leur|lui|je|tu|ils?|elles?|on|[nv]ous|ce))$/i.exec(sWord); if (m) { sWord = m[1]; sSuffix = m[2]; } // split word in 3 parts: prefix, root, suffix return [sPrefix, sWord, sSuffix]; }, analyze: function (sWord) { // return meaning of <sWord> if found else an empty string sWord = sWord.toLowerCase(); if (this.dValues.has(sWord)) { return this.dValues.get(sWord); } return ""; }, readableMorph: function (sMorph) { if (!sMorph) { return " mot inconnu"; } let sRes = ""; sMorph = sMorph.replace(/:V([0-3][ea_])[itpqnmr_eaxz]+/, ":V$1"); let m; while ((m = this._zTag.exec(sMorph)) !== null) { if (this.dTag.has(m[0])) { sRes += this.dTag.get(m[0])[0]; } else { sRes += " [" + m[0] + "]?"; } } if (sRes.startsWith(" verbe") && !sRes.includes("infinitif")) { sRes += " [" + sMorph.slice(1, sMorph.indexOf("/")) + "]"; } if (!sRes) { return " [" + sMorph + "]: étiquettes inconnues"; } return sRes.gl_trimRight(","); }, setLabelsOnToken (oToken) { // Token: .sType, .sValue, .nStart, .nEnd, .lMorph let m = null; try { switch (oToken.sType) { case 'PUNC': case 'SIGN': oToken["aLabels"] = [this.dValues.gl_get(oToken["sValue"], "signe de ponctuation divers")]; break; case 'NUM': oToken["aLabels"] = ["nombre"]; break; case 'LINK': oToken["aLabels"] = ["hyperlien"]; break; case 'TAG': oToken["aLabels"] = ["étiquette (hashtag)"]; break; case 'HTML': oToken["aLabels"] = ["balise HTML"]; break; case 'PSEUDOHTML': oToken["aLabels"] = ["balise pseudo-HTML"]; break; case 'HTMLENTITY': oToken["aLabels"] = ["entité caractère XML/HTML"]; break; case 'HOUR': oToken["aLabels"] = ["heure"]; break; case 'WORD_ELIDED': oToken["aLabels"] = [this.dValues.gl_get(oToken["sValue"].toLowerCase(), "préfixe élidé inconnu")]; break; case 'WORD_ORDINAL': oToken["aLabels"] = ["nombre ordinal"]; break; case 'FOLDERUNIX': oToken["aLabels"] = ["dossier UNIX (et dérivés)"]; break; case 'FOLDERWIN': oToken["aLabels"] = ["dossier Windows"]; break; case 'WORD_ACRONYM': oToken["aLabels"] = ["sigle ou acronyme"]; break; case 'WORD': if (oToken.hasOwnProperty("lMorph") && oToken["lMorph"].length > 0) { // with morphology oToken["aLabels"] = []; for (let sMorph of oToken["lMorph"]) { oToken["aLabels"].push(this.readableMorph(sMorph)); } } else { // no morphology, guessing if (oToken["sValue"].gl_count("-") > 4) { oToken["aLabels"] = ["élément complexe indéterminé"]; } else if (m = this._zPartDemForm.exec(oToken["sValue"])) { // mots avec particules démonstratives oToken["aLabels"] = ["mot avec particule démonstrative"]; } else if (m = this._zImperatifVerb.exec(oToken["sValue"])) { // formes interrogatives oToken["aLabels"] = ["forme verbale impérative"]; } else if (m = this._zInterroVerb.exec(oToken["sValue"])) { // formes interrogatives oToken["aLabels"] = ["forme verbale interrogative"]; } else { oToken["aLabels"] = ["mot inconnu du dictionnaire"]; } } if (oToken.hasOwnProperty("lSubTokens")) { for (let oSubToken of oToken["lSubTokens"]) { if (oSubToken["sValue"]) { if (this.dValues.has(oSubToken["sValue"])) { oSubToken["lMorph"] = [ "" ]; oSubToken["aLabels"] = [ this.dValues.get(oSubToken["sValue"]) ]; } else { oSubToken["aLabels"] = oSubToken["lMorph"].map((sMorph) => this.readableMorph(sMorph)); } } } } break; default: oToken["aLabels"] = ["token de nature inconnue"]; } } catch (e) { console.error(e); } }, // Other functions filterSugg: function (aSugg) { return aSugg.filter((sSugg) => { return !sSugg.endsWith("è") && !sSugg.endsWith("È"); }); } } if (typeof(exports) !== 'undefined') { exports.lexgraph_fr = lexgraph_fr; } |
Modified graphspell-js/spellchecker.js from [be4f6fe289] to [a94325f4c6].
︙ | ︙ | |||
130 131 132 133 134 135 136 | // Lexicographer loadLexicographer (sLangCode) { // load default suggestion module for <sLangCode> if (typeof(process) !== 'undefined') { this.lexicographer = require(`./lexgraph_${sLangCode}.js`); } | > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 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 191 192 193 194 195 196 197 198 199 200 | // Lexicographer loadLexicographer (sLangCode) { // load default suggestion module for <sLangCode> if (typeof(process) !== 'undefined') { this.lexicographer = require(`./lexgraph_${sLangCode}.js`); } else if (self && self.hasOwnProperty("lexgraph_"+sLangCode)) { // self is the Worker this.lexicographer = self["lexgraph_"+sLangCode]; } } analyze (sWord) { // returns a list of words and their morphologies if (!this.lexicographer) { return []; } let lWordAndMorph = []; for (let sElem of this.lexicographer.split(sWord)) { if (sElem) { let lMorph = this.getMorph(sElem); let sLex = this.lexicographer.analyze(sElem) let aRes = []; if (sLex) { aRes = [ [lMorph.join(" | "), sLex] ]; } else { for (let sMorph of lMorph) { aRes.push([sMorph, this.lexicographer.formatTags(sMorph)]); } } if (aRes.length > 0) { lWordAndMorph.push([sElem, aRes]); } } } return lWordAndMorph; } readableMorph (sMorph) { if (!this.lexicographer) { return []; } return this.lexicographer.formatTags(sMorph); } setLabelsOnToken (oToken) { if (!this.lexicographer) { return; } if (!oToken.hasOwnProperty("lMorph")) { oToken["lMorph"] = this.getMorph(oToken["sValue"]); } if (oToken["sType"] == "WORD") { oToken["bValidToken"] = this.isValidToken(oToken["sValue"]); let [sPrefix, sStem, sSuffix] = this.lexicographer.split(oToken["sValue"]); if (sStem != oToken["sValue"]) { oToken["lSubTokens"] = [ { "sType": "WORD", "sValue": sPrefix, "lMorph": this.getMorph(sPrefix) }, { "sType": "WORD", "sValue": sStem, "lMorph": this.getMorph(sStem) }, { "sType": "WORD", "sValue": sSuffix, "lMorph": this.getMorph(sSuffix) } ]; } } this.lexicographer.setLabelsOnToken(oToken); } // Storage activateStorage () { this.bStorage = true; |
︙ | ︙ |
Modified graphspell/ibdawg.py from [f1a1c3c7ab] to [e07922ff50].
︙ | ︙ | |||
297 298 299 300 301 302 303 304 305 306 307 308 309 310 | iAddr = self._lookupArcNode(self.dChar[c], iAddr) if iAddr is None: return False return bool(int.from_bytes(self.byDic[iAddr:iAddr+self.nBytesArc], byteorder='big') & self._finalNodeMask) def getMorph (self, sWord): "retrieves morphologies list, different casing allowed" sWord = st.spellingNormalization(sWord) l = self.morph(sWord) if sWord[0:1].isupper(): l.extend(self.morph(sWord.lower())) if sWord.isupper() and len(sWord) > 1: l.extend(self.morph(sWord.capitalize())) return l | > > | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | iAddr = self._lookupArcNode(self.dChar[c], iAddr) if iAddr is None: return False return bool(int.from_bytes(self.byDic[iAddr:iAddr+self.nBytesArc], byteorder='big') & self._finalNodeMask) def getMorph (self, sWord): "retrieves morphologies list, different casing allowed" if not sWord: return [] sWord = st.spellingNormalization(sWord) l = self.morph(sWord) if sWord[0:1].isupper(): l.extend(self.morph(sWord.lower())) if sWord.isupper() and len(sWord) > 1: l.extend(self.morph(sWord.capitalize())) return l |
︙ | ︙ |
Modified graphspell/lexgraph_fr.py from [06640299ad] to [f36c3bc666].
1 2 3 4 5 6 7 8 9 10 11 | """ Lexicographer for the French language """ # Note: # This mode must contains at least: # <dSugg> : a dictionary for default suggestions. # <bLexicographer> : a boolean False # if the boolean is True, 4 functions are required: # split(sWord) -> returns a list of string (that will be analyzed) # analyze(sWord) -> returns a string with the meaning of word | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | """ Lexicographer for the French language """ # Note: # This mode must contains at least: # <dSugg> : a dictionary for default suggestions. # <bLexicographer> : a boolean False # if the boolean is True, 4 functions are required: # split(sWord) -> returns a list of string (that will be analyzed) # analyze(sWord) -> returns a string with the meaning of word # readableMorph(sMorph) -> returns a string with the meaning of tags # setLabelsOnToken(dToken) -> adds readable information on token # filterSugg(aWord) -> returns a filtered list of suggestions import re #### Suggestions |
︙ | ︙ | |||
168 169 170 171 172 173 174 | ':e': (" épicène", "épicène"), ':m': (" masculin", "masculin"), ':f': (" féminin", "féminin"), ':s': (" singulier", "singulier"), ':p': (" pluriel", "pluriel"), ':i': (" invariable", "invariable"), | | | | > > > | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | ':e': (" épicène", "épicène"), ':m': (" masculin", "masculin"), ':f': (" féminin", "féminin"), ':s': (" singulier", "singulier"), ':p': (" pluriel", "pluriel"), ':i': (" invariable", "invariable"), ':V1_': (" verbe (1ᵉʳ gr.),", "Verbe du 1ᵉʳ groupe"), ':V2_': (" verbe (2ᵉ gr.),", "Verbe du 2ᵉ groupe"), ':V3_': (" verbe (3ᵉ gr.),", "Verbe du 3ᵉ groupe"), ':V1e': (" verbe (1ᵉʳ gr.),", "Verbe du 1ᵉʳ groupe"), ':V2e': (" verbe (2ᵉ gr.),", "Verbe du 2ᵉ groupe"), ':V3e': (" verbe (3ᵉ gr.),", "Verbe du 3ᵉ groupe"), ':V0e': (" verbe,", "Verbe auxiliaire être"), ':V0a': (" verbe,", "Verbe auxiliaire avoir"), ':Y': (" infinitif,", "infinitif"), ':P': (" participe présent,", "participe présent"), ':Q': (" participe passé,", "participe passé"), ':Ip': (" présent,", "indicatif présent"), |
︙ | ︙ | |||
215 216 217 218 219 220 221 | ':Oi': (" pronom indéfini,", "Pronom indéfini"), ':On': (" pronom indéfini négatif,", "Pronom indéfini négatif"), ':Ot': (" pronom interrogatif,", "Pronom interrogatif"), ':Or': (" pronom relatif,", "Pronom relatif"), ':Ow': (" pronom adverbial,", "Pronom adverbial"), ':Os': (" pronom personnel sujet,", "Pronom personnel sujet"), ':Oo': (" pronom personnel objet,", "Pronom personnel objet"), | | < < > > | | | | | | | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | ':Oi': (" pronom indéfini,", "Pronom indéfini"), ':On': (" pronom indéfini négatif,", "Pronom indéfini négatif"), ':Ot': (" pronom interrogatif,", "Pronom interrogatif"), ':Or': (" pronom relatif,", "Pronom relatif"), ':Ow': (" pronom adverbial,", "Pronom adverbial"), ':Os': (" pronom personnel sujet,", "Pronom personnel sujet"), ':Oo': (" pronom personnel objet,", "Pronom personnel objet"), ':Ov': (" préverbe,", "Préverbe"), ':O1': (" 1ʳᵉ pers.,", "Pronom : 1ʳᵉ personne"), ':O2': (" 2ᵉ pers.,", "Pronom : 2ᵉ personne"), ':O3': (" 3ᵉ pers.,", "Pronom : 3ᵉ personne"), ':C': (" conjonction,", "Conjonction"), ':Cc': (" conjonction de coordination,", "Conjonction de coordination"), ':Cs': (" conjonction de subordination,", "Conjonction de subordination"), ':ÉC': (" élément de conjonction,", "Élément de conjonction"), ':ÉCs': (" élément de conjonction de subordination,", "Élément de conjonction de subordination"), ':ÉN': (" élément de locution nominale,", "Élément de locution nominale"), ':ÉA': (" élément de locution adjectivale,", "Élément de locution adjectivale"), ':ÉV': (" élément de locution verbale,", "Élément de locution verbale"), ':ÉW': (" élément de locution adverbiale,", "Élément de locution adverbiale"), ':ÉR': (" élément de locution prépositive,", "Élément de locution prépositive"), ':ÉJ': (" élément de locution interjective,", "Élément de locution interjective"), ':Zp': (" préfixe,", "Préfixe"), ':Zs': (" suffixe,", "Suffixe"), ':H': ("", "<Hors-norme, inclassable>"), ':@': ("", "<Caractère non alpha-numérique>"), |
︙ | ︙ | |||
270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | 'puisqu’': "(puisque), conjonction de subordination", 'quoiqu’': "(quoique), conjonction de subordination", 'jusqu’': "(jusque), préposition", '-je': " pronom personnel sujet, 1ʳᵉ pers. sing.", '-tu': " pronom personnel sujet, 2ᵉ pers. sing.", '-il': " pronom personnel sujet, 3ᵉ pers. masc. sing.", '-on': " pronom personnel sujet, 3ᵉ pers. sing. ou plur.", '-elle': " pronom personnel sujet, 3ᵉ pers. fém. sing.", '-t-il': " “t” euphonique + pronom personnel sujet, 3ᵉ pers. masc. sing.", '-t-on': " “t” euphonique + pronom personnel sujet, 3ᵉ pers. sing. ou plur.", '-t-elle': " “t” euphonique + pronom personnel sujet, 3ᵉ pers. fém. sing.", '-nous': " pronom personnel sujet/objet, 1ʳᵉ pers. plur. ou COI (à nous), plur.", '-vous': " pronom personnel sujet/objet, 2ᵉ pers. plur. ou COI (à vous), plur.", '-ils': " pronom personnel sujet, 3ᵉ pers. masc. plur.", '-elles': " pronom personnel sujet, 3ᵉ pers. masc. plur.", | > > > | | | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | 'puisqu’': "(puisque), conjonction de subordination", 'quoiqu’': "(quoique), conjonction de subordination", 'jusqu’': "(jusque), préposition", '-je': " pronom personnel sujet, 1ʳᵉ pers. sing.", '-tu': " pronom personnel sujet, 2ᵉ pers. sing.", '-il': " pronom personnel sujet, 3ᵉ pers. masc. sing.", '-iel': " pronom personnel sujet, 3ᵉ pers. sing.", '-on': " pronom personnel sujet, 3ᵉ pers. sing. ou plur.", '-elle': " pronom personnel sujet, 3ᵉ pers. fém. sing.", '-t-il': " “t” euphonique + pronom personnel sujet, 3ᵉ pers. masc. sing.", '-t-on': " “t” euphonique + pronom personnel sujet, 3ᵉ pers. sing. ou plur.", '-t-elle': " “t” euphonique + pronom personnel sujet, 3ᵉ pers. fém. sing.", '-t-iel': " “t” euphonique + pronom personnel sujet, 3ᵉ pers. sing.", '-nous': " pronom personnel sujet/objet, 1ʳᵉ pers. plur. ou COI (à nous), plur.", '-vous': " pronom personnel sujet/objet, 2ᵉ pers. plur. ou COI (à vous), plur.", '-ils': " pronom personnel sujet, 3ᵉ pers. masc. plur.", '-elles': " pronom personnel sujet, 3ᵉ pers. masc. plur.", '-iels': " pronom personnel sujet, 3ᵉ pers. plur.", "-là": " particule démonstrative (là)", "-ci": " particule démonstrative (ci)", '-le': " COD, masc. sing.", '-la': " COD, fém. sing.", '-les': " COD, plur.", '-moi': " COI (à moi), sing.", '-toi': " COI (à toi), sing.", |
︙ | ︙ | |||
322 323 324 325 326 327 328 329 330 331 332 333 334 335 | "-t’y": " (te) pronom personnel objet + (y) pronom adverbial", "-s’y": " (se) pronom personnel objet + (y) pronom adverbial", '-en': " pronom adverbial", "-m’en": " (me) pronom personnel objet + (en) pronom adverbial", "-t’en": " (te) pronom personnel objet + (en) pronom adverbial", "-s’en": " (se) pronom personnel objet + (en) pronom adverbial", } _zElidedPrefix = re.compile("(?i)^([ldmtsnjcç]|lorsqu|presqu|jusqu|puisqu|quoiqu|quelqu|qu)[’'‘`ʼ]([\\w-]+)") _zCompoundWord = re.compile("(?i)(\\w+)(-(?:(?:les?|la)-(?:moi|toi|lui|[nv]ous|leur)|t-(?:il|elle|on)|y|en|[mts]’(?:y|en)|les?|l[aà]|[mt]oi|leur|lui|je|tu|ils?|elles?|on|[nv]ous|ce))$") _zTag = re.compile("[:;/][\\w*][^:;/]*") | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | "-t’y": " (te) pronom personnel objet + (y) pronom adverbial", "-s’y": " (se) pronom personnel objet + (y) pronom adverbial", '-en': " pronom adverbial", "-m’en": " (me) pronom personnel objet + (en) pronom adverbial", "-t’en": " (te) pronom personnel objet + (en) pronom adverbial", "-s’en": " (se) pronom personnel objet + (en) pronom adverbial", '.': "point", '·': "point médian", '…': "points de suspension", ':': "deux-points", ';': "point-virgule", ',': "virgule", '?': "point d’interrogation", '!': "point d’exclamation", '(': "parenthèse ouvrante", ')': "parenthèse fermante", '[': "crochet ouvrant", ']': "crochet fermant", '{': "accolade ouvrante", '}': "accolade fermante", '-': "tiret", '—': "tiret cadratin", '–': "tiret demi-cadratin", '«': "guillemet ouvrant (chevrons)", '»': "guillemet fermant (chevrons)", '“': "guillemet ouvrant double", '”': "guillemet fermant double", '‘': "guillemet ouvrant", '’': "guillemet fermant", '"': "guillemets droits (déconseillé en typographie)", '/': "signe de la division", '+': "signe de l’addition", '*': "signe de la multiplication", '=': "signe de l’égalité", '<': "inférieur à", '>': "supérieur à", '⩽': "inférieur ou égal à", '⩾': "supérieur ou égal à", '%': "signe de pourcentage", '‰': "signe pour mille" } _zElidedPrefix = re.compile("(?i)^([ldmtsnjcç]|lorsqu|presqu|jusqu|puisqu|quoiqu|quelqu|qu)[’'‘`ʼ]([\\w-]+)") _zCompoundWord = re.compile("(?i)(\\w+)(-(?:(?:les?|la)-(?:moi|toi|lui|[nv]ous|leur)|t-(?:il|elle|on)|y|en|[mts]’(?:y|en)|les?|l[aà]|[mt]oi|leur|lui|je|tu|ils?|elles?|on|[nv]ous|ce))$") _zTag = re.compile("[:;/][\\w*][^:;/]*") |
︙ | ︙ | |||
354 355 356 357 358 359 360 | "return meaning of <sWord> if found else an empty string" sWord = sWord.lower() if sWord in _dValues: return _dValues[sWord] return "" | | > > | < | > | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 | "return meaning of <sWord> if found else an empty string" sWord = sWord.lower() if sWord in _dValues: return _dValues[sWord] return "" def readableMorph (sMorph): "returns string: readable tags" if not sMorph: return "mot inconnu" sRes = "" sMorph = re.sub("(?<=V[0123][ea_])[itpqnmr_eaxz]+", "", sMorph) for m in _zTag.finditer(sMorph): if m.group(0) in _dTAGS: sRes += _dTAGS[m.group(0)][0] else: sRes += " [" + m.group(0) + "]?" if sRes.startswith(" verbe") and not sRes.endswith("infinitif"): sRes += " [" + sMorph[1:sMorph.find("/")] +"]" if not sRes: return " [" + sMorph + "]: étiquettes inconnues" return sRes.rstrip(",") _zPartDemForm = re.compile("([\\w]+)-(là|ci)$") _zInterroVerb = re.compile("([\\w]+)(-(?:t-(?:ie?l|elle|on)|je|tu|ie?ls?|elles?|on|[nv]ous))$") _zImperatifVerb = re.compile("([\\w]+)(-(?:l(?:es?|a)-(?:moi|toi|lui|[nv]ous|leur)|y|en|[mts]['’ʼ‘‛´`′‵՚ꞌꞋ](?:y|en)|les?|la|[mt]oi|leur|lui))$") def setLabelsOnToken (dToken): # Token: .sType, .sValue, .nStart, .nEnd, .lMorph try: if dToken["sType"] == "PUNC" or dToken["sType"] == "SIGN": dToken["aLabels"] = [_dValues.get(dToken["sValue"], "signe de ponctuation divers")] elif dToken["sType"] == 'NUM': dToken["aLabels"] = ["nombre"] elif dToken["sType"] == 'LINK': dToken["aLabels"] = ["hyperlien"] elif dToken["sType"] == 'TAG': dToken["aLabels"] = ["étiquette (hashtag)"] elif dToken["sType"] == 'HTML': dToken["aLabels"] = ["balise HTML"] elif dToken["sType"] == 'PSEUDOHTML': dToken["aLabels"] = ["balise pseudo-HTML"] elif dToken["sType"] == 'HTMLENTITY': dToken["aLabels"] = ["entité caractère XML/HTML"] elif dToken["sType"] == 'HOUR': dToken["aLabels"] = ["heure"] elif dToken["sType"] == 'WORD_ELIDED': dToken["aLabels"] = [_dValues.get(dToken["sValue"].lower(), "préfixe élidé inconnu")] elif dToken["sType"] == 'WORD_ORDINAL': dToken["aLabels"] = ["nombre ordinal"] elif dToken["sType"] == 'FOLDERUNIX': dToken["aLabels"] = ["dossier UNIX (et dérivés)"] elif dToken["sType"] == 'FOLDERWIN': dToken["aLabels"] = ["dossier Windows"] elif dToken["sType"] == 'WORD_ACRONYM': dToken["aLabels"] = ["sigle ou acronyme"] elif dToken["sType"] == 'WORD': if "lMorph" in dToken and dToken["lMorph"]: # with morphology dToken["aLabels"] = [] for sMorph in dToken["lMorph"]: dToken["aLabels"].append(readableMorph(sMorph)) else: # no morphology, guessing if dToken["sValue"].count("-") > 4: dToken["aLabels"] = ["élément complexe indéterminé"] elif _zPartDemForm.search(dToken["sValue"]): # mots avec particules démonstratives dToken["aLabels"] = ["mot avec particule démonstrative"] elif _zImperatifVerb.search(dToken["sValue"]): # formes interrogatives dToken["aLabels"] = ["forme verbale impérative"] elif _zInterroVerb.search(dToken["sValue"]): # formes interrogatives dToken["aLabels"] = ["forme verbale interrogative"] else: dToken["aLabels"] = ["mot inconnu du dictionnaire"] if "lSubTokens" in dToken: for dSubToken in dToken["lSubTokens"]: if dSubToken["sValue"]: if dSubToken["sValue"] in _dValues: dSubToken["lMorph"] = [ "" ] dSubToken["aLabels"] = [ _dValues[dSubToken["sValue"]] ] else: dSubToken["aLabels"] = [ readableMorph(sMorph) for sMorph in dSubToken["lMorph"] ] else: dToken["aLabels"] = ["token de nature inconnue"] except: return # Other functions def filterSugg (aSugg): "exclude suggestions" return filter(lambda sSugg: not sSugg.endswith(("è", "È")), aSugg) |
Modified graphspell/spellchecker.py from [b9cca64fbd] to [0ef2e9e17a].
︙ | ︙ | |||
96 97 98 99 100 101 102 | self.bCommunityDic = False def deactivatePersonalDictionary (self): "deactivate personal dictionary" self.bPersonalDic = False | | | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | self.bCommunityDic = False def deactivatePersonalDictionary (self): "deactivate personal dictionary" self.bPersonalDic = False # Lexicographer def loadLexicographer (self, sLangCode): "load default suggestion module for <sLangCode>" try: self.lexicographer = importlib.import_module(".lexgraph_"+sLangCode, "grammalecte.graphspell") except ImportError: print("No suggestion module for language <"+sLangCode+">") |
︙ | ︙ | |||
118 119 120 121 122 123 124 | for sElem in self.lexicographer.split(sWord): if sElem: lMorph = self.getMorph(sElem) sLex = self.lexicographer.analyze(sElem) if sLex: aRes = [ (" | ".join(lMorph), sLex) ] else: | | > > > > > > > > > > > > > > > > > > > > > | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | for sElem in self.lexicographer.split(sWord): if sElem: lMorph = self.getMorph(sElem) sLex = self.lexicographer.analyze(sElem) if sLex: aRes = [ (" | ".join(lMorph), sLex) ] else: aRes = [ (sMorph, self.lexicographer.readableMorph(sMorph)) for sMorph in lMorph ] if aRes: lWordAndMorph.append((sElem, aRes)) return lWordAndMorph def readableMorph (self, sMorph): if not self.lexicographer: return "" return self.lexicographer.readableMorph(sMorph) def setLabelsOnToken (self, dToken): if not self.lexicographer: return if "lMorph" not in dToken: dToken["lMorph"] = self.getMorph(dToken["sValue"]) if dToken["sType"] == "WORD": dToken["bValidToken"] = self.isValidToken(dToken["sValue"]) sPrefix, sStem, sSuffix = self.lexicographer.split(dToken["sValue"]) if sStem != dToken["sValue"]: dToken["lSubTokens"] = [ { "sType": "WORD", "sValue": sPrefix, "lMorph": self.getMorph(sPrefix) }, { "sType": "WORD", "sValue": sStem, "lMorph": self.getMorph(sStem) }, { "sType": "WORD", "sValue": sSuffix, "lMorph": self.getMorph(sSuffix) } ] self.lexicographer.setLabelsOnToken(dToken) # Storage def activateStorage (self): "store all lemmas and morphologies retrieved from the word graph" self.bStorage = True |
︙ | ︙ | |||
231 232 233 234 235 236 237 | if sWord not in self._dLemmas: self.getMorph(sWord) return self._dLemmas[sWord] return { s[1:s.find("/")] for s in self.getMorph(sWord) } def suggest (self, sWord, nSuggLimit=10): "generator: returns 1, 2 or 3 lists of suggestions" | | | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 | if sWord not in self._dLemmas: self.getMorph(sWord) return self._dLemmas[sWord] return { s[1:s.find("/")] for s in self.getMorph(sWord) } def suggest (self, sWord, nSuggLimit=10): "generator: returns 1, 2 or 3 lists of suggestions" if self.lexicographer: if sWord in self.lexicographer.dSugg: yield self.lexicographer.dSugg[sWord].split("|") elif sWord.istitle() and sWord.lower() in self.lexicographer.dSugg: lRes = self.lexicographer.dSugg[sWord.lower()].split("|") yield list(map(lambda sSugg: sSugg[0:1].upper()+sSugg[1:], lRes)) else: yield self.oMainDic.suggest(sWord, nSuggLimit, True) |
︙ | ︙ |