bloeys/nterm
1
0
Fork 0
mirror of https://github.com/bloeys/nterm.git synced 2025-12-29 06:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix decoding decomp info+include rune equivalence

Browse Source
This commit is contained in:
bloeys
2022-07-05 06:39:32 +04:00
parent a762283b1d
commit c40d1dfdf1
5 changed files with 139 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
glyphs/glyphs.go
View File

@ -21,6 +21,10 @@ const (
invalidRune = unicode.ReplacementChar
)
var (
RuneInfos map[rune]RuneInfo
)
type GlyphRend struct {
Atlas *FontAtlas
AtlasTex *assets.Texture
@ -144,62 +148,44 @@ func (gr *GlyphRend) glyphFromRunes(curr, prev, next rune) *FontAtlasGlyph {
PosCtx_start PosCtx = iota
PosCtx_mid
PosCtx_end
PosCtx_isolated
)
if prev == invalidRune && next == invalidRune {
prevIsLetter := unicode.IsLetter(prev)
nextIsLetter := unicode.IsLetter(next)
//Isolated case
if !prevIsLetter && !nextIsLetter {
g := gr.Atlas.Glyphs[curr]
return &g
}
ctx := PosCtx_mid
if prev == invalidRune {
if prevIsLetter && nextIsLetter {
ctx = PosCtx_mid
} else if nextIsLetter {
ctx = PosCtx_start
} else if next == invalidRune {
} else {
ctx = PosCtx_end
}
switch ctx {
case PosCtx_start:
mappings := runeInfos[curr].DecompMappings
for mappedRune := range mappings {
equivRunes := RuneInfos[curr].EquivalentRunes
for i := 0; i < len(equivRunes); i++ {
mri := runeInfos[mappedRune]
if mri.IsLigature || mri.DecompTag != CharDecompMap_initial {
continue
otherRune := equivRunes[i]
otherRuneInfo := RuneInfos[otherRune]
if otherRuneInfo.DecompTag == DecompTags_initial {
curr = otherRune
break
}
curr = mappedRune
break
}
case PosCtx_mid:
mappings := runeInfos[curr].DecompMappings
for mappedRune := range mappings {
mri := runeInfos[mappedRune]
if mri.IsLigature || mri.DecompTag != CharDecompMap_medial {
continue
}
curr = mappedRune
break
}
case PosCtx_end:
mappings := runeInfos[curr].DecompMappings
for mappedRune := range mappings {
mri := runeInfos[mappedRune]
if mri.IsLigature || mri.DecompTag != CharDecompMap_final {
continue
}
curr = mappedRune
break
}
}
g := gr.Atlas.Glyphs[curr]
@ -389,13 +375,14 @@ func NewGlyphRend(fontFile string, fontOptions *truetype.Options, screenWidth, s
gr.SetScreenSize(screenWidth, screenHeight)
//TODO: Move this
runeInfos, _ = loadUnicodeData("./unicode-data.txt")
RuneInfos, err = ParseUnicodeData("./unicode-data.txt")
if err != nil {
return nil, err
}
return gr, nil
}
var runeInfos map[rune]runeInfo
func roundF32(x float32) float32 {
return float32(math.Round(float64(x)))
}