unicode-rs
diff --git a/‎scripts/unicode.py‎
Lines changed: 21 additions & 12 deletions b/‎scripts/unicode.py‎
Lines changed: 21 additions & 12 deletions
diff --git a/‎src/lib.rs‎
Lines changed: 5 additions & 0 deletions b/‎src/lib.rs‎
Lines changed: 5 additions & 0 deletions
@@ -191,11 +191,12 @@ def emit_enums(f, script_list, extension_list, longforms):
 use core::convert::TryFrom;
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 #[non_exhaustive]
+#[allow(non_camel_case_types)]
 /// A value of the Script property
 pub enum Script {
 """)
     for script in script_list:
-        f.write("    /// %s\n    %s,\n" % (longforms[script], script))
+        f.write("    /// %s\n    %s,\n" % (script, longforms[script]))
     f.write("""}
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 #[non_exhaustive]
@@ -234,7 +235,15 @@ def emit_enums(f, script_list, extension_list, longforms):
         match self {
 """)
     for script in script_list:
-        f.write("            Script::%s => \"%s\",\n" % (script, longforms[script]))
+        f.write("            Script::%s => \"%s\",\n" % (longforms[script], longforms[script]))
+    f.write("""        }
+    }
+
+    pub(crate) fn inner_short_name(self) -> &'static str {
+        match self {
+""")
+    for script in script_list:
+        f.write("            Script::%s => \"%s\",\n" % (longforms[script], script))
     f.write("""        }
     }
 }
@@ -247,7 +256,7 @@ def emit_enums(f, script_list, extension_list, longforms):
             ScriptExtension::Single(s) => vec![s],
 """)
     for ext in extension_list:
-        scripts = ", ".join(["Script::%s" % s for s in ext])
+        scripts = ", ".join(["Script::%s" % longforms[s] for s in ext])
         f.write("            %s => vec![%s],\n" % (extension_name(ext), scripts))
     f.write("""            _ => unreachable!()
         }
@@ -259,7 +268,7 @@ def emit_enums(f, script_list, extension_list, longforms):
             ScriptExtension::Single(s) => s == other,
 """)
     for ext in extension_list:
-        scripts = " || ".join(["other == Script::%s" % s for s in ext])
+        scripts = " || ".join(["other == Script::%s" % longforms[s] for s in ext])
         f.write("            %s => %s,\n" % (extension_name(ext), scripts))
     f.write("""        }
     }
@@ -268,10 +277,10 @@ def emit_enums(f, script_list, extension_list, longforms):
     pub(crate) fn inner_intersects(self, other: Self) -> bool {
         match (self, other) {
             (a, b) if a == b => true,
-            (ScriptExtension::Single(Script::Zyyy), _) |
-            (ScriptExtension::Single(Script::Zinh), _) |
-            (_, ScriptExtension::Single(Script::Zyyy)) |
-            (_, ScriptExtension::Single(Script::Zinh)) => true,
+            (ScriptExtension::Single(Script::Common), _) |
+            (ScriptExtension::Single(Script::Inherited), _) |
+            (_, ScriptExtension::Single(Script::Common)) |
+            (_, ScriptExtension::Single(Script::Inherited)) => true,
             (ScriptExtension::Single(s), o) | (o, ScriptExtension::Single(s)) => o.inner_contains_script(s),
 """)
     intersections = compute_intersections(extension_list)
@@ -307,10 +316,10 @@ def compute_intersections(extension_list):
                 intersections.append((e1, e2))
     return intersections
 
-def extension_name(ext):
+def extension_name(ext, longforms=[]):
     """Get the rust source for a given ScriptExtension"""
     if len(ext) == 1:
-        return "ScriptExtension::Single(Script::%s)" % ext[0]
+        return "ScriptExtension::Single(Script::%s)" % longforms[ext[0]]
     else:
         return "ScriptExtension::%s" % "".join(ext)
 
@@ -362,8 +371,8 @@ def extension_name(ext):
         emit_search(rf)
 
         emit_table(rf, "SCRIPTS", script_table, t_type = "&'static [(char, char, Script)]",
-                   is_pub=False , pfun=lambda x: "(%s,%s, Script::%s)" % (escape_char(x[0]), escape_char(x[1]), x[2]))
+                   is_pub=False , pfun=lambda x: "(%s,%s, Script::%s)" % (escape_char(x[0]), escape_char(x[1]), longforms[x[2]]))
         emit_table(rf, "SCRIPT_EXTENSIONS", extension_table, t_type = "&'static [(char, char, ScriptExtension)]",
-                   is_pub=False , pfun=lambda x: "(%s,%s,%s)" % (escape_char(x[0]), escape_char(x[1]), extension_name(x[2])))
+                   is_pub=False , pfun=lambda x: "(%s,%s,%s)" % (escape_char(x[0]), escape_char(x[1]), extension_name(x[2], longforms)))
 
         # emit_table(rf, "FOObar", properties)
@@ -15,6 +15,11 @@ impl Script {
     pub fn full_name(self) -> &'static str {
         self.inner_full_name()
     }
+
+    /// Get the four-character short name of a script
+    pub fn short_name(self) -> &'static str {
+        self.inner_short_name()
+    }
 }
 
 impl ScriptExtension {
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,11 @@ impl Script {`
`15`	`15`	`pub fn full_name(self) -> &'static str {`
`16`	`16`	`self.inner_full_name()`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ /// Get the four-character short name of a script`
	`20`	`+ pub fn short_name(self) -> &'static str {`
	`21`	`+ self.inner_short_name()`
	`22`	`+ }`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`impl ScriptExtension {`