Overview
Comment: | [core][build] code clarification: all functions about options in gc_options module |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | core | build |
Files: | files | file ages | folders |
SHA3-256: |
16890053dadc5884496b82c4991de2d6 |
User & Date: | olr on 2020-08-19 10:09:13 |
Original Comment: | [core] code clarification: all functions about options in gc_options module |
Other Links: | manifest | tags |
Context
2020-08-19
| ||
14:55 | [fr] ajustements check-in: 947bd905af user: olr tags: trunk, fr | |
10:09 | [core][build] code clarification: all functions about options in gc_options module check-in: 16890053da user: olr tags: trunk, core, build | |
07:25 | [fr] ajustements check-in: fd7b03dd4e user: olr tags: trunk, fr | |
Changes
Modified compile_rules_js_convert.py from [b4c7f14ca9] to [4c8c5a2dbe].
︙ | ︙ | |||
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 | #sCode = re.sub("(.+) if (.+) else (.+)", "(\\2) ? \\1 : \\3", sCode) # boolean sCode = sCode.replace("False", "false") sCode = sCode.replace("True", "true") sCode = sCode.replace("None", "null") sCode = sCode.replace("bool", "Boolean") # methods sCode = sCode.replace(".__len__()", ".length") sCode = sCode.replace(".endswith", ".endsWith") sCode = sCode.replace(".find", ".indexOf") sCode = sCode.replace(".startswith", ".startsWith") sCode = sCode.replace(".lower", ".toLowerCase") sCode = sCode.replace(".upper", ".toUpperCase") sCode = sCode.replace(".isdigit", ".gl_isDigit") sCode = sCode.replace(".isupper", ".gl_isUpperCase") sCode = sCode.replace(".islower", ".gl_isLowerCase") sCode = sCode.replace(".istitle", ".gl_isTitle") sCode = sCode.replace(".isalpha", ".gl_isAlpha") sCode = sCode.replace(".capitalize", ".gl_toCapitalize") sCode = sCode.replace(".strip", ".gl_trim") sCode = sCode.replace(".lstrip", ".gl_trimLeft") sCode = sCode.replace(".rstrip", ".gl_trimRight") sCode = sCode.replace('.replace("."', r".replace(/\./g") sCode = sCode.replace('.replace("..."', r".replace(/\.\.\./g") sCode = re.sub(r'.replace\("([^"]+)" ?,', ".replace(/\\1/g,", sCode) # regex sCode = re.sub('m\\.group\\((\\d+)\\) +in +(a[a-zA-Z]+)', "\\2.has(m[\\1])", sCode) sCode = re.sub('(lToken\\S+) +in +(a[a-zA-Z]+)', "\\2.has(\\1)", sCode) # slices sCode = sCode.replace("[:m.start()]", ".slice(0,m.index)") sCode = sCode.replace("[m.end():]", ".slice(m.end[0])") sCode = sCode.replace("[m.start():m.end()]", ".slice(m.index, m.end[0])") | > > | 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 | #sCode = re.sub("(.+) if (.+) else (.+)", "(\\2) ? \\1 : \\3", sCode) # boolean sCode = sCode.replace("False", "false") sCode = sCode.replace("True", "true") sCode = sCode.replace("None", "null") sCode = sCode.replace("bool", "Boolean") # methods sCode = sCode.replace("_oSpellChecker", "gc_engine.oSpellChecker") sCode = sCode.replace(".__len__()", ".length") sCode = sCode.replace(".endswith", ".endsWith") sCode = sCode.replace(".find", ".indexOf") sCode = sCode.replace(".startswith", ".startsWith") sCode = sCode.replace(".lower", ".toLowerCase") sCode = sCode.replace(".upper", ".toUpperCase") sCode = sCode.replace(".isdigit", ".gl_isDigit") sCode = sCode.replace(".isupper", ".gl_isUpperCase") sCode = sCode.replace(".islower", ".gl_isLowerCase") sCode = sCode.replace(".istitle", ".gl_isTitle") sCode = sCode.replace(".isalpha", ".gl_isAlpha") sCode = sCode.replace(".capitalize", ".gl_toCapitalize") sCode = sCode.replace(".strip", ".gl_trim") sCode = sCode.replace(".lstrip", ".gl_trimLeft") sCode = sCode.replace(".rstrip", ".gl_trimRight") sCode = sCode.replace('.replace("."', r".replace(/\./g") sCode = sCode.replace('.replace("..."', r".replace(/\.\.\./g") sCode = re.sub(r'.replace\("([^"]+)" ?,', ".replace(/\\1/g,", sCode) # regex sCode = re.sub('m\\.group\\((\\d+)\\) +in +(a[a-zA-Z]+)', "\\2.has(m[\\1])", sCode) sCode = re.sub('(lToken\\S+) +in +(a[a-zA-Z]+)', "\\2.has(\\1)", sCode) # slices sCode = sCode.replace("[:m.start()]", ".slice(0,m.index)") sCode = sCode.replace("[m.end():]", ".slice(m.end[0])") sCode = sCode.replace("[m.start():m.end()]", ".slice(m.index, m.end[0])") |
︙ | ︙ |
Modified gc_core/js/lang_core/gc_engine.js from [a3d26012fc] to [a87347cf36].
︙ | ︙ | |||
26 27 28 29 30 31 32 | let aNew = []; for (let i = 0; i < aArray.length; i = i + 1) { aNew[i] = aArray[i].slice(0,1).toUpperCase() + aArray[i].slice(1); } return aNew; } | < < < < < < < < < < > > > > > > > > > > | | < < < | > > | < | < < | | | | | 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 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | let aNew = []; for (let i = 0; i < aArray.length; i = i + 1) { aNew[i] = aArray[i].slice(0,1).toUpperCase() + aArray[i].slice(1); } return aNew; } function echo (x) { console.log(x); return true; } var _sAppContext = ""; var gc_engine = { //// Informations lang: "${lang}", locales: ${loc}, pkg: "${implname}", name: "${name}", version: "${version}", author: "${author}", //// Tools oSpellChecker: null, oTokenizer: null, //// Data aIgnoredRules: new Set(), oOptionsColors: null, //// Initialization load: function (sContext="JavaScript", sColorType="aRGB", sPath="") { try { _sAppContext = sContext; if (typeof(process) !== 'undefined') { var spellchecker = require("../graphspell/spellchecker.js"); this.oSpellChecker = new spellchecker.SpellChecker("${lang}", "", "${dic_main_filename_js}", "${dic_community_filename_js}", "${dic_personal_filename_js}"); } else { this.oSpellChecker = new SpellChecker("${lang}", sPath, "${dic_main_filename_js}", "${dic_community_filename_js}", "${dic_personal_filename_js}"); } this.oSpellChecker.activateStorage(); this.oTokenizer = this.oSpellChecker.getTokenizer(); gc_options.load(sContext) this.oOptionsColors = gc_options.getOptionsColors(sContext, sColorType); } catch (e) { console.error(e); } }, getSpellChecker: function () { return this.oSpellChecker; }, //// Rules getRules: function (bParagraph) { if (!bParagraph) { return gc_rules.lSentenceRules; } return gc_rules.lParagraphRules; }, ignoreRule: function (sRuleId) { this.aIgnoredRules.add(sRuleId); }, resetIgnoreRules: function () { this.aIgnoredRules.clear(); }, reactivateRule: function (sRuleId) { this.aIgnoredRules.delete(sRuleId); }, listRules: function* (sFilter=null) { // generator: returns tuple (sOption, sLineId, sRuleId) try { for (let [sOption, lRuleGroup] of this.getRules(true)) { for (let [,, sLineId, sRuleId,,] of lRuleGroup) { |
︙ | ︙ | |||
128 129 130 131 132 133 134 | console.error(e); } }, //// Options setOption: function (sOpt, bVal) { | < | < | | | | | 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 | console.error(e); } }, //// Options setOption: function (sOpt, bVal) { gc_options.setOption(sOpt, bVal); }, setOptions: function (dOpt) { gc_options.setOptions(dOpt); }, getOptions: function () { return gc_options.getOptions(); }, getDefaultOptions: function () { return gc_options.getDefaultOptions(); }, resetOptions: function () { gc_options.resetOptions(); }, //// Parsing parse: function (sText, sCountry="${country_default}", bDebug=false, dOptions=null, bContext=false, bFullInfo=false) { // init point to analyse <sText> and returns an iterable of errors or (with option <bFullInfo>) a list of sentences with tokens and errors let oText = new TextParser(sText); |
︙ | ︙ | |||
194 195 196 197 198 199 200 | s += "\n"; } return s; } parse (sCountry="${country_default}", bDebug=false, dOptions=null, bContext=false, bFullInfo=false) { // analyses <sText> and returns an iterable of errors or (with option <bFullInfo>) a list of sentences with tokens and errors | | | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 | s += "\n"; } return s; } parse (sCountry="${country_default}", bDebug=false, dOptions=null, bContext=false, bFullInfo=false) { // analyses <sText> and returns an iterable of errors or (with option <bFullInfo>) a list of sentences with tokens and errors let dOpt = dOptions || gc_options.dOptions; let bShowRuleId = option('idrule'); // parse paragraph try { this.parseText(this.sText, this.sText0, true, 0, sCountry, dOpt, bShowRuleId, bDebug, bContext); } catch (e) { console.error(e); |
︙ | ︙ | |||
217 218 219 220 221 222 223 | 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; | | | | 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 | 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.lToken = Array.from(gc_engine.oTokenizer.genTokens(this.sSentence, true)); this.dTokenPos.clear(); for (let dToken of this.lToken) { if (dToken["sType"] != "INFO") { this.dTokenPos.set(dToken["nStart"], dToken); } } if (bFullInfo) { oSentence = { "nStart": iStart, "nEnd": iEnd, "sSentence": this.sSentence, "lToken": Array.from(this.lToken) }; for (let oToken of oSentence["lToken"]) { if (oToken["sType"] == "WORD") { oToken["bValidToken"] = gc_engine.oSpellChecker.isValidToken(oToken["sValue"]); } } // the list of tokens is duplicated, to keep all tokens from being deleted when analysis } this.parseText(this.sSentence, this.sSentence0, false, iStart, sCountry, dOpt, bShowRuleId, bDebug, bContext); if (bFullInfo) { oSentence["lGrammarErrors"] = Array.from(this.dSentenceError.values()); |
︙ | ︙ | |||
298 299 300 301 302 303 304 | } sText = this.parseGraph(gc_rules_graph.dAllGraph[sGraphName], sCountry, dOptions, bShowRuleId, bDebug, bContext); } } } else if (!sOption || option(sOption)) { for (let [zRegex, bUppercase, sLineId, sRuleId, nPriority, lActions, lGroups, lNegLookBefore] of lRuleGroup) { | | | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | } sText = this.parseGraph(gc_rules_graph.dAllGraph[sGraphName], sCountry, dOptions, bShowRuleId, bDebug, bContext); } } } else if (!sOption || option(sOption)) { for (let [zRegex, bUppercase, sLineId, sRuleId, nPriority, lActions, lGroups, lNegLookBefore] of lRuleGroup) { if (!gc_engine.aIgnoredRules.has(sRuleId)) { while ((m = zRegex.gl_exec2(sText, lGroups, lNegLookBefore)) !== null) { let bCondMemo = null; for (let [sFuncCond, cActionType, sWhat, ...eAct] of lActions) { // action in lActions: [ condition, action type, replacement/suggestion/action[, iGroup[, message, URL]] ] try { bCondMemo = (!sFuncCond || oEvalFunc[sFuncCond](sText, sText0, m, this.dTokenPos, sCountry, bCondMemo)); if (bCondMemo) { |
︙ | ︙ | |||
369 370 371 372 373 374 375 | } } } update (sSentence, bDebug=false) { // update <sSentence> and retokenize this.sSentence = sSentence; | | | 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | } } } update (sSentence, bDebug=false) { // update <sSentence> and retokenize this.sSentence = sSentence; let lNewToken = Array.from(gc_engine.oTokenizer.genTokens(sSentence, true)); for (let oToken of lNewToken) { 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"]; } |
︙ | ︙ | |||
467 468 469 470 471 472 473 | } } } // analysable tokens if (oToken["sType"].slice(0,4) == "WORD") { // token lemmas if (oNode.hasOwnProperty("<lemmas>")) { | | | | 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 | } } } // analysable tokens if (oToken["sType"].slice(0,4) == "WORD") { // token lemmas if (oNode.hasOwnProperty("<lemmas>")) { for (let sLemma of gc_engine.oSpellChecker.getLemma(oToken["sValue"])) { if (oNode["<lemmas>"].hasOwnProperty(sLemma)) { if (bDebug) { console.log(" MATCH: >" + sLemma); } yield { "iToken1": iToken1, "iNode": oNode["<lemmas>"][sLemma] }; bTokenFound = true; } } } // morph arcs if (oNode.hasOwnProperty("<morph>")) { let lMorph = (oToken.hasOwnProperty("lMorph")) ? oToken["lMorph"] : gc_engine.oSpellChecker.getMorph(oToken["sValue"]); if (lMorph.length > 0) { for (let sSearch in oNode["<morph>"]) { if (!sSearch.includes("¬")) { // no anti-pattern if (lMorph.some(sMorph => (sMorph.includes(sSearch)))) { if (bDebug) { console.log(" MATCH: $" + sSearch); |
︙ | ︙ | |||
523 524 525 526 527 528 529 | } } } } } // regex morph arcs if (oNode.hasOwnProperty("<re_morph>")) { | | | 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 | } } } } } // regex morph arcs if (oNode.hasOwnProperty("<re_morph>")) { let lMorph = (oToken.hasOwnProperty("lMorph")) ? oToken["lMorph"] : gc_engine.oSpellChecker.getMorph(oToken["sValue"]); if (lMorph.length > 0) { for (let sRegex in oNode["<re_morph>"]) { if (!sRegex.includes("¬")) { // no anti-pattern if (lMorph.some(sMorph => (sMorph.search(sRegex) !== -1))) { if (bDebug) { console.log(" MATCH: @" + sRegex); |
︙ | ︙ | |||
836 837 838 839 840 841 842 | _createError (nStart, nEnd, sLineId, sRuleId, sOption, sMessage, lSugg, sURL, bContext) { let oErr = { "nStart": nStart, "nEnd": nEnd, "sLineId": sLineId, "sRuleId": sRuleId, "sType": sOption || "notype", | | | 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 | _createError (nStart, nEnd, sLineId, sRuleId, sOption, sMessage, lSugg, sURL, bContext) { let oErr = { "nStart": nStart, "nEnd": nEnd, "sLineId": sLineId, "sRuleId": sRuleId, "sType": sOption || "notype", "aColor": gc_engine.oOptionsColors[sOption], "sMessage": sMessage, "aSuggestions": lSugg, "URL": sURL } if (bContext) { oErr['sUnderlined'] = this.sText0.slice(nStart, nEnd); oErr['sBefore'] = this.sText0.slice(Math.max(0,nStart-80), nStart); |
︙ | ︙ | |||
1029 1030 1031 1032 1033 1034 1035 | }; //////// Common functions function option (sOpt) { // return true if option sOpt is active | | | 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 | }; //////// Common functions function option (sOpt) { // return true if option sOpt is active return gc_options.dOptions.gl_get(sOpt, false); } var re = { search: function (sRegex, sText) { if (sRegex.startsWith("(?i)")) { return sText.search(new RegExp(sRegex.slice(4), "i")) !== -1; } else { |
︙ | ︙ | |||
1119 1120 1121 1122 1123 1124 1125 | function displayInfo (dTokenPos, aWord) { // for debugging: info of word if (!aWord) { console.log("> nothing to find"); return true; } | | | | 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 | function displayInfo (dTokenPos, aWord) { // for debugging: info of word if (!aWord) { console.log("> nothing to find"); return true; } let lMorph = gc_engine.oSpellChecker.getMorph(aWord[1]); if (lMorph.length === 0) { console.log("> not in dictionary"); return true; } if (dTokenPos.has(aWord[0])) { console.log("DA: " + dTokenPos.get(aWord[0])); } console.log("FSA: " + lMorph); return true; } function morph (dTokenPos, aWord, sPattern, sNegPattern, bNoWord=false) { // analyse a tuple (position, word), returns true if not sNegPattern in word morphologies and sPattern in word morphologies (disambiguation on) if (!aWord) { return bNoWord; } let lMorph = (dTokenPos.has(aWord[0]) && dTokenPos.get(aWord[0]))["lMorph"] ? dTokenPos.get(aWord[0])["lMorph"] : gc_engine.oSpellChecker.getMorph(aWord[1]); if (lMorph.length === 0) { return false; } if (sNegPattern) { // check negative condition if (sNegPattern === "*") { // all morph must match sPattern |
︙ | ︙ | |||
1158 1159 1160 1161 1162 1163 1164 | } // search sPattern return lMorph.some(sMorph => (sMorph.search(sPattern) !== -1)); } function analyse (sWord, sPattern, sNegPattern) { // analyse a word, returns True if not sNegPattern in word morphologies and sPattern in word morphologies (disambiguation off) | | | 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 | } // search sPattern return lMorph.some(sMorph => (sMorph.search(sPattern) !== -1)); } function analyse (sWord, sPattern, sNegPattern) { // analyse a word, returns True if not sNegPattern in word morphologies and sPattern in word morphologies (disambiguation off) let lMorph = gc_engine.oSpellChecker.getMorph(sWord); if (lMorph.length === 0) { return false; } if (sNegPattern) { // check negative condition if (sNegPattern === "*") { // all morph must match sPattern |
︙ | ︙ | |||
1216 1217 1218 1219 1220 1221 1222 | let lMorph; if (oToken.hasOwnProperty("lMorph")) { lMorph = oToken["lMorph"]; } else { if (nLeft !== null) { let sValue = (nRight !== null) ? oToken["sValue"].slice(nLeft, nRight) : oToken["sValue"].slice(nLeft); | | | | 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 | let lMorph; if (oToken.hasOwnProperty("lMorph")) { lMorph = oToken["lMorph"]; } else { if (nLeft !== null) { let sValue = (nRight !== null) ? oToken["sValue"].slice(nLeft, nRight) : oToken["sValue"].slice(nLeft); lMorph = gc_engine.oSpellChecker.getMorph(sValue); if (bMemorizeMorph) { oToken["lMorph"] = lMorph; } } else { lMorph = gc_engine.oSpellChecker.getMorph(oToken["sValue"]); } } if (lMorph.length == 0) { return false; } // check negative condition if (sNegPattern) { |
︙ | ︙ | |||
1248 1249 1250 1251 1252 1253 1254 | } function g_analyse (oToken, sPattern, sNegPattern="", nLeft=null, nRight=null, bMemorizeMorph=true) { // analyse a token, return True if <sNegPattern> not in morphologies and <sPattern> in morphologies let lMorph; if (nLeft !== null) { let sValue = (nRight !== null) ? oToken["sValue"].slice(nLeft, nRight) : oToken["sValue"].slice(nLeft); | | | | 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 | } function g_analyse (oToken, sPattern, sNegPattern="", nLeft=null, nRight=null, bMemorizeMorph=true) { // analyse a token, return True if <sNegPattern> not in morphologies and <sPattern> in morphologies let lMorph; if (nLeft !== null) { let sValue = (nRight !== null) ? oToken["sValue"].slice(nLeft, nRight) : oToken["sValue"].slice(nLeft); lMorph = gc_engine.oSpellChecker.getMorph(sValue); if (bMemorizeMorph) { oToken["lMorph"] = lMorph; } } else { lMorph = gc_engine.oSpellChecker.getMorph(oToken["sValue"]); } if (lMorph.length == 0) { return false; } // check negative condition if (sNegPattern) { if (sNegPattern == "*") { |
︙ | ︙ | |||
1276 1277 1278 1279 1280 1281 1282 | } // search sPattern return lMorph.some(sMorph => (sMorph.search(sPattern) !== -1)); } function g_merged_analyse (oToken1, oToken2, cMerger, sPattern, sNegPattern="", bSetMorph=true) { // merge two token values, return True if <sNegPattern> not in morphologies and <sPattern> in morphologies (disambiguation off) | | | 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 | } // search sPattern return lMorph.some(sMorph => (sMorph.search(sPattern) !== -1)); } function g_merged_analyse (oToken1, oToken2, cMerger, sPattern, sNegPattern="", bSetMorph=true) { // merge two token values, return True if <sNegPattern> not in morphologies and <sPattern> in morphologies (disambiguation off) let lMorph = gc_engine.oSpellChecker.getMorph(oToken1["sValue"] + cMerger + oToken2["sValue"]); if (lMorph.length == 0) { return false; } // check negative condition if (sNegPattern) { if (sNegPattern == "*") { // all morph must match sPattern |
︙ | ︙ | |||
1360 1361 1362 1363 1364 1365 1366 | if (!sWord) { return true; } if (!dTokenPos.has(nPos)) { console.log("Error. There should be a token at this position: ", nPos); return true; } | | | 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 | if (!sWord) { return true; } if (!dTokenPos.has(nPos)) { console.log("Error. There should be a token at this position: ", nPos); return true; } let lMorph = gc_engine.oSpellChecker.getMorph(sWord); if (lMorph.length === 0 || lMorph.length === 1) { return true; } let lSelect = lMorph.filter( sMorph => sMorph.search(sPattern) !== -1 ); if (lSelect.length > 0) { if (lSelect.length != lMorph.length) { dTokenPos.get(nPos)["lMorph"] = lSelect; |
︙ | ︙ | |||
1383 1384 1385 1386 1387 1388 1389 | if (!sWord) { return true; } if (!dTokenPos.has(nPos)) { console.log("Error. There should be a token at this position: ", nPos); return true; } | | | 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 | if (!sWord) { return true; } if (!dTokenPos.has(nPos)) { console.log("Error. There should be a token at this position: ", nPos); return true; } let lMorph = gc_engine.oSpellChecker.getMorph(sWord); if (lMorph.length === 0 || lMorph.length === 1) { return true; } let lSelect = lMorph.filter( sMorph => sMorph.search(sPattern) === -1 ); if (lSelect.length > 0) { if (lSelect.length != lMorph.length) { dTokenPos.get(nPos)["lMorph"] = lSelect; |
︙ | ︙ | |||
1408 1409 1410 1411 1412 1413 1414 | } //// Disambiguation for graph rules function g_select (oToken, sPattern, lDefault=null) { // select morphologies for <oToken> according to <sPattern>, always return true | | | | | | | 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 | } //// Disambiguation for graph rules function g_select (oToken, sPattern, lDefault=null) { // select morphologies for <oToken> according to <sPattern>, always return true let lMorph = (oToken.hasOwnProperty("lMorph")) ? oToken["lMorph"] : gc_engine.oSpellChecker.getMorph(oToken["sValue"]); if (lMorph.length === 0 || lMorph.length === 1) { if (lDefault) { oToken["lMorph"] = lDefault; } return true; } let lSelect = lMorph.filter( sMorph => sMorph.search(sPattern) !== -1 ); if (lSelect.length > 0) { if (lSelect.length != lMorph.length) { oToken["lMorph"] = lSelect; } } else if (lDefault) { oToken["lMorph"] = lDefault; } return true; } function g_exclude (oToken, sPattern, lDefault=null) { // select morphologies for <oToken> according to <sPattern>, always return true let lMorph = (oToken.hasOwnProperty("lMorph")) ? oToken["lMorph"] : gc_engine.oSpellChecker.getMorph(oToken["sValue"]); if (lMorph.length === 0 || lMorph.length === 1) { if (lDefault) { oToken["lMorph"] = lDefault; } return true; } let lSelect = lMorph.filter( sMorph => sMorph.search(sPattern) === -1 ); if (lSelect.length > 0) { if (lSelect.length != lMorph.length) { oToken["lMorph"] = lSelect; } } else if (lDefault) { oToken["lMorph"] = lDefault; } return true; } function g_add_morph (oToken, sNewMorph) { // Disambiguation: add a morphology to a token let lMorph = (oToken.hasOwnProperty("lMorph")) ? oToken["lMorph"] : gc_engine.oSpellChecker.getMorph(oToken["sValue"]); lMorph.push(...sNewMorph.split("|")); oToken["lMorph"] = lMorph; return true; } function g_rewrite (oToken, sToReplace, sReplace) { // Disambiguation: rewrite morphologies let lMorph = (oToken.hasOwnProperty("lMorph")) ? oToken["lMorph"] : gc_engine.oSpellChecker.getMorph(oToken["sValue"]); oToken["lMorph"] = lMorph.map(s => s.replace(sToReplace, sReplace)); return true; } function g_define (oToken, sMorphs) { // set morphologies of <oToken>, always return true oToken["lMorph"] = sMorphs.split("|"); return true; } function g_define_from (oToken, nLeft=null, nRight=null) { let sValue = oToken["sValue"]; if (nLeft !== null) { sValue = (nRight !== null) ? sValue.slice(nLeft, nRight) : sValue.slice(nLeft); } oToken["lMorph"] = gc_engine.oSpellChecker.getMorph(sValue); return true; } function g_change_meta (oToken, sType) { // Disambiguation: change type of token oToken["sType"] = sType; return true; |
︙ | ︙ |
Modified gc_core/js/lang_core/gc_options.js from [ece26d7264] to [e4cf4d05b7].
|
| | > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > | > > > > > > > | | | | | | | | | | | | > > > > > > > | | | | 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 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | // Grammar checker options manager /* jshint esversion:6 */ /* jslint esversion:6 */ /* global exports */ ${map} var gc_options = { dOptions: new Map(), sAppContext: "JavaScript", load: function (sContext="JavaScript") { this.sAppContext = sContext; this.dOptions = this.getDefaultOptions(sContext); }, setOption: function (sOpt, bVal) { if (this.dOptions.has(sOpt)) { this.dOptions.set(sOpt, bVal); } }, setOptions: function (dOpt) { this.dOptions.gl_updateOnlyExistingKeys(dOpt); }, getOptions: function () { return this.dOptions.gl_shallowCopy(); }, resetOptions: function () { this.dOptions = this.getDefaultOptions(this._sAppContext); }, getDefaultOptions: function (sContext="") { if (!sContext) { sContext = this.sAppContext; } if (this.oDefaultOpt.hasOwnProperty(sContext)) { return this.oDefaultOpt[sContext].gl_shallowCopy(); } return this.oDefaultOpt["JavaScript"].gl_shallowCopy(); }, getOptionLabels: function (sLang="${sLang}") { if (this.oOptLabel.hasOwnProperty(sLang)) { return this.oOptLabel[sLang]; } return this.oOptLabel["{$sLang}"]; }, getOptionsColors: function (sTheme="Default", sColorType="aRGB") { let oOptColor = (this.oOptColor.hasOwnProperty(sTheme)) ? this.oOptColor[sTheme] : this.oOptColor["Default"]; let oColorType = (this.oColorType.hasOwnProperty(sColorType)) ? this.oColorType[sColorType] : this.oColorType["aRGB"]; let oColor = {}; try { for (let [sOpt, sColor] of Object.entries(oOptColor)) { oColor[sOpt] = oColorType[sColor]; } return oColor; } catch (e) { console.error(e); return {}; } }, lStructOpt: ${lStructOpt}, oDefaultOpt: { "JavaScript": new Map (${dOptJavaScript}), "Firefox": new Map (${dOptFirefox}), "Thunderbird": new Map (${dOptThunderbird}), }, oColorType: ${dColorType}, oOptColor: ${dOptColor}, oOptLabel: ${dOptLabel} }; if (typeof(exports) !== 'undefined') { exports.dOptions = gc_options.dOptions; exports.sAppContext = gc_options.sAppContext; exports.load = gc_options.load; exports.setOption = gc_options.setOption; exports.setOptions = gc_options.setOptions; exports.resetOptions = gc_options.resetOptions; exports.getDefaultOptions = gc_options.getDefaultOptions; exports.getOptions = gc_options.getOptions; exports.getOptionsColors = gc_options.getOptionsColors; exports.lStructOpt = gc_options.lStructOpt; exports.oDefaultOpt = gc_options.oDefaultOpt; exports.dColorType = gc_options.dColorType; exports.oOptColor = gc_options.oOptColor; exports.oOptLabel = gc_options.oOptLabel; } |
Modified gc_core/py/lang_core/gc_engine.py from [d52fc21265] to [8f5c1e4716].
︙ | ︙ | |||
41 42 43 44 45 46 47 | version = "${version}" author = "${author}" # Modules _rules = None # module gc_rules _rules_graph = None # module gc_rules_graph | | < < < > > > > < > > > | < < < | 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 74 75 76 77 78 79 80 81 82 83 | version = "${version}" author = "${author}" # Modules _rules = None # module gc_rules _rules_graph = None # module gc_rules_graph # Tools _oSpellChecker = None _oTokenizer = None # Data _sAppContext = "" # what software is running _aIgnoredRules = set() # Writer underlining style _dOptionsColors = None _bMulticolor = True _nUnderliningStyle = 0 #### Initialization def load (sContext="Python", sColorType="aRGB"): "initialization of the grammar checker" global _oSpellChecker global _sAppContext global _dOptionsColors global _oTokenizer try: _sAppContext = sContext _oSpellChecker = SpellChecker("${lang}", "${dic_main_filename_py}", "${dic_community_filename_py}", "${dic_personal_filename_py}") _oSpellChecker.activateStorage() _oTokenizer = _oSpellChecker.getTokenizer() gc_options.load(sContext) _dOptionsColors = gc_options.getOptionsColors(sContext, sColorType) except: traceback.print_exc() def getSpellChecker (): "return the spellchecker object" return _oSpellChecker |
︙ | ︙ | |||
154 155 156 157 158 159 160 | def displayRules (sFilter=None): "display the name of rules, with the filter <sFilter>" echo("List of rules. Filter: << " + str(sFilter) + " >>") for sOption, sLineId, sRuleId, sType in listRules(sFilter): echo("{:<8} {:<10} {:<10} {}".format(sOption, sLineId, sRuleId, sType)) | | | < < | < | | | | | | < < | < | 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 201 202 | def displayRules (sFilter=None): "display the name of rules, with the filter <sFilter>" echo("List of rules. Filter: << " + str(sFilter) + " >>") for sOption, sLineId, sRuleId, sType in listRules(sFilter): echo("{:<8} {:<10} {:<10} {}".format(sOption, sLineId, sRuleId, sType)) #### Options (just calls to gc_options, to keep for compatibility) def setOption (sOpt, bVal): "set option <sOpt> with <bVal> if it exists" gc_options.setOption(sOpt, bVal) def setOptions (dOpt): "update the dictionary of options with <dOpt>" gc_options.setOptions(dOpt) def getOptions (): "return the dictionary of current options" return gc_options.getOptions() def getDefaultOptions (): "return the dictionary of default options" return gc_options.getDefaultOptions() def getOptionsLabels (sLang="${lang}"): "return options labels" return gc_options.getOptionLabels(sLang) def displayOptions (sLang="${lang}"): "print options" gc_options.displayOptions(sLang) def resetOptions (): "set options to default values" gc_options.resetOptions() def setWriterUnderliningStyle (sStyle="BOLDWAVE", bMulticolor=True): "set underlining style for Writer (WAVE, BOLDWAVE, BOLD)" global _nUnderliningStyle global _bMulticolor # https://api.libreoffice.org/docs/idl/ref/FontUnderline_8idl.html |
︙ | ︙ | |||
260 261 262 263 264 265 266 | #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) | | | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | #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 = option('idrule') # parse paragraph try: self.parseText(self.sText, self.sText0, True, 0, sCountry, dOpt, bShowRuleId, bDebug, bContext) except: raise if bFullInfo: |
︙ | ︙ | |||
879 880 881 882 883 884 885 | self.lToken = lNewToken #### common functions def option (sOpt): "return True if option <sOpt> is active" | | | 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 | self.lToken = lNewToken #### common functions def option (sOpt): "return True if option <sOpt> is active" return gc_options.dOptions.get(sOpt, False) #### Functions to get text outside pattern scope # warning: check compile_rules.py to understand how it works _zNextWord = re.compile(r" +(\w[\w-]*)") |
︙ | ︙ |
Modified gc_core/py/lang_core/gc_options.py from [b668596de4] to [cafc10d4fb].
1 | """ | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > | | > > | | | | | | 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 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | """ Grammar checker options manager """ # generated code, do not edit # template: <gc_core/py/lang_core/gc_options.py> # variables generated in <compile_rules.py> import traceback dOptions = {} _sAppContext = "Python" def load (sContext="Python"): global dOptions global _sAppContext _sAppContext = sContext dOptions = getDefaultOptions(sContext) def setOption (sOpt, bVal): "set option <sOpt> with <bVal> if it exists" if sOpt in dOptions: dOptions[sOpt] = bVal def setOptions (dOpt): "update the dictionary of options with <dOpt>, only known options are updated" for sKey, bVal in dOpt.items(): if sKey in dOptions: dOptions[sKey] = bVal def getOptions (): "return a copy of options as dictionary" return dOptions.copy() def resetOptions (): "set options to default values" global dOptions dOptions = getDefaultOptions() def displayOptions (sLang="${lang}"): "display the list of grammar checking options" print("Options:") print("\n".join( [ k+":\t"+str(v)+"\t"+getOptionLabels(sLang).get(k, ("?", ""))[0] for k, v in sorted(dOptions.items()) ] )) print("") def getOptionLabels (sLang="${sLang}"): "returns dictionary of UI labels" if sLang in _dOptLabel: return _dOptLabel[sLang] return _dOptLabel["${sLang}"] def getDefaultOptions (sContext=""): "returns dictionary of options" if not sContext: sContext = _sAppContext if sContext in _dDefaultOpt: return _dDefaultOpt[sContext].copy() # duplication necessary, to be able to reset to default return _dDefaultOpt["Python"].copy() # duplication necessary, to be able to reset to default def getOptionsColors (sTheme="Default", sColorType="aRGB"): "returns dictionary of options colors" dOptColor = _dOptColor[sTheme] if sTheme in _dOptColor else _dOptColor["Default"] dColorType = _dColorType[sColorType] if sColorType in _dColorType else _dColorType["aRGB"] try: return { sOpt: dColorType[sColor] for sOpt, sColor in dOptColor.items() } except KeyError: traceback.print_exc() return {} lStructOpt = ${lStructOpt} _dDefaultOpt = { "Python": ${dOptPython}, "Server": ${dOptServer}, "Writer": ${dOptWriter} } _dColorType= ${dColorType} |
︙ | ︙ |
Modified gc_core/py/oxt/Options.py from [3ed542ae4e] to [58669fce13].
︙ | ︙ | |||
19 20 21 22 23 24 25 | def loadOptions (sLang): "load options from Grammalecte and change them according to LibreOffice settings, returns a dictionary {option_name: boolean}" try: xNode = helpers.getConfigSetting("/org.openoffice.Lightproof_${implname}/Leaves", False) xChild = xNode.getByName(sLang) | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | def loadOptions (sLang): "load options from Grammalecte and change them according to LibreOffice settings, returns a dictionary {option_name: boolean}" try: xNode = helpers.getConfigSetting("/org.openoffice.Lightproof_${implname}/Leaves", False) xChild = xNode.getByName(sLang) dOpt = gce.gc_options.getOptions() for sKey in dOpt: sValue = xChild.getPropertyValue(sKey) if sValue != '': dOpt[sKey] = bool(int(sValue)) return dOpt except: print("# Error. Unable to load options of language:", sLang) |
︙ | ︙ | |||
68 69 70 71 72 73 74 | setattr(xWidget, k, w) self.xDialog.insertByName(name, xWidget) return xWidget def run (self, sUI): try: dUI = op_strings.getUI(sUI) | | | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | setattr(xWidget, k, w) self.xDialog.insertByName(name, xWidget) return xWidget def run (self, sUI): try: dUI = op_strings.getUI(sUI) dOptionUI = gce.gc_options.getOptionLabels(sUI) # fonts xFDTitle = uno.createUnoStruct("com.sun.star.awt.FontDescriptor") xFDTitle.Height = 9 xFDTitle.Weight = uno.getConstantByName("com.sun.star.awt.FontWeight.BOLD") xFDTitle.Name = "Verdana" |
︙ | ︙ |
Modified gc_lang/fr/modules-js/gce_analyseur.js from [1fc6f58e07] to [ec9bd24475].
︙ | ︙ | |||
14 15 16 17 18 19 20 | } } return g_morph(oToken, sPattern, sNegPattern, 0, nEnd, false); } function apposition (sWord1, sWord2) { // returns true if nom + nom (no agreement required) | | | | | | | 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 | } } return g_morph(oToken, sPattern, sNegPattern, 0, nEnd, false); } function apposition (sWord1, sWord2) { // returns true if nom + nom (no agreement required) return sWord2.length < 2 || (cregex.mbNomNotAdj(gc_engine.oSpellChecker.getMorph(sWord2)) && cregex.mbPpasNomNotAdj(gc_engine.oSpellChecker.getMorph(sWord1))); } function g_checkAgreement (oToken1, oToken2, bNotOnlyNames=true) { // check agreement between <oToken1> and <oToken2> let lMorph1 = oToken1.hasOwnProperty("lMorph") ? oToken1["lMorph"] : gc_engine.oSpellChecker.getMorph(oToken1["sValue"]); if (lMorph1.length === 0) { return true; } let lMorph2 = oToken2.hasOwnProperty("lMorph") ? oToken2["lMorph"] : gc_engine.oSpellChecker.getMorph(oToken2["sValue"]); if (lMorph2.length === 0) { return true; } if (bNotOnlyNames && !(cregex.mbAdj(lMorph2) || cregex.mbAdjNb(lMorph1))) { return false; } return cregex.checkAgreement(lMorph1, lMorph2); } function mbUnit (s) { if (/[µ\/⁰¹²³⁴⁵⁶⁷⁸⁹Ωℓ·]/.test(s)) { return true; } if (s.length > 1 && s.length < 16 && s.slice(0, 1).gl_isLowerCase() && (!s.slice(1).gl_isLowerCase() || /[0-9]/.test(s))) { return true; } return false; } function queryNamesPOS (sWord1, sWord2) { let lMorph1 = gc_engine.oSpellChecker.getMorph(sWord1); let lMorph2 = gc_engine.oSpellChecker.getMorph(sWord2); if (lMorph1.length == 0 || lMorph2.length == 0) { return ":N:e:p"; } let sGender1 = cregex.getGender(lMorph1); let sGender2 = cregex.getGender(lMorph2); if (sGender1 == ":m" || sGender2 == ":m") { return ":N:m:p"; } if (sGender1 == ":f" || sGender2 == ":f") { return ":N:f:p"; } return ":N:e:p"; } |
Modified gc_lang/fr/modules-js/gce_suggestions.js from [54549da722] to [0b731f6b4f].
︙ | ︙ | |||
32 33 34 35 36 37 38 | function suggVerb (sFlex, sWho, funcSugg2=null, bVC=false) { let sSfx; if (bVC) { [sFlex, sSfx] = splitVerb(sFlex); } let aSugg = new Set(); | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | function suggVerb (sFlex, sWho, funcSugg2=null, bVC=false) { let sSfx; if (bVC) { [sFlex, sSfx] = splitVerb(sFlex); } let aSugg = new Set(); for (let sStem of gc_engine.oSpellChecker.getLemma(sFlex)) { let tTags = conj._getTags(sStem); if (tTags) { // we get the tense let aTense = new Set(); for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { let m; let zVerb = new RegExp (">"+sStem+"/.*?(:(?:Y|I[pqsf]|S[pq]|K|P|Q))", "g"); while ((m = zVerb.exec(sMorph)) !== null) { // stem must be used in regex to prevent confusion between different verbs (e.g. sauras has 2 stems: savoir and saurer) if (m) { if (m[1] === ":Y" || m[1] == ":Q") { aTense.add(":Ip"); |
︙ | ︙ | |||
82 83 84 85 86 87 88 | return Array.from(aSugg).join("|"); } return ""; } function suggVerbPpas (sFlex, sWhat=null) { let aSugg = new Set(); | | | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | return Array.from(aSugg).join("|"); } return ""; } function suggVerbPpas (sFlex, sWhat=null) { let aSugg = new Set(); for (let sStem of gc_engine.oSpellChecker.getLemma(sFlex)) { let tTags = conj._getTags(sStem); if (tTags) { if (!sWhat) { aSugg.add(conj._getConjWithTags(sStem, tTags, ":PQ", ":Q1")); aSugg.add(conj._getConjWithTags(sStem, tTags, ":PQ", ":Q2")); aSugg.add(conj._getConjWithTags(sStem, tTags, ":PQ", ":Q3")); aSugg.add(conj._getConjWithTags(sStem, tTags, ":PQ", ":Q4")); |
︙ | ︙ | |||
132 133 134 135 136 137 138 | return Array.from(aSugg).join("|"); } return ""; } function suggVerbTense (sFlex, sTense, sWho) { let aSugg = new Set(); | | | | 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 | return Array.from(aSugg).join("|"); } return ""; } function suggVerbTense (sFlex, sTense, sWho) { let aSugg = new Set(); for (let sStem of gc_engine.oSpellChecker.getLemma(sFlex)) { if (conj.hasConj(sStem, sTense, sWho)) { aSugg.add(conj.getConj(sStem, sTense, sWho)); } } if (aSugg.size > 0) { return Array.from(aSugg).join("|"); } return ""; } function suggVerbImpe (sFlex, bVC=false) { let sSfx; if (bVC) { [sFlex, sSfx] = splitVerb(sFlex); } let aSugg = new Set(); for (let sStem of gc_engine.oSpellChecker.getLemma(sFlex)) { let tTags = conj._getTags(sStem); if (tTags) { if (conj._hasConjWithTags(tTags, ":E", ":2s")) { aSugg.add(conj._getConjWithTags(sStem, tTags, ":E", ":2s")); } if (conj._hasConjWithTags(tTags, ":E", ":1p")) { aSugg.add(conj._getConjWithTags(sStem, tTags, ":E", ":1p")); |
︙ | ︙ | |||
173 174 175 176 177 178 179 | } return Array.from(aSugg).join("|"); } return ""; } function suggVerbInfi (sFlex) { | | | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | } return Array.from(aSugg).join("|"); } return ""; } function suggVerbInfi (sFlex) { return gc_engine.oSpellChecker.getLemma(sFlex).filter(sStem => conj.isVerb(sStem)).join("|"); } const _dQuiEst = new Map ([ ["je", ":1s"], ["j’", ":1s"], ["j’en", ":1s"], ["j’y", ":1s"], ["tu", ":2s"], ["il", ":3s"], ["on", ":3s"], ["elle", ":3s"], ["nous", ":1p"], ["vous", ":2p"], ["ils", ":3p"], ["elles", ":3p"] |
︙ | ︙ | |||
204 205 206 207 208 209 210 | if (!sWho) { if (sSuj[0].gl_isLowerCase()) { // pas un pronom, ni un nom propre return ""; } sWho = ":3s"; } let aSugg = new Set(); | | | | | | | | | | | | | | | | | | 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 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 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 | if (!sWho) { if (sSuj[0].gl_isLowerCase()) { // pas un pronom, ni un nom propre return ""; } sWho = ":3s"; } let aSugg = new Set(); for (let sStem of gc_engine.oSpellChecker.getLemma(sFlex)) { let tTags = conj._getTags(sStem); if (tTags) { for (let sTense of lMode) { if (conj._hasConjWithTags(tTags, sTense, sWho)) { aSugg.add(conj._getConjWithTags(sStem, tTags, sTense, sWho)); } } } } if (aSugg.size > 0) { return Array.from(aSugg).join("|"); } return ""; } //// Nouns and adjectives function suggPlur (sFlex, sWordToAgree=null, bSelfSugg=false) { // returns plural forms assuming sFlex is singular if (sWordToAgree) { let lMorph = gc_engine.oSpellChecker.getMorph(sWordToAgree); if (lMorph.length === 0) { return ""; } let sGender = cregex.getGender(lMorph); if (sGender == ":m") { return suggMasPlur(sFlex); } else if (sGender == ":f") { return suggFemPlur(sFlex); } } let aSugg = new Set(); if (sFlex.endsWith("l")) { if (sFlex.endsWith("al") && sFlex.length > 2 && gc_engine.oSpellChecker.isValid(sFlex.slice(0,-1)+"ux")) { aSugg.add(sFlex.slice(0,-1)+"ux"); } if (sFlex.endsWith("ail") && sFlex.length > 3 && gc_engine.oSpellChecker.isValid(sFlex.slice(0,-2)+"ux")) { aSugg.add(sFlex.slice(0,-2)+"ux"); } } if (sFlex.endsWith("L")) { if (sFlex.endsWith("AL") && sFlex.length > 2 && gc_engine.oSpellChecker.isValid(sFlex.slice(0,-1)+"UX")) { aSugg.add(sFlex.slice(0,-1)+"UX"); } if (sFlex.endsWith("AIL") && sFlex.length > 3 && gc_engine.oSpellChecker.isValid(sFlex.slice(0,-2)+"UX")) { aSugg.add(sFlex.slice(0,-2)+"UX"); } } if (sFlex.slice(-1).gl_isLowerCase()) { if (gc_engine.oSpellChecker.isValid(sFlex+"s")) { aSugg.add(sFlex+"s"); } if (gc_engine.oSpellChecker.isValid(sFlex+"x")) { aSugg.add(sFlex+"x"); } } else { if (gc_engine.oSpellChecker.isValid(sFlex+"S")) { aSugg.add(sFlex+"s"); } if (gc_engine.oSpellChecker.isValid(sFlex+"X")) { aSugg.add(sFlex+"x"); } } if (mfsp.hasMiscPlural(sFlex)) { mfsp.getMiscPlural(sFlex).forEach(function(x) { aSugg.add(x); }); } if (aSugg.size == 0 && bSelfSugg && (sFlex.endsWith("s") || sFlex.endsWith("x") || sFlex.endsWith("S") || sFlex.endsWith("X"))) { aSugg.add(sFlex); } aSugg.delete(""); if (aSugg.size > 0) { return Array.from(aSugg).join("|"); } return ""; } function suggSing (sFlex, bSelfSugg=false) { // returns singular forms assuming sFlex is plural let aSugg = new Set(); if (sFlex.endsWith("ux")) { if (gc_engine.oSpellChecker.isValid(sFlex.slice(0,-2)+"l")) { aSugg.add(sFlex.slice(0,-2)+"l"); } if (gc_engine.oSpellChecker.isValid(sFlex.slice(0,-2)+"il")) { aSugg.add(sFlex.slice(0,-2)+"il"); } } if (sFlex.endsWith("UX")) { if (gc_engine.oSpellChecker.isValid(sFlex.slice(0,-2)+"L")) { aSugg.add(sFlex.slice(0,-2)+"L"); } if (gc_engine.oSpellChecker.isValid(sFlex.slice(0,-2)+"IL")) { aSugg.add(sFlex.slice(0,-2)+"IL"); } } if ((sFlex.endsWith("s") || sFlex.endsWith("x") || sFlex.endsWith("S") || sFlex.endsWith("X")) && gc_engine.oSpellChecker.isValid(sFlex.slice(0,-1))) { aSugg.add(sFlex.slice(0,-1)); } if (bSelfSugg && aSugg.size == 0) { aSugg.add(sFlex); } aSugg.delete(""); if (aSugg.size > 0) { return Array.from(aSugg).join("|"); } return ""; } function suggMasSing (sFlex, bSuggSimil=false) { // returns masculine singular forms let aSugg = new Set(); for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { if (!sMorph.includes(":V")) { // not a verb if (sMorph.includes(":m") || sMorph.includes(":e")) { aSugg.add(suggSing(sFlex)); } else { let sStem = cregex.getLemmaOfMorph(sMorph); if (mfsp.isMasForm(sStem)) { |
︙ | ︙ | |||
352 353 354 355 356 357 358 | } return ""; } function suggMasPlur (sFlex, bSuggSimil=false) { // returns masculine plural forms let aSugg = new Set(); | | | 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | } return ""; } function suggMasPlur (sFlex, bSuggSimil=false) { // returns masculine plural forms let aSugg = new Set(); for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { if (!sMorph.includes(":V")) { // not a verb if (sMorph.includes(":m") || sMorph.includes(":e")) { aSugg.add(suggPlur(sFlex)); } else { let sStem = cregex.getLemmaOfMorph(sMorph); if (mfsp.isMasForm(sStem)) { |
︙ | ︙ | |||
393 394 395 396 397 398 399 | return ""; } function suggFemSing (sFlex, bSuggSimil=false) { // returns feminine singular forms let aSugg = new Set(); | | | 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 | return ""; } function suggFemSing (sFlex, bSuggSimil=false) { // returns feminine singular forms let aSugg = new Set(); for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { if (!sMorph.includes(":V")) { // not a verb if (sMorph.includes(":f") || sMorph.includes(":e")) { aSugg.add(suggSing(sFlex)); } else { let sStem = cregex.getLemmaOfMorph(sMorph); if (mfsp.isMasForm(sStem)) { |
︙ | ︙ | |||
427 428 429 430 431 432 433 | } return ""; } function suggFemPlur (sFlex, bSuggSimil=false) { // returns feminine plural forms let aSugg = new Set(); | | | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 | } return ""; } function suggFemPlur (sFlex, bSuggSimil=false) { // returns feminine plural forms let aSugg = new Set(); for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { if (!sMorph.includes(":V")) { // not a verb if (sMorph.includes(":f") || sMorph.includes(":e")) { aSugg.add(suggPlur(sFlex)); } else { let sStem = cregex.getLemmaOfMorph(sMorph); if (mfsp.isMasForm(sStem)) { |
︙ | ︙ | |||
459 460 461 462 463 464 465 | if (aSugg.size > 0) { return Array.from(aSugg).join("|"); } return ""; } function hasFemForm (sFlex) { | | | | | | | | 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 | if (aSugg.size > 0) { return Array.from(aSugg).join("|"); } return ""; } function hasFemForm (sFlex) { for (let sStem of gc_engine.oSpellChecker.getLemma(sFlex)) { if (mfsp.isMasForm(sStem) || conj.hasConj(sStem, ":PQ", ":Q3")) { return true; } } if (phonet.hasSimil(sFlex, ":f")) { return true; } return false; } function hasMasForm (sFlex) { for (let sStem of gc_engine.oSpellChecker.getLemma(sFlex)) { if (mfsp.isMasForm(sStem) || conj.hasConj(sStem, ":PQ", ":Q1")) { // what has a feminine form also has a masculine form return true; } } if (phonet.hasSimil(sFlex, ":m")) { return true; } return false; } function switchGender (sFlex, bPlur=null) { let aSugg = new Set(); if (bPlur === null) { for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { if (sMorph.includes(":f")) { if (sMorph.includes(":s")) { aSugg.add(suggMasSing(sFlex)); } else if (sMorph.includes(":p")) { aSugg.add(suggMasPlur(sFlex)); } } else if (sMorph.includes(":m")) { if (sMorph.includes(":s")) { aSugg.add(suggFemSing(sFlex)); } else if (sMorph.includes(":p")) { aSugg.add(suggFemPlur(sFlex)); } else { aSugg.add(suggFemSing(sFlex)); aSugg.add(suggFemPlur(sFlex)); } } } } else if (bPlur) { for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { if (sMorph.includes(":f")) { aSugg.add(suggMasPlur(sFlex)); } else if (sMorph.includes(":m")) { aSugg.add(suggFemPlur(sFlex)); } } } else { for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { if (sMorph.includes(":f")) { aSugg.add(suggMasSing(sFlex)); } else if (sMorph.includes(":m")) { aSugg.add(suggFemSing(sFlex)); } } } if (aSugg.size > 0) { return Array.from(aSugg).join("|"); } return ""; } function switchPlural (sFlex) { let aSugg = new Set(); for (let sMorph of gc_engine.oSpellChecker.getMorph(sFlex)) { if (sMorph.includes(":s")) { aSugg.add(suggPlur(sFlex)); } else if (sMorph.includes(":p")) { aSugg.add(suggSing(sFlex)); } } if (aSugg.size > 0) { |
︙ | ︙ | |||
554 555 556 557 558 559 560 | // return list of words phonetically similar to sWord and whom POS is matching sPattern let sSfx; if (bVC) { [sWord, sSfx] = splitVerb(sWord); } let aSugg = phonet.selectSimil(sWord, sPattern); if (aSugg.size === 0 || !bSubst) { | | | 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 | // return list of words phonetically similar to sWord and whom POS is matching sPattern let sSfx; if (bVC) { [sWord, sSfx] = splitVerb(sWord); } let aSugg = phonet.selectSimil(sWord, sPattern); if (aSugg.size === 0 || !bSubst) { for (let sMorph of gc_engine.oSpellChecker.getMorph(sWord)) { for (let e of conj.getSimil(sWord, sMorph, bSubst)) { aSugg.add(e); } } } if (aSugg.size > 0) { if (bVC) { |
︙ | ︙ | |||
580 581 582 583 584 585 586 | if (sWord[0] == "h" || sWord[0] == "H") { return "ce|cet"; } return "ce"; } function suggLesLa (sWord) { | | | 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 | if (sWord[0] == "h" || sWord[0] == "H") { return "ce|cet"; } return "ce"; } function suggLesLa (sWord) { if (gc_engine.oSpellChecker.getMorph(sWord).some(s => s.includes(":p"))) { return "les|la"; } return "la"; } function formatNumber (sNumber) { let nLen = sNumber.length; |
︙ | ︙ |