diff options
Diffstat (limited to 'enc/iso_8859_3.c')
-rw-r--r-- | enc/iso_8859_3.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c index 365d9a77de..2a343eac63 100644 --- a/enc/iso_8859_3.c +++ b/enc/iso_8859_3.c @@ -223,45 +223,46 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, #define DOTLESS_i (0xB9) #define I_WITH_DOT_ABOVE (0xA9) static int -case_map (OnigCaseFoldType* flagP, const OnigUChar** pp, - const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, - const struct OnigEncodingTypeST* enc) +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) { + while (*pp < end && to < to_end) { code = *(*pp)++; - if (code==SHARP_s) { - if (flags&ONIGENC_CASE_UPCASE) { + if (code == SHARP_s) { + if (flags & ONIGENC_CASE_UPCASE) { flags |= ONIGENC_CASE_MODIFIED; *to++ = 'S'; - code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S'; + code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S'; } - else if (flags&ONIGENC_CASE_FOLD) { + else if (flags & ONIGENC_CASE_FOLD) { flags |= ONIGENC_CASE_MODIFIED; *to++ = 's'; code = 's'; } } - else if (code==0xB5) ; + else if (code == 0xB5) + ; else if ((EncISO_8859_3_CtypeTable[code] & BIT_CTYPE_UPPER) - && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) { + && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) { flags |= ONIGENC_CASE_MODIFIED; - if (code=='I') - code = flags&ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i'; + if (code == 'I') + code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i'; else code = ENC_ISO_8859_3_TO_LOWER_CASE(code); } else if ((EncISO_8859_3_CtypeTable[code]&BIT_CTYPE_LOWER) - && (flags&ONIGENC_CASE_UPCASE)) { + && (flags & ONIGENC_CASE_UPCASE)) { flags |= ONIGENC_CASE_MODIFIED; - if (code=='i') - code = flags&ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I'; - else if (code==DOTLESS_i) + if (code == 'i') + code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I'; + else if (code == DOTLESS_i) code = 'I'; - else if (code>=0xB0 && code<=0xBF ) { + else if (code >= 0xB0 && code <= 0xBF) { code -= 0x10; } else { @@ -269,11 +270,11 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp, } } *to++ = code; - if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */ - flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE); + 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); + return (int )(to - to_start); } OnigEncodingDefine(iso_8859_3, ISO_8859_3) = { @@ -293,8 +294,8 @@ OnigEncodingDefine(iso_8859_3, ISO_8859_3) = { onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match, + case_map, 0, ONIGENC_FLAG_NONE, - case_map, }; ENC_ALIAS("ISO8859-3", "ISO-8859-3") |