From 8033d749c243d450edf60009c68af910e9da0d5c Mon Sep 17 00:00:00 2001
From: Song Minjae <alswo9628@gmail.com>
Date: Fri, 24 Mar 2017 14:55:56 +0900
Subject: [PATCH] removing height hacks by making all fonts (except unihan)
 have same height, taller hangul

---
 Slick2d/GameFontBase.kt                       |  41 +++---
 Slick2d/GameFontImpl.kt                       |   6 +-
 assets/graphics/fonts/cjkpunct.tga            | Bin 51218 -> 51244 bytes
 assets/graphics/fonts/hangul_johab.tga        | Bin 197164 -> 246418 bytes
 assets/graphics/fonts/unipunct.tga            | Bin 80658 -> 80684 bytes
 demo/.idea/workspace.xml                      | 118 +++++++++++++-----
 demo/TerrarumSansDemo.iml                     |  61 ++-------
 .../terrarum/imagefont/GameFontBase.kt        |  41 +++---
 .../terrarum/imagefont/GameFontImpl.kt        |   6 +-
 demo/text.txt                                 |  55 ++++----
 10 files changed, 163 insertions(+), 165 deletions(-)

diff --git a/Slick2d/GameFontBase.kt b/Slick2d/GameFontBase.kt
index 902d590..ac888d3 100644
--- a/Slick2d/GameFontBase.kt
+++ b/Slick2d/GameFontBase.kt
@@ -54,20 +54,20 @@ open class GameFontBase : Font {
             9
     }
 
-    private fun isHangul(c: Char) = c.toInt() >= 0xAC00 && c.toInt() < 0xD7A4
-    private fun isAscii(c: Char) = c.toInt() >= 0x20 && c.toInt() <= 0xFF
+    private fun isHangul(c: Char) = c.toInt() in 0xAC00..0xD7A3
+    private fun isAscii(c: Char) = c.toInt() in 0x20..0xFF
     private fun isRunic(c: Char) = runicList.contains(c)
-    private fun isExtA(c: Char) = c.toInt() >= 0x100 && c.toInt() < 0x180
-    private fun isExtB(c: Char) = c.toInt() >= 0x180 && c.toInt() < 0x250
-    private fun isKana(c: Char) = c.toInt() >= 0x3040 && c.toInt() < 0x3100
-    private fun isCJKPunct(c: Char) = c.toInt() >= 0x3000 && c.toInt() < 0x3040
-    private fun isUniHan(c: Char) = c.toInt() >= 0x3400 && c.toInt() < 0xA000
-    private fun isCyrilic(c: Char) = c.toInt() >= 0x400 && c.toInt() < 0x460
-    private fun isFullwidthUni(c: Char) = c.toInt() >= 0xFF00 && c.toInt() < 0xFF20
-    private fun isUniPunct(c: Char) = c.toInt() >= 0x2000 && c.toInt() < 0x2070
-    private fun isWenQuanYi1(c: Char) = c.toInt() >= 0x33F3 && c.toInt() <= 0x69FC
-    private fun isWenQuanYi2(c: Char) = c.toInt() >= 0x69FD && c.toInt() <= 0x9FDC
-    private fun isGreek(c: Char) = c.toInt() >= 0x370 && c.toInt() <= 0x3CE
+    private fun isExtA(c: Char) = c.toInt() in 0x100..0x17F
+    private fun isExtB(c: Char) = c.toInt() in 0x180..0x24F
+    private fun isKana(c: Char) = c.toInt() in 0x3040..0x30FF
+    private fun isCJKPunct(c: Char) = c.toInt() in 0x3000..0x303F
+    private fun isUniHan(c: Char) = c.toInt() in 0x3400..0x9FFF
+    private fun isCyrilic(c: Char) = c.toInt() in 0x400..0x45F
+    private fun isFullwidthUni(c: Char) = c.toInt() in 0xFF00..0xFF1F
+    private fun isUniPunct(c: Char) = c.toInt() in 0x2000..0x206F
+    private fun isWenQuanYi1(c: Char) = c.toInt() in 0x33F3..0x69FC
+    private fun isWenQuanYi2(c: Char) = c.toInt() in 0x69FD..0x9FDC
+    private fun isGreek(c: Char) = c.toInt() in 0x370..0x3CE
 
 
 
@@ -199,17 +199,17 @@ open class GameFontBase : Font {
 
                 hangulSheet.getSubImage(indexCho, choRow).drawWithShadow(
                         Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round(((H - H_HANGUL) / 2).toFloat() + y + 1f).toFloat(),
+                        Math.round(y).toFloat(),
                         scale.toFloat(), thisCol
                 )
                 hangulSheet.getSubImage(indexJung, jungRow).drawWithShadow(
                         Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round(((H - H_HANGUL) / 2).toFloat() + y + 1f).toFloat(),
+                        Math.round(y).toFloat(),
                         scale.toFloat(), thisCol
                 )
                 hangulSheet.getSubImage(indexJong, jongRow).drawWithShadow(
                         Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round(((H - H_HANGUL) / 2).toFloat() + y + 1f).toFloat(),
+                        Math.round(y).toFloat(),
                         scale.toFloat(), thisCol
                 )
             }
@@ -345,12 +345,7 @@ open class GameFontBase : Font {
                 try {
                     sheetKey[prevInstance]!!.getSubImage(sheetX, sheetY).drawWithShadow(
                             Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-
-                            // to deal with the height difference of the sheets
-                            Math.round(y).toFloat() + (if (prevInstance == SHEET_CJK_PUNCT) -1 // height hack
-                            else if (prevInstance == SHEET_FW_UNI) (H - H_HANGUL) / 2    // completely legit height adjustment
-                            else 0).toFloat(),
-
+                            Math.round(y).toFloat(),
                             scale.toFloat(), thisCol
                     )
                 }
@@ -512,9 +507,7 @@ open class GameFontBase : Font {
         internal val W_LATIN_WIDE = 9 // width of regular letters
 
         internal val H = 20
-        internal val H_HANGUL = 16
         internal val H_UNIHAN = 16
-        internal val H_KANA = 20
 
         internal val SHEET_ASCII_VARW = 0
         internal val SHEET_HANGUL = 1
diff --git a/Slick2d/GameFontImpl.kt b/Slick2d/GameFontImpl.kt
index 8af0e30..5ec28ac 100644
--- a/Slick2d/GameFontImpl.kt
+++ b/Slick2d/GameFontImpl.kt
@@ -11,7 +11,7 @@ class GameFontImpl : GameFontBase() {
     init {
 
         GameFontBase.hangulSheet = SpriteSheet(
-                "./assets/graphics/fonts/hangul_johab.tga", GameFontBase.W_HANGUL, GameFontBase.H_HANGUL)
+                "./assets/graphics/fonts/hangul_johab.tga", GameFontBase.W_HANGUL, GameFontBase.H)
         GameFontBase.asciiSheet = SpriteSheet(
                 "./assets/graphics/fonts/ascii_variable.tga", 15, 19, 1)
         GameFontBase.extASheet = SpriteSheet(
@@ -19,9 +19,9 @@ class GameFontImpl : GameFontBase() {
         GameFontBase.extBSheet = SpriteSheet(
                 "./assets/graphics/fonts/LatinExtB_variable.tga", 15, 19, 1)
         GameFontBase.kanaSheet = SpriteSheet(
-                "./assets/graphics/fonts/kana.tga", GameFontBase.W_KANA, GameFontBase.H_KANA)
+                "./assets/graphics/fonts/kana.tga", GameFontBase.W_KANA, GameFontBase.H)
         GameFontBase.cjkPunct = SpriteSheet(
-                "./assets/graphics/fonts/cjkpunct.tga", GameFontBase.W_ASIAN_PUNCT, GameFontBase.H_KANA)
+                "./assets/graphics/fonts/cjkpunct.tga", GameFontBase.W_ASIAN_PUNCT, GameFontBase.H)
         /*uniHan = new SpriteSheet(
                 "./assets/graphics/fonts/unifont_unihan"
                         + ((!terrarum.gameLocale.contains("zh"))
diff --git a/assets/graphics/fonts/cjkpunct.tga b/assets/graphics/fonts/cjkpunct.tga
index ff72b85b30837634f79e41b06d72548495fcb952..af04303f3b1a43afef321f9006db5cc6aa9a499a 100644
GIT binary patch
delta 144
zcmbO<fqBgY<_(&e8+99)Ci8CKne33oGFf*n$7Ib+iOIfMHIvt_Hkce+C^A_$6Io6G
zs?KGjt^(s^-rX`l>@iW-W%AiPk;!jo7yxMjpjMg9Z)ap6$vbR5n|Cx!iUA5jf<j%x
RJcB*`{d6PTJbhgC7ywBiGk*X8

delta 117
zcmZ28fqBvd<_(&elY2MuOg@mqGI{NMj>#*tB_^NEshO<1&S3K0Vv)&fvytTlpz2&U
w>MAf!?%gW`#2yoMT_*b$icHR(Z2+VNfLdiX=g!VRl6TnbTX-~Vqh13O00B=kFaQ7m

diff --git a/assets/graphics/fonts/hangul_johab.tga b/assets/graphics/fonts/hangul_johab.tga
index 3f29bc3ab15add6f64e11bf88c2a9a7fb7de4662..aed24a6e151b6cf9a281ed757c2fb088e405f6b1 100644
GIT binary patch
delta 2209
zcmdT_O=ufe5cWJvPV8tSRhEJdD^S4%750G+I`|-g4m#){L1<(mVjB#_CD1H2ttc*Z
ziw`d35{UCsCT$VTp)@{tTQ8z)O{~^XH})X{6ME30%CSwL3pun9XjD40vK@)I#~xzv
z?!Le8ee=yXqm9+j%}>JNkr6R+^p}NwCwxBW$b*1t&z722aI@@M58!dwk+o5psw!_L
zh292aQ36D;9ThQUkHwnW#Tyr1?8NT-U^w!tK+{~$MI9Le^h%<jdeO3K-7}PSe_PqD
zlv+9!XjWQj;mFAF4%Zxq!swdp44rFg_jz&$lba&dod5YL51Ljd5}>!TIyzc9R8=D$
z!ekvv%GwIK*6Tjd;I=zWue-!Y>B#YSAJfzK^+EE5pz<Ep`XuCj(f?SJIi>BblNttk
zGa`+xAY5CM)BYmIswimMQKSDk?EMJo?~?GnaAXdKW<O2BRb>WKD1Q?*WpC9PQ8nfw
z%8SNOn-vjNxul~Eh#a;xk+~T^ttzc477gc5!3qb^i0d?c9IZ-D8Z7XUd<S<cQ6O>p
zZ$}1RW`On{6r0*!L9EGL!ZVclcM0<!LK(ZZi11BiOnxa0Y%D=qwQDiu>80ZX-opax
z?e<czLz3>2Tm?T$P6AC*z8^(YK3HHhvdS;jH90kOdQd2qWSGzq+>w+o?;y&3<MFc-
zI?kSJejrMdSeXzxM}8D=&C5`ZDKk2a-Oni+dQ4&E9k_tr6OmKxaLT19Hw1q69{j-|
z8MK15pj|9+4h_~IL+&?}{Z^G{G8`GUzJY{G$~*^^znoFmC#GEQYmqt6WUibYx_y0I
zS;2&R{Vv2_Q~5Ay8P52qP4ll?WdA4PIW`udhVomObIo_59>B`m<Y&I8GAoK$`9e$&
zUvJ%}sv?_XV;icDyyC+=BN{q3mZ6C4Mexb~7yYC2WSnJ37X9P8l0PNTniOf((~55I
znTU_OA3uQK!yMGF!wOGN9(vHtpA)NO@@e7PIdMRyI~1C%dlh9=T*G;K&_xlhRMlEY
zD|0KuW43rf$$c_^yv9DsII>PuxMQ$;ycyjeVB4XP{Ap_|?aSf?A)#7lLaKWy?Wa`b
zwG`oJ&|Zcb6=H$G4FXT|teYPbD+0YyvFWQOCn%@M$po!sITb6!AmO%xf}34@0VxS(
zUQ^wjEbUw1IyBH;1QNYdbmYQGEc1U-IS&xb(jelKG()=YC4!qGfPq}*!ztem#5zlM
zxD9+$j-~a>ofzf%8n$Lc4YhkfPCf)<-UeE`kn^{8|AD8}n+3JsIUoRf*9BGOW<M=2
zO676bm1Qta^Ci?nhV!S#*^jK5ugfYsN;Q5+4GP&2Cuvk>36WT&|3{tN-kV}u_?EFc
z2C+0;>X$dpadb;(hgv}PjaRqU`YGBN<J9d_Gw@s4trI?cLs1LkUyX!nSE=-Day^?_
N+E739DoSu?{9mx=fp`D_

delta 1826
zcmcIlL1-IS5cU5ngQaR~#Z{?dq*l-+)nR|oVWA1NgJ|s_gWQN#4T5N?13BcNB_;%_
zfPHXCN)KL$`U%rO3^^pEhniY!+l7L_hm;mtfgu+k>{B3VgH=+JoYJM8`D?4S+Jh5X
z!LGjk|MO<%&70AumxjN%7#|)O-~&4!i(PLG9~hL~1p|V6+=9#%tpNH-mV(U3+>}nd
z2=+HDDcx8_7UB^QAMujR)NjykCA`?Zs+rK<;Az=?C4op;+Rj0Hk)I~GjUDjZl?=<N
zAMOHA;^h?JVod6@McGNjL2vLZE>d!7_AzX(^FwlcBn?Y9wS=61*?{@)SR8_{nc?Xp
z4<{6ko#J^p?HIDtu;g;A1o~B$mm-~zn+*dutX{}orhfUDkH^=e^d5?#ebsjlv$&>^
zmJ6)j6mx((GZ>i(U5%Mu`~FaPjM<q@vD$a+ZWZWwefPHSM48%O_3S5!2wqr~!pXt%
z5zSDruvykh#2@DM02e84!ua<{O(%hbH!KL=W>qx%gd&q-%Y@}GwR}@l$xpQ@OoD{Y
z9d3a8AuEG^f|+Dfrp&$Ij|2tvfB4*;Mvtby5|;LpiI!N8wnQxwl1&wv#c=w$hIW<p
zvF+PO*e<%aWbm|#PmS`=5fL&tgPGn#%{b>uQp8duyD>!*Q8gV)dP~2|FvU;1&L{Q=
zKvK`kwf#eK>E|qpJL%2;S|*e=e5`*3p=huYUhuTQ_k7XoE=1T~;BJH6L{T`Gc=5jw
z%WaHMH8rtW`MXNg2}MLL8}j^odh7uq*zS7uF%_m3ilnhE5|YZ?8{qh?hAnSE`&$$=
zwL40zB%QO1vU9fLJMU-{sO-5KxNmBCU;mMPuDYWo79+%0)(<%UYE-p<XJox4EJjGb
z6E3#Xw%skXV}xZ4Di^*pt$nsX6f3<?zv!cK4($VRm(#Gq`4U6zIk}dYW7L2}+`z^=
z%udPieQ9dr6iEj*FL0cB8~j>tP+5SJ(SYd-yg{YR`3PCmpz|A_Q7O<cv(QCW{gTe3
z8L~H}`yfY_Cd%b9BW;cWhLj}_W0dGcdgZ}>3$5KmT!n!hVuqEo4`N4bPwIy-f1aDz
zjZ6uuCC-spR}i@NDy6v+#pTeT@<xv8J@}gM-r+w*`*QIym)X~L$Qsp7VF7U1J{#NR
z*U{+@5z<9V-1x_L*x$jKB<7WscDhWJut2P_71?p}QXjz~saO5>OZ;*4IowaaFuL>S
YS9$M)$>US+PaS(#RF6)TCJzq$3653s-T(jq

diff --git a/assets/graphics/fonts/unipunct.tga b/assets/graphics/fonts/unipunct.tga
index 344d6f85d7c3681ed250ffb725a1466bd282d09f..ce5a26df795aed30c813c750295bd1e5372f30f9 100644
GIT binary patch
delta 285
zcmbRAjb+U@mJMGWCifmw+1z{V2IE9s7bu;9B$fdd+o;>Zge2$!XK&O!VZKp!2Ipki
zHyWFLkAO^ZfU`I19$<lUkR@Pjh_w(6vTtM<H`~5ZVVtbHOk(lbg-k%5GMjamRYY#o
zy}}6O_)LC#N@eoji9VBkkH`S|3P2nH#6Q4tzDHDm;vQf%dl!P_JhuO3Va#C!i-Ke!
jIy^RmEZV5M(@2T|3POTHUBf(sJ^lT3BiuZFT=f_L8E}6a

delta 254
zcmZ4Ujb+j|mJMGWChDqe?mc#caiXpZl+KvkdkiL)0T$b++roq-=mKYN)IDLoQFjLC
zWZ5?wn|+UfOmTp-H|ic>fpd^0U~GuBU=7=C*%>96K&mI}E|XY%b|Hu@vsrgpMdW1P
zBRxP)01*EGVjm!11&Bek43Mt^#2(xKvM_ouLS;NAzdfZgdGA66m`o1PSsoxskS$k@
IC+cMY0KkQGO#lD@

diff --git a/demo/.idea/workspace.xml b/demo/.idea/workspace.xml
index 24a498c..350da7f 100644
--- a/demo/.idea/workspace.xml
+++ b/demo/.idea/workspace.xml
@@ -27,7 +27,7 @@
       <file leaf-file-name="GameFontDemo.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="610">
+            <state relative-caret-position="924">
               <caret line="72" column="55" lean-forward="false" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
               <folding>
                 <element signature="e#40#238#0" expanded="true" />
@@ -36,11 +36,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="false">
+      <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="493" column="0" lean-forward="false" selection-start-line="493" selection-start-column="0" selection-end-line="493" selection-end-column="0" />
+            <state relative-caret-position="409">
+              <caret line="204" column="48" lean-forward="false" selection-start-line="204" selection-start-column="48" selection-end-line="204" selection-end-column="48" />
               <folding>
                 <element signature="e#31#171#0" expanded="true" />
               </folding>
@@ -48,11 +48,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameFontImpl.kt" pinned="false" current-in-tab="true">
+      <file leaf-file-name="GameFontImpl.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="356">
-              <caret line="48" column="26" lean-forward="false" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+            <state relative-caret-position="518">
+              <caret line="37" column="41" lean-forward="false" selection-start-line="37" selection-start-column="41" selection-end-line="37" selection-end-column="41" />
               <folding>
                 <element signature="e#31#108#0" expanded="true" />
               </folding>
@@ -60,6 +60,16 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="text.txt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/text.txt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="252">
+              <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -96,17 +106,17 @@
         <option value="$PROJECT_DIR$/config.properties" />
         <option value="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
         <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt" />
-        <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt" />
         <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt" />
+        <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt" />
         <option value="$PROJECT_DIR$/text.txt" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-1688" />
+    <option name="x" value="-8" />
     <option name="y" value="-8" />
-    <option name="width" value="1696" />
-    <option name="height" value="1026" />
+    <option name="width" value="1936" />
+    <option name="height" value="1176" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -123,6 +133,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -169,9 +182,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -182,6 +192,18 @@
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.32068965" />
   </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
   <component name="RunManager" selected="Kotlin.net.torvald.terrarum.imagefont.GameFontDemoKt">
     <configuration default="false" name="net.torvald.terrarum.imagefont.GameFontDemoKt" type="JetRunConfigurationType" factoryName="Kotlin" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@@ -384,7 +406,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1688" y="-8" width="1696" height="1026" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -397,13 +419,13 @@
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20833333" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21100427" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="LuaJ" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960597" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3054371" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25896862" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2581574" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -429,6 +451,36 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="72" column="55" lean-forward="false" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
+          <folding>
+            <element signature="e#40#238#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6846">
+          <caret line="493" column="0" lean-forward="false" selection-start-line="493" selection-start-column="0" selection-end-line="493" selection-end-column="0" />
+          <folding>
+            <element signature="e#31#171#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="658">
+          <caret line="48" column="26" lean-forward="false" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+          <folding>
+            <element signature="e#31#108#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -453,7 +505,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="10" lean-forward="true" selection-start-line="0" selection-start-column="10" selection-end-line="0" selection-end-column="10" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -491,7 +542,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="610">
+        <state relative-caret-position="924">
           <caret line="72" column="55" lean-forward="false" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
           <folding>
             <element signature="e#40#238#0" expanded="true" />
@@ -503,38 +554,45 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="10" lean-forward="false" selection-start-line="0" selection-start-column="10" selection-end-line="0" selection-end-column="10" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
+    <entry file="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime-sources.jar!/kotlin/Primitives.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="493" column="0" lean-forward="false" selection-start-line="493" selection-start-column="0" selection-end-line="493" selection-end-column="0" />
-          <folding>
-            <element signature="e#31#171#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="338">
+          <caret line="491" column="24" lean-forward="false" selection-start-line="491" selection-start-column="24" selection-end-line="491" selection-end-column="24" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/text.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+        <state relative-caret-position="252">
+          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="48" column="26" lean-forward="false" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+        <state relative-caret-position="518">
+          <caret line="37" column="41" lean-forward="false" selection-start-line="37" selection-start-column="41" selection-end-line="37" selection-end-column="41" />
           <folding>
             <element signature="e#31#108#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="409">
+          <caret line="204" column="48" lean-forward="false" selection-start-line="204" selection-start-column="48" selection-end-line="204" selection-end-column="48" />
+          <folding>
+            <element signature="e#31#171#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/demo/TerrarumSansDemo.iml b/demo/TerrarumSansDemo.iml
index b19a530..3425576 100644
--- a/demo/TerrarumSansDemo.iml
+++ b/demo/TerrarumSansDemo.iml
@@ -6,67 +6,20 @@
         <option name="compilerInfo">
           <KotlinCompilerInfo>
             <option name="compilerSettings">
-              <CompilerSettings>
-                <option name="additionalArguments" value="-version" />
-                <option name="copyJsLibraryFiles" value="true" />
-                <option name="outputDirectoryForJsLibraryFiles" value="lib" />
-              </CompilerSettings>
+              <CompilerSettings />
             </option>
             <option name="k2jsCompilerArguments">
-              <K2JSCompilerArguments>
-                <option name="outputFile" />
-                <option name="noStdlib" value="false" />
-                <option name="libraryFiles" />
-                <option name="sourceMap" value="false" />
-                <option name="metaInfo" value="false" />
-                <option name="kjsm" value="false" />
-                <option name="target" />
-                <option name="moduleKind" />
-                <option name="main" />
-                <option name="outputPrefix" />
-                <option name="outputPostfix" />
-                <option name="languageVersion" />
-                <option name="apiVersion" />
-                <option name="suppressWarnings" value="false" />
-                <option name="verbose" value="false" />
-                <option name="version" value="false" />
-                <option name="help" value="false" />
-                <option name="extraHelp" value="false" />
-                <option name="noInline" value="false" />
-                <option name="repeat" />
-                <option name="pluginClasspaths" />
-                <option name="pluginOptions" />
-                <option name="freeArgs">
-                  <list />
-                </option>
-                <option name="unknownExtraFlags">
-                  <list />
-                </option>
-              </K2JSCompilerArguments>
+              <K2JSCompilerArguments />
+            </option>
+            <option name="k2jvmCompilerArguments">
+              <K2JVMCompilerArguments />
             </option>
             <option name="_commonCompilerArguments">
-              <DummyImpl>
-                <option name="languageVersion" />
-                <option name="apiVersion" />
-                <option name="suppressWarnings" value="false" />
-                <option name="verbose" value="false" />
-                <option name="version" value="false" />
-                <option name="help" value="false" />
-                <option name="extraHelp" value="false" />
-                <option name="noInline" value="false" />
-                <option name="repeat" />
-                <option name="pluginClasspaths" />
-                <option name="pluginOptions" />
-                <option name="freeArgs">
-                  <list />
-                </option>
-                <option name="unknownExtraFlags">
-                  <list />
-                </option>
-              </DummyImpl>
+              <DummyImpl />
             </option>
           </KotlinCompilerInfo>
         </option>
+        <option name="useProjectSettings" value="false" />
         <option name="versionInfo">
           <KotlinVersionInfo>
             <option name="apiLevel" value="1.0" />
diff --git a/demo/src/net/torvald/terrarum/imagefont/GameFontBase.kt b/demo/src/net/torvald/terrarum/imagefont/GameFontBase.kt
index 902d590..ac888d3 100644
--- a/demo/src/net/torvald/terrarum/imagefont/GameFontBase.kt
+++ b/demo/src/net/torvald/terrarum/imagefont/GameFontBase.kt
@@ -54,20 +54,20 @@ open class GameFontBase : Font {
             9
     }
 
-    private fun isHangul(c: Char) = c.toInt() >= 0xAC00 && c.toInt() < 0xD7A4
-    private fun isAscii(c: Char) = c.toInt() >= 0x20 && c.toInt() <= 0xFF
+    private fun isHangul(c: Char) = c.toInt() in 0xAC00..0xD7A3
+    private fun isAscii(c: Char) = c.toInt() in 0x20..0xFF
     private fun isRunic(c: Char) = runicList.contains(c)
-    private fun isExtA(c: Char) = c.toInt() >= 0x100 && c.toInt() < 0x180
-    private fun isExtB(c: Char) = c.toInt() >= 0x180 && c.toInt() < 0x250
-    private fun isKana(c: Char) = c.toInt() >= 0x3040 && c.toInt() < 0x3100
-    private fun isCJKPunct(c: Char) = c.toInt() >= 0x3000 && c.toInt() < 0x3040
-    private fun isUniHan(c: Char) = c.toInt() >= 0x3400 && c.toInt() < 0xA000
-    private fun isCyrilic(c: Char) = c.toInt() >= 0x400 && c.toInt() < 0x460
-    private fun isFullwidthUni(c: Char) = c.toInt() >= 0xFF00 && c.toInt() < 0xFF20
-    private fun isUniPunct(c: Char) = c.toInt() >= 0x2000 && c.toInt() < 0x2070
-    private fun isWenQuanYi1(c: Char) = c.toInt() >= 0x33F3 && c.toInt() <= 0x69FC
-    private fun isWenQuanYi2(c: Char) = c.toInt() >= 0x69FD && c.toInt() <= 0x9FDC
-    private fun isGreek(c: Char) = c.toInt() >= 0x370 && c.toInt() <= 0x3CE
+    private fun isExtA(c: Char) = c.toInt() in 0x100..0x17F
+    private fun isExtB(c: Char) = c.toInt() in 0x180..0x24F
+    private fun isKana(c: Char) = c.toInt() in 0x3040..0x30FF
+    private fun isCJKPunct(c: Char) = c.toInt() in 0x3000..0x303F
+    private fun isUniHan(c: Char) = c.toInt() in 0x3400..0x9FFF
+    private fun isCyrilic(c: Char) = c.toInt() in 0x400..0x45F
+    private fun isFullwidthUni(c: Char) = c.toInt() in 0xFF00..0xFF1F
+    private fun isUniPunct(c: Char) = c.toInt() in 0x2000..0x206F
+    private fun isWenQuanYi1(c: Char) = c.toInt() in 0x33F3..0x69FC
+    private fun isWenQuanYi2(c: Char) = c.toInt() in 0x69FD..0x9FDC
+    private fun isGreek(c: Char) = c.toInt() in 0x370..0x3CE
 
 
 
@@ -199,17 +199,17 @@ open class GameFontBase : Font {
 
                 hangulSheet.getSubImage(indexCho, choRow).drawWithShadow(
                         Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round(((H - H_HANGUL) / 2).toFloat() + y + 1f).toFloat(),
+                        Math.round(y).toFloat(),
                         scale.toFloat(), thisCol
                 )
                 hangulSheet.getSubImage(indexJung, jungRow).drawWithShadow(
                         Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round(((H - H_HANGUL) / 2).toFloat() + y + 1f).toFloat(),
+                        Math.round(y).toFloat(),
                         scale.toFloat(), thisCol
                 )
                 hangulSheet.getSubImage(indexJong, jongRow).drawWithShadow(
                         Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round(((H - H_HANGUL) / 2).toFloat() + y + 1f).toFloat(),
+                        Math.round(y).toFloat(),
                         scale.toFloat(), thisCol
                 )
             }
@@ -345,12 +345,7 @@ open class GameFontBase : Font {
                 try {
                     sheetKey[prevInstance]!!.getSubImage(sheetX, sheetY).drawWithShadow(
                             Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-
-                            // to deal with the height difference of the sheets
-                            Math.round(y).toFloat() + (if (prevInstance == SHEET_CJK_PUNCT) -1 // height hack
-                            else if (prevInstance == SHEET_FW_UNI) (H - H_HANGUL) / 2    // completely legit height adjustment
-                            else 0).toFloat(),
-
+                            Math.round(y).toFloat(),
                             scale.toFloat(), thisCol
                     )
                 }
@@ -512,9 +507,7 @@ open class GameFontBase : Font {
         internal val W_LATIN_WIDE = 9 // width of regular letters
 
         internal val H = 20
-        internal val H_HANGUL = 16
         internal val H_UNIHAN = 16
-        internal val H_KANA = 20
 
         internal val SHEET_ASCII_VARW = 0
         internal val SHEET_HANGUL = 1
diff --git a/demo/src/net/torvald/terrarum/imagefont/GameFontImpl.kt b/demo/src/net/torvald/terrarum/imagefont/GameFontImpl.kt
index 8af0e30..5ec28ac 100644
--- a/demo/src/net/torvald/terrarum/imagefont/GameFontImpl.kt
+++ b/demo/src/net/torvald/terrarum/imagefont/GameFontImpl.kt
@@ -11,7 +11,7 @@ class GameFontImpl : GameFontBase() {
     init {
 
         GameFontBase.hangulSheet = SpriteSheet(
-                "./assets/graphics/fonts/hangul_johab.tga", GameFontBase.W_HANGUL, GameFontBase.H_HANGUL)
+                "./assets/graphics/fonts/hangul_johab.tga", GameFontBase.W_HANGUL, GameFontBase.H)
         GameFontBase.asciiSheet = SpriteSheet(
                 "./assets/graphics/fonts/ascii_variable.tga", 15, 19, 1)
         GameFontBase.extASheet = SpriteSheet(
@@ -19,9 +19,9 @@ class GameFontImpl : GameFontBase() {
         GameFontBase.extBSheet = SpriteSheet(
                 "./assets/graphics/fonts/LatinExtB_variable.tga", 15, 19, 1)
         GameFontBase.kanaSheet = SpriteSheet(
-                "./assets/graphics/fonts/kana.tga", GameFontBase.W_KANA, GameFontBase.H_KANA)
+                "./assets/graphics/fonts/kana.tga", GameFontBase.W_KANA, GameFontBase.H)
         GameFontBase.cjkPunct = SpriteSheet(
-                "./assets/graphics/fonts/cjkpunct.tga", GameFontBase.W_ASIAN_PUNCT, GameFontBase.H_KANA)
+                "./assets/graphics/fonts/cjkpunct.tga", GameFontBase.W_ASIAN_PUNCT, GameFontBase.H)
         /*uniHan = new SpriteSheet(
                 "./assets/graphics/fonts/unifont_unihan"
                         + ((!terrarum.gameLocale.contains("zh"))
diff --git a/demo/text.txt b/demo/text.txt
index ec1567b..9e33850 100644
--- a/demo/text.txt
+++ b/demo/text.txt
@@ -1,37 +1,38 @@
 Set locale in config.properties to “bgBG” for alternative Bulgarian letters, “srSR” for Serbian.
 
-ABCDEFGHIJKLM NOPQRSTUVWXYZ
-abcdefghijklm nopqrstuvwxyz
+ABCDEFGHIJKLM NOPQRSTUVWXYZ 12345?
+abcdefghijklm nopqrstuvwxyz 67890!
 
-Syö salmiakkia, koska se on hyvää sinulle
+The bitmap font for game developers who seek good font that has real multilingual support,
+for free (as in freedom AND without cost).
 
-The Olympic marmot (Marmota olympus) is a rodent in the squirrel family, Sciuridae.
-It lives only in the U.S. state of Washington, at middle elevations on the Olympic Peninsula.
-About the size of a domestic cat, an adult weighs around 8 kg (18 lb) in summer.
+There are many bitmap fonts on the internet. You care for the multilingual support, but alas!
+most of them does not support your language, vector fonts takes too much time to be loaded,
+even then their legibility suffers because fuck built-in antialias.
+You somehow found a good font, and it makes your game look like a linux terminal, and you say:
+“what the fuck? Is this a game or should I rm -rf this shit‽”
+You speak Japanese, and you wish to support it, but then このクソなfontは only good for Japanese,
+and it is not multilingual, and you don't have a time for this shenanigan.
+Eventually you give up, saying “fuck it!” and just use the fonts that do not match well.
 
-Brná je část statutárního a krajského města Ústí nad Labem v České republice, spadající
-pod městský obvod Ústí nad Labem-Střekov. Nachází se asi pět kilometrů jižně od centra
-města v Českém středohoří na pravém břehu řeky Labe.
+No more suffering. This font has everything you need.
 
-Malaysia er en forholdsvis ung stat. Sin endelige udstrækning fik den først i 1965 efter
-at Singapore trak sig ud. Staten blev grundlagt ved en sammenslutning af flere tidligere
-britiske besiddelser, foreløbigt i 1957 og endeligt i 1963.
+while (isVisible(BadFonts)) { ripAndTear(BadFonts).scope(Guts); }
+How multilingual? Real multilingual!
 
-Το θάλλιο συνοδεύει κυρίως θειούχα ορυκτά βασικών μετάλλων, όπως ο σφαλερίτης, ο σιδηροπυρίτης
-και ο γαληνίτης ενώ αναφέρονται και εμφανίσεις του σε κονδύλους μαγγανίου στους βυθούς των ωκεανών.
+Příliš žluťoučký kůň úpěl ďábelské ódy
+Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich
 διαφυλάξτε γενικά τη ζωή σας από βαθειά ψυχικά τραύματα
 ΔΙΑΦΥΛΆΞΤΕ ΓΕΝΙΚΆ ΤΗ ΖΩΉ ΣΑΣ ΑΠΌ ΒΑΘΕΙΆ ΨΥΧΙΚΆ ΤΡΑΎΜΑΤΑ
-Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства.
-Příliš žluťoučký kůň úpěl ďábelské ódy.    Árvíztűrő tükörfúrógép.
-Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich.
-Pijamalı hasta yağız şoföre çabucak güvendi.    Kŕdeľ ďatľov učí koňa žrať kôru.
-Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwi.
-Înjurând pițigăiat, zoofobul comandă vexat whisky și tequila.
-
-sjaldgæft    ekki stjórnarskrárvarin
-
-Also supports:
-‛Unicode’ „quotation marks“—dashes…‼
-으웽~. 얘! 위에 이 애 우유의 양 외워와! 아오~ 왜요? 어여! 예...  웬 초콜릿? 제가 원했던 건 뻥튀기 쬐끔과 의류예요. 얘야, 왜 또 불평?  퀡퇣풿횂
+Pack my box with five dozen liquor jugs
+Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwi
+정 참판 양반댁 규수 큰 교자 타고 혼례 치른 날    뚫훍뚫훍뚫(읗) 뚫훍뚫훍뚫(읗) 뚫훍뚫훍뚫 따다다
+Kæmi ný öxi hér, ykist þjófum nú bæði víl og ádrepa
+Árvíztűrő tükörfúrógép    Kŕdeľ ďatľov učí koňa žrať kôru
 とりなくこゑす ゆめさませ みよあけわたる ひんかしを そらいろはえて おきつへに ほふねむれゐぬ もやのうち
-鳥啼く声す 夢覚ませ 見よ明け渡る 東を 空色栄えて 沖つ辺に 帆船群れゐぬ 靄の中,
\ No newline at end of file
+鳥啼く声す 夢覚ませ 見よ明け渡る 東を 空色栄えて 沖つ辺に 帆船群れゐぬ 靄の中
+Înjurând pițigăiat, zoofobul comandă vexat whisky și tequila
+Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства
+Pijamalı hasta yağız şoföre çabucak güvendi
+Also supports: ‛Unicode’ „quotation marks“—dashes…「括弧」‼
+ASCII  Latin-1  Latin_Ext-A  Latin_Ext-B  Greek  Cyrillic  CJK-Ideo  Kana  Hangul_Syllables