From c695a9c5f08c784f278b099e0bd0dee69f0b72fc Mon Sep 17 00:00:00 2001 From: minjaesong Date: Fri, 26 Apr 2024 01:30:23 +0900 Subject: [PATCH] more bug fixes --- src/net/torvald/terrarumsansbitmap/MovableType.kt | 4 ++-- src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/net/torvald/terrarumsansbitmap/MovableType.kt b/src/net/torvald/terrarumsansbitmap/MovableType.kt index 0259c5f..3ac1af8 100644 --- a/src/net/torvald/terrarumsansbitmap/MovableType.kt +++ b/src/net/torvald/terrarumsansbitmap/MovableType.kt @@ -49,7 +49,7 @@ class MovableType( // println("Paper width: $paperWidth") val lines = inputText.tokenise() - lines.debugprint() +// lines.debugprint() lines.forEachIndexed { linenum, it -> // println("Processing input text line ${linenum + 1} (word count: ${it.size})...") @@ -653,7 +653,7 @@ class MovableType( proceedToNextLine() lines.forEach { - if ((it[0].size == 2 && it[0][0] == 0 && it[0][1] == 0) || it[0].isZeroGlue()) + if (it.isNotEmpty() && ((it[0].size == 2 && it[0][0] == 0 && it[0][1] == 0) || it[0].isZeroGlue())) it.removeAt(0) } diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index 93a443a..5c7d098 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -2532,7 +2532,7 @@ class TerrarumSansBitmap( private fun isBulgarian(c: CodePoint) = c in 0xF0000..0xF005F private fun isSerbian(c: CodePoint) = c in 0xF0060..0xF00BF fun isColourCode(c: CodePoint) = c == 0x100000 || c in 0x10F000..0x10FFFF - private fun isCharsetOverride(c: CodePoint) = c in 0xFFFC0..0xFFFFF + private fun isCharsetOverride(c: CodePoint) = c in 0xFFFC0..0xFFFDF private fun isDevanagari(c: CodePoint) = c in codeRange[SHEET_DEVANAGARI_VARW] private fun isHangulCompat(c: CodePoint) = c in codeRangeHangulCompat