curioustorvald/Terrarum-sans-bitmap
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum-sans-bitmap.git synced 2026-06-14 17:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

more tokeniser fix

Browse Source
This commit is contained in:
minjaesong
2024-04-25 21:20:45 +09:00
parent 8fd3f0e99a
commit 6c63504497
2 changed files with 58 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
View File

@@ -510,13 +510,13 @@ class TerrarumSansBitmap(
* This method alone will NOT draw the text to the screen, use [MovableType.draw].
*/
fun typesetParagraph(batch: Batch, charSeq: CharSequence, targetWidth: Int): MovableType =
typesetParagraphNormalised(batch, charSeq.toCodePoints(2), targetWidth.toFloat())
typesetParagraphNormalised(batch, normaliseStringForMovableType(charSeq), targetWidth.toFloat())
/**
* Typesets given string and returns the typesetted results, with which the desired text can be drawn on the screen.
* This method alone will NOT draw the text to the screen, use [MovableType.draw].
*/
fun typesetParagraph(batch: Batch, charSeq: CharSequence, targetWidth: Float): MovableType =
typesetParagraphNormalised(batch, charSeq.toCodePoints(2), targetWidth)
typesetParagraphNormalised(batch, normaliseStringForMovableType(charSeq), targetWidth)
private val nullType = MovableType(this, "".toCodePoints(2), 0, true)
@@ -1016,6 +1016,8 @@ class TerrarumSansBitmap(
return seq
}
internal fun normaliseStringForMovableType(s: CharSequence) = s.toCodePoints(2)
// basically an Unicode NFD with some additional flavours
/**
* @param normaliseOption 1-full, 2-omit null filling