preserve '=' for graphemeclusterbreak coderange names

jruby · Dec 17, 2017 · e5de80f · e5de80f
1 parent 99c9098
commit e5de80f
Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/scripts/generate.rb b/scripts/generate.rb
@@ -173,6 +173,7 @@ def generate_coderange_list
     ranges.drop(14).map do |range|
         name = range =~ /Age_(\d)_(\d)/ ? "age=#{$1}.#{$2}" : range.tr('_', '').downcase
         name = cr_map.delete(range) || name
+        name = "#{$1}=#{$2}" if name =~ /(graphemeclusterbreak)(.*)/i
         ([name] + aliases[name].to_a).map{|n|[n, range]}
     end.flatten(1)
 

diff --git a/src/org/jcodings/unicode/UnicodeProperties.java b/src/org/jcodings/unicode/UnicodeProperties.java
@@ -144,7 +144,7 @@ public class UnicodeProperties {
         new CodeRangeEntry("xidc", "CR_XID_Continue"),
         new CodeRangeEntry("defaultignorablecodepoint", "CR_Default_Ignorable_Code_Point"),
         new CodeRangeEntry("di", "CR_Default_Ignorable_Code_Point"),
-        new CodeRangeEntry("graphemeclusterbreakextend", "CR_Grapheme_Extend"),
+        new CodeRangeEntry("graphemeclusterbreak=extend", "CR_Grapheme_Extend"),
         new CodeRangeEntry("graphemebase", "CR_Grapheme_Base"),
         new CodeRangeEntry("grbase", "CR_Grapheme_Base"),
         new CodeRangeEntry("graphemelink", "CR_Grapheme_Link"),
@@ -494,24 +494,24 @@ public class UnicodeProperties {
         new CodeRangeEntry("age=7.0", "CR_Age_7_0"),
         new CodeRangeEntry("age=8.0", "CR_Age_8_0"),
         new CodeRangeEntry("age=9.0", "CR_Age_9_0"),
-        new CodeRangeEntry("graphemeclusterbreakprepend", "CR_Grapheme_Cluster_Break_Prepend"),
-        new CodeRangeEntry("graphemeclusterbreakcr", "CR_Grapheme_Cluster_Break_CR"),
-        new CodeRangeEntry("graphemeclusterbreaklf", "CR_NEWLINE"),
-        new CodeRangeEntry("graphemeclusterbreakcontrol", "CR_Grapheme_Cluster_Break_Control"),
+        new CodeRangeEntry("graphemeclusterbreak=prepend", "CR_Grapheme_Cluster_Break_Prepend"),
+        new CodeRangeEntry("graphemeclusterbreak=cr", "CR_Grapheme_Cluster_Break_CR"),
+        new CodeRangeEntry("graphemeclusterbreak=lf", "CR_NEWLINE"),
+        new CodeRangeEntry("graphemeclusterbreak=control", "CR_Grapheme_Cluster_Break_Control"),
         new CodeRangeEntry("graphemeextend", "CR_Grapheme_Extend"),
         new CodeRangeEntry("grext", "CR_Grapheme_Extend"),
-        new CodeRangeEntry("graphemeclusterbreakregionalindicator", "CR_Grapheme_Cluster_Break_Regional_Indicator"),
-        new CodeRangeEntry("graphemeclusterbreakspacingmark", "CR_Grapheme_Cluster_Break_SpacingMark"),
-        new CodeRangeEntry("graphemeclusterbreakl", "CR_Grapheme_Cluster_Break_L"),
-        new CodeRangeEntry("graphemeclusterbreakv", "CR_Grapheme_Cluster_Break_V"),
-        new CodeRangeEntry("graphemeclusterbreakt", "CR_Grapheme_Cluster_Break_T"),
-        new CodeRangeEntry("graphemeclusterbreaklv", "CR_Grapheme_Cluster_Break_LV"),
-        new CodeRangeEntry("graphemeclusterbreaklvt", "CR_Grapheme_Cluster_Break_LVT"),
-        new CodeRangeEntry("graphemeclusterbreakebase", "CR_Grapheme_Cluster_Break_E_Base"),
-        new CodeRangeEntry("graphemeclusterbreakemodifier", "CR_Grapheme_Cluster_Break_E_Modifier"),
-        new CodeRangeEntry("graphemeclusterbreakzwj", "CR_Grapheme_Cluster_Break_ZWJ"),
-        new CodeRangeEntry("graphemeclusterbreakglueafterzwj", "CR_Grapheme_Cluster_Break_Glue_After_Zwj"),
-        new CodeRangeEntry("graphemeclusterbreakebasegaz", "CR_Grapheme_Cluster_Break_E_Base_GAZ"),
+        new CodeRangeEntry("graphemeclusterbreak=regionalindicator", "CR_Grapheme_Cluster_Break_Regional_Indicator"),
+        new CodeRangeEntry("graphemeclusterbreak=spacingmark", "CR_Grapheme_Cluster_Break_SpacingMark"),
+        new CodeRangeEntry("graphemeclusterbreak=l", "CR_Grapheme_Cluster_Break_L"),
+        new CodeRangeEntry("graphemeclusterbreak=v", "CR_Grapheme_Cluster_Break_V"),
+        new CodeRangeEntry("graphemeclusterbreak=t", "CR_Grapheme_Cluster_Break_T"),
+        new CodeRangeEntry("graphemeclusterbreak=lv", "CR_Grapheme_Cluster_Break_LV"),
+        new CodeRangeEntry("graphemeclusterbreak=lvt", "CR_Grapheme_Cluster_Break_LVT"),
+        new CodeRangeEntry("graphemeclusterbreak=ebase", "CR_Grapheme_Cluster_Break_E_Base"),
+        new CodeRangeEntry("graphemeclusterbreak=emodifier", "CR_Grapheme_Cluster_Break_E_Modifier"),
+        new CodeRangeEntry("graphemeclusterbreak=zwj", "CR_Grapheme_Cluster_Break_ZWJ"),
+        new CodeRangeEntry("graphemeclusterbreak=glueafterzwj", "CR_Grapheme_Cluster_Break_Glue_After_Zwj"),
+        new CodeRangeEntry("graphemeclusterbreak=ebasegaz", "CR_Grapheme_Cluster_Break_E_Base_GAZ"),
         new CodeRangeEntry("ascii", "CR_ASCII"),
         new CodeRangeEntry("inlatin1supplement", "CR_In_Latin_1_Supplement"),
         new CodeRangeEntry("inlatinextendeda", "CR_In_Latin_Extended_A"),