curioustorvald/Terrarum-sans-bitmap
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum-sans-bitmap.git synced 2026-03-07 11:51:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

better tokenising for mixed scripts (latin with numerals, korean with latin)

Browse Source
This commit is contained in:
minjaesong
2024-04-06 22:23:14 +09:00
parent 30327776ba
commit 373af27873
2 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FontTestGDX/src/FontTestGDX.kt
View File

@@ -116,10 +116,10 @@ class FontTestGDX : Game() {
// draw position debuggers
// font.draw(batch, "soft\uFE0F\u00ADhyphen\uFE0F\u00ADated", 24f, 12f)
// batch.draw(testtex, 24f, 12f)
// val layoutDrawCall = { x: Float, y: Float, _: Int -> batch.draw(testtex, x, y) }
// layout.draw(batch, 24f, 12f, mapOf(0 to layoutDrawCall))
// end of draw position debuggers
val layoutDrawCall = { x: Float, y: Float, _: Int -> batch.draw(testtex, x, y) }
layout.draw(batch, 24f, 12f, mapOf(0 to layoutDrawCall))
layout.draw(batch, 24f, 12f)
batch.end()

43
src/net/torvald/terrarumsansbitmap/MovableType.kt
View File

@@ -551,7 +551,7 @@ class MovableType(
else if (cM.isCJparenStart()) {
/* do nothing */
}
else if (cM.isCJpunctOrParenEnd()) {
else if (cM.isCJpunctOrParenEnd() || cM.isNumeric()) {
sendoutBox()
appendZeroGlue()
sendoutGlue()
@@ -575,8 +575,36 @@ class MovableType(
appendToBuffer(c0)
}
else if (isHangulI(c0)) {
if (cM.isWhiteSpace()) {
sendoutGlue()
}
else if (!isHangulPK(cM ?: 0)) {
if (boxBuffer.isNotEmpty()) sendoutBox()
}
appendToBuffer(c0)
}
else if (c0.isNumeric()) {
if (cM.isWhiteSpace()) {
sendoutGlue()
}
else if (cM.isCJ()) {
sendoutBox()
appendZeroGlue()
sendoutGlue()
}
else if (cM != null && !cM!!.isNumeric()) {
sendoutBox()
}
appendToBuffer(c0)
}
else {
if (cM.isCJ()) {
if (!isHangulPK(c0) && isHangulPK(cM ?: 0)) {
sendoutBox()
}
else if (cM.isCJ() || cM.isNumeric()) {
sendoutBox()
}
else if (cM.isWhiteSpace()) {
@@ -614,10 +642,17 @@ class MovableType(
private fun penaliseHyphenation(score: Int): Float = (10.0 * pow(score.toDouble(), 1.0/3.0) + 0.47*score).toFloat()
private fun isVowel(c: CodePoint) = vowels.contains(c)
private fun CodePoint?.isCJ() = if (this == null) false else listOf(4, 6, 12, 13, 20, 23, ).any {
TerrarumSansBitmap.codeRange[it].contains(this)
}
private fun isHangulI(c: CodePoint) = hangulI.contains(c)
private fun isHangulPK(c: CodePoint) = hangulPK.contains(c)
private fun CodePoint?.isNumeric() = if (this == null) false else (this in 0x30..0x39 || this in (0xFF10..0xFF19))
private fun CodePoint?.isWhiteSpace() = if (this == null) false else whitespaceGlues.contains(this)
private fun CodePoint?.isCJparenStart() = if (this == null) false else cjparenStarts.contains(this)
@@ -715,10 +750,6 @@ class MovableType(
}
}
private fun isVowel(c: CodePoint) = vowels.contains(c)
private fun isHangulI(c: CodePoint) = hangulI.contains(c)
private fun isHangulPK(c: CodePoint) = hangulPK.contains(c)
private val vowels = (listOf(0x41, 0x45, 0x49, 0x4f, 0x55, 0x59, 0x41, 0x65, 0x69, 0x6f, 0x75, 0x79) +
(0xc0..0xc6) + (0xc8..0xcf) + (0xd2..0xd6) + (0xd8..0xdd) +
(0xe0..0xe6) + (0xe8..0xef) + (0xf2..0xf6) + (0xf8..0xfd) +