diff options
-rwxr-xr-x | gen/prop/dt | 2 | ||||
-rwxr-xr-x | gen/prop/ea | 5 | ||||
-rwxr-xr-x | gen/prop/nt | 5 | ||||
-rw-r--r-- | lib/unicode/prop/uprop_get_dt.c | 12 | ||||
-rw-r--r-- | lib/unicode/prop/uprop_get_ea.c | 42 | ||||
-rw-r--r-- | lib/unicode/prop/uprop_get_nt.c | 8 |
6 files changed, 38 insertions, 36 deletions
diff --git a/gen/prop/dt b/gen/prop/dt index ba0582a..82d6331 100755 --- a/gen/prop/dt +++ b/gen/prop/dt @@ -81,4 +81,4 @@ END { print "\treturn ch < lengthof(lookup_lat1) ? lookup_lat1[ch] : mlib_lookup(ch);" print "}" } -' data/DerivedDecompositionType.txt +' data/DerivedDecompositionType.txt | sed 's/\s*$//' diff --git a/gen/prop/ea b/gen/prop/ea index 81842c6..6bf1291 100755 --- a/gen/prop/ea +++ b/gen/prop/ea @@ -33,7 +33,8 @@ END { for (i = 0; i < 0x100; i++) { if (i % 8 == 0) printf "\t" - printf "%5s,%s", props[i] ? props[i] : "EA_NA", i % 8 == 7 ? "\n" : " " + printf "%-6s%s", (props[i] ? props[i] : "EA_NA") ",", \ + i % 8 == 7 ? "\n" : " " } print "};" print "" @@ -61,4 +62,4 @@ END { print "\treturn ch < lengthof(lookup_lat1) ? lookup_lat1[ch] : mlib_lookup(ch);" print "}" } -' data/DerivedEastAsianWidth.txt +' data/DerivedEastAsianWidth.txt | sed 's/\s*$//' diff --git a/gen/prop/nt b/gen/prop/nt index 569cc18..a55ea45 100755 --- a/gen/prop/nt +++ b/gen/prop/nt @@ -37,7 +37,8 @@ END { for (i = 0; i < 0x100; i++) { if (i % 8 == 0) printf "\t" - printf "%7s,%s", props[i] ? props[i] : "NT_NONE", i % 8 == 7 ? "\n" : " " + printf "%-8s%s", (props[i] ? props[i] : "NT_NONE") ",", \ + i % 8 == 7 ? "\n" : " " } print "};" print "" @@ -65,4 +66,4 @@ END { print "\treturn ch < lengthof(lookup_lat1) ? lookup_lat1[ch] : mlib_lookup(ch);" print "}" } -' data/DerivedNumericType.txt +' data/DerivedNumericType.txt | sed 's/\s*$//' diff --git a/lib/unicode/prop/uprop_get_dt.c b/lib/unicode/prop/uprop_get_dt.c index 2ee015d..afc3e66 100644 --- a/lib/unicode/prop/uprop_get_dt.c +++ b/lib/unicode/prop/uprop_get_dt.c @@ -27,17 +27,17 @@ static constexpr enum uprop_dt lookup_lat1[] = { DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NB, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_NONE, - DT_COM, DT_NONE, DT_SUP, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_COM, + DT_COM, DT_NONE, DT_SUP, DT_NONE, DT_NONE, DT_NONE, DT_NONE, DT_COM, DT_NONE, DT_NONE, DT_SUP, DT_SUP, DT_COM, DT_COM, DT_NONE, DT_NONE, DT_COM, DT_SUP, DT_SUP, DT_NONE, DT_FRA, DT_FRA, DT_FRA, DT_NONE, - DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_CAN, - DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, + DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_CAN, + DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_NONE, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_NONE, - DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_CAN, - DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, + DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_CAN, + DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, - DT_NONE, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_CAN, + DT_NONE, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_CAN, DT_NONE, DT_CAN, }; static const struct { diff --git a/lib/unicode/prop/uprop_get_ea.c b/lib/unicode/prop/uprop_get_ea.c index 57ff980..91cafad 100644 --- a/lib/unicode/prop/uprop_get_ea.c +++ b/lib/unicode/prop/uprop_get_ea.c @@ -6,10 +6,10 @@ #include "unicode/prop.h" static constexpr enum uprop_ea lookup_lat1[] = { - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, @@ -21,23 +21,23 @@ static constexpr enum uprop_ea lookup_lat1[] = { EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, - EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_N, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, - EA_N, EA_A, EA_NA, EA_NA, EA_A, EA_NA, EA_NA, EA_A, - EA_A, EA_N, EA_A, EA_N, EA_NA, EA_A, EA_A, EA_NA, - EA_A, EA_A, EA_A, EA_A, EA_A, EA_N, EA_A, EA_A, - EA_A, EA_A, EA_A, EA_N, EA_A, EA_A, EA_A, EA_A, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_A, EA_N, - EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, - EA_A, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_A, - EA_A, EA_N, EA_N, EA_N, EA_N, EA_N, EA_A, EA_A, - EA_A, EA_A, EA_N, EA_N, EA_N, EA_N, EA_A, EA_N, - EA_A, EA_A, EA_A, EA_N, EA_A, EA_A, EA_N, EA_N, - EA_A, EA_N, EA_A, EA_A, EA_N, EA_N, EA_N, EA_A, - EA_A, EA_A, EA_A, EA_N, EA_A, EA_N, EA_A, EA_N, + EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_NA, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_N, EA_A, EA_NA, EA_NA, EA_A, EA_NA, EA_NA, EA_A, + EA_A, EA_N, EA_A, EA_N, EA_NA, EA_A, EA_A, EA_NA, + EA_A, EA_A, EA_A, EA_A, EA_A, EA_N, EA_A, EA_A, + EA_A, EA_A, EA_A, EA_N, EA_A, EA_A, EA_A, EA_A, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_A, EA_N, + EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, + EA_A, EA_N, EA_N, EA_N, EA_N, EA_N, EA_N, EA_A, + EA_A, EA_N, EA_N, EA_N, EA_N, EA_N, EA_A, EA_A, + EA_A, EA_A, EA_N, EA_N, EA_N, EA_N, EA_A, EA_N, + EA_A, EA_A, EA_A, EA_N, EA_A, EA_A, EA_N, EA_N, + EA_A, EA_N, EA_A, EA_A, EA_N, EA_N, EA_N, EA_A, + EA_A, EA_A, EA_A, EA_N, EA_A, EA_N, EA_A, EA_N, }; static const struct { diff --git a/lib/unicode/prop/uprop_get_nt.c b/lib/unicode/prop/uprop_get_nt.c index c96b84c..70e0055 100644 --- a/lib/unicode/prop/uprop_get_nt.c +++ b/lib/unicode/prop/uprop_get_nt.c @@ -12,8 +12,8 @@ static constexpr enum uprop_nt lookup_lat1[] = { NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, - NT_DE, NT_DE, NT_DE, NT_DE, NT_DE, NT_DE, NT_DE, NT_DE, - NT_DE, NT_DE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, + NT_DE, NT_DE, NT_DE, NT_DE, NT_DE, NT_DE, NT_DE, NT_DE, + NT_DE, NT_DE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, @@ -28,8 +28,8 @@ static constexpr enum uprop_nt lookup_lat1[] = { NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, - NT_NONE, NT_NONE, NT_DI, NT_DI, NT_NONE, NT_NONE, NT_NONE, NT_NONE, - NT_NONE, NT_DI, NT_NONE, NT_NONE, NT_NU, NT_NU, NT_NU, NT_NONE, + NT_NONE, NT_NONE, NT_DI, NT_DI, NT_NONE, NT_NONE, NT_NONE, NT_NONE, + NT_NONE, NT_DI, NT_NONE, NT_NONE, NT_NU, NT_NU, NT_NU, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, NT_NONE, |