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

more adhoc adjustments

Browse Source
This commit is contained in:
minjaesong
2024-04-30 18:50:24 +09:00
parent b2acb83848
commit d43a2d5bec
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ class MovableType(
// don't hyphenate if: // don't hyphenate if:
// - the word is too short (5 chars or less) // - the word is too short (5 chars or less)
// - the word is pre-hyphenated (ends with hyphen-null) // - the word is pre-hyphenated (ends with hyphen-null)
if (box.text.size <= 8 || box.text.penultimate() == 0x2D) if (box.text.size <= (if (paperWidth < 350) 6 else if (paperWidth < 480) 7 else 8) || box.text.penultimate() == 0x2D)
return Triple(2147483648.0, 2147483647, null) return Triple(2147483648.0, 2147483647, null)
val slug = slug.toMutableList() val slug = slug.toMutableList()
@@ -171,16 +171,16 @@ class MovableType(
val disableHyphThre = 200.0 * paperWidth.toDouble().pow(0.25) val disableHyphThre = 200.0 * paperWidth.toDouble().pow(0.25)
println("\nLine: ${slug.map { it.block.text }.filter { it.isNotGlue() }.joinToString(" ") { it.toReadable() }}") // println("\nLine: ${slug.map { it.block.text }.filter { it.isNotGlue() }.joinToString(" ") { it.toReadable() }}")
println("W diff: $widthDeltaW, badness: $badnessW") // println("W diff: $widthDeltaW, badness: $badnessW")
println("T diff: $widthDeltaT, badness: $badnessT") // println("T diff: $widthDeltaT, badness: $badnessT")
if ((badnessW <= disableHyphThre || badnessT <= disableHyphThre) && badnessH > minOf(badnessW, badnessT) / 100.0) { if ((badnessW <= disableHyphThre || badnessT <= disableHyphThre) && badnessH > minOf(badnessW, badnessT) / 12.0) {
println("H diff: $widthDeltaH, badness: $badnessH (disabled)") // println("H diff: $widthDeltaH, badness: $badnessH (disabled)")
badnessH = 2147483648.0 badnessH = 2147483648.0
} }
else { else {
println("H diff: $widthDeltaH, badness: $badnessH") // println("H diff: $widthDeltaH, badness: $badnessH")
} }
val (selectedBadness, selectedWidthDelta, selectedStrat) = listOf( val (selectedBadness, selectedWidthDelta, selectedStrat) = listOf(