From 6e84854a037afdd3c115f06d0a5d192b2bc5e6c7 Mon Sep 17 00:00:00 2001
From: Mark Davis <mark@macchiato.com>
Date: Fri, 22 Mar 2002 22:08:53 +0000
Subject: [PATCH] last changes (I hope) for Unicode 3.2

X-SVN-Rev: 8209
---
 .../com/ibm/text/UCD/CaseFoldingHeader.txt    | 15 ++++++------
 .../com/ibm/text/UCD/GenerateCaseFolding.java | 23 +++++++++++++++----
 .../com/ibm/text/UCD/UCD_Types.java           |  6 ++---
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/tools/unicodetools/com/ibm/text/UCD/CaseFoldingHeader.txt b/tools/unicodetools/com/ibm/text/UCD/CaseFoldingHeader.txt
index 889bed14d73..42c40efa7f8 100644
--- a/tools/unicodetools/com/ibm/text/UCD/CaseFoldingHeader.txt
+++ b/tools/unicodetools/com/ibm/text/UCD/CaseFoldingHeader.txt
@@ -27,15 +27,16 @@
 # C: common case folding, common mappings shared by both simple and full mappings.
 # F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
 # S: simple case folding, mappings to single characters where different from F.
-# I: special case for dotted uppercase I and dotless lowercase i
-#    - If this mapping is included, the result is case-insensitive, but dotless and dotted I's are not distinguished.
-#    - If this mapping is excluded, the result is not fully case-insensitive, but dotless and dotted I's are distinguished.
+# T: special case for uppercase I and dotted uppercase I
+#    - For non-Turkic languages, this mapping is normally not used.
+#    - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
 #
 # Usage:
-#  A. To do a simple case folding, use the mappings with status C + S + I.
-#  B. To do a full case folding, use the mappings with status C + F + I.
-#    The mappings with status I can be omitted depending on the desired case-folding
-#    behavior. (The default option is to retain them.)
+#  A. To do a simple case folding, use the mappings with status C + S.
+#  B. To do a full case folding, use the mappings with status C + F.
+#
+#    The mappings with status T can be used or omitted depending on the desired case-folding
+#    behavior. (The default option is to exclude them.)
 #
 # =================================================================
 
diff --git a/tools/unicodetools/com/ibm/text/UCD/GenerateCaseFolding.java b/tools/unicodetools/com/ibm/text/UCD/GenerateCaseFolding.java
index 534b264ccf9..f46761e0f78 100644
--- a/tools/unicodetools/com/ibm/text/UCD/GenerateCaseFolding.java
+++ b/tools/unicodetools/com/ibm/text/UCD/GenerateCaseFolding.java
@@ -5,8 +5,8 @@
 *******************************************************************************
 *
 * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/text/UCD/GenerateCaseFolding.java,v $
-* $Date: 2002/03/20 00:21:43 $
-* $Revision: 1.7 $
+* $Date: 2002/03/22 22:08:53 $
+* $Revision: 1.8 $
 *
 *******************************************************************************
 */
@@ -85,11 +85,15 @@ public class GenerateCaseFolding implements UCD_Types {
             if (rFull != null && rFull.equals(rSimple) 
               || (PICK_SHORT && UTF16.countCodePoint(rFull) == 1)) {
                 String type = "C";
-                if (ch == 0x130) {
+                if (ch == 0x49) {
+                	drawLine(out, ch, "C", "i");
+                	drawLine(out, ch, "T", "\u0131");
+                } else if (ch == 0x130) {
                 	drawLine(out, ch, "F", "i\u0307");
-                	drawLine(out, ch, "I", "\u0130");
+                	drawLine(out, ch, "T", "i");
                 } else if (ch == 0x131) {
-                	drawLine(out, ch, "I", "i");
+                	// do nothing
+                	//drawLine(out, ch, "I", "i");
                 } else {
                 	drawLine(out, ch, type, rFull);
                 }
@@ -106,6 +110,15 @@ public class GenerateCaseFolding implements UCD_Types {
         log.close();
         Utility.renameIdentical(mostRecent, Utility.getOutputName(newFile));
     }
+    
+/* Goal is following (with no entries for 0131 or 0069)
+    
+0049; C; 0069; # LATIN CAPITAL LETTER I
+0049; T; 0131; # LATIN CAPITAL LETTER I
+
+0130; F; 0069 0307; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0130; T; 0069; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+*/
 
     static void drawLine(PrintWriter out, int ch, String type, String result) {
         String comment = "";
diff --git a/tools/unicodetools/com/ibm/text/UCD/UCD_Types.java b/tools/unicodetools/com/ibm/text/UCD/UCD_Types.java
index 060beaf4eb9..ef7379e6d57 100644
--- a/tools/unicodetools/com/ibm/text/UCD/UCD_Types.java
+++ b/tools/unicodetools/com/ibm/text/UCD/UCD_Types.java
@@ -5,8 +5,8 @@
 *******************************************************************************
 *
 * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/text/UCD/UCD_Types.java,v $
-* $Date: 2002/03/20 00:21:42 $
-* $Revision: 1.10 $
+* $Date: 2002/03/22 22:08:53 $
+* $Revision: 1.11 $
 *
 *******************************************************************************
 */
@@ -15,7 +15,7 @@ package com.ibm.text.UCD;
 
 public interface UCD_Types {
     
-    public static final int dVersion = 8; // change to fix the generated file D version. If less than zero, no "d"
+    public static final int dVersion = 9; // change to fix the generated file D version. If less than zero, no "d"
     
     public static final String BASE_DIR = "C:\\DATA\\";
     public static final String UCD_DIR = BASE_DIR + "UCD\\";