diff options
| author | duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-13 05:40:12 +0000 |
|---|---|---|
| committer | duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-13 05:40:12 +0000 |
| commit | 749dd69f9916de44d6b029cfd721f49a5fa530b6 (patch) | |
| tree | cef5161b4afaf6ed6db59031b6f08fb4c464ca76 /enc | |
| parent | 553f703ec84a6affd10d705566d77c2af1328d31 (diff) | |
| download | ruby-749dd69f9916de44d6b029cfd721f49a5fa530b6.tar.gz | |
* enc/iso_8859_5.c, test/ruby/enc/test_case_comprehensive.rb:
Implement non-ASCII case conversion for ISO-8859-5, by Masaru Onodera.
* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/iso_8859_5.c | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c index c538d56e31..a4e860db14 100644 --- a/enc/iso_8859_5.c +++ b/enc/iso_8859_5.c @@ -209,6 +209,40 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, flag, p, end, items); } +#ifdef ONIG_CASE_MAPPING +static int +case_map (OnigCaseFoldType* flagP, const OnigUChar** pp, + const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, + const struct OnigEncodingTypeST* enc) +{ + OnigCodePoint code; + OnigUChar *to_start = to; + OnigCaseFoldType flags = *flagP; + + while (*pp<end && to<to_end) { + code = *(*pp)++; + if ((EncISO_8859_5_CtypeTable[code] & BIT_CTYPE_UPPER) + && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) { + flags |= ONIGENC_CASE_MODIFIED; + code = ENC_ISO_8859_5_TO_LOWER_CASE(code); + } + else if ((EncISO_8859_5_CtypeTable[code]&BIT_CTYPE_LOWER) + && (flags&ONIGENC_CASE_UPCASE)) { + flags |= ONIGENC_CASE_MODIFIED; + if (0xF1<=code && code<=0xFF) + code -= 0x50; + else + code -= 0x20; + } + *to++ = code; + if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */ + flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE); + } + *flagP = flags; + return (int)(to-to_start); +} +#endif /* ONIG_CASE_MAPPING */ + OnigEncodingDefine(iso_8859_5, ISO_8859_5) = { onigenc_single_byte_mbc_enc_len, "ISO-8859-5", /* name */ @@ -229,7 +263,7 @@ OnigEncodingDefine(iso_8859_5, ISO_8859_5) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_single_byte_ascii_only_case_map, + case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-5", "ISO-8859-5") |