diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-11 13:45:35 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-11 13:45:35 +0300 |
| commit | 169d0e2887a40e4d845efcaa1e46ec49d02421b7 (patch) | |
| tree | c15cbf4bd8b94bd86b4da7253acd1a43e96f57e0 /src/ellinika | |
| parent | a1a5b7ddd6c3c0532c37551b24fd573a554ac181 (diff) | |
| download | ellinika-169d0e2887a40e4d845efcaa1e46ec49d02421b7.tar.gz ellinika-169d0e2887a40e4d845efcaa1e46ec49d02421b7.tar.bz2 | |
Fixes in conjugator
* data/dbverb.struct: Expand conj to char(32).
Fix several bugs in conjugation table.
Introduce a new pseudo-conjugation A-depon, for verba deponentia.
* data/irregular-verbs.xml: Update.
* scm/conjugator.scm (complement-verb-info): Handle A-depon.
(apply-flect): Don't try to set accent outside of a word, even
if so required by accmap.
(conjugate): For synthetic tenses, look up for aoristoy ypotaktikis
of the same voice as the requested tense. Use accmap to decide whether
a particular person exists in that tense.
Fixes in syllabificator.
* src/ellinika/elmorph.c (_elstr_set_accent): Fix setting accents on
diphthongs.
(deftab) <elmorph:iota>: New flag.
* src/ellinika/elmorph.h (CHF_IOTA): New flag.
* src/ellinika/syllabificator.c (SYL_FLAG_MASK): Add more bits.
(next_syllable): Mark syllables with iota with CHF_DIPHTHONG|CHF_IOTA.
Diffstat (limited to 'src/ellinika')
| -rw-r--r-- | src/ellinika/elmorph.c | 18 | ||||
| -rw-r--r-- | src/ellinika/elmorph.h | 1 | ||||
| -rw-r--r-- | src/ellinika/syllabificator.c | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c index 5a8acdf..6d6a69a 100644 --- a/src/ellinika/elmorph.c +++ b/src/ellinika/elmorph.c @@ -597,13 +597,9 @@ _elstr_set_accent(SCM el, SCM n, int destructive, const char *func_name) pos = 0; - for (i = 0; i < elstr->sylmap[acc_num].phoneme_count; i++) { - struct phoneme *ph = elstr->phoneme + start + i; + + for (i = elstr->sylmap[acc_num].phoneme_count; i > 0; i--) { + struct phoneme *ph = elstr->phoneme + start + i - 1; if (ph->flags & CHF_CONSONANT) /* skip */ ; - else if (ph->flags & CHF_DIPHTHONG) { - phoneme = ph; - pos = ph->start + 1; - break; - } else if (ph->flags & CHF_VOWEL) { + else if (ph->flags & CHF_VOWEL) { phoneme = ph; - pos = ph->start; break; @@ -616,2 +612,7 @@ _elstr_set_accent(SCM el, SCM n, int destructive, const char *func_name) scm_list_2(n, el)); + else if (phoneme->flags & CHF_DIPHTHONG) + pos = phoneme->start + phoneme->count - 1; + else + pos = phoneme->start; + phoneme->flags |= CHF_OXEIA; @@ -745,2 +746,3 @@ static struct deftab { { CHF_DIPHTHONG, "elmorph:diphthong" }, + { CHF_IOTA, "elmorph:iota" }, }; diff --git a/src/ellinika/elmorph.h b/src/ellinika/elmorph.h index 2399b8a..c0df60f 100644 --- a/src/ellinika/elmorph.h +++ b/src/ellinika/elmorph.h @@ -36,2 +36,3 @@ #define CHF_DIPHTHONG 0x08000 +#define CHF_IOTA 0x10000 diff --git a/src/ellinika/syllabificator.c b/src/ellinika/syllabificator.c index c4105ec..e034163 100644 --- a/src/ellinika/syllabificator.c +++ b/src/ellinika/syllabificator.c @@ -34,3 +34,3 @@ struct syllabificator { -#define SYL_FLAG_MASK (CHF_ACCENT_MASK) +#define SYL_FLAG_MASK (CHF_ACCENT_MASK|CHF_DIPHTHONG|CHF_IOTA) @@ -96,2 +96,4 @@ next_syllable(struct syllabificator *sp) sp->phon_cur++; + if (sp->phon[sp->phon_cur].flags & CHF_VOWEL) + syl->flags |= CHF_DIPHTHONG|CHF_IOTA; } |