From 4f6584ac27ac1182aa94dfed2b10d5b347899f3c Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Thu, 25 Nov 2021 13:44:18 +0900
Subject: [PATCH] minor change in kerning rule

---
 FontTestGDX/src/TypewriterGDX.kt                       |  2 +-
 .../terrarumsansbitmap/gdx/TerrarumSansBitmap.kt       | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/FontTestGDX/src/TypewriterGDX.kt b/FontTestGDX/src/TypewriterGDX.kt
index 3a9b981..b23387e 100644
--- a/FontTestGDX/src/TypewriterGDX.kt
+++ b/FontTestGDX/src/TypewriterGDX.kt
@@ -58,7 +58,7 @@ class TypewriterGDX(val width: Int, val height: Int) : Game() {
             184,164,171,170, // >HON (ASC_3-90)
             62, // space
             74,48, // ;t (HANG_BEO)
-            43,12, // o5 (HANG_YU)
+            43,12, // o5 (HANG_CYU)
             38,48,51, // jtw (HANG_EOL)
             164, // H (ASC_-)
             75,34, // 'f (HANG_TA)
diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
index 6119b80..c7b72cf 100755
--- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
@@ -1366,7 +1366,7 @@ class TerrarumSansBitmap(
                 if (it.first.matches(maskL!!) && it.second.matches(maskR!!)) {
                     val contraction = if (glyphProps[prevChar]?.isKernYtype == true || glyphProps[thisChar]?.isKernYtype == true) it.yy else it.bb
 
-                    dbgprn("Kerning rule match #${index+1}: ${prevChar.toChar()}${thisChar.toChar()}, Rule:${it.first} ${it.second}; Contraction: $contraction")
+                    dbgprn("Kerning rule match #${index+1}: ${prevChar.toChar()}${thisChar.toChar()}, Rule:${it.first.s} ${it.second.s}; Contraction: $contraction")
 
                     return -contraction
                 }
@@ -1974,16 +1974,10 @@ print(','.join(a))
          */
         private val kerningRules = arrayListOf(
                 Kem(ing("_@_`___`__"),ing("`_________")),
-                Kem(ing("_@_@___`__"),ing("`___`_@___")),
+                Kem(ing("_@_@_`_`__"),ing("`_____@___")),
                 Kem(ing("_@_@___`__"),ing("`___@_____"),1,1),
                 Kem(ing("___`_`____"),ing("`___@_`___")),
                 Kem(ing("___`_`____"),ing("`_@___`___")),
-
-//                Kem(ing("_`________"),ing("@_`___`___")),
-//                Kem(ing("_`___`_@__"),ing("@_@___`___")),
-//                Kem(ing("_`___@____"),ing("@_@___`___"),1,1),
-//                Kem(ing("_`___@_`__"),ing("__`_`_____")),
-//                Kem(ing("_`_@___`__"),ing("__`_`_____")),
         )
 
         init {