diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | enc/iso_8859_1.c | 6 | ||||
| -rw-r--r-- | enc/iso_8859_4.c | 3 |
3 files changed, 8 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed Jul 13 15:19:03 2016 Martin Duerst <duerst@it.aoyama.ac.jp> + + * enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if + there is no modification. + Wed Jul 13 14:40:04 2016 Martin Duerst <duerst@it.aoyama.ac.jp> * enc/iso_8859_5.c, test/ruby/enc/test_case_comprehensive.rb: diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c index 6070e4874c..9be16d3978 100644 --- a/enc/iso_8859_1.c +++ b/enc/iso_8859_1.c @@ -284,13 +284,11 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp, flags |= ONIGENC_CASE_MODIFIED; code += 0x20; } + else if (code==0xAA || code==0xBA || code==0xB5 || code==0xFF) ; else if ((EncISO_8859_1_CtypeTable[code]&BIT_CTYPE_LOWER) && (flags&ONIGENC_CASE_UPCASE)) { flags |= ONIGENC_CASE_MODIFIED; - if (code==0xAA || code==0xBA || code==0xB5 || code==0xFF) - ; - else - code -= 0x20; + code -= 0x20; } *to++ = code; if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */ diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c index 06a57ef7aa..753f2470df 100644 --- a/enc/iso_8859_4.c +++ b/enc/iso_8859_4.c @@ -252,14 +252,13 @@ case_map(OnigCaseFoldType* flagP, const OnigUChar** pp, flags |= ONIGENC_CASE_MODIFIED; code = ENC_ISO_8859_4_TO_LOWER_CASE(code); } + else if (code==0xA2) ; else if ((EncISO_8859_4_CtypeTable[code]&BIT_CTYPE_LOWER) && (flags&ONIGENC_CASE_UPCASE)) { flags |= ONIGENC_CASE_MODIFIED; if (code>=0xA0&&code<=0xBF) { if (code==0xBF) code -= 0x02; - else if (code==0xA2) - ; else code -= 0x10; } |