Skip to content

Commit

Permalink
Catalan entrellu:ir
Browse files Browse the repository at this point in the history
  • Loading branch information
@bretttolbert
bretttolbert committed Dec 24, 2023
1 parent 903033b commit 801cc84
Show file tree
Hide file tree
Showing 4 changed files with 162 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

- 1.9.4 [23 December 2023]
- Improved Catalan Support
- Added more missing templates (7+)
- TODO: Still missing 27 templates for 176 out of 8616 verbs
- Added more missing templates (8+)
- TODO: Still missing 26 templates for 172 out of 8616 verbs
- See `test_inflector_ca.test_all_verbs_have_templates`

- 1.9.3 [22 December 2023]
Expand Down
63 changes: 62 additions & 1 deletion tests/test_inflector_ca.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def test_all_verbs_have_templates():
verbs = cg.get_verbs()
assert len(verbs) == 8616
template_names = cg.get_template_names()
assert len(template_names) == 49
assert len(template_names) == 50
missing_verbs = []
missing_templates = set()
for verb in verbs:
Expand Down Expand Up @@ -1876,6 +1876,67 @@ def test_find_verb_by_infinitive():
"elles dolen",
],
),
(
"entrelluir",
"indicatiu",
"present",
False,
"f",
[
"jo entrelluo",
"tu entrelluus",
"ella entrelluu",
"nosaltres entrelluïm",
"vosaltres entrelluïu",
"elles entrelluen",
],
),
(
"entrelluir",
"indicatiu",
"present",
True,
"f",
[
"jo entrelluo",
"tu entrelluus",
"ella entrellú",
"nosaltres entrelluïm",
"vosaltres entrelluïu",
"elles entrelluen",
],
),
(
"entrelluir",
"indicatiu",
"imperfet",
True,
"f",
[
"jo entrelluïa",
"tu entrelluïes",
"ella entrelluïa",
"nosaltres entrelluíem",
"vosaltres entrelluíeu",
"elles entrelluïen",
],
),
(
"entrelluir",
"imperatiu",
"imperatiu-present",
False,
"m",
["entrelluu", "entrelluï", "entrelluïm", "entrelluïu", "entrelluïn"],
),
(
"entrelluir",
"imperatiu",
"imperatiu-present",
True,
"m",
["entrellú", "entrelluï", "entrelluïm", "entrelluïu", "entrelluïn"],
),
],
)
def test_inflector_ca_conjugate_mood_tense(
Expand Down
93 changes: 93 additions & 0 deletions verbecc/data/conjugations-ca.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2973,6 +2973,99 @@ except in the first and second person plural.
</Particip>
</template>

<!-- TODO: Inherit form dorm:ir -->
<template name="entrellu:ir">
<Indicatiu>
<present>
<p><i>o</i></p>
<p><i>us</i></p>
<p><i>u</i><i>-ú</i></p>
<p><i>ïm</i></p>
<p><i>ïu</i></p>
<p><i>en</i></p>
</present>
<imperfet>
<p><i>ïa</i></p>
<p><i>ïes</i></p>
<p><i>ïa</i></p>
<p><i>íem</i></p>
<p><i>íeu</i></p>
<p><i>ïen</i></p>
</imperfet>
<passat-simple>
<p><i>í</i></p>
<p><i>ires</i></p>
<p><i>í</i></p>
<p><i>írem</i></p>
<p><i>íreu</i></p>
<p><i>iren</i></p>
</passat-simple>
<futur>
<p><i>iré</i></p>
<p><i>iràs</i></p>
<p><i>irà</i></p>
<p><i>irem</i></p>
<p><i>ireu</i></p>
<p><i>iran</i></p>
</futur>
</Indicatiu>
<Subjuntiu>
<present>
<p><i>i</i></p>
<p><i>is</i></p>
<p><i>i</i></p>
<p><i>im</i></p>
<p><i>iu</i></p>
<p><i>in</i></p>
</present>
<imperfet>
<p><i>ís</i></p>
<p><i>issis</i></p>
<p><i>ís</i></p>
<p><i>íssim</i></p>
<p><i>íssiu</i></p>
<p><i>issin</i></p>
</imperfet>
</Subjuntiu>
<Imperatiu>
<imperatiu-present>
<p><i>u</i><i>-ú</i></p>
<p><i>ï</i></p>
<p><i>ïm</i></p>
<p><i>ïu</i></p>
<p><i>ïn</i></p>
</imperatiu-present>
</Imperatiu>
<Condicional>
<present>
<p><i>iria</i></p>
<p><i>iries</i></p>
<p><i>iria</i></p>
<p><i>iríem</i></p>
<p><i>iríeu</i></p>
<p><i>irien</i></p>
</present>
</Condicional>
<Infinitiu>
<infinitiu-present>
<p><i>ir</i></p>
</infinitiu-present>
</Infinitiu>
<Gerundi>
<gerundi>
<p><i>int</i></p>
</gerundi>
</Gerundi>
<Particip>
<particip>
<p><i>ït</i></p>
<p><i>ïda</i></p>
<p><i>ïts</i></p>
<p><i>ïdes</i></p>
</particip>
</Particip>
</template>

<!-- TODO: Inherit form dorm:ir -->
<template name="descos:ir">
<Indicatiu>
Expand Down
10 changes: 5 additions & 5 deletions verbecc/data/verbs-ca.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4322,7 +4322,7 @@
<v><i>entrelligar</i><t>preg:ar</t><en></en></v>
<v><i>entrelligassar</i><t>cant:ar</t><en></en></v>
<v><i>entrellucar</i><t>tren:car</t><en></en></v>
<v><i>entrelluir</i><t>dorm:ir</t><en></en></v>
<v><i>entrelluir</i><t>entrellu:ir</t><en></en></v>
<v><i>entrelluscar</i><t>tren:car</t><en></en></v>
<v><i>entremaliejar</i><t>enve:jar</t><en></en></v>
<v><i>entrematar</i><t>cant:ar</t><en></en></v>
Expand Down Expand Up @@ -6075,7 +6075,7 @@
<v><i>lluentejar</i><t>enve:jar</t><en></en></v>
<v><i>lluertejar</i><t>enve:jar</t><en></en></v>
<v><i>llufar</i><t>cant:ar</t><en></en></v>
<v><i>lluir</i><t>entrell:uir</t><en></en></v>
<v><i>lluir</i><t>entrellu:ir</t><en></en></v>
<v><i>lluitar</i><t>cant:ar</t><en></en></v>
<v><i>llumejar</i><t>enve:jar</t><en></en></v>
<v><i>llunyejar</i><t>enve:jar</t><en></en></v>
Expand Down Expand Up @@ -7046,7 +7046,7 @@
<v><i>proveir</i><t>obe:ir</t><en></en></v>
<v><i>provenir</i><t>prev:enir</t><en></en></v>
<v><i>provocar</i><t>tren:car</t><en></en></v>
<v><i>pruir</i><t>entrell:uir</t><en></en></v>
<v><i>pruir</i><t>entrellu:ir</t><en></en></v>
<v><i>prémer</i><t>t:émer</t><en></en></v>
<v><i>pseudomorfitzar</i><t>cant:ar</t><en></en></v>
<v><i>psicoanalitzar</i><t>cant:ar</t><en></en></v>
Expand Down Expand Up @@ -7430,7 +7430,7 @@
<v><i>relliscar</i><t>tren:car</t><en></en></v>
<v><i>rellogar</i><t>preg:ar</t><en></en></v>
<v><i>rellucar</i><t>tren:car</t><en></en></v>
<v><i>relluir</i><t>entrell:uir</t><en></en></v>
<v><i>relluir</i><t>entrellu:ir</t><en></en></v>
<v><i>remagencar</i><t>tren:car</t><en></en></v>
<v><i>remallar</i><t>cant:ar</t><en></en></v>
<v><i>remar</i><t>cant:ar</t><en></en></v>
Expand Down Expand Up @@ -8329,7 +8329,7 @@
<v><i>trascamar</i><t>cant:ar</t><en></en></v>
<v><i>trascolar</i><t>cant:ar</t><en></en></v>
<v><i>traslladar</i><t>cant:ar</t><en></en></v>
<v><i>traslluir</i><t>entrell:uir</t><en></en></v>
<v><i>traslluir</i><t>entrellu:ir</t><en></en></v>
<v><i>trasmudar</i><t>cant:ar</t><en></en></v>
<v><i>traspalar</i><t>cant:ar</t><en></en></v>
<v><i>traspaperar</i><t>cant:ar</t><en></en></v>
Expand Down

0 comments on commit 801cc84

Please sign in to comment.