Skip to content

Commit e7278bc

Browse files
committed
Include ASCII characters in "na" table
Since we're now assigning "na" (narrow) characters width 1, we can include the ASCII character ranges in the table.
1 parent 1e492b2 commit e7278bc

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

runewidth_table.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

runewidth_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var tables = []tableInfo{
4444
{doublewidth, "doublewidth", 182440, "3d16eda8650dc2c92d6318d32f0b4a74fda5a278db2d4544b1dd65863394823c"},
4545
{ambiguous, "ambiguous", 138739, "d05e339a10f296de6547ff3d6c5aee32f627f6555477afebd4a3b7e3cf74c9e3"},
4646
{emoji, "emoji", 3535, "9ec17351601d49c535658de8d129c1d0ccda2e620669fc39a2faaee7dedcef6d"},
47-
{narrow, "narrow", 10, "68441e98eca1450efbe857ac051fcc872eed347054dfd0bc662d1c4ee021d69f"},
47+
{narrow, "narrow", 111, "fa897699c5e3cd9141c638d539331b0bdd508b874e22996c5e929767d455fc5a"},
4848
{neutral, "neutral", 27333, "5455f5e75c307f70b4e9b2384dc5a8bcd91a4c5e2b24b2b185dfad4d860ee5c2"},
4949
}
5050

@@ -164,6 +164,7 @@ var runewidthtests = []struct {
164164
{'\u0300', 0, 0},
165165
{'\u2028', 0, 0},
166166
{'\u2029', 0, 0},
167+
{'a', 1, 1}, // ASCII classified as "na" (narrow)
167168
{'⟦', 1, 1}, // non-ASCII classified as "na" (narrow)
168169
}
169170

script/generate.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,10 @@ func eastasian(out io.Writer, in io.Reader) error {
9292
hi: r2,
9393
})
9494
case "Na":
95-
if r1 > 0xFF {
96-
na = append(na, rrange{
97-
lo: r1,
98-
hi: r2,
99-
})
100-
}
95+
na = append(na, rrange{
96+
lo: r1,
97+
hi: r2,
98+
})
10199
case "N":
102100
nu = append(nu, rrange{
103101
lo: r1,

0 commit comments

Comments
 (0)