Skip to content

Commit

Permalink
Catalan v:iure
Browse files Browse the repository at this point in the history
  • Loading branch information
@bretttolbert
bretttolbert committed Dec 25, 2023
1 parent 87a4c12 commit 6bbb887
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- 1.9.6 [25 December 2023]
- Improved Catalan Support
- Added more missing templates (1)
- TODO: Still missing 6 templates for 15 out of 8616 verbs
- TODO: Still missing 5 templates for 9 out of 8616 verbs
- See `test_inflector_ca.test_all_verbs_have_templates`

- 1.9.5 [24 December 2023]
Expand Down
47 changes: 46 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) == 62
assert len(template_names) == 63
missing_verbs = []
missing_templates = set()
for verb in verbs:
Expand Down Expand Up @@ -2641,6 +2641,51 @@ def test_find_verb_by_infinitive():
"vosaltres premoriu",
"elles premoren"
]
),
(
"conviure",
"indicatiu",
"present",
False,
"f",
[
"jo convisc",
"tu convius",
"ella conviu",
"nosaltres convivim",
"vosaltres conviviu",
"elles conviuen"
]
),
(
"conviure",
"indicatiu",
"imperfet",
False,
"f",
[
"jo convivia",
"tu convivies",
"ella convivia",
"nosaltres convivíem",
"vosaltres convivíeu",
"elles convivien"
]
),
(
"conviure",
"indicatiu",
"passat-simple",
False,
"f",
[
"jo convisquí",
"tu convisqueres",
"ella convisqué",
"nosaltres convisquérem",
"vosaltres convisquéreu",
"elles convisqueren"
]
)
],
)
Expand Down
92 changes: 92 additions & 0 deletions verbecc/data/conjugations-ca.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,98 @@ Only difference is the participles
</Particip>
</template>

<template name="v:iure">
<Indicatiu>
<present>
<p><i>isc</i></p>
<p><i>ius</i></p>
<p><i>iu</i></p>
<p><i>ivim</i></p>
<p><i>iviu</i></p>
<p><i>iuen</i></p>
</present>
<imperfet>
<p><i>ivia</i></p>
<p><i>ivies</i></p>
<p><i>ivia</i></p>
<p><i>ivíem</i></p>
<p><i>ivíeu</i></p>
<p><i>ivien</i></p>
</imperfet>
<passat-simple>
<p><i>isquí</i></p>
<p><i>isqueres</i></p>
<p><i>isqué</i></p>
<p><i>isquérem</i></p>
<p><i>isquéreu</i></p>
<p><i>isqueren</i></p>
</passat-simple>
<futur>
<p><i>iuré</i></p>
<p><i>iuràs</i></p>
<p><i>iurà</i></p>
<p><i>iurem</i></p>
<p><i>iureu</i></p>
<p><i>iuran</i></p>
</futur>
</Indicatiu>
<Subjuntiu>
<present>
<p><i>isgui</i></p>
<p><i>isguis</i></p>
<p><i>isgui</i></p>
<p><i>isguem</i></p>
<p><i>isgue</i></p>
<p><i>isguin</i></p>
</present>
<imperfet>
<p><i>isgués</i></p>
<p><i>isguessis</i></p>
<p><i>isgués</i></p>
<p><i>isguéssim</i></p>
<p><i>isguéssiu</i></p>
<p><i>isguessin</i></p>
</imperfet>
</Subjuntiu>
<Imperatiu>
<imperatiu-present>
<p><i>iu</i></p>
<p><i>isqui</i></p>
<p><i>isquem</i></p>
<p><i>ieu</i></p>
<p><i>isquin</i></p>
</imperatiu-present>
</Imperatiu>
<Condicional>
<present>
<p><i>iuria</i></p>
<p><i>iuries</i></p>
<p><i>iuria</i></p>
<p><i>iuríem</i></p>
<p><i>iuríeu</i></p>
<p><i>iurien</i></p>
</present>
</Condicional>
<Infinitiu>
<infinitiu-present>
<p><i>iure</i></p>
</infinitiu-present>
</Infinitiu>
<Gerundi>
<gerundi>
<p><i>ient</i></p>
</gerundi>
</Gerundi>
<Particip>
<particip>
<p><i>iscut</i></p>
<p><i>iscuda</i></p>
<p><i>iscuts</i></p>
<p><i>iscudes</i></p>
</particip>
</Particip>
</template>

<!-- TODO: This should inherit from cantar -->
<template name=":anar">
<Indicatiu>
Expand Down
12 changes: 6 additions & 6 deletions verbecc/data/verbs-ca.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1904,7 +1904,7 @@
<v><i>conversejar</i><t>enve:jar</t><en></en></v>
<v><i>convertir</i><t>serv:ir</t><en></en></v>
<v><i>convidar</i><t>cant:ar</t><en></en></v>
<v><i>conviure</i><t>vi:ure</t><en></en></v>
<v><i>conviure</i><t>v:iure</t><en>live together</en></v>
<v><i>convocar</i><t>tren:car</t><en></en></v>
<v><i>convulsar</i><t>cant:ar</t><en></en></v>
<v><i>convèncer</i><t>v:èncer</t><en></en></v>
Expand Down Expand Up @@ -3134,7 +3134,7 @@
<v><i>desvironar</i><t>cant:ar</t><en></en></v>
<v><i>desvirtuar</i><t>evacu:ar</t><en></en></v>
<v><i>desvitrificar</i><t>tren:car</t><en></en></v>
<v><i>desviure</i><t>vi:ure</t><en></en></v>
<v><i>desviure</i><t>v:iure</t><en></en></v>
<v><i>desvorar</i><t>cant:ar</t><en></en></v>
<v><i>desxifrar</i><t>cant:ar</t><en></en></v>
<v><i>detallar</i><t>cant:ar</t><en></en></v>
Expand Down Expand Up @@ -6145,7 +6145,7 @@
<v><i>malvendre</i><t>malven:dre</t><en></en></v>
<v><i>malversar</i><t>cant:ar</t><en></en></v>
<v><i>malveure</i><t>perd:re</t><en></en></v>
<v><i>malviure</i><t>vi:ure</t><en></en></v>
<v><i>malviure</i><t>v:iure</t><en></en></v>
<v><i>mal·leabilitzar</i><t>cant:ar</t><en></en></v>
<v><i>mamar</i><t>cant:ar</t><en></en></v>
<v><i>mamotejar</i><t>enve:jar</t><en></en></v>
Expand Down Expand Up @@ -6752,7 +6752,7 @@
<v><i>pertànyer</i><t>pertàny:er</t><en>belong</en></v>
<v><i>pervenir</i><t>prev:enir</t><en></en></v>
<v><i>pervertir</i><t>serv:ir</t><en></en></v>
<v><i>perviure</i><t>vi:ure</t><en></en></v>
<v><i>perviure</i><t>v:iure</t><en></en></v>
<v><i>perxar</i><t>cant:ar</t><en></en></v>
<v><i>perxejar</i><t>enve:jar</t><en></en></v>
<v><i>pesar</i><t>cant:ar</t><en></en></v>
Expand Down Expand Up @@ -7670,7 +7670,7 @@
<v><i>reviscolar</i><t>cant:ar</t><en></en></v>
<v><i>revistar</i><t>cant:ar</t><en></en></v>
<v><i>revitalitzar</i><t>cant:ar</t><en></en></v>
<v><i>reviure</i><t>vi:ure</t><en></en></v>
<v><i>reviure</i><t>v:iure</t><en></en></v>
<v><i>revivificar</i><t>tren:car</t><en></en></v>
<v><i>revocar</i><t>tren:car</t><en></en></v>
<v><i>revolar</i><t>cant:ar</t><en></en></v>
Expand Down Expand Up @@ -7950,7 +7950,7 @@
<v><i>sobrevaler</i><t>val:er</t><en></en></v>
<v><i>sobrevalorar</i><t>cant:ar</t><en></en></v>
<v><i>sobrevenir</i><t>prev:enir</t><en></en></v>
<v><i>sobreviure</i><t>vi:ure</t><en></en></v>
<v><i>sobreviure</i><t>v:iure</t><en></en></v>
<v><i>sobrevolar</i><t>cant:ar</t><en></en></v>
<v><i>sobtar</i><t>cant:ar</t><en></en></v>
<v><i>socalivar</i><t>cant:ar</t><en></en></v>
Expand Down

0 comments on commit 6bbb887

Please sign in to comment.