Changes In Branch webext2 Through [ec97664b24] Excluding Merge-Ins
This is equivalent to a diff from 6af1e457f4 to ec97664b24
|
2017-08-03
| ||
| 10:04 | [core][js] ibdawg initialization check-in: 3d1c080fa8 user: olr tags: core, webext2 | |
| 09:10 | [core][js] default properties in conj, phonet and mfsp + export all properties of mfsp check-in: ec97664b24 user: olr tags: core, webext2 | |
| 09:06 | [core][js] phonet initialization check-in: 1d14af8272 user: olr tags: core, webext2 | |
|
2017-08-01
| ||
| 09:50 | [core][py] variable renaming check-in: 1b98af1338 user: olr tags: trunk, core | |
|
2017-07-31
| ||
| 15:31 | [core][js] helpers as object check-in: 1140b979f8 user: olr tags: core, webext2 | |
| 07:52 | [core][js] text: remove useless functions check-in: 6af1e457f4 user: olr tags: trunk, core | |
| 07:44 | [core][js][fr] JavaScript sucks: avoid weird and unpredictable behavior, infinite loop and similar crazyness -> stable number of groups in regex check-in: 20ec5b88a4 user: olr tags: trunk, core, warning | |
Modified gc_core/js/helpers.js from [da0905c944] to [a78485e9a7].
1 2 3 4 5 6 7 8 9 | // HELPERS "use strict"; // In Firefox, there is no console.log in PromiseWorker, but there is worker.log. // In Thunderbird, you can’t access to console directly. So it’s required to pass a log function. let funcOutput = null; | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | | | | < | | | | | | | | | | | | | | | < | | | | | | | | | | | | | | | | | > | | | | | | | | 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 |
// HELPERS
"use strict";
// In Firefox, there is no console.log in PromiseWorker, but there is worker.log.
// In Thunderbird, you can’t access to console directly. So it’s required to pass a log function.
let funcOutput = null;
var helpers = {
setLogOutput: function (func) {
funcOutput = func;
},
echo: function (obj) {
if (funcOutput !== null) {
funcOutput(obj);
} else {
console.log(obj);
}
return true;
},
logerror: function (e, bStack=false) {
let sMsg = "\n" + e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message;
if (bStack) {
sMsg += "\n--- Stack ---\n" + e.stack;
}
if (funcOutput !== null) {
funcOutput(sMsg);
} else {
console.error(sMsg);
}
},
inspect: function (o) {
let sMsg = "__inspect__: " + typeof o;
for (let sParam in o) {
sMsg += "\n" + sParam + ": " + o.sParam;
}
sMsg += "\n" + JSON.stringify(o) + "\n__end__";
this.echo(sMsg);
},
loadFile: function (spf) {
// load ressources in workers (suggested by Mozilla extensions reviewers)
// for more options have a look here: https://gist.github.com/Noitidart/ec1e6b9a593ec7e3efed
// if not in workers, use sdk/data.load() instead
try {
let xRequest;
if (typeof XMLHttpRequest !== "undefined") {
xRequest = new XMLHttpRequest();
} else {
// JS bullshit again… necessary for Thunderbird
let { Cc, Ci } = require("chrome");
xRequest = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
xRequest.QueryInterface(Ci.nsIXMLHttpRequest);
}
xRequest.open('GET', spf, false); // 3rd arg is false for synchronous, sync is acceptable in workers
xRequest.send();
return xRequest.responseText;
}
catch (e) {
this.logerror(e);
return null
}
},
// conversions
objectToMap: function (obj) {
let m = new Map();
for (let param in obj) {
//console.log(param + " " + obj[param]);
m.set(param, obj[param]);
}
return m;
},
mapToObject: function (m) {
let obj = {};
for (let [k, v] of m) {
obj[k] = v;
}
return obj;
}
}
if (typeof(exports) !== 'undefined') {
exports.setLogOutput = helpers.setLogOutput;
exports.echo = helpers.echo;
exports.logerror = helpers.logerror;
exports.inspect = helpers.inspect;
exports.loadFile = helpers.loadFile;
exports.objectToMap = helpers.objectToMap;
exports.mapToObject = helpers.mapToObject;
}
|
Modified gc_core/js/ibdawg.js from [e748c8288e] to [81ed21aafb].
1 2 3 4 | //// IBDAWG "use strict"; | > > | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 |
//// IBDAWG
"use strict";
if (typeof(exports) !== 'undefined') {
var str_transform = require("resource://grammalecte/str_transform.js");
var helpers = require("resource://grammalecte/helpers.js");
}
// String
// Don’t remove. Necessary in TB.
${string}
|
| ︙ | ︙ | |||
37 38 39 40 41 42 43 |
throw RangeError("# Error. Unknown dictionary version: " + this.nVersion);
}
this.dChar = helpers.objectToMap(this.dChar);
//this.byDic = new Uint8Array(this.byDic); // not quicker, even slower
if (this.cStemming == "S") {
| | | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
throw RangeError("# Error. Unknown dictionary version: " + this.nVersion);
}
this.dChar = helpers.objectToMap(this.dChar);
//this.byDic = new Uint8Array(this.byDic); // not quicker, even slower
if (this.cStemming == "S") {
this.funcStemming = str_transform.getStemFromSuffixCode;
} else if (this.cStemming == "A") {
this.funcStemming = str_transform.getStemFromAffixCode;
} else {
this.funcStemming = str_transform.noStemming;
}
// Configuring DAWG functions according to nVersion
switch (this.nVersion) {
case 1:
this.morph = this._morph1;
this.stem = this._stem1;
|
| ︙ | ︙ |
Modified gc_core/js/lang_core/gc_engine.js from [ce3013cd59] to [57156dedce].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 |
// Grammar checker engine
${string}
${regex}
${map}
function capitalizeArray (aArray) {
// can’t map on user defined function??
let aNew = [];
for (let i = 0; i < aArray.length; i = i + 1) {
aNew[i] = aArray[i].gl_toCapitalize();
}
return aNew;
}
| > > > > > > > > > > > < < < < < < < < < < < < | < < < < < < < | < | > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | > > > | > > | | | | | | | | | | | | < | | | > | | > | < < < | | | | | | | | | | | | < < < | | 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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 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 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 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 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 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 |
// Grammar checker engine
${string}
${regex}
${map}
if (typeof(exports) !== 'undefined') {
var ibdawg = require("resource://grammalecte/ibdawg.js");
var helpers = require("resource://grammalecte/helpers.js");
var gc_options = require("resource://grammalecte/${lang}/gc_options.js");
var gc_rules = require("resource://grammalecte/${lang}/gc_rules.js");
var cregex = require("resource://grammalecte/${lang}/cregex.js");
var text = require("resource://grammalecte/text.js");
var echo = require("resource://grammalecte/helpers.js").echo;
}
function capitalizeArray (aArray) {
// can’t map on user defined function??
let aNew = [];
for (let i = 0; i < aArray.length; i = i + 1) {
aNew[i] = aArray[i].gl_toCapitalize();
}
return aNew;
}
// data
let _sAppContext = ""; // what software is running
let _dOptions = null;
let _aIgnoredRules = new Set();
let _oDict = null;
let _dAnalyses = new Map(); // cache for data from dictionary
const gc_engine = {
//// Informations
lang: "${lang}",
locales: ${loc},
pkg: "${implname}",
name: "${name}",
version: "${version}",
author: "${author}",
//// Parsing
parse: function (sText, sCountry="${country_default}", bDebug=false, bContext=false) {
// analyses the paragraph sText and returns list of errors
let dErrors;
let errs;
let sAlt = sText;
let dDA = new Map(); // Disamnbiguator
let dPriority = new Map(); // Key = position; value = priority
let sNew = "";
// parse paragraph
try {
[sNew, dErrors] = this._proofread(sText, sAlt, 0, true, dDA, dPriority, sCountry, bDebug, bContext);
if (sNew) {
sText = sNew;
}
}
catch (e) {
helpers.logerror(e);
}
// cleanup
if (sText.includes(" ")) {
sText = sText.replace(/ /g, ' '); // nbsp
}
if (sText.includes(" ")) {
sText = sText.replace(/ /g, ' '); // snbsp
}
if (sText.includes("'")) {
sText = sText.replace(/'/g, "’");
}
if (sText.includes("‑")) {
sText = sText.replace(/‑/g, "-"); // nobreakdash
}
// parse sentence
for (let [iStart, iEnd] of this._getSentenceBoundaries(sText)) {
if (4 < (iEnd - iStart) < 2000) {
dDA.clear();
//echo(sText.slice(iStart, iEnd));
try {
[_, errs] = this._proofread(sText.slice(iStart, iEnd), sAlt.slice(iStart, iEnd), iStart, false, dDA, dPriority, sCountry, bDebug, bContext);
dErrors.gl_update(errs);
}
catch (e) {
helpers.logerror(e);
}
}
}
return Array.from(dErrors.values());
},
_zEndOfSentence: new RegExp ('([.?!:;…][ .?!… »”")]*|.$)', "g"),
_zBeginOfParagraph: new RegExp ("^[- –—.,;?!…]*", "ig"),
_zEndOfParagraph: new RegExp ("[- .,;?!…–—]*$", "ig"),
_getSentenceBoundaries: function* (sText) {
let mBeginOfSentence = this._zBeginOfParagraph.exec(sText)
let iStart = this._zBeginOfParagraph.lastIndex;
let m;
while ((m = this._zEndOfSentence.exec(sText)) !== null) {
yield [iStart, this._zEndOfSentence.lastIndex];
iStart = this._zEndOfSentence.lastIndex;
}
},
_proofread: function (s, sx, nOffset, bParagraph, dDA, dPriority, sCountry, bDebug, bContext) {
let dErrs = new Map();
let bChange = false;
let bIdRule = option('idrule');
let m;
let bCondMemo;
let nErrorStart;
for (let [sOption, lRuleGroup] of this._getRules(bParagraph)) {
if (!sOption || option(sOption)) {
for (let [zRegex, bUppercase, sLineId, sRuleId, nPriority, lActions, lGroups, lNegLookBefore] of lRuleGroup) {
if (!_aIgnoredRules.has(sRuleId)) {
while ((m = zRegex.gl_exec2(s, lGroups, lNegLookBefore)) !== null) {
bCondMemo = null;
/*if (bDebug) {
echo(">>>> Rule # " + sLineId + " - Text: " + s + " opt: "+ sOption);
}*/
for (let [sFuncCond, cActionType, sWhat, ...eAct] of lActions) {
// action in lActions: [ condition, action type, replacement/suggestion/action[, iGroup[, message, URL]] ]
try {
//echo(oEvalFunc[sFuncCond]);
bCondMemo = (!sFuncCond || oEvalFunc[sFuncCond](s, sx, m, dDA, sCountry, bCondMemo))
if (bCondMemo) {
switch (cActionType) {
case "-":
// grammar error
//echo("-> error detected in " + sLineId + "\nzRegex: " + zRegex.source);
nErrorStart = nOffset + m.start[eAct[0]];
if (!dErrs.has(nErrorStart) || nPriority > dPriority.get(nErrorStart)) {
dErrs.set(nErrorStart, this._createError(s, sx, sWhat, nOffset, m, eAct[0], sLineId, sRuleId, bUppercase, eAct[1], eAct[2], bIdRule, sOption, bContext));
dPriority.set(nErrorStart, nPriority);
}
break;
case "~":
// text processor
//echo("-> text processor by " + sLineId + "\nzRegex: " + zRegex.source);
s = this._rewrite(s, sWhat, eAct[0], m, bUppercase);
bChange = true;
if (bDebug) {
echo("~ " + s + " -- " + m[eAct[0]] + " # " + sLineId);
}
break;
case "=":
// disambiguation
//echo("-> disambiguation by " + sLineId + "\nzRegex: " + zRegex.source);
oEvalFunc[sWhat](s, m, dDA);
if (bDebug) {
echo("= " + m[0] + " # " + sLineId + "\nDA: " + dDA.gl_toString());
}
break;
case ">":
// we do nothing, this test is just a condition to apply all following actions
break;
default:
echo("# error: unknown action at " + sLineId);
}
} else {
if (cActionType == ">") {
break;
}
}
}
catch (e) {
echo(s);
echo("# line id: " + sLineId + "\n# rule id: " + sRuleId);
helpers.logerror(e);
}
}
}
}
}
}
}
if (bChange) {
return [s, dErrs];
}
return [false, dErrs];
},
_createError: function (s, sx, sRepl, nOffset, m, iGroup, sLineId, sRuleId, bUppercase, sMsg, sURL, bIdRule, sOption, bContext) {
let oErr = {};
oErr["nStart"] = nOffset + m.start[iGroup];
oErr["nEnd"] = nOffset + m.end[iGroup];
oErr["sLineId"] = sLineId;
oErr["sRuleId"] = sRuleId;
oErr["sType"] = (sOption) ? sOption : "notype";
// suggestions
if (sRepl[0] === "=") {
let sugg = oEvalFunc[sRepl.slice(1)](s, m);
if (sugg) {
if (bUppercase && m[iGroup].slice(0,1).gl_isUpperCase()) {
oErr["aSuggestions"] = capitalizeArray(sugg.split("|"));
} else {
oErr["aSuggestions"] = sugg.split("|");
}
} else {
oErr["aSuggestions"] = [];
}
} else if (sRepl == "_") {
oErr["aSuggestions"] = [];
} else {
if (bUppercase && m[iGroup].slice(0,1).gl_isUpperCase()) {
oErr["aSuggestions"] = capitalizeArray(sRepl.gl_expand(m).split("|"));
} else {
oErr["aSuggestions"] = sRepl.gl_expand(m).split("|");
}
}
// Message
if (sMsg[0] === "=") {
sMessage = oEvalFunc[sMsg.slice(1)](s, m)
} else {
sMessage = sMsg.gl_expand(m);
}
if (bIdRule) {
sMessage += " ##" + sLineId + " #" + sRuleId;
}
oErr["sMessage"] = sMessage;
// URL
oErr["URL"] = sURL || "";
// Context
if (bContext) {
oErr["sUnderlined"] = sx.slice(m.start[iGroup], m.end[iGroup]);
oErr["sBefore"] = sx.slice(Math.max(0, m.start[iGroup]-80), m.start[iGroup]);
oErr["sAfter"] = sx.slice(m.end[iGroup], m.end[iGroup]+80);
}
return oErr;
},
_rewrite: function (s, sRepl, iGroup, m, bUppercase) {
// text processor: write sRepl in s at iGroup position"
let ln = m.end[iGroup] - m.start[iGroup];
let sNew = "";
if (sRepl === "*") {
sNew = " ".repeat(ln);
} else if (sRepl === ">" || sRepl === "_" || sRepl === "~") {
sNew = sRepl + " ".repeat(ln-1);
} else if (sRepl === "@") {
sNew = "@".repeat(ln);
} else if (sRepl.slice(0,1) === "=") {
sNew = oEvalFunc[sRepl.slice(1)](s, m);
sNew = sNew + " ".repeat(ln-sNew.length);
if (bUppercase && m[iGroup].slice(0,1).gl_isUpperCase()) {
sNew = sNew.gl_toCapitalize();
}
} else {
sNew = sRepl.gl_expand(m);
sNew = sNew + " ".repeat(ln-sNew.length);
}
//echo("\n"+s+"\nstart: "+m.start[iGroup]+" end:"+m.end[iGroup])
return s.slice(0, m.start[iGroup]) + sNew + s.slice(m.end[iGroup]);
},
// Actions on rules
ignoreRule: function (sRuleId) {
_aIgnoredRules.add(sRuleId);
},
resetIgnoreRules: function () {
_aIgnoredRules.clear();
},
reactivateRule: function (sRuleId) {
_aIgnoredRules.delete(sRuleId);
},
listRules: function (sFilter=null) {
// generator: returns tuple (sOption, sLineId, sRuleId)
try {
for ([sOption, lRuleGroup] of _getRules(true)) {
for ([_, _, sLineId, sRuleId, _, _] of lRuleGroup) {
if (!sFilter || sRuleId.test(sFilter)) {
yield [sOption, sLineId, sRuleId];
}
}
}
for ([sOption, lRuleGroup] of _getRules(false)) {
for ([_, _, sLineId, sRuleId, _, _] of lRuleGroup) {
if (!sFilter || sRuleId.test(sFilter)) {
yield [sOption, sLineId, sRuleId];
}
}
}
}
catch (e) {
helpers.logerror(e);
}
},
_getRules: function (bParagraph) {
if (!bParagraph) {
return gc_rules.lSentenceRules;
}
return gc_rules.lParagraphRules;
},
//// Initialization
load: function (sContext="JavaScript") {
try {
_oDict = new ibdawg.IBDAWG("${dic_name}.json");
_sAppContext = sContext;
_dOptions = gc_options.getOptions(sContext).gl_shallowCopy(); // duplication necessary, to be able to reset to default
}
catch (e) {
helpers.logerror(e);
}
},
getDictionary: function () {
return _oDict;
},
//// Options
setOption: function (sOpt, bVal) {
if (_dOptions.has(sOpt)) {
_dOptions.set(sOpt, bVal);
}
},
setOptions: function (dOpt) {
_dOptions.gl_updateOnlyExistingKeys(dOpt);
},
getOptions: function () {
return _dOptions;
},
getDefaultOptions: function () {
return gc_options.getOptions(_sAppContext).gl_shallowCopy();
},
resetOptions: function () {
_dOptions = gc_options.getOptions(_sAppContext).gl_shallowCopy();
}
}
//////// Common functions
function option (sOpt) {
// return true if option sOpt is active
return _dOptions.get(sOpt);
}
function displayInfo (dDA, aWord) {
|
| ︙ | ︙ | |||
592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 |
return true;
}
function define (dDA, nPos, lMorph) {
dDA.set(nPos, lMorph);
return true;
}
//////// GRAMMAR CHECKER PLUGINS
${pluginsJS}
${callablesJS}
if (typeof(exports) !== 'undefined') {
| > | > | | | > > > > > > > > > > > > > > > | | | | | | < < < < | 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 |
return true;
}
function define (dDA, nPos, lMorph) {
dDA.set(nPos, lMorph);
return true;
}
//////// GRAMMAR CHECKER PLUGINS
${pluginsJS}
${callablesJS}
if (typeof(exports) !== 'undefined') {
exports.lang = gc_engine.lang;
exports.locales = gc_engine.locales;
exports.pkg = gc_engine.pkg;
exports.name = gc_engine.name;
exports.version = gc_engine.version;
exports.author = gc_engine.author;
exports.parse = gc_engine.parse;
exports._zEndOfSentence = gc_engine._zEndOfSentence;
exports._zBeginOfParagraph = gc_engine._zBeginOfParagraph;
exports._zEndOfParagraph = gc_engine._zEndOfParagraph;
exports._getSentenceBoundaries = gc_engine._getSentenceBoundaries;
exports._proofread = gc_engine._proofread;
exports._createError = gc_engine._createError;
exports._rewrite = gc_engine._rewrite;
exports.ignoreRule = gc_engine.ignoreRule;
exports.resetIgnoreRules = gc_engine.resetIgnoreRules;
exports.reactivateRule = gc_engine.reactivateRule;
exports.listRules = gc_engine.listRules;
exports._getRules = gc_engine._getRules;
exports.load = gc_engine.load;
exports.getDictionary = gc_engine.getDictionary;
exports.setOption = gc_engine.setOption;
exports.setOptions = gc_engine.setOptions;
exports.getOptions = gc_engine.getOptions;
exports.getDefaultOptions = gc_engine.getDefaultOptions;
exports.resetOptions = gc_engine.resetOptions;
}
|
Modified gc_core/js/lang_core/gc_options.js from [6e45d077d4] to [0ccaf067f3].
1 2 3 4 |
// Options for Grammalecte
${map}
| > > | | | | | | | | | | | | | | > | | > | | 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 |
// Options for Grammalecte
${map}
const gc_options = {
getOptions: function (sContext="JavaScript") {
if (this.dOpt.hasOwnProperty(sContext)) {
return this.dOpt[sContext];
}
return this.dOpt["JavaScript"];
},
lStructOpt: ${lStructOpt},
dOpt: {
"JavaScript": new Map (${dOptJavaScript}),
"Firefox": new Map (${dOptFirefox}),
"Thunderbird": new Map (${dOptThunderbird}),
},
dOptLabel: ${dOptLabel}
}
if (typeof(exports) !== 'undefined') {
exports.getOptions = gc_options.getOptions;
exports.lStructOpt = gc_options.lStructOpt;
exports.dOpt = gc_options.dOpt;
exports.dOptLabel = gc_options.dOptLabel;
}
|
Modified gc_core/js/lang_core/gc_rules.js from [03bc540fb7] to [b235fdd2ed].
1 2 3 4 5 6 |
// Grammar checker rules
"use strict";
${string}
${regex}
| > | | > | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 |
// Grammar checker rules
"use strict";
${string}
${regex}
const gc_rules = {
lParagraphRules: ${paragraph_rules_JS},
lSentenceRules: ${sentence_rules_JS}
}
if (typeof(exports) !== 'undefined') {
exports.lParagraphRules = gc_rules.lParagraphRules;
exports.lSentenceRules = gc_rules.lSentenceRules;
}
|
Modified gc_core/js/str_transform.js from [0fafeda9a5] to [33525a019a].
1 2 | //// STRING TRANSFORMATION | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > | < | | | | | | > | < | | | | | | | | | > | | | 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 |
//// STRING TRANSFORMATION
// Note: 48 is the ASCII code for "0"
const str_transform = {
getStemFromSuffixCode: function (sFlex, sSfxCode) {
// Suffix only
if (sSfxCode == "0") {
return sFlex;
}
return sSfxCode[0] == '0' ? sFlex + sSfxCode.slice(1) : sFlex.slice(0, -(sSfxCode.charCodeAt(0)-48)) + sSfxCode.slice(1);
},
getStemFromAffixCode: function (sFlex, sAffCode) {
// Prefix and suffix
if (sAffCode == "0") {
return sFlex;
}
if (!sAffCode.includes("/")) {
return "# error #";
}
let [sPfxCode, sSfxCode] = sAffCode.split('/');
sFlex = sPfxCode.slice(1) + sFlex.slice(sPfxCode.charCodeAt(0)-48);
return sSfxCode[0] == '0' ? sFlex + sSfxCode.slice(1) : sFlex.slice(0, -(sSfxCode.charCodeAt(0)-48)) + sSfxCode.slice(1);
}
}
if (typeof(exports) !== 'undefined') {
exports.getStemFromSuffixCode = str_transform.getStemFromSuffixCode;
exports.getStemFromAffixCode = str_transform.getStemFromAffixCode;
}
|
Modified gc_core/js/tests.js from [f2f737b523] to [373a8fcfff].
1 2 3 4 5 | // JavaScript "use strict"; | > | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
// JavaScript
"use strict";
if (typeof(exports) !== 'undefined') {
var helpers = require("resource://grammalecte/helpers.js");
}
class TestGrammarChecking {
constructor (gce) {
this.gce = gce;
this._aRuleTested = new Set();
|
| ︙ | ︙ |
Modified gc_core/js/text.js from [beffb97d58] to [2c268f1b5e].
1 2 3 4 | // JavaScript "use strict"; | > > | | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | | | 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 |
// JavaScript
"use strict";
if (typeof(exports) !== 'undefined') {
var helpers = require("resource://grammalecte/helpers.js");
}
const text = {
getParagraph: function* (sText) {
// generator: returns paragraphs of text
let iStart = 0;
let iEnd = 0;
sText = sText.replace("\r", "");
while ((iEnd = sText.indexOf("\n", iStart)) !== -1) {
yield sText.slice(iStart, iEnd);
iStart = iEnd + 1;
}
yield sText.slice(iStart);
},
wrap: function* (sText, nWidth=80) {
// generator: returns text line by line
while (sText) {
if (sText.length >= nWidth) {
let nEnd = sText.lastIndexOf(" ", nWidth) + 1;
if (nEnd > 0) {
yield sText.slice(0, nEnd);
sText = sText.slice(nEnd);
} else {
yield sText.slice(0, nWidth);
sText = sText.slice(nWidth);
}
} else {
break;
}
}
yield sText;
},
getReadableError: function (oErr) {
// Returns an error oErr as a readable error
try {
let sResult = "\n* " + oErr['nStart'] + ":" + oErr['nEnd']
+ " # " + oErr['sLineId'] + " # " + oErr['sRuleId'] + ":\n";
sResult += " " + oErr["sMessage"];
if (oErr["aSuggestions"].length > 0) {
sResult += "\n > Suggestions : " + oErr["aSuggestions"].join(" | ");
}
if (oErr["URL"] !== "") {
sResult += "\n > URL: " + oErr["URL"];
}
return sResult;
}
catch (e) {
helpers.logerror(e);
return "\n# Error. Data: " + oErr.toString();
}
}
}
if (typeof(exports) !== 'undefined') {
exports.getParagraph = text.getParagraph;
exports.wrap = text.wrap;
exports.getReadableError = text.getReadableError;
}
|
Modified gc_core/js/tokenizer.js from [a6594366c3] to [02266194ef].
1 2 3 4 5 | // JavaScript // Very simple tokenizer "use strict"; | > > | | > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |
// JavaScript
// Very simple tokenizer
"use strict";
if (typeof(exports) !== 'undefined') {
var helpers = require("resource://grammalecte/helpers.js");
}
const aTkzPatterns = {
// All regexps must start with ^.
"default":
[
[/^[ \t]+/, 'SPACE'],
[/^[,.;:!?…«»“”‘’"(){}\[\]/·–—]+/, 'SEPARATOR'],
[/^(?:https?:\/\/|www[.]|[a-zA-Zà-öÀ-Ö0-9ø-ÿØ-ßĀ-ʯfi-st_]+[@.][a-zA-Zà-öÀ-Ö0-9ø-ÿØ-ßĀ-ʯfi-st_]+[@.])[a-zA-Zà-öÀ-Ö0-9ø-ÿØ-ßĀ-ʯfi-st_.\/?&!%=+*"'@$#-]+/, 'LINK'],
[/^[#@][a-zA-Zà-öÀ-Ö0-9ø-ÿØ-ßĀ-ʯfi-st_-]+/, 'TAG'],
|
| ︙ | ︙ | |||
38 39 40 41 42 43 44 |
}
class Tokenizer {
constructor (sLang) {
this.sLang = sLang;
| | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
}
class Tokenizer {
constructor (sLang) {
this.sLang = sLang;
if (!aTkzPatterns.hasOwnProperty(sLang)) {
this.sLang = "default";
}
this.aRules = aTkzPatterns[this.sLang];
};
* genTokens (sText) {
let m;
let i = 0;
while (sText) {
let nCut = 1;
|
| ︙ | ︙ |
Modified gc_lang/fr/modules-js/conj.js from [4856ca7520] to [3dc81e8a3f].
1 2 3 4 5 6 7 8 |
// Grammalecte - Conjugueur
// License: GPL 3
"use strict";
${map}
| < | < | | | | | < < < < < < < < | < < < | | | | | < | > > | > | | | | | | | | | | | < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 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 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 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 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 |
// Grammalecte - Conjugueur
// License: GPL 3
"use strict";
${map}
const conj = {
_lVtyp: [],
_lTags: [],
_dPatternConj: {},
_dVerb: {},
init: function (sJSONData) {
try {
let _oData = JSON.parse(sJSONData);
this._lVtyp = _oData.lVtyp;
this._lTags = _oData.lTags;
this._dPatternConj = _oData.dPatternConj;
this._dVerb = _oData.dVerb;
}
catch (e) {
console.error(e);
}
},
_zStartVoy: new RegExp("^[aeéiouœê]"),
_zNeedTeuph: new RegExp("[tdc]$"),
_dProSuj: new Map ([ [":1s", "je"], [":1ś", "je"], [":2s", "tu"], [":3s", "il"], [":1p", "nous"], [":2p", "vous"], [":3p", "ils"] ]),
_dProObj: new Map ([ [":1s", "me "], [":1ś", "me "], [":2s", "te "], [":3s", "se "], [":1p", "nous "], [":2p", "vous "], [":3p", "se "] ]),
_dProObjEl: new Map ([ [":1s", "m’"], [":1ś", "m’"], [":2s", "t’"], [":3s", "s’"], [":1p", "nous "], [":2p", "vous "], [":3p", "s’"] ]),
_dImpePro: new Map ([ [":2s", "-toi"], [":1p", "-nous"], [":2p", "-vous"] ]),
_dImpeProNeg: new Map ([ [":2s", "ne te "], [":1p", "ne nous "], [":2p", "ne vous "] ]),
_dImpeProEn: new Map ([ [":2s", "-t’en"], [":1p", "-nous-en"], [":2p", "-vous-en"] ]),
_dImpeProNegEn: new Map ([ [":2s", "ne t’en "], [":1p", "ne nous en "], [":2p", "ne vous en "] ]),
_dGroup: new Map ([ ["0", "auxiliaire"], ["1", "1ᵉʳ groupe"], ["2", "2ᵉ groupe"], ["3", "3ᵉ groupe"] ]),
_dTenseIdx: new Map ([ [":PQ", 0], [":Ip", 1], [":Iq", 2], [":Is", 3], [":If", 4], [":K", 5], [":Sp", 6], [":Sq", 7], [":E", 8] ]),
isVerb: function (sVerb) {
return this._dVerb.hasOwnProperty(sVerb);
},
getConj: function (sVerb, sTense, sWho) {
// returns conjugation (can be an empty string)
if (!this._dVerb.hasOwnProperty(sVerb)) {
return null;
}
if (!this._dPatternConj[sTense][this._lTags[this._dVerb[sVerb][1]][this._dTenseIdx.get(sTense)]].hasOwnProperty(sWho)) {
return "";
}
return this._modifyStringWithSuffixCode(sVerb, this._dPatternConj[sTense][this._lTags[this._dVerb[sVerb][1]][this._dTenseIdx.get(sTense)]][sWho]);
},
hasConj: function (sVerb, sTense, sWho) {
// returns false if no conjugation (also if empty) else true
if (!this._dVerb.hasOwnProperty(sVerb)) {
return false;
}
if (this._dPatternConj[sTense][this._lTags[this._dVerb[sVerb][1]][this._dTenseIdx.get(sTense)]].hasOwnProperty(sWho)
&& this._dPatternConj[sTense][this._lTags[this._dVerb[sVerb][1]][this._dTenseIdx.get(sTense)]][sWho]) {
return true;
}
return false;
},
getVtyp: function (sVerb) {
// returns raw informations about sVerb
if (!this._dVerb.hasOwnProperty(sVerb)) {
return null;
}
return this._lVtyp[this._dVerb[sVerb][0]];
},
getSimil: function (sWord, sMorph, sFilter=null) {
if (!sMorph.includes(":V")) {
return new Set();
}
let sInfi = sMorph.slice(1, sMorph.indexOf(" "));
let tTags = this._getTags(sInfi);
let aSugg = new Set();
if (sMorph.includes(":Q") || sMorph.includes(":Y")) {
// we suggest conjugated forms
if (sMorph.includes(":V1")) {
aSugg.add(sInfi);
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Ip", ":3s"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Ip", ":2p"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Iq", ":1s"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Iq", ":3s"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Iq", ":3p"));
} else if (sMorph.includes(":V2")) {
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Ip", ":1s"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Ip", ":3s"));
} else if (sMorph.includes(":V3")) {
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Ip", ":1s"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Ip", ":3s"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Is", ":1s"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":Is", ":3s"));
} else if (isMorph.includes(":V0a")) {
aSugg.add("eus");
aSugg.add("eut");
} else {
aSugg.add("étais");
aSugg.add("était");
}
aSugg.delete("");
} else {
// we suggest past participles
aSugg.add(this._getConjWithTags(sInfi, tTags, ":PQ", ":Q1"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":PQ", ":Q2"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":PQ", ":Q3"));
aSugg.add(this._getConjWithTags(sInfi, tTags, ":PQ", ":Q4"));
aSugg.delete("");
// if there is only one past participle (epi inv), unreliable.
if (aSugg.size === 1) {
aSugg.clear();
}
if (sMorph.includes(":V1")) {
aSugg.add(sInfi);
}
}
return aSugg;
},
_getTags: function (sVerb) {
// returns tuple of tags (usable with functions _getConjWithTags and _hasConjWithTags)
if (!this._dVerb.hasOwnProperty(sVerb)) {
return null;
}
return this._lTags[this._dVerb[sVerb][1]];
},
_getConjWithTags: function (sVerb, tTags, sTense, sWho) {
// returns conjugation (can be an empty string)
if (!this._dPatternConj[sTense][tTags[this._dTenseIdx.get(sTense)]].hasOwnProperty(sWho)) {
return "";
}
return this._modifyStringWithSuffixCode(sVerb, this._dPatternConj[sTense][tTags[this._dTenseIdx.get(sTense)]][sWho]);
},
_hasConjWithTags: function (tTags, sTense, sWho) {
// returns false if no conjugation (also if empty) else true
if (this._dPatternConj[sTense][tTags[this._dTenseIdx.get(sTense)]].hasOwnProperty(sWho)
&& this._dPatternConj[sTense][tTags[this._dTenseIdx.get(sTense)]][sWho]) {
return true;
}
return false;
},
_modifyStringWithSuffixCode: function (sWord, sSfx) {
// returns sWord modified by sSfx
if (sSfx === "") {
return "";
}
if (sSfx === "0") {
return sWord;
}
try {
if (sSfx[0] !== '0') {
return sWord.slice(0, -(sSfx.charCodeAt(0)-48)) + sSfx.slice(1); // 48 is the ASCII code for "0"
} else {
return sWord + sSfx.slice(1);
}
}
catch (e) {
console.log(e);
return "## erreur, code : " + sSfx + " ##";
}
}
}
class Verb {
constructor (sVerb) {
if (typeof sVerb !== "string" || sVerb === "") {
throw new TypeError ("The value should be a non-empty string");
}
this.sVerb = sVerb;
this.sVerbAux = "";
this._sRawInfo = conj.getVtyp(this.sVerb);
this.sInfo = this._readableInfo(this._sRawInfo);
this._tTags = conj._getTags(sVerb);
this._tTagsAux = conj._getTags(this.sVerbAux);
this.bProWithEn = (this._sRawInfo[5] === "e");
this.dConj = new Map ([
[":Y", new Map ([
["label", "Infinitif"],
[":Y", sVerb]
])],
[":PQ", new Map ([
["label", "Participes passés et présent"],
[":Q1", conj._getConjWithTags(sVerb, this._tTags, ":PQ", ":Q1")],
[":Q2", conj._getConjWithTags(sVerb, this._tTags, ":PQ", ":Q2")],
[":Q3", conj._getConjWithTags(sVerb, this._tTags, ":PQ", ":Q3")],
[":Q4", conj._getConjWithTags(sVerb, this._tTags, ":PQ", ":Q4")],
[":P", conj._getConjWithTags(sVerb, this._tTags, ":PQ", ":P")]
])],
[":Ip", new Map ([
["label", "Présent"],
[":1s", conj._getConjWithTags(sVerb, this._tTags, ":Ip", ":1s")],
[":1ś", conj._getConjWithTags(sVerb, this._tTags, ":Ip", ":1ś")],
[":2s", conj._getConjWithTags(sVerb, this._tTags, ":Ip", ":2s")],
[":3s", conj._getConjWithTags(sVerb, this._tTags, ":Ip", ":3s")],
[":1p", conj._getConjWithTags(sVerb, this._tTags, ":Ip", ":1p")],
[":2p", conj._getConjWithTags(sVerb, this._tTags, ":Ip", ":2p")],
[":3p", conj._getConjWithTags(sVerb, this._tTags, ":Ip", ":3p")]
])],
[":Iq", new Map ([
["label", "Imparfait"],
[":1s", conj._getConjWithTags(sVerb, this._tTags, ":Iq", ":1s")],
[":2s", conj._getConjWithTags(sVerb, this._tTags, ":Iq", ":2s")],
[":3s", conj._getConjWithTags(sVerb, this._tTags, ":Iq", ":3s")],
[":1p", conj._getConjWithTags(sVerb, this._tTags, ":Iq", ":1p")],
[":2p", conj._getConjWithTags(sVerb, this._tTags, ":Iq", ":2p")],
[":3p", conj._getConjWithTags(sVerb, this._tTags, ":Iq", ":3p")]
])],
[":Is", new Map ([
["label", "Passé simple"],
[":1s", conj._getConjWithTags(sVerb, this._tTags, ":Is", ":1s")],
[":2s", conj._getConjWithTags(sVerb, this._tTags, ":Is", ":2s")],
[":3s", conj._getConjWithTags(sVerb, this._tTags, ":Is", ":3s")],
[":1p", conj._getConjWithTags(sVerb, this._tTags, ":Is", ":1p")],
[":2p", conj._getConjWithTags(sVerb, this._tTags, ":Is", ":2p")],
[":3p", conj._getConjWithTags(sVerb, this._tTags, ":Is", ":3p")]
])],
[":If", new Map ([
["label", "Futur"],
[":1s", conj._getConjWithTags(sVerb, this._tTags, ":If", ":1s")],
[":2s", conj._getConjWithTags(sVerb, this._tTags, ":If", ":2s")],
[":3s", conj._getConjWithTags(sVerb, this._tTags, ":If", ":3s")],
[":1p", conj._getConjWithTags(sVerb, this._tTags, ":If", ":1p")],
[":2p", conj._getConjWithTags(sVerb, this._tTags, ":If", ":2p")],
[":3p", conj._getConjWithTags(sVerb, this._tTags, ":If", ":3p")]
])],
[":Sp", new Map ([
["label", "Présent subjonctif"],
[":1s", conj._getConjWithTags(sVerb, this._tTags, ":Sp", ":1s")],
[":1ś", conj._getConjWithTags(sVerb, this._tTags, ":Sp", ":1ś")],
[":2s", conj._getConjWithTags(sVerb, this._tTags, ":Sp", ":2s")],
[":3s", conj._getConjWithTags(sVerb, this._tTags, ":Sp", ":3s")],
[":1p", conj._getConjWithTags(sVerb, this._tTags, ":Sp", ":1p")],
[":2p", conj._getConjWithTags(sVerb, this._tTags, ":Sp", ":2p")],
[":3p", conj._getConjWithTags(sVerb, this._tTags, ":Sp", ":3p")]
])],
[":Sq", new Map ([
["label", "Imparfait subjonctif"],
[":1s", conj._getConjWithTags(sVerb, this._tTags, ":Sq", ":1s")],
[":1ś", conj._getConjWithTags(sVerb, this._tTags, ":Sq", ":1ś")],
[":2s", conj._getConjWithTags(sVerb, this._tTags, ":Sq", ":2s")],
[":3s", conj._getConjWithTags(sVerb, this._tTags, ":Sq", ":3s")],
[":1p", conj._getConjWithTags(sVerb, this._tTags, ":Sq", ":1p")],
[":2p", conj._getConjWithTags(sVerb, this._tTags, ":Sq", ":2p")],
[":3p", conj._getConjWithTags(sVerb, this._tTags, ":Sq", ":3p")]
])],
[":K", new Map ([
["label", "Conditionnel"],
[":1s", conj._getConjWithTags(sVerb, this._tTags, ":K", ":1s")],
[":2s", conj._getConjWithTags(sVerb, this._tTags, ":K", ":2s")],
[":3s", conj._getConjWithTags(sVerb, this._tTags, ":K", ":3s")],
[":1p", conj._getConjWithTags(sVerb, this._tTags, ":K", ":1p")],
[":2p", conj._getConjWithTags(sVerb, this._tTags, ":K", ":2p")],
[":3p", conj._getConjWithTags(sVerb, this._tTags, ":K", ":3p")]
])],
[":E", new Map ([
["label", "Impératif"],
[":2s", conj._getConjWithTags(sVerb, this._tTags, ":E", ":2s")],
[":1p", conj._getConjWithTags(sVerb, this._tTags, ":E", ":1p")],
[":2p", conj._getConjWithTags(sVerb, this._tTags, ":E", ":2p")]
])]
]);
};
_readableInfo () {
// returns readable infos
this.sVerbAux = (this._sRawInfo.slice(7,8) == "e") ? "être" : "avoir";
let sGroup = conj._dGroup.get(this._sRawInfo[0]);
let sInfo = "";
if (this._sRawInfo.slice(3,4) == "t") {
sInfo = "transitif";
} else if (this._sRawInfo.slice(4,5) == "n") {
sInfo = "transitif indirect";
} else if (this._sRawInfo.slice(2,3) == "i") {
sInfo = "intransitif";
|
| ︙ | ︙ | |||
321 322 323 324 325 326 327 |
} else {
sInfi = this.sVerb;
}
if (bPro) {
if (this.bProWithEn) {
sInfi = "s’en " + sInfi;
} else {
| | | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 |
} else {
sInfi = this.sVerb;
}
if (bPro) {
if (this.bProWithEn) {
sInfi = "s’en " + sInfi;
} else {
sInfi = (conj._zStartVoy.test(sInfi)) ? "s’" + sInfi : "se " + sInfi;
}
}
if (bNeg) {
sInfi = "ne pas " + sInfi;
}
if (bTpsCo) {
sInfi += " " + this._seekPpas(bPro, bFem, (this._sRawInfo[5] == "r"));
|
| ︙ | ︙ | |||
346 347 348 349 350 351 352 |
participePresent (bPro, bNeg, bTpsCo, bInt, bFem) {
if (!this.dConj.get(":PQ").get(":P")) {
return "";
}
let sPartPre;
if (bTpsCo) {
| | | | 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 |
participePresent (bPro, bNeg, bTpsCo, bInt, bFem) {
if (!this.dConj.get(":PQ").get(":P")) {
return "";
}
let sPartPre;
if (bTpsCo) {
sPartPre = (!bPro) ? conj._getConjWithTags(this.sVerbAux, this._tTagsAux, ":PQ", ":P") : getConj("être", ":PQ", ":P");
} else {
sPartPre = this.dConj.get(":PQ").get(":P");
}
if (sPartPre === "") {
return "";
}
let bEli = conj._zStartVoy.test(sPartPre);
if (bPro) {
if (this.bProWithEn) {
sPartPre = "s’en " + sPartPre;
} else {
sPartPre = (bEli) ? "s’" + sPartPre : "se " + sPartPre;
}
}
|
| ︙ | ︙ | |||
382 383 384 385 386 387 388 |
return "";
}
let sConj;
if (!bTpsCo && bInt && sWho == ":1s" && this.dConj.get(sTemps).gl_get(":1ś", false)) {
sWho = ":1ś";
}
if (bTpsCo) {
| | | | | | | 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 |
return "";
}
let sConj;
if (!bTpsCo && bInt && sWho == ":1s" && this.dConj.get(sTemps).gl_get(":1ś", false)) {
sWho = ":1ś";
}
if (bTpsCo) {
sConj = (!bPro) ? conj._getConjWithTags(this.sVerbAux, this._tTagsAux, sTemps, sWho) : getConj("être", sTemps, sWho);
} else {
sConj = this.dConj.get(sTemps).get(sWho);
}
if (sConj === "") {
return "";
}
let bEli = conj._zStartVoy.test(sConj);
if (bPro) {
if (!this.bProWithEn) {
sConj = (bEli) ? conj._dProObjEl.get(sWho) + sConj : conj._dProObj.get(sWho) + sConj;
} else {
sConj = conj._dProObjEl.get(sWho) + "en " + sConj;
}
}
if (bNeg) {
sConj = (bEli && !bPro) ? "n’" + sConj : "ne " + sConj;
}
if (bInt) {
if (sWho == ":3s" && !conj._zNeedTeuph.test(sConj)) {
sConj += "-t";
}
sConj += "-" + this._getPronom(sWho, bFem);
} else {
if (sWho == ":1s" && bEli && !bNeg && !bPro) {
sConj = "j’" + sConj;
} else {
|
| ︙ | ︙ | |||
434 435 436 437 438 439 440 |
return "on";
} else if (bFem) {
return "elle";
}
} else if (sWho == ":3p" && bFem) {
return "elles";
}
| | | | | | | | 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 |
return "on";
} else if (bFem) {
return "elle";
}
} else if (sWho == ":3p" && bFem) {
return "elles";
}
return conj._dProSuj.get(sWho);
};
imperatif (sWho, bPro, bNeg, bTpsCo, bFem) {
if (!this.dConj.get(":E").get(sWho)) {
return "";
}
let sImpe;
if (bTpsCo) {
sImpe = (!bPro) ? conj._getConjWithTags(this.sVerbAux, this._tTagsAux, ":E", sWho) : getConj("être", ":E", sWho);
} else {
sImpe = this.dConj.get(":E").get(sWho);
}
if (sImpe === "") {
return "";
}
let bEli = conj._zStartVoy.test(sImpe);
if (bNeg) {
if (bPro) {
if (!this.bProWithEn) {
sImpe = (bEli && sWho == ":2s") ? "ne t’" + sImpe + " pas" : conj._dImpeProNeg.get(sWho) + sImpe + " pas";
} else {
sImpe = conj._dImpeProNegEn.get(sWho) + sImpe + " pas";
}
} else {
sImpe = (bEli) ? "n’" + sImpe + " pas" : "ne " + sImpe + " pas";
}
} else if (bPro) {
sImpe = (this.bProWithEn) ? sImpe + conj._dImpeProEn.get(sWho) : sImpe + conj._dImpePro.get(sWho);
}
if (bTpsCo) {
return sImpe + " " + this._seekPpas(bPro, bFem, sWho.endsWith("p") || this._sRawInfo[5] == "r");
}
return sImpe;
};
|
| ︙ | ︙ | |||
484 485 486 487 488 489 490 491 |
if (!bPlur) {
return (this.dConj.get(":PQ").get(":Q3")) ? this.dConj.get(":PQ").get(":Q3") : this.dConj.get(":PQ").get(":Q1");
}
return (this.dConj.get(":PQ").get(":Q4")) ? this.dConj.get(":PQ").get(":Q4") : this.dConj.get(":PQ").get(":Q1");
}
}
| > | > > > > > > > > > > > > > > > | | > > > > > | > > > > > > > > > > > | | | | | | > | > | | 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 |
if (!bPlur) {
return (this.dConj.get(":PQ").get(":Q3")) ? this.dConj.get(":PQ").get(":Q3") : this.dConj.get(":PQ").get(":Q1");
}
return (this.dConj.get(":PQ").get(":Q4")) ? this.dConj.get(":PQ").get(":Q4") : this.dConj.get(":PQ").get(":Q1");
}
}
// Initialization
if (typeof(browser) !== 'undefined') {
// WebExtension
conj.init(helpers.loadFile(browser.extension.getURL("grammalecte/fr/conj_data.json")));
} else if (typeof(require) !== 'undefined') {
// Add-on SDK and Thunderbird
let helpers = require("resource://grammalecte/helpers.js");
conj.init(helpers.loadFile("resource://grammalecte/fr/conj_data.json"));
} else if (typeof(self) !== 'undefined') {
// used within Firefox content script (conjugation panel).
// can’t load JSON from here, so we do it in ui.js and send it here.
self.port.on("provideConjData", function (sJSONData) {
conj.init(sJSONData);
});
} else {
console.log("Error: Impossible d’initialiser le module conj");
}
if (typeof(exports) !== 'undefined') {
exports._lVtyp = conj._lVtyp;
exports._lTags = conj._lTags;
exports._dPatternConj = conj._dPatternConj;
exports._dVerb = conj._dVerb;
exports.init = conj.init;
exports._zStartVoy = conj._zStartVoy;
exports._zNeedTeuph = conj._zNeedTeuph;
exports._dProSuj = conj._dProSuj;
exports._dProObj = conj._dProObj;
exports._dProObjEl = conj._dProObjEl;
exports._dImpePro = conj._dImpePro;
exports._dImpeProNeg = conj._dImpeProNeg;
exports._dImpeProEn = conj._dImpeProEn;
exports._dImpeProNegEn = conj._dImpeProNegEn;
exports._dGroup = conj._dGroup;
exports._dTenseIdx = conj._dTenseIdx;
exports.isVerb = conj.isVerb;
exports.getConj = conj.getConj;
exports.hasConj = conj.hasConj;
exports.getVtyp = conj.getVtyp;
exports.getSimil = conj.getSimil;
exports._getTags = conj._getTags;
exports._getConjWithTags = conj._getConjWithTags;
exports._hasConjWithTags = conj._hasConjWithTags;
exports._modifyStringWithSuffixCode = conj._modifyStringWithSuffixCode;
exports.Verb = Verb;
}
|
Modified gc_lang/fr/modules-js/cregex.js from [266ea45a85] to [6a54cddafc].
1 2 3 | //// Grammalecte - Compiled regular expressions | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | > > > > > < < < | | < < < | | | | | | | | | | | | | | | | | | | > | > > | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | 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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 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 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 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 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 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 |
//// Grammalecte - Compiled regular expressions
var cregex = {
///// Lemme
_zLemma: new RegExp(">([a-zà-öø-ÿ0-9Ā-ʯ][a-zà-öø-ÿ0-9Ā-ʯ-]+)"),
///// Masculin / féminin / singulier / pluriel
_zGender: new RegExp(":[mfe]"),
_zNumber: new RegExp(":[spi]"),
///// Nom et adjectif
_zNA: new RegExp(":[NA]"),
//// nombre
_zNAs: new RegExp(":[NA].*:s"),
_zNAp: new RegExp(":[NA].*:p"),
_zNAi: new RegExp(":[NA].*:i"),
_zNAsi: new RegExp(":[NA].*:[si]"),
_zNApi: new RegExp(":[NA].*:[pi]"),
//// genre
_zNAm: new RegExp(":[NA].*:m"),
_zNAf: new RegExp(":[NA].*:f"),
_zNAe: new RegExp(":[NA].*:e"),
_zNAme: new RegExp(":[NA].*:[me]"),
_zNAfe: new RegExp(":[NA].*:[fe]"),
//// nombre et genre
// singuilier
_zNAms: new RegExp(":[NA].*:m.*:s"),
_zNAfs: new RegExp(":[NA].*:f.*:s"),
_zNAes: new RegExp(":[NA].*:e.*:s"),
_zNAmes: new RegExp(":[NA].*:[me].*:s"),
_zNAfes: new RegExp(":[NA].*:[fe].*:s"),
// singulier et invariable
_zNAmsi: new RegExp(":[NA].*:m.*:[si]"),
_zNAfsi: new RegExp(":[NA].*:f.*:[si]"),
_zNAesi: new RegExp(":[NA].*:e.*:[si]"),
_zNAmesi: new RegExp(":[NA].*:[me].*:[si]"),
_zNAfesi: new RegExp(":[NA].*:[fe].*:[si]"),
// pluriel
_zNAmp: new RegExp(":[NA].*:m.*:p"),
_zNAfp: new RegExp(":[NA].*:f.*:p"),
_zNAep: new RegExp(":[NA].*:e.*:p"),
_zNAmep: new RegExp(":[NA].*:[me].*:p"),
_zNAfep: new RegExp(":[NA].*:[me].*:p"),
// pluriel et invariable
_zNAmpi: new RegExp(":[NA].*:m.*:[pi]"),
_zNAfpi: new RegExp(":[NA].*:f.*:[pi]"),
_zNAepi: new RegExp(":[NA].*:e.*:[pi]"),
_zNAmepi: new RegExp(":[NA].*:[me].*:[pi]"),
_zNAfepi: new RegExp(":[NA].*:[fe].*:[pi]"),
//// Divers
_zAD: new RegExp(":[AB]"),
///// Verbe
_zVconj: new RegExp(":[123][sp]"),
_zVconj123: new RegExp(":V[123].*:[123][sp]"),
///// Nom | Adjectif | Verbe
_zNVconj: new RegExp(":(?:N|[123][sp])"),
_zNAVconj: new RegExp(":(?:N|A|[123][sp])"),
///// Spécifique
_zNnotA: new RegExp(":N(?!:A)"),
_zPNnotA: new RegExp(":(?:N(?!:A)|Q)"),
///// Noms propres
_zNP: new RegExp(":(?:M[12P]|T)"),
_zNPm: new RegExp(":(?:M[12P]|T):m"),
_zNPf: new RegExp(":(?:M[12P]|T):f"),
_zNPe: new RegExp(":(?:M[12P]|T):e"),
///// FONCTIONS
getLemmaOfMorph: function (sMorph) {
return this._zLemma.exec(sMorph)[1];
},
checkAgreement: function (l1, l2) {
// check number agreement
if (!this.mbInv(l1) && !this.mbInv(l2)) {
if (this.mbSg(l1) && !this.mbSg(l2)) {
return false;
}
if (this.mbPl(l1) && !this.mbPl(l2)) {
return false;
}
}
// check gender agreement
if (this.mbEpi(l1) || this.mbEpi(l2)) {
return true;
}
if (this.mbMas(l1) && !this.mbMas(l2)) {
return false;
}
if (this.mbFem(l1) && !this.mbFem(l2)) {
return false;
}
return true;
},
checkConjVerb: function (lMorph, sReqConj) {
return lMorph.some(s => s.includes(sReqConj));
},
getGender: function (lMorph) {
// returns gender of word (':m', ':f', ':e' or empty string).
let sGender = "";
for (let sMorph of lMorph) {
let m = this._zGender.exec(sMorph);
if (m) {
if (!sGender) {
sGender = m[0];
} else if (sGender != m[0]) {
return ":e";
}
}
}
return sGender;
},
getNumber: function (lMorph) {
// returns number of word (':s', ':p', ':i' or empty string).
let sNumber = "";
for (let sMorph of lMorph) {
let m = this._zNumber.exec(sWord);
if (m) {
if (!sNumber) {
sNumber = m[0];
} else if (sNumber != m[0]) {
return ":i";
}
}
}
return sNumber;
},
// NOTE : isWhat (lMorph) returns true if lMorph contains nothing else than What
// mbWhat (lMorph) returns true if lMorph contains What at least once
//// isXXX = it’s certain
isNom: function (lMorph) {
return lMorph.every(s => s.includes(":N"));
},
isNomNotAdj: function (lMorph) {
return lMorph.every(s => this._zNnotA.test(s));
},
isAdj: function (lMorph) {
return lMorph.every(s => s.includes(":A"));
},
isNomAdj: function (lMorph) {
return lMorph.every(s => this._zNA.test(s));
},
isNomVconj: function (lMorph) {
return lMorph.every(s => this._zNVconj.test(s));
},
isInv: function (lMorph) {
return lMorph.every(s => s.includes(":i"));
},
isSg: function (lMorph) {
return lMorph.every(s => s.includes(":s"));
},
isPl: function (lMorph) {
return lMorph.every(s => s.includes(":p"));
},
isEpi: function (lMorph) {
return lMorph.every(s => s.includes(":e"));
},
isMas: function (lMorph) {
return lMorph.every(s => s.includes(":m"));
},
isFem: function (lMorph) {
return lMorph.every(s => s.includes(":f"));
},
//// mbXXX = MAYBE XXX
mbNom: function (lMorph) {
return lMorph.some(s => s.includes(":N"));
},
mbAdj: function (lMorph) {
return lMorph.some(s => s.includes(":A"));
},
mbAdjNb: function (lMorph) {
return lMorph.some(s => this._zAD.test(s));
},
mbNomAdj: function (lMorph) {
return lMorph.some(s => this._zNA.test(s));
},
mbNomNotAdj: function (lMorph) {
let b = false;
for (let s of lMorph) {
if (s.includes(":A")) {
return false;
}
if (s.includes(":N")) {
b = true;
}
}
return b;
},
mbPpasNomNotAdj: function (lMorph) {
return lMorph.some(s => this._zPNnotA.test(s));
},
mbVconj: function (lMorph) {
return lMorph.some(s => this._zVconj.test(s));
},
mbVconj123: function (lMorph) {
return lMorph.some(s => this._zVconj123.test(s));
},
mbMG: function (lMorph) {
return lMorph.some(s => s.includes(":G"));
},
mbInv: function (lMorph) {
return lMorph.some(s => s.includes(":i"));
},
mbSg: function (lMorph) {
return lMorph.some(s => s.includes(":s"));
},
mbPl: function (lMorph) {
return lMorph.some(s => s.includes(":p"));
},
mbEpi: function (lMorph) {
return lMorph.some(s => s.includes(":e"));
},
mbMas: function (lMorph) {
return lMorph.some(s => s.includes(":m"));
},
mbFem: function (lMorph) {
return lMorph.some(s => s.includes(":f"));
},
mbNpr: function (lMorph) {
return lMorph.some(s => this._zNP.test(s));
},
mbNprMasNotFem: function (lMorph) {
if (lMorph.some(s => this._zNPf.test(s))) {
return false;
}
return lMorph.some(s => this._zNPm.test(s));
}
}
if (typeof(exports) !== 'undefined') {
exports._zLemma = cregex._zLemma;
exports._zGender = cregex._zGender;
exports._zNumber = cregex._zNumber;
exports._zNA = cregex._zNA;
exports._zNAs = cregex._zNAs;
exports._zNAp = cregex._zNAp;
exports._zNAi = cregex._zNAi;
exports._zNAsi = cregex._zNAsi;
exports._zNApi = cregex._zNApi;
exports._zNAm = cregex._zNAm;
exports._zNAf = cregex._zNAf;
exports._zNAe = cregex._zNAe;
exports._zNAme = cregex._zNAme;
exports._zNAfe = cregex._zNAfe;
exports._zNAms = cregex._zNAms;
exports._zNAfs = cregex._zNAfs;
exports._zNAes = cregex._zNAes;
exports._zNAmes = cregex._zNAmes;
exports._zNAfes = cregex._zNAfes;
exports._zNAmsi = cregex._zNAmsi;
exports._zNAfsi = cregex._zNAfsi;
exports._zNAesi = cregex._zNAesi;
exports._zNAmesi = cregex._zNAmesi;
exports._zNAfesi = cregex._zNAfesi;
exports._zNAmp = cregex._zNAmp;
exports._zNAfp = cregex._zNAfp;
exports._zNAep = cregex._zNAep;
exports._zNAmep = cregex._zNAmep;
exports._zNAfep = cregex._zNAfep;
exports._zNAmpi = cregex._zNAmpi;
exports._zNAfpi = cregex._zNAfpi;
exports._zNAepi = cregex._zNAepi;
exports._zNAmepi = cregex._zNAmepi;
exports._zNAfepi = cregex._zNAfepi;
exports._zAD = cregex._zAD;
exports._zVconj = cregex._zVconj;
exports._zVconj123 = cregex._zVconj123;
exports._zNVconj = cregex._zNVconj;
exports._zNAVconj = cregex._zNAVconj;
exports._zNnotA = cregex._zNnotA;
exports._zPNnotA = cregex._zPNnotA;
exports._zNP = cregex._zNP;
exports._zNPm = cregex._zNPm;
exports._zNPf = cregex._zNPf;
exports._zNPe = cregex._zNPe;
exports.getLemmaOfMorph = cregex.getLemmaOfMorph;
exports.checkAgreement = cregex.checkAgreement;
exports.checkConjVerb = cregex.checkConjVerb;
exports.getGender = cregex.getGender;
exports.getNumber = cregex.getNumber;
exports.isNom = cregex.isNom;
exports.isNomNotAdj = cregex.isNomNotAdj;
exports.isAdj = cregex.isAdj;
exports.isNomAdj = cregex.isNomAdj;
exports.isNomVconj = cregex.isNomVconj;
exports.isInv = cregex.isInv;
exports.isSg = cregex.isSg;
exports.isPl = cregex.isPl;
exports.isEpi = cregex.isEpi;
exports.isMas = cregex.isMas;
exports.isFem = cregex.isFem;
exports.mbNom = cregex.mbNom;
exports.mbAdj = cregex.mbAdj;
exports.mbAdjNb = cregex.mbAdjNb;
exports.mbNomAdj = cregex.mbNomAdj;
exports.mbNomNotAdj = cregex.mbNomNotAdj;
exports.mbPpasNomNotAdj = cregex.mbPpasNomNotAdj;
exports.mbVconj = cregex.mbVconj;
exports.mbVconj123 = cregex.mbVconj123;
exports.mbMG = cregex.mbMG;
exports.mbInv = cregex.mbInv;
exports.mbSg = cregex.mbSg;
exports.mbPl = cregex.mbPl;
exports.mbEpi = cregex.mbEpi;
exports.mbMas = cregex.mbMas;
exports.mbFem = cregex.mbFem;
exports.mbNpr = cregex.mbNpr;
exports.mbNprMasNotFem = cregex.mbNprMasNotFem;
}
|
Modified gc_lang/fr/modules-js/gce_analyseur.js from [673094989d] to [973aa5af1d].
| ︙ | ︙ | |||
18 19 20 21 22 23 24 |
return "vous";
}
if (s2 == "eux") {
return "ils";
}
if (s2 == "elle" || s2 == "elles") {
// We don’t check if word exists in _dAnalyses, for it is assumed it has been done before
| | | | | | | | | | | | | 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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 |
return "vous";
}
if (s2 == "eux") {
return "ils";
}
if (s2 == "elle" || s2 == "elles") {
// We don’t check if word exists in _dAnalyses, for it is assumed it has been done before
if (cregex.mbNprMasNotFem(_dAnalyses.gl_get(s1, ""))) {
return "ils";
}
// si épicène, indéterminable, mais OSEF, le féminin l’emporte
return "elles";
}
return s1 + " et " + s2;
}
function apposition (sWord1, sWord2) {
// returns true if nom + nom (no agreement required)
// We don’t check if word exists in _dAnalyses, for it is assumed it has been done before
return cregex.mbNomNotAdj(_dAnalyses.gl_get(sWord2, "")) && cregex.mbPpasNomNotAdj(_dAnalyses.gl_get(sWord1, ""));
}
function isAmbiguousNAV (sWord) {
// words which are nom|adj and verb are ambiguous (except être and avoir)
if (!_dAnalyses.has(sWord) && !_storeMorphFromFSA(sWord)) {
return false;
}
if (!cregex.mbNomAdj(_dAnalyses.gl_get(sWord, "")) || sWord == "est") {
return false;
}
if (cregex.mbVconj(_dAnalyses.gl_get(sWord, "")) && !cregex.mbMG(_dAnalyses.gl_get(sWord, ""))) {
return true;
}
return false;
}
function isAmbiguousAndWrong (sWord1, sWord2, sReqMorphNA, sReqMorphConj) {
//// use it if sWord1 won’t be a verb; word2 is assumed to be true via isAmbiguousNAV
// We don’t check if word exists in _dAnalyses, for it is assumed it has been done before
let a2 = _dAnalyses.gl_get(sWord2, null);
if (!a2 || a2.length === 0) {
return false;
}
if (cregex.checkConjVerb(a2, sReqMorphConj)) {
// verb word2 is ok
return false;
}
let a1 = _dAnalyses.gl_get(sWord1, null);
if (!a1 || a1.length === 0) {
return false;
}
if (cregex.checkAgreement(a1, a2) && (cregex.mbAdj(a2) || cregex.mbAdj(a1))) {
return false;
}
return true;
}
function isVeryAmbiguousAndWrong (sWord1, sWord2, sReqMorphNA, sReqMorphConj, bLastHopeCond) {
//// use it if sWord1 can be also a verb; word2 is assumed to be true via isAmbiguousNAV
// We don’t check if word exists in _dAnalyses, for it is assumed it has been done before
let a2 = _dAnalyses.gl_get(sWord2, null)
if (!a2 || a2.length === 0) {
return false;
}
if (cregex.checkConjVerb(a2, sReqMorphConj)) {
// verb word2 is ok
return false;
}
let a1 = _dAnalyses.gl_get(sWord1, null);
if (!a1 || a1.length === 0) {
return false;
}
if (cregex.checkAgreement(a1, a2) && (cregex.mbAdj(a2) || cregex.mbAdjNb(a1))) {
return false;
}
// now, we know there no agreement, and conjugation is also wrong
if (cregex.isNomAdj(a1)) {
return true;
}
//if cregex.isNomAdjVerb(a1): # considered true
if (bLastHopeCond) {
return true;
}
return false;
}
function checkAgreement (sWord1, sWord2) {
// We don’t check if word exists in _dAnalyses, for it is assumed it has been done before
let a2 = _dAnalyses.gl_get(sWord2, null)
if (!a2 || a2.length === 0) {
return true;
}
let a1 = _dAnalyses.gl_get(sWord1, null);
if (!a1 || a1.length === 0) {
return true;
}
return cregex.checkAgreement(a1, a2);
}
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))) {
|
| ︙ | ︙ |
Modified gc_lang/fr/modules-js/gce_suggestions.js from [d46530bfae] to [7f7dced66d].
1 2 | //// GRAMMAR CHECKING ENGINE PLUGIN: Suggestion mechanisms | > | | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 |
//// GRAMMAR CHECKING ENGINE PLUGIN: Suggestion mechanisms
if (typeof(exports) !== 'undefined') {
var conj = require("resource://grammalecte/fr/conj.js");
var mfsp = require("resource://grammalecte/fr/mfsp.js");
var phonet = require("resource://grammalecte/fr/phonet.js");
}
//// verbs
function suggVerb (sFlex, sWho, funcSugg2=null) {
// we don’t check if word exists in _dAnalyses, for it is assumed it has been done before
let aSugg = new Set();
|
| ︙ | ︙ | |||
193 194 195 196 197 198 199 |
function suggPlur (sFlex, sWordToAgree=null) {
// returns plural forms assuming sFlex is singular
if (sWordToAgree) {
if (!_dAnalyses.has(sWordToAgree) && !_storeMorphFromFSA(sWordToAgree)) {
return "";
}
| | | 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 |
function suggPlur (sFlex, sWordToAgree=null) {
// returns plural forms assuming sFlex is singular
if (sWordToAgree) {
if (!_dAnalyses.has(sWordToAgree) && !_storeMorphFromFSA(sWordToAgree)) {
return "";
}
let sGender = cregex.getGender(_dAnalyses.gl_get(sWordToAgree, []));
if (sGender == ":m") {
return suggMasPlur(sFlex);
} else if (sGender == ":f") {
return suggFemPlur(sFlex);
}
}
let aSugg = new Set();
|
| ︙ | ︙ | |||
259 260 261 262 263 264 265 |
let aSugg = new Set();
for (let sMorph of _dAnalyses.gl_get(sFlex, [])) {
if (!sMorph.includes(":V")) {
// not a verb
if (sMorph.includes(":m") || sMorph.includes(":e")) {
aSugg.add(suggSing(sFlex));
} else {
| | | | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 |
let aSugg = new Set();
for (let sMorph of _dAnalyses.gl_get(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.isFemForm(sStem)) {
mfsp.getMasForm(sStem, false).forEach(function(x) { aSugg.add(x); });
}
}
} else {
// a verb
let sVerb = cregex.getLemmaOfMorph(sMorph);
if (conj.hasConj(sVerb, ":PQ", ":Q1") && conj.hasConj(sVerb, ":PQ", ":Q3")) {
// We also check if the verb has a feminine form.
// If not, we consider it’s better to not suggest the masculine one, as it can be considered invariable.
aSugg.add(conj.getConj(sVerb, ":PQ", ":Q1"));
}
}
}
|
| ︙ | ︙ | |||
295 296 297 298 299 300 301 |
let aSugg = new Set();
for (let sMorph of _dAnalyses.gl_get(sFlex, [])) {
if (!sMorph.includes(":V")) {
// not a verb
if (sMorph.includes(":m") || sMorph.includes(":e")) {
aSugg.add(suggPlur(sFlex));
} else {
| | | | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 |
let aSugg = new Set();
for (let sMorph of _dAnalyses.gl_get(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.isFemForm(sStem)) {
mfsp.getMasForm(sStem, true).forEach(function(x) { aSugg.add(x); });
}
}
} else {
// a verb
let sVerb = cregex.getLemmaOfMorph(sMorph);
if (conj.hasConj(sVerb, ":PQ", ":Q2")) {
aSugg.add(conj.getConj(sVerb, ":PQ", ":Q2"));
} else if (conj.hasConj(sVerb, ":PQ", ":Q1")) {
let sSugg = conj.getConj(sVerb, ":PQ", ":Q1");
// it is necessary to filter these flexions, like “succédé” or “agi” that are not masculine plural
if (sSugg.endsWith("s")) {
aSugg.add(sSugg);
|
| ︙ | ︙ | |||
336 337 338 339 340 341 342 |
let aSugg = new Set();
for (let sMorph of _dAnalyses.gl_get(sFlex, [])) {
if (!sMorph.includes(":V")) {
// not a verb
if (sMorph.includes(":f") || sMorph.includes(":e")) {
aSugg.add(suggSing(sFlex));
} else {
| | | | 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 |
let aSugg = new Set();
for (let sMorph of _dAnalyses.gl_get(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.isFemForm(sStem)) {
aSugg.add(sStem);
}
}
} else {
// a verb
let sVerb = cregex.getLemmaOfMorph(sMorph);
if (conj.hasConj(sVerb, ":PQ", ":Q3")) {
aSugg.add(conj.getConj(sVerb, ":PQ", ":Q3"));
}
}
}
if (bSuggSimil) {
for (let e of phonet.selectSimil(sFlex, ":f:[si]")) {
|
| ︙ | ︙ | |||
370 371 372 373 374 375 376 |
let aSugg = new Set();
for (let sMorph of _dAnalyses.gl_get(sFlex, [])) {
if (!sMorph.includes(":V")) {
// not a verb
if (sMorph.includes(":f") || sMorph.includes(":e")) {
aSugg.add(suggPlur(sFlex));
} else {
| | | | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 |
let aSugg = new Set();
for (let sMorph of _dAnalyses.gl_get(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.isFemForm(sStem)) {
aSugg.add(sStem+"s");
}
}
} else {
// a verb
let sVerb = cregex.getLemmaOfMorph(sMorph);
if (conj.hasConj(sVerb, ":PQ", ":Q4")) {
aSugg.add(conj.getConj(sVerb, ":PQ", ":Q4"));
}
}
}
if (bSuggSimil) {
for (let e of phonet.selectSimil(sFlex, ":f:[pi]")) {
|
| ︙ | ︙ |
Modified gc_lang/fr/modules-js/lexicographe.js from [5e8c9037a7] to [8f5fca9732].
1 2 3 4 5 6 7 8 9 |
// Grammalecte - Lexicographe
// License: MPL 2
"use strict";
${string}
${map}
| > | < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |
// Grammalecte - Lexicographe
// License: MPL 2
"use strict";
${string}
${map}
if (typeof(exports) !== 'undefined') {
const helpers = require("resource://grammalecte/helpers.js");
}
const _dTAGS = new Map ([
[':G', "[mot grammatical]"],
[':N', " nom,"],
[':A', " adjectif,"],
[':M1', " prénom,"],
[':M2', " patronyme,"],
|
| ︙ | ︙ |
Modified gc_lang/fr/modules-js/mfsp.js from [404b1b695d] to [33bc239621].
1 2 3 4 | // Grammalecte "use strict"; | > > | < | | > | | | < | < | | | > > > > > > > | > > | < < < > | > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > | | | | > > | 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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
// Grammalecte
"use strict";
if (typeof(require) !== 'undefined') {
var helpers = require("resource://grammalecte/helpers.js");
}
const mfsp = {
// list of affix codes
_lTagMiscPlur: [],
_lTagMasForm: [],
// dictionary of words with uncommon plurals (-x, -ux, english, latin and italian plurals) and tags to generate them
_dMiscPlur: {},
// dictionary of feminine forms and tags to generate masculine forms (singular and plural)
_dMasForm: {},
init: function (sJSONData) {
try {
let _oData = JSON.parse(sJSONData);
this._lTagMiscPlur = _oData.lTagMiscPlur;
this._lTagMasForm = _oData.lTagMasForm;
this._dMiscPlur = helpers.objectToMap(_oData.dMiscPlur);
this._dMasForm = helpers.objectToMap(_oData.dMasForm);
}
catch (e) {
console.error(e);
}
},
isFemForm: function (sWord) {
// returns True if sWord exists in this._dMasForm
return this._dMasForm.has(sWord);
},
getMasForm: function (sWord, bPlur) {
// returns masculine form with feminine form
if (this._dMasForm.has(sWord)) {
return [ for (sTag of this._whatSuffixCode(sWord, bPlur)) this._modifyStringWithSuffixCode(sWord, sTag) ];
}
return [];
},
hasMiscPlural: function (sWord) {
// returns True if sWord exists in dMiscPlur
return this._dMiscPlur.has(sWord);
},
getMiscPlural: function (sWord) {
// returns plural form with singular form
if (this._dMiscPlur.has(sWord)) {
return [ for (sTag of this._lTagMiscPlur[this._dMiscPlur.get(sWord)].split("|")) this._modifyStringWithSuffixCode(sWord, sTag) ];
}
return [];
},
_whatSuffixCode: function (sWord, bPlur) {
// necessary only for dMasFW
let sSfx = this._lTagMasForm[this._dMasForm.get(sWord)];
if (sSfx.includes("/")) {
if (bPlur) {
return sSfx.slice(sSfx.indexOf("/")+1).split("|");
}
return sSfx.slice(0, sSfx.indexOf("/")).split("|");
}
return sSfx.split("|");
},
_modifyStringWithSuffixCode: function (sWord, sSfx) {
// returns sWord modified by sSfx
if (!sWord) {
return "";
}
if (sSfx === "0") {
return sWord;
}
try {
if (sSfx[0] !== '0') {
return sWord.slice(0, -(sSfx.charCodeAt(0)-48)) + sSfx.slice(1); // 48 is the ASCII code for "0"
} else {
return sWord + sSfx.slice(1);
}
}
catch (e) {
console.log(e);
return "## erreur, code : " + sSfx + " ##";
}
}
}
// Initialization
if (typeof(browser) !== 'undefined') {
// WebExtension
mfsp.init(helpers.loadFile(browser.extension.getURL("grammalecte/fr/mfsp_data.json")));
} else if (typeof(require) !== 'undefined') {
// Add-on SDK and Thunderbird
mfsp.init(helpers.loadFile("resource://grammalecte/fr/mfsp_data.json"));
} else {
console.log("Error: Impossible d’initialiser le module mfsp");
}
if (typeof(exports) !== 'undefined') {
exports._lTagMiscPlur = mfsp._lTagMiscPlur;
exports._lTagMasForm = mfsp._lTagMasForm;
exports._dMiscPlur = mfsp._dMiscPlur;
exports._dMasForm = mfsp._dMasForm;
exports.init = mfsp.init;
exports.isFemForm = mfsp.isFemForm;
exports.getMasForm = mfsp.getMasForm;
exports.hasMiscPlural = mfsp.hasMiscPlural;
exports.getMiscPlural = mfsp.getMiscPlural;
exports._whatSuffixCode = mfsp._whatSuffixCode;
exports._modifyStringWithSuffixCode = mfsp._modifyStringWithSuffixCode;
}
|
Modified gc_lang/fr/modules-js/phonet.js from [1d899a6d9f] to [828ddc2ac6].
1 2 | // Grammalecte - Suggestion phonétique | > | > | | > > > > > > | | | | > > | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > | | | | 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 |
// Grammalecte - Suggestion phonétique
if (typeof(require) !== 'undefined') {
var helpers = require("resource://grammalecte/helpers.js");
}
const phonet = {
_dWord: {},
_lSet: [],
_dMorph: {},
init: function (sJSONData) {
try {
let _oData = JSON.parse(sJSONData);
this._dWord = helpers.objectToMap(_oData.dWord);
this._lSet = _oData.lSet;
this._dMorph = helpers.objectToMap(_oData.dMorph);
}
catch (e) {
console.error(e);
}
},
hasSimil: function (sWord, sPattern=null) {
// return True if there is list of words phonetically similar to sWord
if (!sWord) {
return false;
}
if (this._dWord.has(sWord)) {
if (sPattern) {
return this.getSimil(sWord).some(sSimil => this._dMorph.gl_get(sSimil, []).some(sMorph => sMorph.search(sPattern) >= 0));
}
return true;
}
if (sWord.slice(0,1).gl_isUpperCase()) {
sWord = sWord.toLowerCase();
if (this._dWord.has(sWord)) {
if (sPattern) {
return this.getSimil(sWord).some(sSimil => this._dMorph.gl_get(sSimil, []).some(sMorph => sMorph.search(sPattern) >= 0));
}
return true;
}
}
return false;
},
getSimil: function (sWord) {
// return list of words phonetically similar to sWord
if (!sWord) {
return [];
}
if (this._dWord.has(sWord)) {
return this._lSet[this._dWord.get(sWord)];
}
if (sWord.slice(0,1).gl_isUpperCase()) {
sWord = sWord.toLowerCase();
if (this._dWord.has(sWord)) {
return this._lSet[this._dWord.get(sWord)];
}
}
return [];
},
selectSimil: function (sWord, sPattern) {
// return list of words phonetically similar to sWord and whom POS is matching sPattern
if (!sPattern) {
return new Set(this.getSimil(sWord));
}
let aSelect = new Set();
for (let sSimil of this.getSimil(sWord)) {
for (let sMorph of this._dMorph.gl_get(sSimil, [])) {
if (sMorph.search(sPattern) >= 0) {
aSelect.add(sSimil);
}
}
}
return aSelect;
}
}
// Initialization
if (typeof(browser) !== 'undefined') {
// WebExtension
phonet.init(helpers.loadFile(browser.extension.getURL("grammalecte/fr/phonet_data.json")));
} else if (typeof(require) !== 'undefined') {
// Add-on SDK and Thunderbird
phonet.init(helpers.loadFile("resource://grammalecte/fr/phonet_data.json"));
} else {
console.log("Error: Impossible d’initialiser le module phonet");
}
if (typeof(exports) !== 'undefined') {
exports._dWord = phonet._dWord;
exports._lSet = phonet._lSet;
exports._dMorph = phonet._dMorph;
exports.init = phonet.init;
exports.hasSimil = phonet.hasSimil;
exports.getSimil = phonet.getSimil;
exports.selectSimil = phonet.selectSimil;
}
|
Modified gc_lang/fr/modules-js/textformatter.js from [7314bcd9a1] to [6dfa91f96e].
| ︙ | ︙ | |||
194 195 196 197 198 199 200 |
[/^(qu|lorsqu|puisqu|quoiqu|presqu|jusqu|aujourd|entr|quelqu|prud) /ig, "$1’"] ],
"ma_1letter_lowercase": [ [/[ ]([ldjnmtscç]) (?=[aàeéêiîoôuyhAÀEÉÊIÎOÔUYH])/g, "$1’"] ],
"ma_1letter_uppercase": [ [/[ ]([LDJNMTSCÇ]) (?=[aàeéêiîoôuyhAÀEÉÊIÎOÔUYH])/g, "$1’"],
[/^([LDJNMTSCÇ]) (?=[aàeéêiîoôuyhAÀEÉÊIÎOÔUYH])/g, "$1’"] ]
};
| | | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 |
[/^(qu|lorsqu|puisqu|quoiqu|presqu|jusqu|aujourd|entr|quelqu|prud) /ig, "$1’"] ],
"ma_1letter_lowercase": [ [/[ ]([ldjnmtscç]) (?=[aàeéêiîoôuyhAÀEÉÊIÎOÔUYH])/g, "$1’"] ],
"ma_1letter_uppercase": [ [/[ ]([LDJNMTSCÇ]) (?=[aàeéêiîoôuyhAÀEÉÊIÎOÔUYH])/g, "$1’"],
[/^([LDJNMTSCÇ]) (?=[aàeéêiîoôuyhAÀEÉÊIÎOÔUYH])/g, "$1’"] ]
};
const dTFDefaultOptions = new Map ([
["ts_units", true],
["start_of_paragraph", true],
["end_of_paragraph", true],
["between_words", true],
["before_punctuation", true],
["within_parenthesis", true],
["within_square_brackets", true],
|
| ︙ | ︙ | |||
247 248 249 250 251 252 253 |
["etc", true],
["missing_hyphens", true],
["ma_word", true],
["ma_1letter_lowercase", false],
["ma_1letter_uppercase", false]
]);
| | | | | | 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 |
["etc", true],
["missing_hyphens", true],
["ma_word", true],
["ma_1letter_lowercase", false],
["ma_1letter_uppercase", false]
]);
const dTFOptions = dTFDefaultOptions.gl_shallowCopy();
class TextFormatter {
constructor () {
this.sLang = "fr";
};
formatText (sText, dOpt=null) {
if (dOpt !== null) {
dTFOptions.gl_updateOnlyExistingKeys(dOpt);
}
for (let [sOptName, bVal] of dTFOptions) {
if (bVal && oReplTable.has(sOptName)) {
for (let [zRgx, sRep] of oReplTable[sOptName]) {
sText = sText.replace(zRgx, sRep);
}
}
}
return sText;
};
getDefaultOptions () {
return dTFDefaultOptions;
}
}
if (typeof(exports) !== 'undefined') {
exports.TextFormatter = TextFormatter;
exports.oReplTable = oReplTable;
}
|
Modified gc_lang/fr/tb/content/overlay.js from [31d038a91d] to [a6d0f601cc].
| ︙ | ︙ | |||
908 909 910 911 912 913 914 915 916 917 918 919 920 921 |
oTextFormatter.resetProgressBar();
}
}, false);
window.addEventListener("load", function (xEvent) {
oDictIgniter.init();
oGrammarChecker.loadGC();
}, false);
window.addEventListener("compose-window-init", function (xEvent) {
oGrammarChecker.loadUI();
oGrammarChecker.closePanel();
oGrammarChecker.clearPreview();
oTextFormatter.init();
| > | 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 |
oTextFormatter.resetProgressBar();
}
}, false);
window.addEventListener("load", function (xEvent) {
oDictIgniter.init();
oGrammarChecker.loadGC();
//oGrammarChecker.fullTests();
}, false);
window.addEventListener("compose-window-init", function (xEvent) {
oGrammarChecker.loadUI();
oGrammarChecker.closePanel();
oGrammarChecker.clearPreview();
oTextFormatter.init();
|
| ︙ | ︙ |
Modified gc_lang/fr/webext/gce_worker.js from [8fda2777a3] to [19de02aa0c].
1 2 |
| > > > > > < > > > | < < < < < < < | | | > > > > | > > | | > > > > | < < < < | 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 |
/*
WARNING.
JavaScript still sucks.
No module available in WebExtension at the moment! :(
No require, no import/export.
In order to use the same base of code with XUL-addon for Thunderbird and SDK-addon for Firefox,
all modules have been “objectified”. And while they are still imported via “require”
in the previous extensions, they are loaded as background scripts in WebExtension sharing
the same memory space (it seems)…
When JavaScript become a modern language, “deobjectify” the modules…
ATM, import/export are not available by default:
— Chrome 60 – behind the Experimental Web Platform flag in chrome:flags.
— Firefox 54 – behind the dom.moduleScripts.enabled setting in about:config.
— Edge 15 – behind the Experimental JavaScript Features setting in about:flags.
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/export
*/
helpers.echo("START");
helpers.echo(conj.getConj("devenir", ":E", ":2s"));
helpers.echo(mfsp.getMasForm("emmerdeuse", true));
helpers.echo(mfsp.getMasForm("pointilleuse", false));
helpers.echo(phonet.getSimil("est"));
let oTokenizer = null;
let oDict = null;
let oLxg = null;
function loadGrammarChecker (sGCOptions="", sContext="JavaScript") {
if (gce === null) {
|
| ︙ | ︙ |
Modified gc_lang/fr/webext/manifest.json from [53ddc564c6] to [ce6a6e89b7].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 |
"browser_action": {
"default_icon": "img/logo-32.png",
"default_popup": "panel/main.html",
"default_title": "Grammalecte [fr]",
"browser_style": false
},
"background": {
| > | > > > > > > > | < > > | | 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 |
"browser_action": {
"default_icon": "img/logo-32.png",
"default_popup": "panel/main.html",
"default_title": "Grammalecte [fr]",
"browser_style": false
},
"background": {
"scripts": [
"grammalecte/helpers.js",
"grammalecte/text.js",
"grammalecte/tokenizer.js",
"grammalecte/fr/conj.js",
"grammalecte/fr/mfsp.js",
"grammalecte/fr/phonet.js",
"gce_worker.js"
]
},
"web_accessible_resources": [
"grammalecte/fr/conj_data.json",
"grammalecte/fr/mfsp_data.json",
"grammalecte/fr/phonet_data.json",
"grammalecte/fr/tests_data.json"
],
"permissions": [
"activeTab"
]
}
|
Modified gc_lang/fr/xpi/data/conj_panel.js from [0a29bb81bd] to [eb75f474de].
| ︙ | ︙ | |||
67 68 69 70 71 72 73 |
sVerb = sVerb.slice(2);
}
if (sVerb.endsWith("?")) {
document.getElementById('oint').checked = true;
sVerb = sVerb.slice(0,-1).trim();
}
| | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
sVerb = sVerb.slice(2);
}
if (sVerb.endsWith("?")) {
document.getElementById('oint').checked = true;
sVerb = sVerb.slice(0,-1).trim();
}
if (!conj.isVerb(sVerb)) {
document.getElementById('verb').style = "color: #BB4411;";
} else {
self.port.emit("show");
document.getElementById('verb_title').textContent = sVerb;
document.getElementById('verb').style = "color: #999999;";
document.getElementById('verb').value = "";
oVerb = new Verb(sVerb);
|
| ︙ | ︙ |