From 14dd8a17e84e123299dab248ef4060d817e0d7d6 Mon Sep 17 00:00:00 2001 From: duerst Date: Tue, 26 Jul 2016 07:19:43 +0000 Subject: * enc/windows_1250.c, test/ruby/enc/test_case_comprehensive.rb: Implement non-ASCII case conversion for Windows-1250, by Sho Koike. * ChangeLog: Fixed order of previous two entries. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/windows_1250.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) (limited to 'enc') diff --git a/enc/windows_1250.c b/enc/windows_1250.c index aed293b4ed..47317ddaf6 100644 --- a/enc/windows_1250.c +++ b/enc/windows_1250.c @@ -29,6 +29,7 @@ */ #include "regenc.h" +#include "iso_8859.h" #define ENC_CP1250_TO_LOWER_CASE(c) EncCP1250_ToLowerCaseTable[c] #define ENC_IS_CP1250_CTYPE(code,ctype) \ @@ -101,7 +102,7 @@ static const unsigned short EncCP1250_CtypeTable[256] = { 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,/* E */ 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,/* F */ - 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, + 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0, }; static int @@ -189,6 +190,55 @@ cp1250_get_case_fold_codes_by_str(OnigCaseFoldType flag, flag, p, end, items); } +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= 0x8A && code <= 0xBF && code!=0xB9) + code -= 0x10; + 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); +} + OnigEncodingDefine(windows_1250, Windows_1250) = { onigenc_single_byte_mbc_enc_len, "Windows-1250", /* name */ @@ -208,7 +258,7 @@ OnigEncodingDefine(windows_1250, Windows_1250) = { onigenc_always_true_is_allowed_reverse_match, 0, ONIGENC_FLAG_NONE, - onigenc_single_byte_ascii_only_case_map, + case_map, }; /* * Name: windows-1250 @@ -218,4 +268,3 @@ OnigEncodingDefine(windows_1250, Windows_1250) = { * Link: http://en.wikipedia.org/wiki/Windows-1250 */ ENC_ALIAS("CP1250", "Windows-1250") - -- cgit v1.2.3