From 6bf4a5a995a17f6947c298a1f61944356fbe9940 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Fri, 19 Jan 2024 16:01:51 +0900
Subject: [PATCH] Old hangul rendering fix

---
 BuildJAR_TerrarumSansBitmap.iml                        |  4 ++--
 FontTestGDX/FontTestGDX.iml                            |  2 +-
 .../terrarumsansbitmap/gdx/TerrarumSansBitmap.kt       | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 BuildJAR_TerrarumSansBitmap.iml
 mode change 100755 => 100644 FontTestGDX/FontTestGDX.iml

diff --git a/BuildJAR_TerrarumSansBitmap.iml b/BuildJAR_TerrarumSansBitmap.iml
old mode 100755
new mode 100644
index c33f24f..4a11a15
--- a/BuildJAR_TerrarumSansBitmap.iml
+++ b/BuildJAR_TerrarumSansBitmap.iml
@@ -5,9 +5,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8.0_242" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="lib" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/FontTestGDX/FontTestGDX.iml b/FontTestGDX/FontTestGDX.iml
old mode 100755
new mode 100644
index 473e081..a9a0ded
--- a/FontTestGDX/FontTestGDX.iml
+++ b/FontTestGDX/FontTestGDX.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8.0_242" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="BuildJAR_TerrarumSansBitmap" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
index 46a4c16..6a26136 100755
--- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
@@ -2277,9 +2277,9 @@ class TerrarumSansBitmap(
         // ㅣ
         private val jungseongI = arrayOf(21,61).toSortedSet()
         // ㅗ ㅛ ㅜ ㅠ
-        private val jungseongOU = arrayOf(9,13,14,18,34,35,39,45,51,53,54,64,80,83).toSortedSet()
+        private val jungseongOU = arrayOf(9,13,14,18,34,35,39,45,51,53,54,64,73,80,83).toSortedSet()
         // ㅘ ㅙ ㅞ
-        private val jungseongOUComplex = (arrayOf(10,11,16) + (22..33).toList() + arrayOf(36,37,38) + (41..44).toList() + arrayOf(46,47,48,49,50) + (56..59).toList() + arrayOf(63) + (67..79).toList() + arrayOf(81,82) + (84..93).toList()).toSortedSet()
+        private val jungseongOUComplex = (arrayOf(10,11,16) + (22..33).toList() + arrayOf(36,37,38) + (41..44).toList() + (46..50).toList() + (56..59).toList() + arrayOf(63) + (67..72).toList() + (74..79).toList() + (81..83).toList() + (85..91).toList() + arrayOf(93, 94)).toSortedSet()
         // ㅐ ㅒ ㅔ ㅖ etc
         private val jungseongRightie = arrayOf(2,4,6,8,11,16,32,33,37,42,44,48,50,71,72,75,78,79,83,86,87,88,94).toSortedSet()
         // ㅚ *ㅝ* ㅟ
@@ -2289,7 +2289,7 @@ class TerrarumSansBitmap(
         // ㅢ
         private val jungseongYI = arrayOf(20,60,65).toSortedSet()
         // ㅜ ㅝ ㅞ ㅟ ㅠ
-        private val jungseongUU = arrayOf(14,15,16,17,18,27,30,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,59,67,68,77,78,79,80,81,82,83,84,91).toSortedSet()
+        private val jungseongUU = arrayOf(14,15,16,17,18,27,30,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,59,67,68,73,77,78,79,80,81,82,83,84,91).toSortedSet()
 
         private val jungseongWide = (jungseongOU.toList() + jungseongEU.toList()).toSortedSet()
 
@@ -2316,15 +2316,15 @@ class TerrarumSansBitmap(
         private fun getHanInitialRow(i: Int, p: Int, f: Int): Int {
             var ret =
                 if (p in jungseongI) 3
-                else if (p in jungseongOUComplex) 7
                 else if (p in jungseongOEWI) 11
+                else if (p in jungseongOUComplex) 7
                 else if (p in jungseongOU) 5
                 else if (p in jungseongEU) 9
                 else if (p in jungseongYI) 13
                 else 1
 
             if (f != 0) ret += 1
-
+            //println("getHanInitialRow $i $p $f -> $ret")
             return if (p in jungseongUU && i in choseongGiyeoks) giyeokRemapping[ret] ?: throw NullPointerException("i=$i p=$p f=$f ret=$ret") else ret
         }