kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* enc/iso_8859_15.c, test/ruby/enc/test_case_comprehensive.rb:

Browse source 
Implement non-ASCII case conversion for ISO-8859-15, by Maho Harada.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2016-07-06 09:59:23 +00:00
parent 79b1758b65
commit 6fb97b3f32
3 changed files with 70 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jul 6 18:59:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/iso_8859_15.c, test/ruby/enc/test_case_comprehensive.rb:
Implement non-ASCII case conversion for ISO-8859-15, by Maho Harada.
Wed Jul 6 18:34:21 2016 Martin Duerst <duerst@it.aoyama.ac.jp> Wed Jul 6 18:34:21 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/iso_8859_16.c, test/ruby/enc/test_case_comprehensive.rb: * enc/iso_8859_16.c, test/ruby/enc/test_case_comprehensive.rb:

65
enc/iso_8859_15.c
View file

@ -220,6 +220,69 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
flag, p, end, items); 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 (code==SHARP_s) {
if (flags&ONIGENC_CASE_UPCASE) {
flags |= ONIGENC_CASE_MODIFIED;
*to++ = 'S';
code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
}
else if (flags&ONIGENC_CASE_FOLD) {
flags |= ONIGENC_CASE_MODIFIED;
*to++ = 's';
code = 's';
}
}
else if (code==0xAA || code==0xBA) ;
else if ((EncISO_8859_15_CtypeTable[code] & BIT_CTYPE_UPPER)
&& (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
flags |= ONIGENC_CASE_MODIFIED;
if (code==0xA6)
code += 2;
else if (code==0xB4)
code += 4;
else if (code==0xBC)
code += 1;
else if (code==0xBE)
code += 0x41;
else
code += 0x20;
}
else if ((EncISO_8859_15_CtypeTable[code]&BIT_CTYPE_LOWER)
&& (flags&ONIGENC_CASE_UPCASE)) {
flags |= ONIGENC_CASE_MODIFIED;
if (code==0xA8)
code -= 2;
else if (code==0xB8)
code -= 4;
else if (code==0xBD)
code -= 1;
else if (code==0xFF)
code -= 0x41;
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_15, ISO_8859_15) = { OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
onigenc_single_byte_mbc_enc_len, onigenc_single_byte_mbc_enc_len,
"ISO-8859-15", /* name */ "ISO-8859-15", /* name */
@ -240,7 +303,7 @@ OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
0, 0,
ONIGENC_FLAG_NONE, ONIGENC_FLAG_NONE,
#ifdef ONIG_CASE_MAPPING #ifdef ONIG_CASE_MAPPING
onigenc_single_byte_ascii_only_case_map, case_map,
#endif /* ONIG_CASE_MAPPING */ #endif /* ONIG_CASE_MAPPING */
}; };
ENC_ALIAS("ISO8859-15", "ISO-8859-15") ENC_ALIAS("ISO8859-15", "ISO-8859-15")

2
test/ruby/enc/test_case_comprehensive.rb
View file

@ -247,7 +247,7 @@ class TestComprehensiveCaseFold
generate_ascii_only_case_mapping_tests 'ISO-8859-10' generate_ascii_only_case_mapping_tests 'ISO-8859-10'
generate_ascii_only_case_mapping_tests 'ISO-8859-13' generate_ascii_only_case_mapping_tests 'ISO-8859-13'
generate_ascii_only_case_mapping_tests 'ISO-8859-14' generate_ascii_only_case_mapping_tests 'ISO-8859-14'
generate_ascii_only_case_mapping_tests 'ISO-8859-15' generate_case_mapping_tests 'ISO-8859-15'
generate_case_mapping_tests 'ISO-8859-16' generate_case_mapping_tests 'ISO-8859-16'
generate_ascii_only_case_mapping_tests 'KOI8-R' generate_ascii_only_case_mapping_tests 'KOI8-R'
generate_ascii_only_case_mapping_tests 'KOI8-U' generate_ascii_only_case_mapping_tests 'KOI8-U'