From ef6405f71cbc73864a4ee4a46c9ab6d5ccd16959 Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 24 May 2016 23:01:39 +0000
Subject: * enc/unicode.c: Fix flag error for switch from titlecase to
 lowercase. * test/ruby/enc/test_case_mapping.rb: Tests for above error.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enc/unicode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'enc')

diff --git a/enc/unicode.c b/enc/unicode.c
index 8f978bc9a7..22d1dda809 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -670,6 +670,8 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
     OnigUChar *to_start = to;
     OnigCaseFoldType flags = *flagP;
     to_end -= CASE_MAPPING_SLACK;
+    /* copy flags ONIGENC_CASE_UPCASE     and ONIGENC_CASE_DOWNCASE over to
+     *            ONIGENC_CASE_UP_SPECIAL and ONIGENC_CASE_DOWN_SPECIAL */
     flags |= (flags&(ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE))<<ONIGENC_CASE_SPECIAL_OFFSET;
 
     while (*pp<end && to<=to_end) {
@@ -780,7 +782,8 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
 	to += ONIGENC_CODE_TO_MBC(enc, code, to);
 	/* switch from titlecase to lowercase for capitalize */
 	if (flags & ONIGENC_CASE_TITLECASE)
-	    flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_TITLECASE|ONIGENC_CASE_DOWNCASE);
+	    flags ^= (ONIGENC_CASE_UPCASE    |ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE|
+		      ONIGENC_CASE_UP_SPECIAL|ONIGENC_CASE_DOWN_SPECIAL);
     }
     *flagP = flags;
     return (int)(to-to_start);
-- 
cgit v1.2.3