From 860f142437aaad430187b2521cfe25ec8e7b5503 Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Mon, 12 Feb 2024 17:25:36 +0100 Subject: [PATCH 1/7] Split verbs --- learning-irregular-verbs-in-English.el | 620 +------------------------ verbs.el | 603 ++++++++++++++++++++++++ 2 files changed, 617 insertions(+), 606 deletions(-) create mode 100644 verbs.el diff --git a/learning-irregular-verbs-in-English.el b/learning-irregular-verbs-in-English.el index b1d4af9..e18846d 100644 --- a/learning-irregular-verbs-in-English.el +++ b/learning-irregular-verbs-in-English.el @@ -12,615 +12,16 @@ ;;; Code: ;; Imports +(load-file "verbs.el") +(require 'verbs) (require 'widget) (eval-when-compile (require 'wid-edit)) ;; Variables - -(defvar lire--verbs '( - ( - (infinitive . "beat") - (simple-past . "beat") - (past-participle . "beaten") - (translations - (es . "golpear"))) - ( - (infinitive . "become") - (simple-past . "became") - (past-participle . "become") - (translations - (es . "llegar a ser, convertirse en"))) - ( - (infinitive . "begin") - (simple-past . "began") - (past-participle . "begun") - (translations - (es . "empezar"))) - ( - (infinitive . "bend") - (simple-past . "bent") - (past-participle . "bent") - (translations - (es . "doblar"))) - ( - (infinitive . "bet") - (simple-past . "bet") - (past-participle . "bet") - (translations - (es . "apostar"))) - ( - (infinitive . "bite") - (simple-past . "bit") - (past-participle . "bitten") - (translations - (es . ("morder")))) - ( - (infinitive . "bleed") - (simple-past . "bled") - (past-participle . "bled") - (translations - (es . "sangrar"))) - ( - (infinitive . "blow") - (simple-past . "blew") - (past-participle . "blown") - (translations - (es . ("soplar")))) - ( - (infinitive . "break") - (simple-past . "broke") - (past-participle . "broken") - (translations - (es . "romper"))) - ( - (infinitive . "bring") - (simple-past . "brought") - (past-participle . "brought") - (translations - (es . "traer"))) - ( - (infinitive . "build") - (simple-past . "built") - (past-participle . "built") - (translations - (es . "construir"))) - ( - (infinitive . "burn") - (simple-past . "burnt") - (past-participle . "burnt") - (translations - (es . "quemar"))) - ( - (infinitive . "buy") - (simple-past . "bought") - (past-participle . "bought") - (translations - (es . "comprar"))) - ( - (infinitive . "catch") - (simple-past . "caught") - (past-participle . "caught") - (translations - (es . "coger"))) - ( - (infinitive . "choose") - (simple-past . "chose") - (past-participle . "chosen") - (translations - (es . "escoger"))) - ( - (infinitive . "come") - (simple-past . "came") - (past-participle . "come") - (translations - (es . "venir"))) - ( - (infinitive . "cost") - (simple-past . "cost") - (past-participle . "cost") - (translations - (es . "costar"))) - ( - (infinitive . "cut") - (simple-past . "cut") - (past-participle . "cut") - (translations - (es . "cortar"))) - ( - (infinitive . "dig") - (simple-past . "dug") - (past-participle . "dug") - (translations - (es . "cavar"))) - ( - (infinitive . "do") - (simple-past . "did") - (past-participle . "done") - (translations - (es . "hacer"))) - ( - (infinitive . "draw") - (simple-past . "drew") - (past-participle . "drawn") - (translations - (es . '"(dibujar, trazar"))) - ( - (infinitive . "dream") - (simple-past . "dreamt") - (past-participle . "dreamt") - (translations - (es . "soñar"))) - ( - (infinitive . "drink") - (simple-past . "drank") - (past-participle . "drunk") - (translations - (es . "beber"))) - ( - (infinitive . "drive") - (simple-past . "drove") - (past-participle . "driven") - (translations - (es . "conducir"))) - ( - (infinitive . "eat") - (simple-past . "ate") - (past-participle . "eaten") - (translations - (es . "comer"))) - ( - (infinitive . "fall") - (simple-past . "fell") - (past-participle . "fallen") - (translations - (es . "caer(se)"))) - ( - (infinitive . "feed") - (simple-past . "fed") - (past-participle . "fed") - (translations - (es . "dar de comer, alimentar"))) - ( - (infinitive . "feel") - (simple-past . "felt") - (past-participle . "felt") - (translations - (es . "sentir"))) - ( - (infinitive . "fight") - (simple-past . "fought") - (past-participle . "fought") - (translations - (es . "pelear, luchar"))) - ( - (infinitive . "find") - (simple-past . "found") - (past-participle . "found") - (translations - (es . "encontrar"))) - ( - (infinitive . "fly") - (simple-past . "flew") - (past-participle . "flown") - (translations - (es . "volar"))) - ( - (infinitive . "forget") - (simple-past . "forgot") - (past-participle . "forgotten") - (translations - (es . "olvidar"))) - ( - (infinitive . "forgive") - (simple-past . "forgave") - (past-participle . "forgiven") - (translations - (es . "perdonar"))) - ( - (infinitive . "freeze") - (simple-past . "froze") - (past-participle . "frozen") - (translations - (es . "helar, congelar"))) - ( - (infinitive . "get") - (simple-past . "got") - (past-participle . "got") - (translations - (es . "conseguir"))) - ( - (infinitive . "give") - (simple-past . "gave") - (past-participle . "given") - (translations - (es . "dar"))) - ( - (infinitive . "go") - (simple-past . "went") - (past-participle . "gone") - (translations - (es . "ir"))) - ( - (infinitive . "grow") - (simple-past . "grew") - (past-participle . "grown") - (translations - (es . "cultivar, crecer"))) - ( - (infinitive . "hang") - (simple-past . "hung") - (past-participle . "hung") - (translations - (es . "colgar"))) - ( - (infinitive . "have") - (simple-past . "had") - (past-participle . "had") - (translations - (es . "tener"))) - ( - (infinitive . "hear") - (simple-past . "heard") - (past-participle . "heard") - (translations - (es .' ("oír")))) - ( - (infinitive . "hide") - (simple-past . "hid") - (past-participle . "hidden") - (translations - (es . "esconder"))) - ( - (infinitive . "hit") - (simple-past . "hit") - (past-participle . "hit") - (translations - (es . "golpear, pegar"))) - ( - (infinitive . "hold") - (simple-past . "held") - (past-participle . "held") - (translations - (es . "sostener"))) - ( - (infinitive . "hurt") - (simple-past . "hurt") - (past-participle . "hurt") - (translations - (es . "herir"))) - ( - (infinitive . "keep") - (simple-past . "kept") - (past-participle . "kept") - (translations - (es . "mantener"))) - ( - (infinitive . "know") - (simple-past . "knew") - (past-participle . "known") - (translations - (es . "saber, conocer"))) - ( - (infinitive . "lay") - (simple-past . "laid") - (past-participle . "laid") - (translations - (es . "poner (la mesa), colocar"))) - ( - (infinitive . "lead") - (simple-past . "led") - (past-participle . "led") - (translations - (es . "dirigir"))) - ( - (infinitive . "learn") - (simple-past . "learnt") - (past-participle . "learnt") - (translations - (es . "aprender"))) - ( - (infinitive . "leave") - (simple-past . "left") - (past-participle . "left") - (translations - (es . "dejar, marcharse(se)"))) - ( - (infinitive . "lend") - (simple-past . "lent") - (past-participle . "lent") - (translations - (es . "prestar"))) - ( - (infinitive . "let") - (simple-past . "let") - (past-participle . "let") - (translations - (es . "dejar, permitir"))) - ( - (infinitive . "lie") - (simple-past . "lay") - (past-participle . "lain") - (translations - (es . "tumbarse"))) - ( - (infinitive . "light") - (simple-past . "lit") - (past-participle . "lit") - (translations - (es . "iluminar"))) - ( - (infinitive . "lose") - (simple-past . "lost") - (past-participle . "lost") - (translations - (es . "perder"))) - ( - (infinitive . "make") - (simple-past . "made") - (past-participle . "made") - (translations - (es . "hacer"))) - ( - (infinitive . "mean") - (simple-past . "meant") - (past-participle . "meant") - (translations - (es . "significar, querer decir"))) - ( - (infinitive . "meet") - (simple-past . "met") - (past-participle . "met") - (translations - (es . "conocer"))) - ( - (infinitive . "pay") - (simple-past . "paid") - (past-participle . "paid") - (translations - (es . "pagar"))) - ( - (infinitive . "put") - (simple-past . "put") - (past-participle . "put") - (translations - (es . "poner"))) - ( - (infinitive . "read") - (simple-past . "read") - (past-participle . "read") - (translations - (es . "leer"))) - ( - (infinitive . "ride") - (simple-past . "rode") - (past-participle . "ridden") - (translations - (es . "montar"))) - ( - (infinitive . "ring") - (simple-past . "rang") - (past-participle . "rung") - (translations - (es . "sonar, llamar por teléfono"))) - ( - (infinitive . "rise") - (simple-past . "rose") - (past-participle . "risen") - (translations - (es . "levantarse"))) - ( - (infinitive . "run") - (simple-past . "ran") - (past-participle . "run") - (translations - (es . "correr"))) - ( - (infinitive . "say") - (simple-past . "said") - (past-participle . "said") - (translations - (es . "decir"))) - ( - (infinitive . "see") - (simple-past . "saw") - (past-participle . "seen") - (translations - (es . "ver"))) - ( - (infinitive . "sell") - (simple-past . "sold") - (past-participle . "sold") - (translations - (es . "vender"))) - ( - (infinitive . "send") - (simple-past . "sent") - (past-participle . "sent") - (translations - (es . "enviar"))) - ( - (infinitive . "set") - (simple-past . "set") - (past-participle . "set") - (translations - (es . "colocar, fijar, poner la mesa"))) - ( - (infinitive . "shake") - (simple-past . "shook") - (past-participle . "shaken") - (translations - (es . "agitar, sacudir"))) - ( - (infinitive . "shine") - (simple-past . "shone") - (past-participle . "shone") - (translations - (es . "brillar, sacar brillo"))) - ( - (infinitive . "shoot") - (simple-past . "shot") - (past-participle . "shot") - (translations - (es . "disparar"))) - ( - (infinitive . "show") - (simple-past . "showed") - (past-participle . "shown") - (translations - (es . "mostrar"))) - ( - (infinitive . "shut") - (simple-past . "shut") - (past-participle . "shut") - (translations - (es . "cerrar"))) - ( - (infinitive . "sing") - (simple-past . "sang") - (past-participle . "sung") - (translations - (es . "cantar"))) - ( - (infinitive . "sink") - (simple-past . "sank") - (past-participle . "sunk") - (translations - (es . "hundir(se)"))) - ( - (infinitive . "sit") - (simple-past . "sat") - (past-participle . "sat") - (translations - (es . "sentar(se)"))) - ( - (infinitive . "sleep") - (simple-past . "slept") - (past-participle . "slept") - (translations - (es . "dormir"))) - ( - (infinitive . "smell") - (simple-past . "smelt") - (past-participle . "smelt") - (translations - (es . "oler"))) - ( - (infinitive . "speak") - (simple-past . "spoke") - (past-participle . "spoken") - (translations - (es . "hablar"))) - ( - (infinitive . "spell") - (simple-past . "spelt") - (past-participle . "spelt") - (translations - (es . "deletrear"))) - ( - (infinitive . "spend") - (simple-past . "spent") - (past-participle . "spent") - (translations - (es . "gastar"))) - ( - (infinitive . "spill") - (simple-past . "spilt") - (past-participle . "spilt") - (translations - (es . "derramar"))) - ( - (infinitive . "spit") - (simple-past . "spit") - (past-participle . "spit") - (translations - (es . "escupir"))) - ( - (infinitive . "stand") - (simple-past . "stood") - (past-participle . "stood") - (translations - (es . "ponerse/estar de pie"))) - ( - (infinitive . "steal") - (simple-past . "stole") - (past-participle . "stolen") - (translations - (es . "robar"))) - ( - (infinitive . "swim") - (simple-past . "swam") - (past-participle . "swum") - (translations - (es . "nadar"))) - ( - (infinitive . "take") - (simple-past . "took") - (past-participle . "taken") - (translations - (es . "tomar, coger"))) - ( - (infinitive . "teach") - (simple-past . "taught") - (past-participle . "taught") - (translations - (es . "enseñar"))) - ( - (infinitive . "tear") - (simple-past . "tore") - (past-participle . "torn") - (translations - (es . "romper, rasgar"))) - ( - (infinitive . "tell") - (simple-past . "told") - (past-participle . "told") - (translations - (es . "decir, contar"))) - ( - (infinitive . "think") - (simple-past . "thought") - (past-participle . "thought") - (translations - (es . "pensar"))) - ( - (infinitive . "throw") - (simple-past . "threw") - (past-participle . "thrown") - (translations - (es . "lanzar, tirar"))) - ( - (infinitive . "understand") - (simple-past . "understood") - (past-participle . "understood") - (translations - (es . "entender"))) - ( - (infinitive . "wake") - (simple-past . "woke") - (past-participle . "woken") - (translations - (es . "despertar"))) - ( - (infinitive . "wear") - (simple-past . "wore") - (past-participle . "worn") - (translations - (es . "llevar puesto"))) - ( - (infinitive . "win") - (simple-past . "won") - (past-participle . "won") - (translations - (es . "ganar"))) - ( - (infinitive . "write") - (simple-past . "wrote") - (past-participle . "written") - (translations - (es . "escribir"))))) -;; Variables (defvar lire--verbs-shuffle '()) +(defvar lire--file-name-unresolved "unresolved.txt") +(defvar lire--verbs-unresolved '()) (defvar lire--buffer-name "*Learning irregular verbs in English*") (defvar lire--state 1) ;; 1: lire--start, 2: playing (before first check), 3: win (show success layout) (defvar lire--verb-to-learn-infinitive nil) @@ -671,15 +72,22 @@ Example: (lire--shuffle '(1 2 3 4 5)) => (3 1 5 2 4)" ;; Recursively call the shuffle function with the new original list and the new shuffled list (lire--shuffle originalListWithoutRandomElement newShuffledList)))) - (defun lire--kill-app () "Kill the application." (kill-buffer lire--buffer-name)) +(defun lire--save-verb-unresolved (infinitive) + "Save the verb unresolved to lire--verbs-unresolved and to the file." + (setq lire--verbs-unresolved (cons infinitive lire--verbs-unresolved)) + (with-temp-file (concat (file-name-directory user-init-file) lire--file-name-unresolved) + (prin1 lire--verbs-unresolved (current-buffer)))) + (defun lire--value-field-simple-past () + "Get the value of the simple past." (if (not (eq lire--widget-field-simple-past nil)) (widget-value lire--widget-field-simple-past) "")) (defun lire--value-field-past-participle () + "Get the value of the past participle." (if (not (eq lire--widget-field-past-participle nil)) (widget-value lire--widget-field-past-participle) "")) (defun lire--set-verb-to-learn () @@ -786,9 +194,9 @@ Example: (lire--shuffle '(1 2 3 4 5)) => (3 1 5 2 4)" (defun lire--show-solutions () "Show solutions" - (setq lire--is-resolve nil) (widget-value-set lire--widget-field-simple-past lire--verb-to-learn-simple-past) - (widget-value-set lire--widget-field-past-participle lire--verb-to-learn-past-participle)) + (widget-value-set lire--widget-field-past-participle lire--verb-to-learn-past-participle) + (lire--save-verb-unresolved lire--verb-to-learn-infinitive)) (defun lire--make-button-show-solution () "Make the button show solution." diff --git a/verbs.el b/verbs.el new file mode 100644 index 0000000..45277fd --- /dev/null +++ b/verbs.el @@ -0,0 +1,603 @@ +(provide 'verbs) + +(defvar lire--verbs '( + ( + (infinitive . "beat") + (simple-past . "beat") + (past-participle . "beaten") + (translations + (es . "golpear"))) + ( + (infinitive . "become") + (simple-past . "became") + (past-participle . "become") + (translations + (es . "llegar a ser, convertirse en"))) + ( + (infinitive . "begin") + (simple-past . "began") + (past-participle . "begun") + (translations + (es . "empezar"))) + ( + (infinitive . "bend") + (simple-past . "bent") + (past-participle . "bent") + (translations + (es . "doblar"))) + ( + (infinitive . "bet") + (simple-past . "bet") + (past-participle . "bet") + (translations + (es . "apostar"))) + ( + (infinitive . "bite") + (simple-past . "bit") + (past-participle . "bitten") + (translations + (es . "morder"))) + ( + (infinitive . "bleed") + (simple-past . "bled") + (past-participle . "bled") + (translations + (es . "sangrar"))) + ( + (infinitive . "blow") + (simple-past . "blew") + (past-participle . "blown") + (translations + (es . "soplar"))) + ( + (infinitive . "break") + (simple-past . "broke") + (past-participle . "broken") + (translations + (es . "romper"))) + ( + (infinitive . "bring") + (simple-past . "brought") + (past-participle . "brought") + (translations + (es . "traer"))) + ( + (infinitive . "build") + (simple-past . "built") + (past-participle . "built") + (translations + (es . "construir"))) + ( + (infinitive . "burn") + (simple-past . "burnt") + (past-participle . "burnt") + (translations + (es . "quemar"))) + ( + (infinitive . "buy") + (simple-past . "bought") + (past-participle . "bought") + (translations + (es . "comprar"))) + ( + (infinitive . "catch") + (simple-past . "caught") + (past-participle . "caught") + (translations + (es . "coger"))) + ( + (infinitive . "choose") + (simple-past . "chose") + (past-participle . "chosen") + (translations + (es . "escoger"))) + ( + (infinitive . "come") + (simple-past . "came") + (past-participle . "come") + (translations + (es . "venir"))) + ( + (infinitive . "cost") + (simple-past . "cost") + (past-participle . "cost") + (translations + (es . "costar"))) + ( + (infinitive . "cut") + (simple-past . "cut") + (past-participle . "cut") + (translations + (es . "cortar"))) + ( + (infinitive . "dig") + (simple-past . "dug") + (past-participle . "dug") + (translations + (es . "cavar"))) + ( + (infinitive . "do") + (simple-past . "did") + (past-participle . "done") + (translations + (es . "hacer"))) + ( + (infinitive . "draw") + (simple-past . "drew") + (past-participle . "drawn") + (translations + (es . '"(dibujar, trazar"))) + ( + (infinitive . "dream") + (simple-past . "dreamt") + (past-participle . "dreamt") + (translations + (es . "soñar"))) + ( + (infinitive . "drink") + (simple-past . "drank") + (past-participle . "drunk") + (translations + (es . "beber"))) + ( + (infinitive . "drive") + (simple-past . "drove") + (past-participle . "driven") + (translations + (es . "conducir"))) + ( + (infinitive . "eat") + (simple-past . "ate") + (past-participle . "eaten") + (translations + (es . "comer"))) + ( + (infinitive . "fall") + (simple-past . "fell") + (past-participle . "fallen") + (translations + (es . "caer(se)"))) + ( + (infinitive . "feed") + (simple-past . "fed") + (past-participle . "fed") + (translations + (es . "dar de comer, alimentar"))) + ( + (infinitive . "feel") + (simple-past . "felt") + (past-participle . "felt") + (translations + (es . "sentir"))) + ( + (infinitive . "fight") + (simple-past . "fought") + (past-participle . "fought") + (translations + (es . "pelear, luchar"))) + ( + (infinitive . "find") + (simple-past . "found") + (past-participle . "found") + (translations + (es . "encontrar"))) + ( + (infinitive . "fly") + (simple-past . "flew") + (past-participle . "flown") + (translations + (es . "volar"))) + ( + (infinitive . "forget") + (simple-past . "forgot") + (past-participle . "forgotten") + (translations + (es . "olvidar"))) + ( + (infinitive . "forgive") + (simple-past . "forgave") + (past-participle . "forgiven") + (translations + (es . "perdonar"))) + ( + (infinitive . "freeze") + (simple-past . "froze") + (past-participle . "frozen") + (translations + (es . "helar, congelar"))) + ( + (infinitive . "get") + (simple-past . "got") + (past-participle . "got") + (translations + (es . "conseguir"))) + ( + (infinitive . "give") + (simple-past . "gave") + (past-participle . "given") + (translations + (es . "dar"))) + ( + (infinitive . "go") + (simple-past . "went") + (past-participle . "gone") + (translations + (es . "ir"))) + ( + (infinitive . "grow") + (simple-past . "grew") + (past-participle . "grown") + (translations + (es . "cultivar, crecer"))) + ( + (infinitive . "hang") + (simple-past . "hung") + (past-participle . "hung") + (translations + (es . "colgar"))) + ( + (infinitive . "have") + (simple-past . "had") + (past-participle . "had") + (translations + (es . "tener"))) + ( + (infinitive . "hear") + (simple-past . "heard") + (past-participle . "heard") + (translations + (es . "oír"))) + ( + (infinitive . "hide") + (simple-past . "hid") + (past-participle . "hidden") + (translations + (es . "esconder"))) + ( + (infinitive . "hit") + (simple-past . "hit") + (past-participle . "hit") + (translations + (es . "golpear, pegar"))) + ( + (infinitive . "hold") + (simple-past . "held") + (past-participle . "held") + (translations + (es . "sostener"))) + ( + (infinitive . "hurt") + (simple-past . "hurt") + (past-participle . "hurt") + (translations + (es . "herir"))) + ( + (infinitive . "keep") + (simple-past . "kept") + (past-participle . "kept") + (translations + (es . "mantener"))) + ( + (infinitive . "know") + (simple-past . "knew") + (past-participle . "known") + (translations + (es . "saber, conocer"))) + ( + (infinitive . "lay") + (simple-past . "laid") + (past-participle . "laid") + (translations + (es . "poner (la mesa), colocar"))) + ( + (infinitive . "lead") + (simple-past . "led") + (past-participle . "led") + (translations + (es . "dirigir"))) + ( + (infinitive . "learn") + (simple-past . "learnt") + (past-participle . "learnt") + (translations + (es . "aprender"))) + ( + (infinitive . "leave") + (simple-past . "left") + (past-participle . "left") + (translations + (es . "dejar, marcharse(se)"))) + ( + (infinitive . "lend") + (simple-past . "lent") + (past-participle . "lent") + (translations + (es . "prestar"))) + ( + (infinitive . "let") + (simple-past . "let") + (past-participle . "let") + (translations + (es . "dejar, permitir"))) + ( + (infinitive . "lie") + (simple-past . "lay") + (past-participle . "lain") + (translations + (es . "tumbarse"))) + ( + (infinitive . "light") + (simple-past . "lit") + (past-participle . "lit") + (translations + (es . "iluminar"))) + ( + (infinitive . "lose") + (simple-past . "lost") + (past-participle . "lost") + (translations + (es . "perder"))) + ( + (infinitive . "make") + (simple-past . "made") + (past-participle . "made") + (translations + (es . "hacer"))) + ( + (infinitive . "mean") + (simple-past . "meant") + (past-participle . "meant") + (translations + (es . "significar, querer decir"))) + ( + (infinitive . "meet") + (simple-past . "met") + (past-participle . "met") + (translations + (es . "conocer"))) + ( + (infinitive . "pay") + (simple-past . "paid") + (past-participle . "paid") + (translations + (es . "pagar"))) + ( + (infinitive . "put") + (simple-past . "put") + (past-participle . "put") + (translations + (es . "poner"))) + ( + (infinitive . "read") + (simple-past . "read") + (past-participle . "read") + (translations + (es . "leer"))) + ( + (infinitive . "ride") + (simple-past . "rode") + (past-participle . "ridden") + (translations + (es . "montar"))) + ( + (infinitive . "ring") + (simple-past . "rang") + (past-participle . "rung") + (translations + (es . "sonar, llamar por teléfono"))) + ( + (infinitive . "rise") + (simple-past . "rose") + (past-participle . "risen") + (translations + (es . "levantarse"))) + ( + (infinitive . "run") + (simple-past . "ran") + (past-participle . "run") + (translations + (es . "correr"))) + ( + (infinitive . "say") + (simple-past . "said") + (past-participle . "said") + (translations + (es . "decir"))) + ( + (infinitive . "see") + (simple-past . "saw") + (past-participle . "seen") + (translations + (es . "ver"))) + ( + (infinitive . "sell") + (simple-past . "sold") + (past-participle . "sold") + (translations + (es . "vender"))) + ( + (infinitive . "send") + (simple-past . "sent") + (past-participle . "sent") + (translations + (es . "enviar"))) + ( + (infinitive . "set") + (simple-past . "set") + (past-participle . "set") + (translations + (es . "colocar, fijar, poner la mesa"))) + ( + (infinitive . "shake") + (simple-past . "shook") + (past-participle . "shaken") + (translations + (es . "agitar, sacudir"))) + ( + (infinitive . "shine") + (simple-past . "shone") + (past-participle . "shone") + (translations + (es . "brillar, sacar brillo"))) + ( + (infinitive . "shoot") + (simple-past . "shot") + (past-participle . "shot") + (translations + (es . "disparar"))) + ( + (infinitive . "show") + (simple-past . "showed") + (past-participle . "shown") + (translations + (es . "mostrar"))) + ( + (infinitive . "shut") + (simple-past . "shut") + (past-participle . "shut") + (translations + (es . "cerrar"))) + ( + (infinitive . "sing") + (simple-past . "sang") + (past-participle . "sung") + (translations + (es . "cantar"))) + ( + (infinitive . "sink") + (simple-past . "sank") + (past-participle . "sunk") + (translations + (es . "hundir(se)"))) + ( + (infinitive . "sit") + (simple-past . "sat") + (past-participle . "sat") + (translations + (es . "sentar(se)"))) + ( + (infinitive . "sleep") + (simple-past . "slept") + (past-participle . "slept") + (translations + (es . "dormir"))) + ( + (infinitive . "smell") + (simple-past . "smelt") + (past-participle . "smelt") + (translations + (es . "oler"))) + ( + (infinitive . "speak") + (simple-past . "spoke") + (past-participle . "spoken") + (translations + (es . "hablar"))) + ( + (infinitive . "spell") + (simple-past . "spelt") + (past-participle . "spelt") + (translations + (es . "deletrear"))) + ( + (infinitive . "spend") + (simple-past . "spent") + (past-participle . "spent") + (translations + (es . "gastar"))) + ( + (infinitive . "spill") + (simple-past . "spilt") + (past-participle . "spilt") + (translations + (es . "derramar"))) + ( + (infinitive . "spit") + (simple-past . "spit") + (past-participle . "spit") + (translations + (es . "escupir"))) + ( + (infinitive . "stand") + (simple-past . "stood") + (past-participle . "stood") + (translations + (es . "ponerse/estar de pie"))) + ( + (infinitive . "steal") + (simple-past . "stole") + (past-participle . "stolen") + (translations + (es . "robar"))) + ( + (infinitive . "swim") + (simple-past . "swam") + (past-participle . "swum") + (translations + (es . "nadar"))) + ( + (infinitive . "take") + (simple-past . "took") + (past-participle . "taken") + (translations + (es . "tomar, coger"))) + ( + (infinitive . "teach") + (simple-past . "taught") + (past-participle . "taught") + (translations + (es . "enseñar"))) + ( + (infinitive . "tear") + (simple-past . "tore") + (past-participle . "torn") + (translations + (es . "romper, rasgar"))) + ( + (infinitive . "tell") + (simple-past . "told") + (past-participle . "told") + (translations + (es . "decir, contar"))) + ( + (infinitive . "think") + (simple-past . "thought") + (past-participle . "thought") + (translations + (es . "pensar"))) + ( + (infinitive . "throw") + (simple-past . "threw") + (past-participle . "thrown") + (translations + (es . "lanzar, tirar"))) + ( + (infinitive . "understand") + (simple-past . "understood") + (past-participle . "understood") + (translations + (es . "entender"))) + ( + (infinitive . "wake") + (simple-past . "woke") + (past-participle . "woken") + (translations + (es . "despertar"))) + ( + (infinitive . "wear") + (simple-past . "wore") + (past-participle . "worn") + (translations + (es . "llevar puesto"))) + ( + (infinitive . "win") + (simple-past . "won") + (past-participle . "won") + (translations + (es . "ganar"))) + ( + (infinitive . "write") + (simple-past . "wrote") + (past-participle . "written") + (translations + (es . "escribir"))))) From 0fbf1f0e3d8dd189c3f78bf22f2d09b4e51e7fbf Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Mon, 12 Feb 2024 17:31:18 +0100 Subject: [PATCH 2/7] Import verbs --- learning-irregular-verbs-in-English.el | 3 +-- verbs.el | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/learning-irregular-verbs-in-English.el b/learning-irregular-verbs-in-English.el index e18846d..ef3474f 100644 --- a/learning-irregular-verbs-in-English.el +++ b/learning-irregular-verbs-in-English.el @@ -12,8 +12,7 @@ ;;; Code: ;; Imports -(load-file "verbs.el") -(require 'verbs) +(require 'learning-irregular-verbs-in-English--verbs) (require 'widget) (eval-when-compile (require 'wid-edit)) diff --git a/verbs.el b/verbs.el index 45277fd..8fbbdec 100644 --- a/verbs.el +++ b/verbs.el @@ -1,5 +1,3 @@ -(provide 'verbs) - (defvar lire--verbs '( ( (infinitive . "beat") @@ -601,3 +599,5 @@ (past-participle . "written") (translations (es . "escribir"))))) + +(provide 'learning-irregular-verbs-in-English--verbs) From e2a9f0a0000a5474b99c401f2468be9109b1d787 Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Mon, 12 Feb 2024 17:40:53 +0100 Subject: [PATCH 3/7] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 58499944b8065479bb92fbd934b7d3f4eaab8209 Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Mon, 12 Feb 2024 17:56:57 +0100 Subject: [PATCH 4/7] Rename files --- README.md | 10 +- learning-irregular-verbs-in-English.el | 320 ------------------------- verbs.el => lirve-verbs.el | 18 +- lirve.el | 320 +++++++++++++++++++++++++ 4 files changed, 341 insertions(+), 327 deletions(-) delete mode 100644 learning-irregular-verbs-in-English.el rename verbs.el => lirve-verbs.el (96%) create mode 100644 lirve.el diff --git a/README.md b/README.md index 7f7fa1c..478cd07 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Learn irregular English verbs in Emacs -## learning-irregular-verbs-in-English.el +## learning-irregular-verbs-in-english.el ![Demo](demo.png) @@ -8,8 +8,8 @@ Add in your `init.el`. ```elisp -(use-package learning-irregular-verbs-in-English - :straight (:host github :repo "tanrax/learning-irregular-verbs-in-English.el" :files ("learning-irregular-verbs-in-English.el")) +(use-package learning-irregular-verbs-in-english + :straight (:host github :repo "tanrax/learning-irregular-verbs-in-English.el" :files ("lirve--verbs.el" "lirve.el")) :ensure t) ``` @@ -22,13 +22,13 @@ Shows the translation of the verb when resolving or failing. Only available in Spanish. ```elisp -(setq learning-irregular-verbs-in-English--show-translation 'es) +(setq lirve--show-translation 'es) ``` ## Usage ``` -M-x learning-irregular-verbs-in-English +M-x learning-irregular-verbs-in-english ``` ## Controls diff --git a/learning-irregular-verbs-in-English.el b/learning-irregular-verbs-in-English.el deleted file mode 100644 index ef3474f..0000000 --- a/learning-irregular-verbs-in-English.el +++ /dev/null @@ -1,320 +0,0 @@ -;;; learning-irregular-verbs-in-English.el --- Application to learn and review irregular verbs in English. -*- lexical-binding: t; -;; -;; Copyright © 2024 Andros Fenollosa -;; Authors: Andros Fenollosa -;; URL: https://github.com/tanrax/learning-irregular-verbs-in-English.el -;; Version: 1.1.0 -;; SPDX-License-Identifier: GPL-3.0-or-later - -;;; Commentary: -;; Application to learn and review irregular verbs in English. - -;;; Code: - -;; Imports -(require 'learning-irregular-verbs-in-English--verbs) -(require 'widget) -(eval-when-compile - (require 'wid-edit)) - -;; Variables -(defvar lire--verbs-shuffle '()) -(defvar lire--file-name-unresolved "unresolved.txt") -(defvar lire--verbs-unresolved '()) -(defvar lire--buffer-name "*Learning irregular verbs in English*") -(defvar lire--state 1) ;; 1: lire--start, 2: playing (before first check), 3: win (show success layout) -(defvar lire--verb-to-learn-infinitive nil) -(defvar lire--verb-to-learn-simple-past nil) -(defvar lire--verb-to-learn-past-participle nil) -(defvar lire--translation "") -(defvar lire--emoji-valid "✅") -(defvar lire--emoji-error "👎") -(defvar lire--widget-title nil) -(defvar lire--text-title " 🧑‍🎓 Learning irregular verbs in English 🇬🇧") -(defvar lire--widget-item-verb nil) -(defvar lire--widget-field-simple-past nil) -(defvar lire--widget-label-check-simple-past nil) -(defvar lire--widget-field-past-participle nil) -(defvar lire--widget-label-check-past-participle nil) -(defvar lire--text-button-check "Check") -(defvar lire--widget-button-check nil) -(defvar lire--widget-item-space-before-check nil) -(defvar lire--text-button-show-solution "Don't know") -(defvar lire--widget-button-show-solution nil) -(defvar lire--widget-message-success nil) -(defvar lire--widget-item-space-before-success nil) -(defvar lire--text-success "Nice!") -(defvar lire--text-fail "Next time you will do better") -(defvar lire--is-resolve t) -(defvar lire--widget-item-space-after-success nil) -(defvar lire--widget-button-quit nil) -(defvar lire--text-button-quit "Quit") -(defvar lire--widget-item-space-between-buttons nil) -(defvar lire--widget-button-lire--replay nil) -(defvar lire--text-button-lire--replay "New challenge") - -;; Functions - -(defun lire--shuffle (originalList &optional shuffledList) - "Applies the Fisher-Yates shuffle algorithm to a list. -Example: (lire--shuffle '(1 2 3 4 5)) => (3 1 5 2 4)" - (if (null originalList) - ;; End recursion, return the shuffled list - shuffledList - ;; Otherwise, continue with the logic - (let* ((randomPosition (random (length originalList))) - (randomElement (nth randomPosition originalList)) - ;; Create a new original list without the randomly selected element - (originalListWithoutRandomElement (append (cl-subseq originalList 0 randomPosition) (nthcdr (1+ randomPosition) originalList))) - ;; Create a new shuffled list with the selected element at the beginning - (newShuffledList (if (null shuffledList) (list randomElement) (cons randomElement shuffledList)))) - ;; Recursively call the shuffle function with the new original list and the new shuffled list - (lire--shuffle originalListWithoutRandomElement newShuffledList)))) - -(defun lire--kill-app () - "Kill the application." - (kill-buffer lire--buffer-name)) - -(defun lire--save-verb-unresolved (infinitive) - "Save the verb unresolved to lire--verbs-unresolved and to the file." - (setq lire--verbs-unresolved (cons infinitive lire--verbs-unresolved)) - (with-temp-file (concat (file-name-directory user-init-file) lire--file-name-unresolved) - (prin1 lire--verbs-unresolved (current-buffer)))) - -(defun lire--value-field-simple-past () - "Get the value of the simple past." - (if (not (eq lire--widget-field-simple-past nil)) (widget-value lire--widget-field-simple-past) "")) - -(defun lire--value-field-past-participle () - "Get the value of the past participle." - (if (not (eq lire--widget-field-past-participle nil)) (widget-value lire--widget-field-past-participle) "")) - -(defun lire--set-verb-to-learn () - "Set the verb to learn." - (when (null lire--verbs-shuffle) - (setq lire--verbs-shuffle (lire--shuffle lire--verbs))) - (let ((verb-to-learn (car lire--verbs-shuffle))) - (setq lire--verb-to-learn-infinitive (alist-get 'infinitive verb-to-learn)) - (setq lire--verb-to-learn-simple-past (alist-get 'simple-past verb-to-learn)) - (setq lire--verb-to-learn-past-participle (alist-get 'past-participle verb-to-learn)) - (when (not (null (boundp 'learning-irregular-verbs-in-English--show-translation))) (setq lire--translation (alist-get learning-irregular-verbs-in-English--show-translation (alist-get 'translations verb-to-learn)))) - ;; Remove the verb from the list - (setq lire--verbs-shuffle (cdr lire--verbs-shuffle)))) - -(defun lire--format-value-infinitive () - "Format the value of the infinitive." - (format "Infinitive ➡️ %s" lire--verb-to-learn-infinitive)) - -(defun lire--format-check-simple-past () - "Format the value of the simple past." - (if (eq lire--state 1) - "" - (format " %s" (if - (and - (string= (lire--value-field-simple-past) lire--verb-to-learn-simple-past) - (not (string= (lire--value-field-simple-past) ""))) - lire--emoji-valid lire--emoji-error)))) - -(defun lire--format-check-past-participle () - "Format the value of the past participle." - (if (eq lire--state 1) - "" - (format " %s" (if - (and - (string= (lire--value-field-past-participle) lire--verb-to-learn-past-participle) - (not (string= (lire--value-field-past-participle) ""))) - lire--emoji-valid lire--emoji-error)))) - -(defun lire--show-translation () - "Show translation if learning-irregular-verbs-in-English--show-translation is t" - (when (not (null lire--translation)) - (widget-value-set lire--widget-item-verb (concat (lire--format-value-infinitive) " 🇪🇸 " lire--translation)))) - -(defun lire--toggle-layout-finish () - "Toggle the layout to success." - (if (eq lire--state 3) - (progn - ;; Show translate - (lire--show-translation) - ;; Cursor to end - (goto-char (point-max)) - ;; Remove check button - (widget-delete lire--widget-button-check) - (setq lire--widget-button-check nil) - ;; Remove space after check button - (widget-delete lire--widget-item-space-before-check) - (setq lire--widget-item-space-before-check nil) - ;; Remove show solution button - (widget-delete lire--widget-button-show-solution) - (setq lire--widget-button-show-solution nil) - ;; Text success - (setq lire--widget-item-space-before-success (widget-create 'item - "")) - (setq lire--widget-message-success (widget-create 'item - (if lire--is-resolve lire--text-success lire--text-fail))) - (setq lire--widget-item-space-after-success (widget-create 'item - "\n")) - ;; Lire--Replay button - (setq lire--widget-button-lire--replay (widget-create 'push-button - :size 20 - :notify (lambda (&rest ignore) - (lire--replay)) - lire--text-button-lire--replay)) - ;; Space - (setq lire--widget-item-space-between-buttons (widget-create 'item - "\n")) - ;; Quit button - (setq lire--widget-button-quit (widget-create 'push-button - :size 20 - :notify (lambda (&rest ignore) - (lire--kill-app)) - lire--text-button-quit)) - (widget-backward 2) - ) - (progn - (when (not (eq lire--widget-item-space-before-success nil)) (widget-delete lire--widget-item-space-before-success)) - (when (not (eq lire--widget-message-success nil)) (widget-delete lire--widget-message-success)) - (when (not (eq lire--widget-item-space-after-success nil)) (widget-delete lire--widget-item-space-after-success)) - (when (not (eq lire--widget-button-lire--replay nil)) (widget-delete lire--widget-button-lire--replay)) - (when (not (eq lire--widget-item-space-between-buttons nil)) (widget-delete lire--widget-item-space-between-buttons)) - (when (not (eq lire--widget-button-quit nil)) (widget-delete lire--widget-button-quit)) - ))) - -(defun lire--make-button-check () - "Make the button check." - (setq lire--widget-button-check (widget-create 'push-button - :notify (lambda (&rest ignore) - (lire--update)) - lire--text-button-check))) -(defun lire--make-space-after-check () - "Add space between Button check and Button show solution" - (setq lire--widget-item-space-before-check (widget-create 'item "\n"))) - - -(defun lire--show-solutions () - "Show solutions" - (widget-value-set lire--widget-field-simple-past lire--verb-to-learn-simple-past) - (widget-value-set lire--widget-field-past-participle lire--verb-to-learn-past-participle) - (lire--save-verb-unresolved lire--verb-to-learn-infinitive)) - -(defun lire--make-button-show-solution () - "Make the button show solution." - (setq lire--widget-button-show-solution (widget-create 'push-button - :notify (lambda (&rest ignore) - (lire--show-solutions) - (lire--update)) - lire--text-button-show-solution))) - - -(defun lire--start () - "Start challenge." - ;; Set the lire--state - (setq lire--state 1) - ;; Get a new verb - (lire--set-verb-to-learn) - ;; Show the verb in infinitive - (widget-value-set lire--widget-item-verb (lire--format-value-infinitive)) - ;; Reset button check - (when (eq lire--widget-button-check nil) (lire--make-button-check)) - ;; Reset space after check - (when (eq lire--widget-item-space-before-check nil) (lire--make-space-after-check)) - ;; Reset button show solution - (when (eq lire--widget-button-show-solution nil) (lire--make-button-show-solution)) - ;; Clear the fields - (widget-value-set lire--widget-field-simple-past "") - (widget-value-set lire--widget-label-check-simple-past "") - (widget-value-set lire--widget-field-past-participle "") - (widget-value-set lire--widget-label-check-past-participle "") - ;; Update labels - (lire--update)) - -(defun lire--replay () - "Replay the challenge." - (interactive) - (lire--start) - (widget-backward 1)) - -(defun lire--update () - "Update state and show temps layouts." - (interactive) - ;; Is playing? - (when (and (eq lire--state 1) - (or - (not (string= (lire--value-field-simple-past) "")) - (not (string= (lire--value-field-past-participle) ""))) - ) - (setq lire--state 2)) - ;; Check the answers - (when (eq lire--state 2) - ;; Is win? - (when (and - (string= (lire--value-field-simple-past) lire--verb-to-learn-simple-past) - (string= (lire--value-field-past-participle) lire--verb-to-learn-past-participle)) - ;; Set the lire--state - (setq lire--state 3)) - ;; Update the check labels - (widget-value-set lire--widget-label-check-simple-past (lire--format-check-simple-past)) - (widget-value-set lire--widget-label-check-past-participle (lire--format-check-past-participle))) - ;; Update the success layout if needed - (lire--toggle-layout-finish) - (setq lire--is-resolve t)) - -(defun lire--main-layout () - "Make widgets for the main layout." - ;; Create the buffer - (switch-to-buffer lire--buffer-name) - ;; Clear the buffer - (kill-all-local-variables) - (let ((inhibit-read-only t)) - (erase-buffer)) - (remove-overlays) - ;; Create the widgets - ;; Title - (insert (propertize (format "\n%s\n\n" lire--text-title) 'face '(:height 1.2 :weight bold))) - ;; Verb in infinitive - (setq lire--widget-item-verb (widget-create 'item - :value "")) - ;; Separator - (insert "\nSimple past ➡️ ") - ;; Simple past - (setq lire--widget-field-simple-past (widget-create 'editable-field - :size 8 - :help-echo "Type a Simple past" - )) - ;; Label check - (insert " ") - (setq lire--widget-label-check-simple-past (widget-create 'item - (lire--format-check-simple-past))) - ;; Separator - (insert "\nPast participle ➡️ ") - ;; Past participle - (setq lire--widget-field-past-participle (widget-create 'editable-field - :size 8 - :help-echo "Type a Past participle")) - ;; Label check - (insert " ") - (setq lire--widget-label-check-past-participle (widget-create 'item - (lire--format-check-past-participle))) - ;; Separator - (insert "\n") - ;; Check button - (lire--make-button-check) - ;; Separator - (lire--make-space-after-check) - ;; Show solution button - (lire--make-button-show-solution) - ;; Display the buffer - (use-local-map widget-keymap) - (widget-setup)) - -;; Init -(defun learning-irregular-verbs-in-English () - "Application to learn and review irregular verbs in English." - (interactive) - (lire--main-layout) - (lire--start) - (widget-backward 4)) - -(provide 'learning-irregular-verbs-in-English) - -;;; learning-irregular-verbs-in-English.el ends here diff --git a/verbs.el b/lirve-verbs.el similarity index 96% rename from verbs.el rename to lirve-verbs.el index 8fbbdec..b0078f1 100644 --- a/verbs.el +++ b/lirve-verbs.el @@ -1,4 +1,17 @@ -(defvar lire--verbs '( +;;; lirve-verbs.el --- Verb list for learning irregular verbs in English -*- lexical-binding: t; -*- +;; +;; Copyright © 2024 Andros Fenollosa +;; Authors: Andros Fenollosa +;; URL: https://github.com/tanrax/learning-irregular-verbs-in-English.el +;; Version: 1.2.0 +;; SPDX-License-Identifier: GPL-3.0-or-later + +;;; Commentary: +;; This file contains a list of irregular verbs in English, with their + +;;; Code: + +(defvar lirve--verbs '( ( (infinitive . "beat") (simple-past . "beat") @@ -600,4 +613,5 @@ (translations (es . "escribir"))))) -(provide 'learning-irregular-verbs-in-English--verbs) +(provide 'lirve-verbs) +;;; lirve-verbs.el ends here diff --git a/lirve.el b/lirve.el new file mode 100644 index 0000000..0a6965b --- /dev/null +++ b/lirve.el @@ -0,0 +1,320 @@ +;;; lirve.el --- Application to learn and review irregular verbs in English. -*- lexical-binding: t; +;; +;; Copyright © 2024 Andros Fenollosa +;; Authors: Andros Fenollosa +;; URL: https://github.com/tanrax/learning-irregular-verbs-in-English.el +;; Version: 1.2.0 +;; SPDX-License-Identifier: GPL-3.0-or-later + +;;; Commentary: +;; Application to learn and review irregular verbs in English. + +;;; Code: + +;; Imports +(require 'lirve-verbs) +(require 'widget) +(eval-when-compile + (require 'wid-edit)) + +;; Variables +(defvar lirve--verbs-shuffle '()) +(defvar lirve--file-name-unresolved "lirve-unresolved.txt") +(defvar lirve--verbs-unresolved '()) +(defvar lirve--buffer-name "*Learning irregular verbs in English*") +(defvar lirve--state 1) ;; 1: lirve--start, 2: playing (before first check), 3: win (show success layout) +(defvar lirve--verb-to-learn-infinitive nil) +(defvar lirve--verb-to-learn-simple-past nil) +(defvar lirve--verb-to-learn-past-participle nil) +(defvar lirve--translation "") +(defvar lirve--emoji-valid "✅") +(defvar lirve--emoji-error "👎") +(defvar lirve--widget-title nil) +(defvar lirve--text-title " 🧑‍🎓 Learning irregular verbs in English 🇬🇧") +(defvar lirve--widget-item-verb nil) +(defvar lirve--widget-field-simple-past nil) +(defvar lirve--widget-label-check-simple-past nil) +(defvar lirve--widget-field-past-participle nil) +(defvar lirve--widget-label-check-past-participle nil) +(defvar lirve--text-button-check "Check") +(defvar lirve--widget-button-check nil) +(defvar lirve--widget-item-space-before-check nil) +(defvar lirve--text-button-show-solution "Don't know") +(defvar lirve--widget-button-show-solution nil) +(defvar lirve--widget-message-success nil) +(defvar lirve--widget-item-space-before-success nil) +(defvar lirve--text-success "Nice!") +(defvar lirve--text-fail "Next time you will do better") +(defvar lirve--is-resolve t) +(defvar lirve--widget-item-space-after-success nil) +(defvar lirve--widget-button-quit nil) +(defvar lirve--text-button-quit "Quit") +(defvar lirve--widget-item-space-between-buttons nil) +(defvar lirve--widget-button-lirve--replay nil) +(defvar lirve--text-button-lirve--replay "New challenge") + +;; Functions + +(defun lirve--shuffle (originalList &optional shuffledList) + "Applies the Fisher-Yates shuffle algorithm to a list. +Example: (lirve--shuffle '(1 2 3 4 5)) => (3 1 5 2 4)" + (if (null originalList) + ;; End recursion, return the shuffled list + shuffledList + ;; Otherwise, continue with the logic + (let* ((randomPosition (random (length originalList))) + (randomElement (nth randomPosition originalList)) + ;; Create a new original list without the randomly selected element + (originalListWithoutRandomElement (append (cl-subseq originalList 0 randomPosition) (nthcdr (1+ randomPosition) originalList))) + ;; Create a new shuffled list with the selected element at the beginning + (newShuffledList (if (null shuffledList) (list randomElement) (cons randomElement shuffledList)))) + ;; Recursively call the shuffle function with the new original list and the new shuffled list + (lirve--shuffle originalListWithoutRandomElement newShuffledList)))) + +(defun lirve--kill-app () + "Kill the application." + (kill-buffer lirve--buffer-name)) + +(defun lirve--save-verb-unresolved (infinitive) + "Save the verb unresolved to lirve--verbs-unresolved and to the file." + (setq lirve--verbs-unresolved (cons infinitive lirve--verbs-unresolved)) + (with-temp-file (concat (file-name-directory user-init-file) lirve--file-name-unresolved) + (prin1 lirve--verbs-unresolved (current-buffer)))) + +(defun lirve--value-field-simple-past () + "Get the value of the simple past." + (if (not (eq lirve--widget-field-simple-past nil)) (widget-value lirve--widget-field-simple-past) "")) + +(defun lirve--value-field-past-participle () + "Get the value of the past participle." + (if (not (eq lirve--widget-field-past-participle nil)) (widget-value lirve--widget-field-past-participle) "")) + +(defun lirve--set-verb-to-learn () + "Set the verb to learn." + (when (null lirve--verbs-shuffle) + (setq lirve--verbs-shuffle (lirve--shuffle lirve--verbs))) + (let ((verb-to-learn (car lirve--verbs-shuffle))) + (setq lirve--verb-to-learn-infinitive (alist-get 'infinitive verb-to-learn)) + (setq lirve--verb-to-learn-simple-past (alist-get 'simple-past verb-to-learn)) + (setq lirve--verb-to-learn-past-participle (alist-get 'past-participle verb-to-learn)) + (when (not (null (boundp 'learning-irregular-verbs-in-English--show-translation))) (setq lirve--translation (alist-get learning-irregular-verbs-in-English--show-translation (alist-get 'translations verb-to-learn)))) + ;; Remove the verb from the list + (setq lirve--verbs-shuffle (cdr lirve--verbs-shuffle)))) + +(defun lirve--format-value-infinitive () + "Format the value of the infinitive." + (format "Infinitive ➡️ %s" lirve--verb-to-learn-infinitive)) + +(defun lirve--format-check-simple-past () + "Format the value of the simple past." + (if (eq lirve--state 1) + "" + (format " %s" (if + (and + (string= (lirve--value-field-simple-past) lirve--verb-to-learn-simple-past) + (not (string= (lirve--value-field-simple-past) ""))) + lirve--emoji-valid lirve--emoji-error)))) + +(defun lirve--format-check-past-participle () + "Format the value of the past participle." + (if (eq lirve--state 1) + "" + (format " %s" (if + (and + (string= (lirve--value-field-past-participle) lirve--verb-to-learn-past-participle) + (not (string= (lirve--value-field-past-participle) ""))) + lirve--emoji-valid lirve--emoji-error)))) + +(defun lirve--show-translation () + "Show translation if learning-irregular-verbs-in-English--show-translation is t" + (when (not (null lirve--translation)) + (widget-value-set lirve--widget-item-verb (concat (lirve--format-value-infinitive) " 🇪🇸 " lirve--translation)))) + +(defun lirve--toggle-layout-finish () + "Toggle the layout to success." + (if (eq lirve--state 3) + (progn + ;; Show translate + (lirve--show-translation) + ;; Cursor to end + (goto-char (point-max)) + ;; Remove check button + (widget-delete lirve--widget-button-check) + (setq lirve--widget-button-check nil) + ;; Remove space after check button + (widget-delete lirve--widget-item-space-before-check) + (setq lirve--widget-item-space-before-check nil) + ;; Remove show solution button + (widget-delete lirve--widget-button-show-solution) + (setq lirve--widget-button-show-solution nil) + ;; Text success + (setq lirve--widget-item-space-before-success (widget-create 'item + "")) + (setq lirve--widget-message-success (widget-create 'item + (if lirve--is-resolve lirve--text-success lirve--text-fail))) + (setq lirve--widget-item-space-after-success (widget-create 'item + "\n")) + ;; Lirve--Replay button + (setq lirve--widget-button-lirve--replay (widget-create 'push-button + :size 20 + :notify (lambda (&rest ignore) + (lirve--replay)) + lirve--text-button-lirve--replay)) + ;; Space + (setq lirve--widget-item-space-between-buttons (widget-create 'item + "\n")) + ;; Quit button + (setq lirve--widget-button-quit (widget-create 'push-button + :size 20 + :notify (lambda (&rest ignore) + (lirve--kill-app)) + lirve--text-button-quit)) + (widget-backward 2) + ) + (progn + (when (not (eq lirve--widget-item-space-before-success nil)) (widget-delete lirve--widget-item-space-before-success)) + (when (not (eq lirve--widget-message-success nil)) (widget-delete lirve--widget-message-success)) + (when (not (eq lirve--widget-item-space-after-success nil)) (widget-delete lirve--widget-item-space-after-success)) + (when (not (eq lirve--widget-button-lirve--replay nil)) (widget-delete lirve--widget-button-lirve--replay)) + (when (not (eq lirve--widget-item-space-between-buttons nil)) (widget-delete lirve--widget-item-space-between-buttons)) + (when (not (eq lirve--widget-button-quit nil)) (widget-delete lirve--widget-button-quit)) + ))) + +(defun lirve--make-button-check () + "Make the button check." + (setq lirve--widget-button-check (widget-create 'push-button + :notify (lambda (&rest ignore) + (lirve--update)) + lirve--text-button-check))) +(defun lirve--make-space-after-check () + "Add space between Button check and Button show solution" + (setq lirve--widget-item-space-before-check (widget-create 'item "\n"))) + + +(defun lirve--show-solutions () + "Show solutions" + (widget-value-set lirve--widget-field-simple-past lirve--verb-to-learn-simple-past) + (widget-value-set lirve--widget-field-past-participle lirve--verb-to-learn-past-participle) + (lirve--save-verb-unresolved lirve--verb-to-learn-infinitive)) + +(defun lirve--make-button-show-solution () + "Make the button show solution." + (setq lirve--widget-button-show-solution (widget-create 'push-button + :notify (lambda (&rest ignore) + (lirve--show-solutions) + (lirve--update)) + lirve--text-button-show-solution))) + + +(defun lirve--start () + "Start challenge." + ;; Set the lirve--state + (setq lirve--state 1) + ;; Get a new verb + (lirve--set-verb-to-learn) + ;; Show the verb in infinitive + (widget-value-set lirve--widget-item-verb (lirve--format-value-infinitive)) + ;; Reset button check + (when (eq lirve--widget-button-check nil) (lirve--make-button-check)) + ;; Reset space after check + (when (eq lirve--widget-item-space-before-check nil) (lirve--make-space-after-check)) + ;; Reset button show solution + (when (eq lirve--widget-button-show-solution nil) (lirve--make-button-show-solution)) + ;; Clear the fields + (widget-value-set lirve--widget-field-simple-past "") + (widget-value-set lirve--widget-label-check-simple-past "") + (widget-value-set lirve--widget-field-past-participle "") + (widget-value-set lirve--widget-label-check-past-participle "") + ;; Update labels + (lirve--update)) + +(defun lirve--replay () + "Replay the challenge." + (interactive) + (lirve--start) + (widget-backward 1)) + +(defun lirve--update () + "Update state and show temps layouts." + (interactive) + ;; Is playing? + (when (and (eq lirve--state 1) + (or + (not (string= (lirve--value-field-simple-past) "")) + (not (string= (lirve--value-field-past-participle) ""))) + ) + (setq lirve--state 2)) + ;; Check the answers + (when (eq lirve--state 2) + ;; Is win? + (when (and + (string= (lirve--value-field-simple-past) lirve--verb-to-learn-simple-past) + (string= (lirve--value-field-past-participle) lirve--verb-to-learn-past-participle)) + ;; Set the lirve--state + (setq lirve--state 3)) + ;; Update the check labels + (widget-value-set lirve--widget-label-check-simple-past (lirve--format-check-simple-past)) + (widget-value-set lirve--widget-label-check-past-participle (lirve--format-check-past-participle))) + ;; Update the success layout if needed + (lirve--toggle-layout-finish) + (setq lirve--is-resolve t)) + +(defun lirve--main-layout () + "Make widgets for the main layout." + ;; Create the buffer + (switch-to-buffer lirve--buffer-name) + ;; Clear the buffer + (kill-all-local-variables) + (let ((inhibit-read-only t)) + (erase-buffer)) + (remove-overlays) + ;; Create the widgets + ;; Title + (insert (propertize (format "\n%s\n\n" lirve--text-title) 'face '(:height 1.2 :weight bold))) + ;; Verb in infinitive + (setq lirve--widget-item-verb (widget-create 'item + :value "")) + ;; Separator + (insert "\nSimple past ➡️ ") + ;; Simple past + (setq lirve--widget-field-simple-past (widget-create 'editable-field + :size 8 + :help-echo "Type a Simple past" + )) + ;; Label check + (insert " ") + (setq lirve--widget-label-check-simple-past (widget-create 'item + (lirve--format-check-simple-past))) + ;; Separator + (insert "\nPast participle ➡️ ") + ;; Past participle + (setq lirve--widget-field-past-participle (widget-create 'editable-field + :size 8 + :help-echo "Type a Past participle")) + ;; Label check + (insert " ") + (setq lirve--widget-label-check-past-participle (widget-create 'item + (lirve--format-check-past-participle))) + ;; Separator + (insert "\n") + ;; Check button + (lirve--make-button-check) + ;; Separator + (lirve--make-space-after-check) + ;; Show solution button + (lirve--make-button-show-solution) + ;; Display the buffer + (use-local-map widget-keymap) + (widget-setup)) + +;; Init +(defun learning-irregular-verbs-in-english () + "Application to learn and review irregular verbs in English." + (interactive) + (lirve--main-layout) + (lirve--start) + (widget-backward 4)) + +(provide 'lirve) + +;;; lirve.el ends here From de6f1692bb6556db613d142f66d1528280949e44 Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Mon, 12 Feb 2024 18:13:29 +0100 Subject: [PATCH 5/7] Update readme --- README.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 478cd07..5af5e5a 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,18 @@ -# Learn irregular English verbs in Emacs -## learning-irregular-verbs-in-english.el +# Lirve: Learn irregular English verbs in Emacs + +Lirve helps you learn irregular verbs using the spaced repetition technique. In other words: Lirve remember your mistakes and repeat the challenge in the future. ![Demo](demo.png) ## Install -Add in your `init.el`. +You need to have `straight` installed. + +Then, add it to your `init.el`. ```elisp (use-package learning-irregular-verbs-in-english - :straight (:host github :repo "tanrax/learning-irregular-verbs-in-English.el" :files ("lirve--verbs.el" "lirve.el")) + :straight (:host github :repo "tanrax/learning-irregular-verbs-in-English.el" :files ("lirve-verbs.el" "lirve.el")) :ensure t) ``` @@ -19,7 +22,7 @@ Shows the translation of the verb when resolving or failing. ![Demo translation](demo-translation.png) -Only available in Spanish. +Only available in Spanish (at the moment). ```elisp (setq lirve--show-translation 'es) @@ -38,4 +41,7 @@ M-x learning-irregular-verbs-in-english | `TAB` | Move to the next field | | `S-TAB` | Move to the previous field | | `RET` | Click on the button | -| `q` | Quit | + +## Collaborate + +If you want to add more languages, make a PR with the translations in `lirve-verbs.el`. From 2330c8304f2890bfb1388c2ef9af6e7fa4375788 Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Mon, 12 Feb 2024 18:15:58 +0100 Subject: [PATCH 6/7] Update --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 5af5e5a..97d6ce5 100644 --- a/README.md +++ b/README.md @@ -45,3 +45,15 @@ M-x learning-irregular-verbs-in-english ## Collaborate If you want to add more languages, make a PR with the translations in `lirve-verbs.el`. + +For example, the verb `beat` in Italian and Spanish: + +```ellisp +( + (infinitive . "beat") + (simple-past . "beat") + (past-participle . "beaten") + (translations + (es . "golpear") + (it . "colpo"))) +``` From 343f20e401ea2653ee50244c79750865bc8e0580 Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Thu, 15 Feb 2024 21:50:16 +0100 Subject: [PATCH 7/7] Save, load and delete fails --- lirve.el | 71 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/lirve.el b/lirve.el index 0a6965b..2b36acc 100644 --- a/lirve.el +++ b/lirve.el @@ -1,4 +1,4 @@ -;;; lirve.el --- Application to learn and review irregular verbs in English. -*- lexical-binding: t; +;;; lirve.el --- Application to learn and review irregular verbs in English. -*- lexical-binding: t -*- ;; ;; Copyright © 2024 Andros Fenollosa ;; Authors: Andros Fenollosa @@ -18,8 +18,10 @@ (require 'wid-edit)) ;; Variables +(defvar lirve--count-verbs 0) ;; It's used to know when unresolved verbs are shown +(defvar lirve--interval-unresolved 3) ;; Interval to show unresolved verbs (defvar lirve--verbs-shuffle '()) -(defvar lirve--file-name-unresolved "lirve-unresolved.txt") +(defvar lirve--file-name-unresolved ".lirve-unresolved") (defvar lirve--verbs-unresolved '()) (defvar lirve--buffer-name "*Learning irregular verbs in English*") (defvar lirve--state 1) ;; 1: lirve--start, 2: playing (before first check), 3: win (show success layout) @@ -55,13 +57,29 @@ ;; Functions +(defun lirve--kill-app () + "Kill the application." + (interactive) + (kill-buffer lirve--buffer-name)) + +(defun lirve--it-have-decimals (num) + "Return t if NUM is have decimals." + (let ((my-num (if (and + (stringp num) + ) ;; Return 0 if it is not a number + (string-to-number num) num))) + (when my-num (not (or (zerop my-num) ;; Check if it is 0 + (integerp my-num) ;; Check if it is integer + (and (floatp my-num) (equal my-num (float (truncate my-num)))) ;; Check if it is float + ))))) + (defun lirve--shuffle (originalList &optional shuffledList) "Applies the Fisher-Yates shuffle algorithm to a list. Example: (lirve--shuffle '(1 2 3 4 5)) => (3 1 5 2 4)" (if (null originalList) ;; End recursion, return the shuffled list shuffledList - ;; Otherwise, continue with the logic + ;; Otherwise, continue with the logic (let* ((randomPosition (random (length originalList))) (randomElement (nth randomPosition originalList)) ;; Create a new original list without the randomly selected element @@ -71,16 +89,38 @@ Example: (lirve--shuffle '(1 2 3 4 5)) => (3 1 5 2 4)" ;; Recursively call the shuffle function with the new original list and the new shuffled list (lirve--shuffle originalListWithoutRandomElement newShuffledList)))) -(defun lirve--kill-app () - "Kill the application." - (kill-buffer lirve--buffer-name)) +(defun lirve--get-verb-for-infinitive (infinitive) + "Get the verb for the infinitive." + (car (seq-filter + (lambda (verb) (string= infinitive (alist-get 'infinitive verb))) + lirve--verbs + ))) + +(defun lirve--full-path-unresolved () + "Get the full path of the unresolved file." + (concat (file-name-directory user-init-file) lirve--file-name-unresolved)) (defun lirve--save-verb-unresolved (infinitive) "Save the verb unresolved to lirve--verbs-unresolved and to the file." - (setq lirve--verbs-unresolved (cons infinitive lirve--verbs-unresolved)) - (with-temp-file (concat (file-name-directory user-init-file) lirve--file-name-unresolved) + (when infinitive + (progn + (setq lirve--verbs-unresolved (delete-dups (append lirve--verbs-unresolved (list infinitive)))) + (with-temp-file (lirve--full-path-unresolved) + (prin1 lirve--verbs-unresolved (current-buffer)))))) + +(defun lirve--remove-verb-unresolved (infinitive) + "Remove the verb unresolved from lirve--verbs-unresolved and from the file." + (setq lirve--verbs-unresolved (delete infinitive lirve--verbs-unresolved)) + (with-temp-file (lirve--full-path-unresolved) (prin1 lirve--verbs-unresolved (current-buffer)))) +(defun lirve--load-verbs-unresolved () + "Load the unresolved verbs from the file." + (when (file-exists-p (lirve--full-path-unresolved)) + (with-temp-buffer + (insert-file-contents (lirve--full-path-unresolved)) + (setq lirve--verbs-unresolved (read (current-buffer)))))) + (defun lirve--value-field-simple-past () "Get the value of the simple past." (if (not (eq lirve--widget-field-simple-past nil)) (widget-value lirve--widget-field-simple-past) "")) @@ -91,15 +131,25 @@ Example: (lirve--shuffle '(1 2 3 4 5)) => (3 1 5 2 4)" (defun lirve--set-verb-to-learn () "Set the verb to learn." + ;; If the list is empty, shuffle it (when (null lirve--verbs-shuffle) (setq lirve--verbs-shuffle (lirve--shuffle lirve--verbs))) - (let ((verb-to-learn (car lirve--verbs-shuffle))) + ;; Get verb + (let* ((turn-unresolved (not (lirve--it-have-decimals (/ (float lirve--count-verbs) lirve--interval-unresolved)))) ;; Calculate if it is time to show unresolved verbs: Count / Interval. If it isn't a decimal, it is time to show unresolved verbs + (verb-to-learn + (if (and lirve--verbs-unresolved turn-unresolved) + (lirve--get-verb-for-infinitive (car lirve--verbs-unresolved)) + (car lirve--verbs-shuffle)))) (setq lirve--verb-to-learn-infinitive (alist-get 'infinitive verb-to-learn)) (setq lirve--verb-to-learn-simple-past (alist-get 'simple-past verb-to-learn)) (setq lirve--verb-to-learn-past-participle (alist-get 'past-participle verb-to-learn)) (when (not (null (boundp 'learning-irregular-verbs-in-English--show-translation))) (setq lirve--translation (alist-get learning-irregular-verbs-in-English--show-translation (alist-get 'translations verb-to-learn)))) ;; Remove the verb from the list - (setq lirve--verbs-shuffle (cdr lirve--verbs-shuffle)))) + (if turn-unresolved + (lirve--remove-verb-unresolved verb-to-learn) + (setq lirve--verbs-shuffle (cdr lirve--verbs-shuffle)))) + ;; Increase the count of verbs + (setq lirve--count-verbs (1+ lirve--count-verbs))) (defun lirve--format-value-infinitive () "Format the value of the infinitive." @@ -311,6 +361,7 @@ Example: (lirve--shuffle '(1 2 3 4 5)) => (3 1 5 2 4)" (defun learning-irregular-verbs-in-english () "Application to learn and review irregular verbs in English." (interactive) + (lirve--load-verbs-unresolved) (lirve--main-layout) (lirve--start) (widget-backward 4))