Engage new tables for ucd/normal

open-i18n · Aug 11, 2017 · 2a7c441 · 2a7c441
1 parent 42db673
commit 2a7c441
Show file tree

Hide file tree

Showing 23 changed files with 6,218 additions and 11,232 deletions.
diff --git a/etc/refresh-tables.sh b/etc/refresh-tables.sh
@@ -15,7 +15,3 @@ cargo run --release --package=unic-gen -- --download --generate idna ucd normal
 echo
 echo "Generating idna tables with python"
 python2 tools/gen_idna_tables.py
-
-echo
-echo "Generating remaining ucd tables with python"
-python2 tools/gen_ucd_tables.py
diff --git a/gen/src/generate/mod.rs b/gen/src/generate/mod.rs
@@ -17,3 +17,11 @@ pub mod ucd;
 /// The standard auto-generated source disclaimer.
 const PREAMBLE: &'static str = "// WARNING: Auto-generated by the `unic-gen` crate.\n\
                                 // WARNING: DO NOT EDIT MANUALLY!";
+
+fn capitalize(str: &str) -> String {
+    let mut chars = str.chars();
+    match chars.next() {
+        None => String::new(),
+        Some(ch) => ch.to_uppercase().collect::<String>() + chars.as_str(),
+    }
+}
diff --git a/gen/src/generate/ucd/mod.rs b/gen/src/generate/ucd/mod.rs
@@ -49,12 +49,10 @@ pub fn generate() -> io::Result<()> {
     fs::create_dir_all(path)?;
     core::generate(path, &ucd_version, &unicode_data)?;
 
-    // let path = Path::new("unic/ucd/normal/src/tables");
-    // let _ = fs::remove_dir_all(path);
-    // fs::create_dir_all(path)?;
-    // normal::generate(path, &ucd_version, &unicode_data)?;
-    use std::io::Write;
-    writeln!(::std::io::stderr(), "Use Python generation for ucd/normal")?;
+    let path = Path::new("unic/ucd/normal/src/tables");
+    let _ = fs::remove_dir_all(path);
+    fs::create_dir_all(path)?;
+    normal::generate(path, &ucd_version, &unicode_data)?;
 
     Ok(())
 }
diff --git a/gen/src/generate/ucd/normal.rs b/gen/src/generate/ucd/normal.rs
@@ -18,6 +18,7 @@ use super::{UnicodeData, UnicodeDataEntry, UnicodeVersion};
 
 use generate::PREAMBLE;
 use generate::char_property::{ToBSearchSet, ToRangeBSearchMap, ToSingleBSearchMap};
+use generate::capitalize;
 
 struct GeneralCategoryMarkData(BTreeSet<char>);
 
@@ -166,6 +167,10 @@ impl<'a, 'b> From<&'a CanonicalDecompositionData<'b>> for CanonicalCompositionDa
                 .push((follow, composed));
         }
 
+        for value in map.values_mut() {
+            value.sort_by_key(|it| it.0)
+        }
+
         CanonicalCompositionData(map)
     }
 }
@@ -180,7 +185,7 @@ impl<'a> CompatibilityDecompositionData<'a> {
             "{}\n{}",
             PREAMBLE,
             self.0.to_single_bsearch_map(|val, f| {
-                write!(f, "(\"{}\", &[", val.0)?;
+                write!(f, "({}, &[", capitalize(&val.0.to_lowercase()))?;
                 for char in val.1.iter() {
                     write!(f, "'{}',", char.escape_unicode()).unwrap();
                 }