Skip to content

Refactor Unicode General Category lookup #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Refactor Unicode General Category lookup #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de6f480
[segmenter] remove one usage of LookupType
benoitkugler Oct 1, 2025
6f67884
[unicodedata] add test values
benoitkugler Oct 1, 2025
9ee9571
[unicodedata] use standard library for categories content, by define …
benoitkugler Oct 1, 2025
cae40c3
[unicodedata] revert using standard categories
benoitkugler Oct 1, 2025
96dd28c
[unicodedata] remove LookupType
benoitkugler Oct 2, 2025
93bee5f
[unicodedata] avoid backward compatible change
benoitkugler Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions segmenter/unicode14_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,7 @@ func (cr *cursor) ruleLB1() {
case ucd.BreakAI, ucd.BreakSG, ucd.BreakXX:
cr.line = ucd.BreakAL
case ucd.BreakSA:
generalCategory := ucd.LookupType(cr.r)
if generalCategory == unicode.Mn || generalCategory == unicode.Mc {
if unicode.Is(unicode.Mn, cr.r) || unicode.Is(unicode.Mc, cr.r) {
cr.line = ucd.BreakCM
} else {
cr.line = ucd.BreakAL
Expand Down
75 changes: 51 additions & 24 deletions unicodedata/general_category.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions unicodedata/unicode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,11 @@ import (
"github.com/go-text/typesetting/language"
)

var categories []*unicode.RangeTable

func init() {
for cat, table := range unicode.Categories {
if len(cat) == 2 {
categories = append(categories, table)
}
}
}

// LookupType returns the unicode general categorie of the rune,
// or nil if not found.
// The returned table is one of the standard library unicode package.
func LookupType(r rune) *unicode.RangeTable {
for _, table := range categories {
for _, table := range allCategories {
if unicode.Is(table, r) {
return table
}
Expand Down
5 changes: 3 additions & 2 deletions unicodedata/unicode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package unicodedata

import (
"reflect"
"testing"
"unicode"

Expand Down Expand Up @@ -101,6 +100,8 @@ func TestLookupType(t *testing.T) {
{'.', unicode.Po},
{'カ', unicode.Lo},
{'🦳', unicode.So},
{'\U0001F3FF', unicode.Sk},
{'\U0001F02C', nil},
{-1, nil},
}
for _, tt := range tests {
Expand Down Expand Up @@ -508,7 +509,7 @@ func TestLookupLineBreakClass(t *testing.T) {

}
for _, tt := range tests {
if got := LookupLineBreakClass(tt.args); !reflect.DeepEqual(got, tt.want) {
if got := LookupLineBreakClass(tt.args); got != tt.want {
t.Errorf("LookupLineBreakClass(U+%x) = %p, want %p", tt.args, got, tt.want)
}
}
Expand Down