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

fix: space before hyphen gets ignored

Browse Source
This commit is contained in:
minjaesong
2024-04-29 01:40:02 +09:00
parent 87492c1f0b
commit 8bf0642b3f
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -497,42 +497,32 @@ class MovableType(
val c0 = it val c0 = it
if (c0.isColourCode()) { if (c0.isColourCode()) {
if (glue != 0) if (glue > 0) sendoutGlue()
sendoutGlue()
addControlChar(c0) addControlChar(c0)
appendToBuffer(c0) appendToBuffer(c0)
} }
else if (c0 == 0x100000) { else if (c0 == 0x100000) {
requestControlCharRemovalIf { (it.first in 0x10F000..0x10FFFF) } requestControlCharRemovalIf { (it.first in 0x10F000..0x10FFFF) }
if (glue > 0) sendoutGlue()
if (glue != 0)
sendoutGlue()
appendToBuffer(c0) appendToBuffer(c0)
} }
else if (c0.isControlIn()) { else if (c0.isControlIn()) {
if (glue != 0) if (glue > 0) sendoutGlue()
sendoutGlue()
addControlChar(c0) addControlChar(c0)
appendToBuffer(c0) appendToBuffer(c0)
} }
else if (c0.isControlOut()) { else if (c0.isControlOut()) {
if (glue != 0) if (glue > 0) sendoutGlue()
sendoutGlue()
requestControlCharRemovalPop() requestControlCharRemovalPop()
appendToBuffer(c0) appendToBuffer(c0)
} }
else if (c0 == 0x0A) { // \n else if (c0 == 0x0A) { // \n
glue = 0
sendoutBox() sendoutBox()
proceedToNextLine() proceedToNextLine()
} }
else if (c0 == 0x2D) { // hyphen else if (c0 == 0x2D) { // hyphen
if (glue > 0) sendoutGlue()
appendToBuffer(c0) appendToBuffer(c0)
sendoutBox() sendoutBox()
} }
@@ -646,6 +636,7 @@ class MovableType(
} }
// tokenise camelCase // tokenise camelCase
else if (cM.isMiniscule() && c0.isMajuscule()) { else if (cM.isMiniscule() && c0.isMajuscule()) {
if (glue > 0) sendoutGlue()
sendoutBox() sendoutBox()
appendToBuffer(c0) appendToBuffer(c0)
} }