Overview
Comment: | [fx][tb][lo] lexical editor: tag p and q for verb generation |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | tb | fx | lo | multid |
Files: | files | file ages | folders |
SHA3-256: |
11a83392a7fad4d5b488b349cf33707b |
User & Date: | olr on 2018-03-27 16:51:42 |
Other Links: | branch diff | manifest | tags |
Context
2018-03-27
| ||
18:13 | [fx] lexical editor: fix label check-in: 5e197dddff user: olr tags: fx, multid | |
16:51 | [fx][tb][lo] lexical editor: tag p and q for verb generation check-in: 11a83392a7 user: olr tags: tb, fx, lo, multid | |
16:13 | [lo] lexicon editor: search within personal dictionary check-in: 819d3a016f user: olr tags: lo, multid | |
Changes
Modified gc_lang/fr/oxt/DictOptions/LexiconEditor.py from [85224c07b2] to [fa7335a6fb].
︙ | ︙ | |||
458 459 460 461 462 463 464 465 466 467 468 469 470 471 | c_t = "t" if self.xV_t.State else "_" c_n = "n" if self.xV_n.State else "_" c_p = "p" if self.xV_p.State else "_" c_m = "m" if self.xV_m.State else "_" c_ae = "e" if self.xV_ae.State else "_" c_aa = "a" if self.xV_aa.State else "_" sVerbTag = c_i + c_t + c_n + c_p + c_m + c_ae + c_aa if not sVerbTag.endswith("__") and not sVerbTag.startswith("____"): sVerbPattern = self.xVpattern.Text.strip() if not sVerbPattern: # Utilisation du générateur de conjugaison for sFlexion, sFlexTags in conjgen.conjugate(self.sLemma, sVerbTag, not bool(self.xV_pp.State)): self.lGeneratedFlex.append((sFlexion, sFlexTags)) else: | > > | 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 | c_t = "t" if self.xV_t.State else "_" c_n = "n" if self.xV_n.State else "_" c_p = "p" if self.xV_p.State else "_" c_m = "m" if self.xV_m.State else "_" c_ae = "e" if self.xV_ae.State else "_" c_aa = "a" if self.xV_aa.State else "_" sVerbTag = c_i + c_t + c_n + c_p + c_m + c_ae + c_aa if "p" in sVerbTag and not sVerbTag.startswith("___p_"): sVerbTag = sVerbTag.replace("p", "q") if not sVerbTag.endswith("__") and not sVerbTag.startswith("____"): sVerbPattern = self.xVpattern.Text.strip() if not sVerbPattern: # Utilisation du générateur de conjugaison for sFlexion, sFlexTags in conjgen.conjugate(self.sLemma, sVerbTag, not bool(self.xV_pp.State)): self.lGeneratedFlex.append((sFlexion, sFlexTags)) else: |
︙ | ︙ |
Modified gc_lang/fr/tb/content/lex_editor.js from [7dc34ae726] to [fada324b17].
︙ | ︙ | |||
304 305 306 307 308 309 310 311 312 313 314 315 316 317 | let c_t = (document.getElementById("v_t").checked) ? "t" : "_"; let c_n = (document.getElementById("v_n").checked) ? "n" : "_"; let c_p = (document.getElementById("v_p").checked) ? "p" : "_"; let c_m = (document.getElementById("v_m").checked) ? "m" : "_"; let c_ae = (document.getElementById("v_ae").checked) ? "e" : "_"; let c_aa = (document.getElementById("v_aa").checked) ? "a" : "_"; let sVerbTag = c_i + c_t + c_n + c_p + c_m + c_ae + c_aa; if (!sVerbTag.endsWith("__") && !sVerbTag.startsWith("____")) { let sVerbPattern = document.getElementById("verbe_modele").value.trim(); if (sVerbPattern.length == 0) { // utilisation du générateur de conjugaison let bVarPpas = !document.getElementById("v_ppas").checked; for (let [sFlexion, sFlexTags] of conj_generator.conjugate(this.sLemma, sVerbTag, bVarPpas)) { this.lFlexion.push([sFlexion, sFlexTags]); | > > > | 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 | let c_t = (document.getElementById("v_t").checked) ? "t" : "_"; let c_n = (document.getElementById("v_n").checked) ? "n" : "_"; let c_p = (document.getElementById("v_p").checked) ? "p" : "_"; let c_m = (document.getElementById("v_m").checked) ? "m" : "_"; let c_ae = (document.getElementById("v_ae").checked) ? "e" : "_"; let c_aa = (document.getElementById("v_aa").checked) ? "a" : "_"; let sVerbTag = c_i + c_t + c_n + c_p + c_m + c_ae + c_aa; if (sVerbTag.includes("p") && !sVerbTag.startsWith("___p_")) { sVerbTag = sVerbTag.replace("p", "q"); } if (!sVerbTag.endsWith("__") && !sVerbTag.startsWith("____")) { let sVerbPattern = document.getElementById("verbe_modele").value.trim(); if (sVerbPattern.length == 0) { // utilisation du générateur de conjugaison let bVarPpas = !document.getElementById("v_ppas").checked; for (let [sFlexion, sFlexTags] of conj_generator.conjugate(this.sLemma, sVerbTag, bVarPpas)) { this.lFlexion.push([sFlexion, sFlexTags]); |
︙ | ︙ |
Modified gc_lang/fr/webext/panel/lex_editor.js from [5d68930536] to [8aaea91d99].
︙ | ︙ | |||
376 377 378 379 380 381 382 383 384 385 386 387 388 389 | let c_t = (document.getElementById("up_v_t").checked) ? "t" : "_"; let c_n = (document.getElementById("up_v_n").checked) ? "n" : "_"; let c_p = (document.getElementById("up_v_p").checked) ? "p" : "_"; let c_m = (document.getElementById("up_v_m").checked) ? "m" : "_"; let c_ae = (document.getElementById("up_v_ae").checked) ? "e" : "_"; let c_aa = (document.getElementById("up_v_aa").checked) ? "a" : "_"; let sVerbTag = c_i + c_t + c_n + c_p + c_m + c_ae + c_aa; if (!sVerbTag.endsWith("__") && !sVerbTag.startsWith("____")) { let sVerbPattern = document.getElementById("verb_pattern").value.trim(); if (sVerbPattern.length == 0) { // utilisation du générateur de conjugaison let bVarPpas = !document.getElementById("up_v_ppas").checked; for (let [sFlexion, sFlexTags] of conj_generator.conjugate(this.sLemma, sVerbTag, bVarPpas)) { this.lFlexion.push([sFlexion, sFlexTags]); | > > > | 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | let c_t = (document.getElementById("up_v_t").checked) ? "t" : "_"; let c_n = (document.getElementById("up_v_n").checked) ? "n" : "_"; let c_p = (document.getElementById("up_v_p").checked) ? "p" : "_"; let c_m = (document.getElementById("up_v_m").checked) ? "m" : "_"; let c_ae = (document.getElementById("up_v_ae").checked) ? "e" : "_"; let c_aa = (document.getElementById("up_v_aa").checked) ? "a" : "_"; let sVerbTag = c_i + c_t + c_n + c_p + c_m + c_ae + c_aa; if (sVerbTag.includes("p") && !sVerbTag.startsWith("___p_")) { sVerbTag = sVerbTag.replace("p", "q"); } if (!sVerbTag.endsWith("__") && !sVerbTag.startsWith("____")) { let sVerbPattern = document.getElementById("verb_pattern").value.trim(); if (sVerbPattern.length == 0) { // utilisation du générateur de conjugaison let bVarPpas = !document.getElementById("up_v_ppas").checked; for (let [sFlexion, sFlexTags] of conj_generator.conjugate(this.sLemma, sVerbTag, bVarPpas)) { this.lFlexion.push([sFlexion, sFlexTags]); |
︙ | ︙ |