2005-05-31 Atsushi Enomoto <atsushi@ximian.com>

	* create-char-mapping-source.cs :
	  Removed ToWidthInsensitive() generation.

svn path=/branches/atsushi/mcs/; revision=45238

diff --git a/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog b/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
index f6c59c7a88328a42263d0ed519d74a86429a9c4f..42ff5be1386749ae3a09c33c7559fd1ff846d440 100644 (file)
--- a/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
+++ b/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-31  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * create-char-mapping-source.cs :
+         Removed ToWidthInsensitive() generation.
+
 2005-05-31  Atsushi Enomoto  <atsushi@ximian.com>
 
        * create-mscompat-collation-table.cs : Now it dumps level1 to 3 values.

diff --git a/mcs/class/corlib/Mono.Globalization.Unicode/create-char-mapping-source.cs b/mcs/class/corlib/Mono.Globalization.Unicode/create-char-mapping-source.cs
index 7916b3f752da0d2353a6bb51d4d38f2bf4ca7aa5..42b79e8581be762a85ab0f964cfe7bd360db8ea6 100644 (file)
--- a/mcs/class/corlib/Mono.Globalization.Unicode/create-char-mapping-source.cs
+++ b/mcs/class/corlib/Mono.Globalization.Unicode/create-char-mapping-source.cs
@@ -63,7 +63,6 @@ namespace Mono.Globalization.Unicode
                int [] mapIndex = new int [0x5000];
 
                ArrayList mappings = new ArrayList ();
-               ArrayList widthSensitives = new ArrayList ();
 
                public CharMappingGenerator ()
                {
@@ -167,19 +166,6 @@ namespace Mono.Globalization.Unicode
                        Console.WriteLine ("    }");
                        Console.WriteLine ("    return 0;");
                        Console.WriteLine ("}");
-
-                       // WidthSensitives
-                       Console.WriteLine ("public static int ToWidthInsensitive (int i)");
-                       Console.WriteLine ("{");
-                       Console.WriteLine ("    if (i != 0x3000 && i < 0xFF00)");
-                       Console.WriteLine ("            return i;");
-                       Console.WriteLine ("    switch (i) {");
-                       foreach (int i in widthSensitives)
-                               Console.WriteLine ("    case 0x{0:X}:", i);
-                       Console.WriteLine ("            return mappedChars [NormalizationTableUtil.MapIdx (i)];");
-                       Console.WriteLine ("    }");
-                       Console.WriteLine ("    return i;");
-                       Console.WriteLine ("}");
                }
 
                private void DumpArray (int [] array, int count, bool getCP)
@@ -216,19 +202,12 @@ namespace Mono.Globalization.Unicode
 
                                string [] values = line.Substring (n + 1).Split (';');
                                string canon = values [4];
+//if (values [2] != "0") Console.Error.WriteLine ("----- {0:X03} : {1:x}", int.Parse (values [2]), cp);
                                string combiningCategory = canon.IndexOf ('>') < 0 ? "" : canon.Substring (1, canon.IndexOf ('>') - 1);
                                string mappedCharsValue = canon;
                                if (combiningCategory.Length > 0)
                                        mappedCharsValue = canon.Substring (combiningCategory.Length + 2).Trim ();
                                if (mappedCharsValue.Length > 0) {
-                                       switch (combiningCategory) {
-                                       case "narrow":
-                                       case "wide":
-                                       case "super":
-                                       case "sub":
-                                               widthSensitives.Add (cp);
-                                               break;
-                                       }
                                        mappings.Add (new CharMapping (cp,
                                                mappedCharCount, 
                                                combiningCategory.Length == 0));