diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-14 02:21:00 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-14 02:26:46 +0300 |
| commit | bee3becef44e298f59d72cee3c8e552bccb10d65 (patch) | |
| tree | d62e1cc162c52f89b2c7a7fb8aa7a3f0e2df115f /data/irregular-verbs.xml | |
| parent | d7b0bf03404d26c7c972b3040725eda339f57122 (diff) | |
| download | ellinika-bee3becef44e298f59d72cee3c8e552bccb10d65.tar.gz ellinika-bee3becef44e298f59d72cee3c8e552bccb10d65.tar.bz2 | |
Improve verb database structure for better handling of individual verbs.
* data/dbverb.struct (verbflect): Split alternative flections
into separate groups.
(conjugation): Set fold values for imp.
Add missing accmaps
(verb): Drop table.
(verbclass,verbtense): New tables.
* data/irregular-verbs.xml: Update.
* scm/verbop.scm: Rewrite for the new database structure.
* src/ellinika/conjugator.scm: Likewise.
* src/ellinika/tests/conj/ntynv.scm: Fix typo.
* src/ellinika/tests/conj/bastv.scm: New file.
* src/ellinika/tests/conj/kauomai.scm: New file.
Diffstat (limited to 'data/irregular-verbs.xml')
| -rw-r--r-- | data/irregular-verbs.xml | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/data/irregular-verbs.xml b/data/irregular-verbs.xml index 8951bda..e53e9fd 100644 --- a/data/irregular-verbs.xml +++ b/data/irregular-verbs.xml @@ -138,6 +138,9 @@ <aor>ήγαγ</aor> <root theme="sub">αγάγ</root> </act> + <pas> + <root theme="aor">αχθ</root> + </pas> </v> <v> @@ -184,7 +187,7 @@ <v> <a>βαστώ</a> - <c>B2</c> + <c>B1</c> <suffix>ηξ</suffix> <!-- also αξ --> </v> @@ -295,33 +298,7 @@ <root theme="aor">δωσ</root> </act> </v> -<!-- - <v> - <a>έρχομαι</a> - <c>A</c> - <suffix></suffix> - <accmap>000000</accmap> - <act> - <root theme="sub">ερθ</root> - <ind/> - <sub> - <t name="Ενεστώτας"/> - <t name="Παρατατικός"/> - <t name="Μέλλοντας διαρκείας"/> - <t name="Παρακείμενος"/> - <t name="Υπερσυντέλικος"/> - <t name="Συντελεσμένος μέλλοντας"/> - <t name="Μέλλοντας στιγμιαίος"/> - </sub> - <imp/> - </act> - <pas> - <root theme="aor">ήρθ</root> - <root theme="sub">ερθ</root> - </pas> - </v> ---> - + <v> <a>έρχομαι</a> <c>A-depon</c> @@ -342,12 +319,32 @@ </imp> </pas> </v> - -<!-- FIXME - έρχομαι - κάθομαι ---> + <v> + <a>κάθομαι</a> + <c>A-depon</c> + <act> + <root theme="aor">κάτσ</root> + </act> + <pas> + <root theme="aor">κάτσ</root> + <ind> + <t name="Αόριστος"> + <augment>ε</augment> + <accmap>333333+</accmap> + </t> + </ind> + <imp> + <t name="Ενεστώτας"> + <p n="p" p="2">κάθεστε</p> + </t> + <t name="Αόριστος"> + <p n="s" p="2">κάθισε</p> + <p n="p" p="2">κάθιστε</p> + </t> + </imp> + </pas> + </v> <v> <a>καίω</a> |