diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-02 20:37:07 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-02 20:37:07 +0000 |
| commit | 99076de629a6f5f2b654118cde3612f9ba05edf0 (patch) | |
| tree | f55ad0ce5dbc03d049202ddd62658f3583801c42 | |
| parent | 5d9417629ffd39745bb56667acdedb172ba2fc4e (diff) | |
| download | ellinika-99076de629a6f5f2b654118cde3612f9ba05edf0.tar.gz ellinika-99076de629a6f5f2b654118cde3612f9ba05edf0.tar.bz2 | |
Fix previous commit
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@553 941c8c0f-9102-463b-b60b-cd22ce0e6858
| -rw-r--r-- | scm/elchr.c (renamed from scm/elstr.c) | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/scm/elstr.c b/scm/elchr.c index 816b45e..fa271a1 100644 --- a/scm/elstr.c +++ b/scm/elchr.c @@ -5,26 +5,7 @@ #include <stdlib.h> #include <libguile.h> #include "utf8.h" - -#define CHF_OXEIA 1 -#define CHF_PERISPWMENH 2 -#define CHF_BAREIA 3 - -#define CHF_ACCENT_MASK 0x000f - -#define CHF_TREMA 0x0010 - -#define CHF_VOWEL 0x0020 -#define CHF_CONSONANT 0x0040 -#define CHF_SEMICONSONANT 0x0080 -#define CHF_PUNCT 0x0100 -#define CHF_SYMBOL 0x0200 -#define CHF_MODIFIER 0x0400 -#define CHF_ARCHAIC 0x0800 -#define CHF_LOWER 0x1000 -#define CHF_UPPER 0x2000 -#define CHF_NUMERIC 0x4000 - +#include "elchr.h" struct char_info_st { unsigned ch; /* Characters */ @@ -175,7 +156,7 @@ struct char_info_st el_basic_ctype[] = { { 0x0382, }, { 0x0383, }, { 0x0384, CHF_MODIFIER }, /* Oxeia */ - { 0x0385, CHF_MODIDFIER }, /* dialytika */ + { 0x0385, CHF_MODIFIER }, /* dialytika */ { 0x0386, CHF_VOWEL|CHF_UPPER|CHF_OXEIA, 0x0391, 0x03AC }, /* Ά */ { 0x0387, CHF_PUNCT }, /* ano teleia */ { 0x0388, CHF_VOWEL|CHF_UPPER|CHF_OXEIA, 0x0395, 0x03AD }, /* Έ */ @@ -211,7 +192,7 @@ struct char_info_st el_basic_ctype[] = { { 0x03A6, CHF_CONSONANT|CHF_UPPER|CHF_NUMERIC, 0, 0x03C6, 500 }, /* Φ */ { 0x03A7, CHF_CONSONANT|CHF_UPPER|CHF_NUMERIC, 0, 0x03C7, 600 }, /* Χ */ { 0x03A8, CHF_CONSONANT|CHF_UPPER|CHF_NUMERIC, 0, 0x03C8, 700 }, /* Ψ */ - { 0x03A9, CHF_COWEL|CHF_UPPER|CHF_NUMERIC, 0, 0x03C9, 800, 0x038F }, /* Ω */ + { 0x03A9, CHF_VOWEL|CHF_UPPER|CHF_NUMERIC, 0, 0x03C9, 800, 0x038F }, /* Ω */ { 0x03AA, CHF_VOWEL|CHF_UPPER|CHF_TREMA, 0x0399, 0x03CA }, /* Ϊ */ { 0x03AB, CHF_VOWEL|CHF_UPPER|CHF_TREMA, 0x03A5, 0x03CB }, /* Ϋ */ { 0x03AC, CHF_VOWEL|CHF_LOWER|CHF_OXEIA, 0x03B1, 0x0386 }, /* ά */ @@ -292,8 +273,8 @@ struct char_info_st el_basic_ctype[] = { { 0x03F7, }, { 0x03F8, }, { 0x03F9, CHF_CONSONANT|CHF_UPPER, 0, 0x03F2 }, /* LUNATE SIGMA */ - { 0x03FA, CFH_ANCIENT|CHF_CONSONANT|CHF_UPPER, 0, 0x03FB }, /* SAN */ - { 0x03FB, CFH_ANCIENT|CHF_CONSONANT|CHF_LOWER, 0, 0x03FA }, /* san */ + { 0x03FA, CHF_ARCHAIC|CHF_CONSONANT|CHF_UPPER, 0, 0x03FB }, /* SAN */ + { 0x03FB, CHF_ARCHAIC|CHF_CONSONANT|CHF_LOWER, 0, 0x03FA }, /* san */ { 0x03FC, CHF_SYMBOL|CHF_CONSONANT|CHF_LOWER, }, /* rho with stroke */ { 0x03FD, CHF_SYMBOL|CHF_CONSONANT|CHF_UPPER, 0, 0x037B}, /* CAPITAL REV. LUNATE SIGMA antisigma */ @@ -592,7 +573,7 @@ elchr_islower(unsigned ch) } int -elchr_accent(unsigned ch) +elchr_getaccent(unsigned ch) { return elchr_flags(ch) & CHF_ACCENT_MASK; } @@ -617,9 +598,9 @@ elchr_isconsonant(unsigned ch) } int -elchr_issemiconsonant(unsigned ch) +elchr_issemivowel(unsigned ch) { - return elchr_flags(ch) & CHF_SEMICONSONANT; + return elchr_flags(ch) & CHF_SEMIVOWEL; } int |