wenquanyi: fixed bad code point allocation

LICENSE.md

@@ -19,7 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-====
-
-WenQuanYi font is distributed under GNU GPL Version 2. See their [license document here](http://wenq.org/wqy2/index.cgi?GPL)

README.md

@@ -4,9 +4,11 @@
 
 ![Cyrillic sample – Russian, Bulgarian, Serbian](https://github.com/minjaesong/Terrarum-sans-bitmap/blob/master/terrarum_sans_cyrillic_2.png)
 
-**Font demo** — head to the **Release** tab
+(note—you can't display Bulgarian and Russian glyphs at the same time, you must ```reload()``` them upon the change of locale of your game)
 
-This font is a bitmap font used in my game project, Terrarum (hence the name). The font supports more than 90 % of european languages, as well as Chinese, Japanese and Korean. More technical side, it supports Latin-1 Supplement, Latin Ext-A, Latin Ext-B, Cyrillic (Russian, Bulgarian, Serbian), Greek, Chinese (limited to Unicode BMP), Japanese, Korean (all 11 172 possible syllables).
+**Font demo** — head to the **[Release](https://github.com/minjaesong/Terrarum-sans-bitmap/releases)** tab
+
+This font is a bitmap font used in [my game project called Terrarum](https://gitlab.com/minjaesong/terrarum) (hence the name). The font supports more than 90 % of european languages, as well as Chinese, Japanese and Korean. More technical side, it supports Latin-1 Supplement, Latin Ext-A, Latin Ext-B, Cyrillic (Russian, Bulgarian, Serbian), Greek, Chinese (limited to Unicode BMP), Japanese, Korean (all 11 172 possible syllables).
 
 The code for the fonts are meant to be used with Slick2d (extends ```Font``` class). If you are not using the framework, please refer to the __Font metrics__ section to implement the font metrics correctly on your system.
 
@@ -149,3 +151,5 @@ This is a Kotlin-like pseudocode for assembling the glyph:
 ## Acknowledgement
 
 Thanks to kind people of [/r/Typography](https://www.reddit.com/r/typography/) for amazing feedbacks.
+
+CJK Ideographs are powered by [WenQuanYi Font](http://wenq.org/wqy2/index.cgi?BitmapSong). The font is distributed under the GNU GPL version 2. Although the glyphs themselves are not copyrightable (the program codes—e.g. TTF—do), we would like to give a credit for the font and the people behind it.

Slick2d/GameFontBase.kt

@@ -54,20 +54,18 @@ open class GameFontBase : Font {
             9
     }
 
-    private fun isHangul(c: Char) = c.toInt() >= 0xAC00 && c.toInt() < 0xD7A4
+    private fun isHangul(c: Char) = c.toInt() in 0xAC00..0xD7A3
-    private fun isAscii(c: Char) = c.toInt() >= 0x20 && c.toInt() <= 0xFF
+    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 isExtA(c: Char) = c.toInt() in 0x100..0x17F
-    private fun isExtB(c: Char) = c.toInt() >= 0x180 && c.toInt() < 0x250
+    private fun isExtB(c: Char) = c.toInt() in 0x180..0x24F
-    private fun isKana(c: Char) = c.toInt() >= 0x3040 && c.toInt() < 0x3100
+    private fun isKana(c: Char) = c.toInt() in 0x3040..0x30FF
-    private fun isCJKPunct(c: Char) = c.toInt() >= 0x3000 && c.toInt() < 0x3040
+    private fun isCJKPunct(c: Char) = c.toInt() in 0x3000..0x303F
-    private fun isUniHan(c: Char) = c.toInt() >= 0x3400 && c.toInt() < 0xA000
+    private fun isUniHan(c: Char) = c.toInt() in 0x3400..0x9FFF
-    private fun isCyrilic(c: Char) = c.toInt() >= 0x400 && c.toInt() < 0x460
+    private fun isCyrilic(c: Char) = c.toInt() in 0x400..0x45F
-    private fun isFullwidthUni(c: Char) = c.toInt() >= 0xFF00 && c.toInt() < 0xFF20
+    private fun isFullwidthUni(c: Char) = c.toInt() in 0xFF00..0xFF1F
-    private fun isUniPunct(c: Char) = c.toInt() >= 0x2000 && c.toInt() < 0x2070
+    private fun isUniPunct(c: Char) = c.toInt() in 0x2000..0x206F
-    private fun isWenQuanYi1(c: Char) = c.toInt() >= 0x33F3 && c.toInt() <= 0x69FC
+    private fun isGreek(c: Char) = c.toInt() in 0x370..0x3CE
-    private fun isWenQuanYi2(c: Char) = c.toInt() >= 0x69FD && c.toInt() <= 0x9FDC
-    private fun isGreek(c: Char) = c.toInt() >= 0x370 && c.toInt() <= 0x3CE
 
 
 
@@ -86,8 +84,8 @@ open class GameFontBase : Font {
     private fun cjkPunctIndexX(c: Char) = (c.toInt() - 0x3000) % 16
     private fun cjkPunctIndexY(c: Char) = (c.toInt() - 0x3000) / 16
 
-    private fun uniHanIndexX(c: Char) = (c.toInt() - 0x3400) % 256
+    private fun unihanIndexX(c: Char) = (c.toInt() - 0x3400) % 256
-    private fun uniHanIndexY(c: Char) = (c.toInt() - 0x3400) / 256
+    private fun unihanIndexY(c: Char) = (c.toInt() - 0x3400) / 256
 
     private fun cyrilicIndexX(c: Char) = (c.toInt() - 0x400) % 16
     private fun cyrilicIndexY(c: Char) = (c.toInt() - 0x400) / 16
@@ -98,19 +96,13 @@ open class GameFontBase : Font {
     private fun uniPunctIndexX(c: Char) = (c.toInt() - 0x2000) % 16
     private fun uniPunctIndexY(c: Char) = (c.toInt() - 0x2000) / 16
 
-    private fun wenQuanYiIndexX(c: Char) =
-            (c.toInt() - if (c.toInt() <= 0x4DB5) 0x33F3 else 0x33F3 + 0x4A) % 32
-    private fun wenQuanYi1IndexY(c: Char) = (c.toInt() - (0x33F3 + 0x4A)) / 32
-    private fun wenQuanYi2IndexY(c: Char) = (c.toInt() - 0x69FD) / 32
-
     private fun greekIndexX(c: Char) = (c.toInt() - 0x370) % 16
     private fun greekIndexY(c: Char) = (c.toInt() - 0x370) / 16
 
     private val unihanWidthSheets = arrayOf(
             SHEET_UNIHAN,
             SHEET_FW_UNI,
-            SHEET_WENQUANYI_1,
+            SHEET_UNIHAN
-            SHEET_WENQUANYI_2
     )
     private val zeroWidthSheets = arrayOf(
             SHEET_COLOURCODE
@@ -132,15 +124,14 @@ open class GameFontBase : Font {
             val chr = s[i]
             val ctype = getSheetType(s[i])
 
-            if (chr.toInt() == 0x21B) // Romanian t; HAX!
+            if (variableWidthSheets.contains(ctype)) {
-                len += 6
+                len += try {
-            else if (variableWidthSheets.contains(ctype)) {
+                    asciiWidths[chr.toInt()]!!
-                try {
-                    len += asciiWidths[chr.toInt()]!!
                 }
                 catch (e: kotlin.KotlinNullPointerException) {
                     println("KotlinNullPointerException on glyph number ${Integer.toHexString(chr.toInt()).toUpperCase()}")
-                    System.exit(1)
+                    //System.exit(1)
+                    W_LATIN_WIDE // failsafe
                 }
             }
             else if (zeroWidthSheets.contains(ctype))
@@ -200,57 +191,37 @@ 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
                 )
             }
         }
         //hangulSheet.endUse()
 
-        // unihan fonts
+        // WenQuanYi
-        /*uniHan.startUse();
+        //uniHan.startUse()
-        for (int i = 0; i < s.length(); i++) {
+
-            char ch = s.charAt(i);
+        for (i in 0..s.length - 1) {
+            val ch = s[i]
+
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
 
             if (isUniHan(ch)) {
-                int glyphW = getWidth("" + ch);
-                uniHan.renderInUse(
-                        Math.round(x
-                                + getWidthSubstr(s, i + 1) - glyphW
-                        )
-                        , Math.round((H - H_UNIHAN) / 2 + y)
-                        , uniHanIndexX(ch)
-                        , uniHanIndexY(ch)
-                );
-            }
-        }
-
-        uniHan.endUse();*/
-
-        // WenQuanYi 1
-        //wenQuanYi_1.startUse()
-
-        for (i in 0..s.length - 1) {
-            val ch = s[i]
-
-            if (ch.isColourCode()) {
-                thisCol = colourKey[ch]!!
-                continue
-            }
-
-            if (isWenQuanYi1(ch)) {
                 val glyphW = getWidth("" + ch)
-                wenQuanYi_1.getSubImage(wenQuanYiIndexX(ch), wenQuanYi1IndexY(ch)).drawWithShadow(
+                uniHan.getSubImage(unihanIndexX(ch), unihanIndexY(ch)).drawWithShadow(
                         Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
                         Math.round((H - H_UNIHAN) / 2 + y).toFloat(),
                         scale.toFloat(), thisCol
@@ -258,29 +229,7 @@ open class GameFontBase : Font {
             }
         }
 
-        //wenQuanYi_1.endUse()
+        //uniHan.endUse()
-        // WenQuanYi 2
-        //wenQuanYi_2.startUse()
-
-        for (i in 0..s.length - 1) {
-            val ch = s[i]
-
-            if (ch.isColourCode()) {
-                thisCol = colourKey[ch]!!
-                continue
-            }
-
-            if (isWenQuanYi2(ch)) {
-                val glyphW = getWidth("" + ch)
-                wenQuanYi_2.getSubImage(wenQuanYiIndexX(ch), wenQuanYi2IndexY(ch)).drawWithShadow(
-                        Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round((H - H_UNIHAN) / 2 + y).toFloat(),
-                        scale.toFloat(), thisCol
-                )
-            }
-        }
-
-        //wenQuanYi_2.endUse()
 
         // regular fonts
         var prevInstance = -1
@@ -346,12 +295,7 @@ open class GameFontBase : Font {
                 try {
                     sheetKey[prevInstance]!!.getSubImage(sheetX, sheetY).drawWithShadow(
                             Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-
+                            Math.round(y).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(),
-
                             scale.toFloat(), thisCol
                     )
                 }
@@ -495,12 +439,10 @@ open class GameFontBase : Font {
         lateinit internal var extBSheet: SpriteSheet
         lateinit internal var kanaSheet: SpriteSheet
         lateinit internal var cjkPunct: SpriteSheet
-        // static SpriteSheet uniHan;
+        lateinit internal var uniHan: SpriteSheet
         lateinit internal var cyrilic: SpriteSheet
         lateinit internal var fullwidthForms: SpriteSheet
         lateinit internal var uniPunct: SpriteSheet
-        lateinit internal var wenQuanYi_1: SpriteSheet
-        lateinit internal var wenQuanYi_2: SpriteSheet
         lateinit internal var greekSheet: SpriteSheet
 
         internal val JUNG_COUNT = 21
@@ -513,9 +455,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
@@ -527,9 +467,7 @@ open class GameFontBase : Font {
         internal val SHEET_CYRILIC_VARW = 8
         internal val SHEET_FW_UNI = 9
         internal val SHEET_UNI_PUNCT = 10
-        internal val SHEET_WENQUANYI_1 = 11
+        internal val SHEET_GREEK_VARW = 11
-        internal val SHEET_WENQUANYI_2 = 12
-        internal val SHEET_GREEK_VARW = 13
 
 
         internal val SHEET_UNKNOWN = 254

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,16 +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"))
-                        ? "_ja" : "")
-                        +".tga"
-                , W_UNIHAN, H_UNIHAN
-        );*/
         GameFontBase.cyrilic = SpriteSheet(
                 when (GameFontDemo.gameLocale.substring(0..1)) {
                     "bg" -> "./assets/graphics/fonts/cyrilic_bulgarian_variable.tga"
@@ -39,10 +32,8 @@ class GameFontImpl : GameFontBase() {
                 "./assets/graphics/fonts/fullwidth_forms.tga", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN)
         GameFontBase.uniPunct = SpriteSheet(
                 "./assets/graphics/fonts/unipunct.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
-        GameFontBase.wenQuanYi_1 = SpriteSheet(
+        GameFontBase.uniHan = SpriteSheet(
-                "./assets/graphics/fonts/wenquanyi_11pt_part1.tga", 16, 18, 2)
+                "./assets/graphics/fonts/wenquanyi.tga", 16, 16)
-        GameFontBase.wenQuanYi_2 = SpriteSheet(
-                "./assets/graphics/fonts/wenquanyi_11pt_part2.tga", 16, 18, 2)
         GameFontBase.greekSheet = SpriteSheet(
                 "./assets/graphics/fonts/greek_variable.tga", 15, 19, 1)
 
@@ -54,12 +45,10 @@ class GameFontImpl : GameFontBase() {
                 GameFontBase.extBSheet,
                 GameFontBase.kanaSheet,
                 GameFontBase.cjkPunct,
-                null, // Full unihan, filler because we're using WenQuanYi
+                GameFontBase.uniHan,
                 GameFontBase.cyrilic,
                 GameFontBase.fullwidthForms,
                 GameFontBase.uniPunct,
-                GameFontBase.wenQuanYi_1,
-                GameFontBase.wenQuanYi_2,
                 GameFontBase.greekSheet
         )
         GameFontBase.sheetKey = shk
@@ -73,6 +62,7 @@ class GameFontImpl : GameFontBase() {
     }
 
     fun reload() {
+        GameFontBase.cyrilic.destroy()
         GameFontBase.cyrilic = SpriteSheet(
                 when (GameFontDemo.gameLocale.substring(0..1)) {
                     "bg" -> "./assets/graphics/fonts/cyrilic_bulgarian_variable.tga"

code_for_Slick2d/GameFontBase.kt

@@ -1,552 +0,0 @@
-package net.torvald.imagefont
-
-import org.lwjgl.opengl.GL11
-import org.newdawn.slick.*
-import org.newdawn.slick.opengl.Texture
-import java.nio.ByteOrder
-import java.util.*
-
-/**
- * Created by minjaesong on 16-01-27.
- */
-open class GameFontBase : Font {
-
-    private fun getHan(hanIndex: Int): IntArray {
-        val han_x = hanIndex % JONG_COUNT
-        val han_y = hanIndex / JONG_COUNT
-        val ret = intArrayOf(han_x, han_y)
-        return ret
-    }
-
-    private fun getHanChosung(hanIndex: Int) = hanIndex / (JUNG_COUNT * JONG_COUNT)
-
-    private fun getHanJungseong(hanIndex: Int) = hanIndex / JONG_COUNT % JUNG_COUNT
-
-    private fun getHanJongseong(hanIndex: Int) = hanIndex % JONG_COUNT
-
-    private val jungseongWide = arrayOf(8, 12, 13, 17, 18, 21)
-    private val jungseongComplex = arrayOf(9, 10, 11, 14, 15, 16, 22)
-
-    private fun isJungseongWide(hanIndex: Int) = jungseongWide.contains(getHanJungseong(hanIndex))
-    private fun isJungseongComplex(hanIndex: Int) = jungseongComplex.contains(getHanJungseong(hanIndex))
-
-    private fun getHanInitialRow(hanIndex: Int): Int {
-        val ret: Int
-
-        if (isJungseongWide(hanIndex))
-            ret = 2
-        else if (isJungseongComplex(hanIndex))
-            ret = 4
-        else
-            ret = 0
-
-        return if (getHanJongseong(hanIndex) == 0) ret else ret + 1
-    }
-
-    private fun getHanMedialRow(hanIndex: Int) = if (getHanJongseong(hanIndex) == 0) 6 else 7
-
-    private fun getHanFinalRow(hanIndex: Int): Int {
-        val jungseongIndex = getHanJungseong(hanIndex)
-
-        return if (jungseongWide.contains(jungseongIndex))
-            8
-        else
-            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 isExtA(c: Char) = c.toInt() >= 0x100 && c.toInt() < 0x180
-    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 isRomanian(c: Char) = c.toInt() >= 0x218 && c.toInt() <= 0x21A
-    private fun isRomanianNarrow(c: Char) = c.toInt() == 0x21B
-
-
-
-    private fun extAindexX(c: Char) = (c.toInt() - 0x100) % 16
-    private fun extAindexY(c: Char) = (c.toInt() - 0x100) / 16
-
-    private fun kanaIndexX(c: Char) = (c.toInt() - 0x3040) % 16
-    private fun kanaIndexY(c: Char) = (c.toInt() - 0x3040) / 16
-
-    private fun cjkPunctIndexX(c: Char) = (c.toInt() - 0x3000) % 16
-    private fun cjkPunctIndexY(c: Char) = (c.toInt() - 0x3000) / 16
-
-    private fun uniHanIndexX(c: Char) = (c.toInt() - 0x3400) % 256
-    private fun uniHanIndexY(c: Char) = (c.toInt() - 0x3400) / 256
-
-    private fun cyrilicIndexX(c: Char) = (c.toInt() - 0x400) % 16
-    private fun cyrilicIndexY(c: Char) = (c.toInt() - 0x400) / 16
-
-    private fun fullwidthUniIndexX(c: Char) = (c.toInt() - 0xFF00) % 16
-    private fun fullwidthUniIndexY(c: Char) = (c.toInt() - 0xFF00) / 16
-
-    private fun uniPunctIndexX(c: Char) = (c.toInt() - 0x2000) % 16
-    private fun uniPunctIndexY(c: Char) = (c.toInt() - 0x2000) / 16
-
-    private fun wenQuanYiIndexX(c: Char) =
-            (c.toInt() - if (c.toInt() <= 0x4DB5) 0x33F3 else 0x33F3 + 0x4A) % 32
-    private fun wenQuanYi1IndexY(c: Char) = (c.toInt() - (0x33F3 + 0x4A)) / 32
-    private fun wenQuanYi2IndexY(c: Char) = (c.toInt() - 0x69FD) / 32
-
-    private fun greekIndexX(c: Char) = (c.toInt() - 0x370) % 16
-    private fun greekIndexY(c: Char) = (c.toInt() - 0x370) / 16
-
-    private fun romanianIndexX(c: Char) = c.toInt() - 0x218
-    private fun romanianIndexY(c: Char) = 0
-
-    private fun thaiIndexX(c: Char) = (c.toInt() - 0xE00) % 16
-    private fun thaiIndexY(c: Char) = (c.toInt() - 0xE00) / 16
-
-    private fun thaiNarrowIndexX(c: Char) = 3
-    private fun thaiNarrowIndexY(c: Char) = 0
-
-
-    private val narrowWidthSheets = arrayOf(
-            SHEET_EXTB_ROMANIAN_NARROW
-    )
-    private val unihanWidthSheets = arrayOf(
-            SHEET_UNIHAN,
-            SHEET_FW_UNI,
-            SHEET_WENQUANYI_1,
-            SHEET_WENQUANYI_2
-    )
-    private val zeroWidthSheets = arrayOf(
-            SHEET_COLOURCODE
-    )
-    private val variableWidthSheets = arrayOf(
-            SHEET_ASCII_VARW,
-            SHEET_CYRILIC_VARW,
-            SHEET_EXTA_VARW,
-            SHEET_GREEK_VARW
-    )
-
-
-    override fun getWidth(s: String) = getWidthSubstr(s, s.length)
-
-    private fun getWidthSubstr(s: String, endIndex: Int): Int {
-        var len = 0
-        for (i in 0..endIndex - 1) {
-            val chr = s[i]
-            val ctype = getSheetType(s[i])
-
-            if (chr.toInt() == 0x21B) // Romanian t; HAX!
-                len += 6
-            else if (variableWidthSheets.contains(ctype)) {
-                try {
-                    len += asciiWidths[chr.toInt()]!!
-                }
-                catch (e: kotlin.KotlinNullPointerException) {
-                    println("KotlinNullPointerException on glyph number ${Integer.toHexString(chr.toInt()).toUpperCase()}")
-                    System.exit(1)
-                }
-            }
-            else if (zeroWidthSheets.contains(ctype))
-                len += 0
-            else if (narrowWidthSheets.contains(ctype))
-                len += W_LATIN_NARROW
-            else if (ctype == SHEET_CJK_PUNCT)
-                len += W_ASIAN_PUNCT
-            else if (ctype == SHEET_HANGUL)
-                len += W_HANGUL
-            else if (ctype == SHEET_KANA)
-                len += W_KANA
-            else if (unihanWidthSheets.contains(ctype))
-                len += W_UNIHAN
-            else
-                len += W_LATIN_WIDE
-
-            if (i < endIndex - 1) len += interchar
-        }
-        return len * scale
-    }
-
-    override fun getHeight(s: String) = H * scale
-
-    override fun getLineHeight() = H * scale
-
-    override fun drawString(x: Float, y: Float, s: String) = drawString(x, y, s, Color.white)
-
-    override fun drawString(x: Float, y: Float, s: String, color: Color) {
-        GL11.glEnable(GL11.GL_BLEND)
-        GL11.glColorMask(true, true, true, true)
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA)
-
-        var thisCol = color
-
-        // hangul fonts first
-        //hangulSheet.startUse() // disabling texture binding to make the font coloured
-        // JOHAB
-        for (i in 0..s.length - 1) {
-            val ch = s[i]
-
-            if (isHangul(ch)) {
-                val hIndex = ch.toInt() - 0xAC00
-
-                val indexCho = getHanChosung(hIndex)
-                val indexJung = getHanJungseong(hIndex)
-                val indexJong = getHanJongseong(hIndex)
-
-                val choRow = getHanInitialRow(hIndex)
-                val jungRow = getHanMedialRow(hIndex)
-                val jongRow = getHanFinalRow(hIndex)
-
-                val glyphW = getWidth(ch.toString())
-
-                hangulSheet.getSubImage(indexCho, choRow).drawWithShadow(
-                        Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round(((H - H_HANGUL) / 2).toFloat() + y + 1f).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(),
-                        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(),
-                        scale.toFloat(), thisCol
-                )
-            }
-        }
-        //hangulSheet.endUse()
-
-        // unihan fonts
-        /*uniHan.startUse();
-        for (int i = 0; i < s.length(); i++) {
-            char ch = s.charAt(i);
-
-            if (isUniHan(ch)) {
-                int glyphW = getWidth("" + ch);
-                uniHan.renderInUse(
-                        Math.round(x
-                                + getWidthSubstr(s, i + 1) - glyphW
-                        )
-                        , Math.round((H - H_UNIHAN) / 2 + y)
-                        , uniHanIndexX(ch)
-                        , uniHanIndexY(ch)
-                );
-            }
-        }
-
-        uniHan.endUse();*/
-
-        // WenQuanYi 1
-        //wenQuanYi_1.startUse()
-
-        for (i in 0..s.length - 1) {
-            val ch = s[i]
-
-            if (isWenQuanYi1(ch)) {
-                val glyphW = getWidth("" + ch)
-                wenQuanYi_1.getSubImage(wenQuanYiIndexX(ch), wenQuanYi1IndexY(ch)).drawWithShadow(
-                        Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round((H - H_UNIHAN) / 2 + y).toFloat(),
-                        scale.toFloat(), thisCol
-                )
-            }
-        }
-
-        //wenQuanYi_1.endUse()
-        // WenQuanYi 2
-        //wenQuanYi_2.startUse()
-
-        for (i in 0..s.length - 1) {
-            val ch = s[i]
-
-            if (isWenQuanYi2(ch)) {
-                val glyphW = getWidth("" + ch)
-                wenQuanYi_2.getSubImage(wenQuanYiIndexX(ch), wenQuanYi2IndexY(ch)).drawWithShadow(
-                        Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round((H - H_UNIHAN) / 2 + y).toFloat(),
-                        scale.toFloat(), thisCol
-                )
-            }
-        }
-
-        //wenQuanYi_2.endUse()
-
-        // regular fonts
-        var prevInstance = -1
-        for (i in 0..s.length - 1) {
-            val ch = s[i]
-
-            if (!isHangul(ch) && !isUniHan(ch)) {
-
-                // if not init, endUse first
-                if (prevInstance != -1) {
-                    //sheetKey[prevInstance].endUse()
-                }
-                //sheetKey[getSheetType(ch)].startUse()
-                prevInstance = getSheetType(ch)
-
-                val sheetX: Int
-                val sheetY: Int
-                when (prevInstance) {
-                    SHEET_EXTA_VARW    -> {
-                        sheetX = extAindexX(ch)
-                        sheetY = extAindexY(ch)
-                    }
-                    SHEET_KANA       -> {
-                        sheetX = kanaIndexX(ch)
-                        sheetY = kanaIndexY(ch)
-                    }
-                    SHEET_CJK_PUNCT  -> {
-                        sheetX = cjkPunctIndexX(ch)
-                        sheetY = cjkPunctIndexY(ch)
-                    }
-                    SHEET_CYRILIC_VARW -> {
-                        sheetX = cyrilicIndexX(ch)
-                        sheetY = cyrilicIndexY(ch)
-                    }
-                    SHEET_FW_UNI             -> {
-                        sheetX = fullwidthUniIndexX(ch)
-                        sheetY = fullwidthUniIndexY(ch)
-                    }
-                    SHEET_UNI_PUNCT            -> {
-                        sheetX = uniPunctIndexX(ch)
-                        sheetY = uniPunctIndexY(ch)
-                    }
-                    SHEET_GREEK_VARW           -> {
-                        sheetX = greekIndexX(ch)
-                        sheetY = greekIndexY(ch)
-                    }
-                    SHEET_EXTB_ROMANIAN_WIDE   -> {
-                        sheetX = romanianIndexX(ch)
-                        sheetY = romanianIndexY(ch)
-                    }
-                    SHEET_EXTB_ROMANIAN_NARROW -> {
-                        sheetX = 0
-                        sheetY = 0
-                    }
-                    else                       -> {
-                        sheetX = ch.toInt() % 16
-                        sheetY = ch.toInt() / 16
-                    }
-                }
-
-                val glyphW = getWidth("" + ch)
-                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(),
-
-                            scale.toFloat(), thisCol
-                    )
-                }
-                catch (e: ArrayIndexOutOfBoundsException) {
-                    // character that does not exist in the sheet. No render, pass.
-                }
-                catch (e1: RuntimeException) {
-                    // System.err.println("[GameFontBase] RuntimeException raised while processing character '$ch' (U+${Integer.toHexString(ch.toInt()).toUpperCase()})")
-                    // e1.printStackTrack()
-                }
-            }
-
-        }
-        if (prevInstance != -1) {
-            //sheetKey[prevInstance].endUse()
-        }
-
-        GL11.glEnd()
-    }
-
-    private fun getSheetType(c: Char): Int {
-        // EFs
-        if (isRomanianNarrow(c))
-            return SHEET_EXTB_ROMANIAN_NARROW
-        else if (isHangul(c))
-            return SHEET_HANGUL
-        else if (isKana(c))
-            return SHEET_KANA
-        else if (isUniHan(c))
-            return SHEET_UNIHAN
-        else if (isAscii(c))
-            return SHEET_ASCII_VARW
-        else if (isExtA(c))
-            return SHEET_EXTA_VARW
-        else if (isCyrilic(c))
-            return SHEET_CYRILIC_VARW
-        else if (isUniPunct(c))
-            return SHEET_UNI_PUNCT
-        else if (isCJKPunct(c))
-            return SHEET_CJK_PUNCT
-        else if (isFullwidthUni(c))
-            return SHEET_FW_UNI
-        else if (isGreek(c))
-            return SHEET_GREEK_VARW
-        else if (isRomanian(c))
-            return SHEET_EXTB_ROMANIAN_WIDE
-        else
-            return SHEET_UNKNOWN// fixed width punctuations
-        // fixed width
-        // fallback
-    }
-
-    /**
-     * Draw part of a string to the screen. Note that this will still position the text as though
-     * it's part of the bigger string.
-     * @param x
-     * *
-     * @param y
-     * *
-     * @param s
-     * *
-     * @param color
-     * *
-     * @param startIndex
-     * *
-     * @param endIndex
-     */
-    override fun drawString(x: Float, y: Float, s: String, color: Color, startIndex: Int, endIndex: Int) {
-        val unprintedHead = s.substring(0, startIndex)
-        val printedBody = s.substring(startIndex, endIndex)
-        val xoff = getWidth(unprintedHead)
-        drawString(x + xoff, y, printedBody, color)
-    }
-
-    fun buildWidthTable(sheet: SpriteSheet, codeOffset: Int, codeRange: IntRange, rows: Int = 16) {
-        fun Byte.toUint() = java.lang.Byte.toUnsignedInt(this)
-
-        /** @return Intarray(R, G, B, A) */
-        fun Texture.getPixel(x: Int, y: Int): IntArray {
-            val textureWidth = this.textureWidth
-            val hasAlpha = this.hasAlpha()
-
-            val offset = (if (hasAlpha) 4 else 3) * (textureWidth * y + x) // 4: # of channels (RGBA)
-
-            if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
-                return intArrayOf(
-                        this.textureData[offset].toUint(),
-                        this.textureData[offset + 1].toUint(),
-                        this.textureData[offset + 2].toUint(),
-                        if (hasAlpha)
-                            this.textureData[offset + 3].toUint()
-                        else 255
-                )
-            }
-            else {
-                return intArrayOf(
-                        this.textureData[offset + 2].toUint(),
-                        this.textureData[offset + 1].toUint(),
-                        this.textureData[offset].toUint(),
-                        if (hasAlpha)
-                            this.textureData[offset + 3].toUint()
-                        else 255
-                )
-            }
-        }
-
-        val binaryCodeOffset = 15
-
-        val cellW = sheet.getSubImage(0, 0).width + 1  // should be 16
-        val cellH = sheet.getSubImage(0, 0).height + 1 // should be 20
-
-        // control chars
-        for (ccode in codeRange) {
-            val glyphX = ccode % rows
-            val glyphY = ccode / rows
-
-            val codeStartX = (glyphX * cellW) + binaryCodeOffset
-            val codeStartY = (glyphY * cellH)
-
-            var glyphWidth = 0
-            for (downCtr in 0..3) {
-                // if alpha is not zero, assume it's 1
-                if (sheet.texture.getPixel(codeStartX, codeStartY + downCtr)[3] == 255) {
-                    glyphWidth = glyphWidth or (1 shl downCtr)
-                }
-            }
-
-            asciiWidths[codeOffset + ccode] = glyphWidth
-        }
-    }
-
-    companion object {
-
-        lateinit internal var hangulSheet: SpriteSheet
-        lateinit internal var asciiSheet: SpriteSheet
-
-        internal val asciiWidths: HashMap<Int, Int> = HashMap()
-
-        lateinit internal var extASheet: SpriteSheet
-        lateinit internal var kanaSheet: SpriteSheet
-        lateinit internal var cjkPunct: SpriteSheet
-        // static SpriteSheet uniHan;
-        lateinit internal var cyrilic: SpriteSheet
-        lateinit internal var fullwidthForms: SpriteSheet
-        lateinit internal var uniPunct: SpriteSheet
-        lateinit internal var wenQuanYi_1: SpriteSheet
-        lateinit internal var wenQuanYi_2: SpriteSheet
-        lateinit internal var greekSheet: SpriteSheet
-        lateinit internal var romanianSheet: SpriteSheet
-        lateinit internal var romanianSheetNarrow: SpriteSheet
-
-        internal val JUNG_COUNT = 21
-        internal val JONG_COUNT = 28
-
-        internal val W_ASIAN_PUNCT = 10
-        internal val W_HANGUL = 11
-        internal val W_KANA = 12
-        internal val W_UNIHAN = 16
-        internal val W_LATIN_WIDE = 9 // width of regular letters, including m
-        internal val W_LATIN_NARROW = 5 // width of letter f, t, i, l
-
-        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
-        internal val SHEET_EXTA_VARW = 2
-        internal val SHEET_KANA = 3
-        internal val SHEET_CJK_PUNCT = 4
-        internal val SHEET_UNIHAN = 5
-        internal val SHEET_CYRILIC_VARW = 6
-        internal val SHEET_FW_UNI = 7
-        internal val SHEET_UNI_PUNCT = 8
-        internal val SHEET_WENQUANYI_1 = 9
-        internal val SHEET_WENQUANYI_2 = 10
-        internal val SHEET_GREEK_VARW = 11
-        internal val SHEET_EXTB_ROMANIAN_WIDE = 12
-        internal val SHEET_EXTB_ROMANIAN_NARROW = 13
-
-        internal val SHEET_UNKNOWN = 254
-        internal val SHEET_COLOURCODE = 255
-
-        lateinit internal var sheetKey: Array<SpriteSheet?>
-
-        internal var interchar = 0
-        internal var scale = 1
-            set(value) {
-                if (value > 0) field = value
-                else throw IllegalArgumentException("Font scale cannot be zero or negative (input: $value)")
-            }
-
-    }// end of companion object
-}
-
-fun Image.drawWithShadow(x: Float, y: Float, color: Color) =
-        this.drawWithShadow(x, y, 1f, color)
-
-fun Image.drawWithShadow(x: Float, y: Float, scale: Float, color: Color) {
-    this.draw(x + 1, y + 1, scale, color.darker(0.5f))
-    this.draw(x    , y + 1, scale, color.darker(0.5f))
-    this.draw(x + 1, y    , scale, color.darker(0.5f))
-
-    this.draw(x, y, scale, color)
-}

code_for_Slick2d/GameFontImpl.kt

@@ -1,75 +0,0 @@
-package net.torvald.imagefont
-
-import net.torvald.terrarum.imagefont.GameFontDemo
-import org.newdawn.slick.*
-
-/**
- * Created by minjaesong on 16-01-20.
- */
-class GameFontImpl : GameFontBase() {
-
-    init {
-
-        GameFontBase.hangulSheet = SpriteSheet(
-                "./assets/graphics/fonts/hangul_johab.tga", GameFontBase.W_HANGUL, GameFontBase.H_HANGUL)
-        GameFontBase.asciiSheet = SpriteSheet(
-                "./assets/graphics/fonts/ascii_variable.tga", 15, 19, 1)
-        GameFontBase.extASheet = SpriteSheet(
-                "./assets/graphics/fonts/LatinExtA_variable.tga", 15, 19, 1)
-        GameFontBase.kanaSheet = SpriteSheet(
-                "./assets/graphics/fonts/kana.tga", GameFontBase.W_KANA, GameFontBase.H_KANA)
-        GameFontBase.cjkPunct = SpriteSheet(
-                "./assets/graphics/fonts/cjkpunct.tga", GameFontBase.W_ASIAN_PUNCT, GameFontBase.H_KANA)
-        /*uniHan = new SpriteSheet(
-                "./assets/graphics/fonts/unifont_unihan"
-                        + ((!terrarum.gameLocale.contains("zh"))
-                        ? "_ja" : "")
-                        +".tga"
-                , W_UNIHAN, H_UNIHAN
-        );*/
-        GameFontBase.cyrilic = SpriteSheet(
-                when (GameFontDemo.gameLocale.substring(0..1)) {
-                    "bg" -> "./assets/graphics/fonts/cyrilic_bulgarian_variable.tga"
-                    "sr" -> "./assets/graphics/fonts/cyrilic_serbian_variable.tga"
-                    else -> "./assets/graphics/fonts/cyrilic_variable.tga"
-                }, 15, 19, 1)
-        GameFontBase.fullwidthForms = SpriteSheet(
-                "./assets/graphics/fonts/fullwidth_forms.tga", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN)
-        GameFontBase.uniPunct = SpriteSheet(
-                "./assets/graphics/fonts/unipunct.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
-        GameFontBase.wenQuanYi_1 = SpriteSheet(
-                "./assets/graphics/fonts/wenquanyi_11pt_part1.tga", 16, 18, 2)
-        GameFontBase.wenQuanYi_2 = SpriteSheet(
-                "./assets/graphics/fonts/wenquanyi_11pt_part2.tga", 16, 18, 2)
-        GameFontBase.greekSheet = SpriteSheet(
-                "./assets/graphics/fonts/greek_variable.tga", 15, 19, 1)
-        GameFontBase.romanianSheet = SpriteSheet(
-                "./assets/graphics/fonts/romana_wide.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
-        GameFontBase.romanianSheetNarrow = SpriteSheet(
-                "./assets/graphics/fonts/romana_narrow.tga", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
-
-        val shk = arrayOf(
-                GameFontBase.asciiSheet,
-                GameFontBase.hangulSheet,
-                GameFontBase.extASheet,
-                GameFontBase.kanaSheet,
-                GameFontBase.cjkPunct,
-                null, // Full unihan, filler because we're using WenQuanYi
-                GameFontBase.cyrilic,
-                GameFontBase.fullwidthForms,
-                GameFontBase.uniPunct,
-                GameFontBase.wenQuanYi_1,
-                GameFontBase.wenQuanYi_2,
-                GameFontBase.greekSheet,
-                GameFontBase.romanianSheet,
-                GameFontBase.romanianSheetNarrow
-        )
-        GameFontBase.sheetKey = shk
-
-
-        buildWidthTable(asciiSheet, 0, 0..0xFF)
-        buildWidthTable(extASheet, 0x100, 0..0x7F)
-        buildWidthTable(cyrilic, 0x400, 0..0x5F)
-        buildWidthTable(greekSheet, 0x370, 0..0x5F)
-    }
-}

code_for_Slick2d/README.md

@@ -1 +0,0 @@
-Font implementations for Slick2d

demo/.idea/workspace.xml

@@ -23,44 +23,62 @@
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+    <splitter split-orientation="horizontal" split-proportion="0.5">
-      <file leaf-file-name="GameFontDemo.kt" pinned="false" current-in-tab="false">
+      <split-first>
-        <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <provider selected="true" editor-type-id="text-editor">
+          <file leaf-file-name="GameFontDemo.kt" pinned="false" current-in-tab="false">
-            <state relative-caret-position="610">
+            <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
-              <caret line="72" column="55" lean-forward="false" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
+              <provider selected="true" editor-type-id="text-editor">
-              <folding>
+                <state relative-caret-position="1008">
-                <element signature="e#40#238#0" expanded="true" />
+                  <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>
+                  <folding>
-            </state>
+                    <element signature="e#40#238#0" expanded="true" />
-          </provider>
+                  </folding>
-        </entry>
+                </state>
-      </file>
+              </provider>
-      <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="false">
+            </entry>
-        <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
+          </file>
-          <provider selected="true" editor-type-id="text-editor">
+          <file leaf-file-name="GameFontImpl.kt" pinned="false" current-in-tab="true">
-            <state relative-caret-position="202">
+            <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
-              <caret line="493" column="0" lean-forward="false" selection-start-line="493" selection-start-column="0" selection-end-line="493" selection-end-column="0" />
+              <provider selected="true" editor-type-id="text-editor">
-              <folding>
+                <state relative-caret-position="375">
-                <element signature="e#31#171#0" expanded="true" />
+                  <caret line="36" column="22" lean-forward="false" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
-              </folding>
+                  <folding>
-            </state>
+                    <element signature="e#31#108#0" expanded="true" />
-          </provider>
+                  </folding>
-        </entry>
+                </state>
-      </file>
+              </provider>
-      <file leaf-file-name="GameFontImpl.kt" pinned="false" current-in-tab="true">
+            </entry>
-        <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
+          </file>
-          <provider selected="true" editor-type-id="text-editor">
+          <file leaf-file-name="text.txt" pinned="false" current-in-tab="false">
-            <state relative-caret-position="356">
+            <entry file="file://$PROJECT_DIR$/text.txt">
-              <caret line="48" column="26" lean-forward="false" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+              <provider selected="true" editor-type-id="text-editor">
-              <folding>
+                <state relative-caret-position="252">
-                <element signature="e#31#108#0" expanded="true" />
+                  <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-              </folding>
+                  <folding />
-            </state>
+                </state>
-          </provider>
+              </provider>
-        </entry>
+            </entry>
-      </file>
+          </file>
-    </leaf>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <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="14">
+                  <caret line="36" column="19" lean-forward="false" selection-start-line="36" selection-start-column="19" selection-end-line="36" selection-end-column="19" />
+                  <folding>
+                    <element signature="e#31#171#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -96,17 +114,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$/text.txt" />
         <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$/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="width" value="1936" />
-    <option name="height" value="1026" />
+    <option name="height" value="1176" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -170,18 +188,30 @@
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="project.kotlinCompiler" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/lib" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="Artifacts" />
     <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 +414,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" />
@@ -393,17 +423,17 @@
       <window_info id="Palette&#9;" 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="1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" 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="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" 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="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="8" 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.21634616" 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="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="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="true" show_stripe_button="true" weight="0.25896862" 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 +459,112 @@
     <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="1008">
+          <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$/text.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="18" column="0" lean-forward="false" 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="588">
+          <caret line="42" column="46" lean-forward="true" selection-start-line="42" selection-start-column="46" selection-end-line="42" selection-end-column="46" />
+          <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="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" 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/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/GameFontImpl.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <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$/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>
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2800">
+          <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>
+    <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 +589,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>
@@ -489,9 +624,41 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/config.properties">
+      <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" />
+        </state>
+      </provider>
+    </entry>
+    <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="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" />
+        </state>
+      </provider>
+    </entry>
+    <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="false" 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/GameFontBase.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="14">
+          <caret line="36" column="19" lean-forward="false" selection-start-line="36" selection-start-column="19" selection-end-line="36" selection-end-column="19" />
+          <folding>
+            <element signature="e#31#171#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="610">
+        <state relative-caret-position="1008">
           <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" />
@@ -499,36 +666,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config.properties">
-      <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">
-      <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>
-      </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" />
-          <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">
+        <state relative-caret-position="375">
-          <caret line="48" column="26" lean-forward="false" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+          <caret line="36" column="22" lean-forward="false" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
           <folding>
             <element signature="e#31#108#0" expanded="true" />
           </folding>

demo/TerrarumSansDemo.iml

@@ -6,67 +6,20 @@
         <option name="compilerInfo">
           <KotlinCompilerInfo>
             <option name="compilerSettings">
-              <CompilerSettings>
+              <CompilerSettings />
-                <option name="additionalArguments" value="-version" />
-                <option name="copyJsLibraryFiles" value="true" />
-                <option name="outputDirectoryForJsLibraryFiles" value="lib" />
-              </CompilerSettings>
             </option>
             <option name="k2jsCompilerArguments">
-              <K2JSCompilerArguments>
+              <K2JSCompilerArguments />
-                <option name="outputFile" />
+            </option>
-                <option name="noStdlib" value="false" />
+            <option name="k2jvmCompilerArguments">
-                <option name="libraryFiles" />
+              <K2JVMCompilerArguments />
-                <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>
             </option>
             <option name="_commonCompilerArguments">
-              <DummyImpl>
+              <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>
             </option>
           </KotlinCompilerInfo>
         </option>
+        <option name="useProjectSettings" value="false" />
         <option name="versionInfo">
           <KotlinVersionInfo>
             <option name="apiLevel" value="1.0" />

demo/src/net/torvald/terrarum/imagefont/GameFontBase.kt

@@ -54,20 +54,18 @@ open class GameFontBase : Font {
             9
     }
 
-    private fun isHangul(c: Char) = c.toInt() >= 0xAC00 && c.toInt() < 0xD7A4
+    private fun isHangul(c: Char) = c.toInt() in 0xAC00..0xD7A3
-    private fun isAscii(c: Char) = c.toInt() >= 0x20 && c.toInt() <= 0xFF
+    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 isExtA(c: Char) = c.toInt() in 0x100..0x17F
-    private fun isExtB(c: Char) = c.toInt() >= 0x180 && c.toInt() < 0x250
+    private fun isExtB(c: Char) = c.toInt() in 0x180..0x24F
-    private fun isKana(c: Char) = c.toInt() >= 0x3040 && c.toInt() < 0x3100
+    private fun isKana(c: Char) = c.toInt() in 0x3040..0x30FF
-    private fun isCJKPunct(c: Char) = c.toInt() >= 0x3000 && c.toInt() < 0x3040
+    private fun isCJKPunct(c: Char) = c.toInt() in 0x3000..0x303F
-    private fun isUniHan(c: Char) = c.toInt() >= 0x3400 && c.toInt() < 0xA000
+    private fun isUniHan(c: Char) = c.toInt() in 0x3400..0x9FFF
-    private fun isCyrilic(c: Char) = c.toInt() >= 0x400 && c.toInt() < 0x460
+    private fun isCyrilic(c: Char) = c.toInt() in 0x400..0x45F
-    private fun isFullwidthUni(c: Char) = c.toInt() >= 0xFF00 && c.toInt() < 0xFF20
+    private fun isFullwidthUni(c: Char) = c.toInt() in 0xFF00..0xFF1F
-    private fun isUniPunct(c: Char) = c.toInt() >= 0x2000 && c.toInt() < 0x2070
+    private fun isUniPunct(c: Char) = c.toInt() in 0x2000..0x206F
-    private fun isWenQuanYi1(c: Char) = c.toInt() >= 0x33F3 && c.toInt() <= 0x69FC
+    private fun isGreek(c: Char) = c.toInt() in 0x370..0x3CE
-    private fun isWenQuanYi2(c: Char) = c.toInt() >= 0x69FD && c.toInt() <= 0x9FDC
-    private fun isGreek(c: Char) = c.toInt() >= 0x370 && c.toInt() <= 0x3CE
 
 
 
@@ -86,8 +84,8 @@ open class GameFontBase : Font {
     private fun cjkPunctIndexX(c: Char) = (c.toInt() - 0x3000) % 16
     private fun cjkPunctIndexY(c: Char) = (c.toInt() - 0x3000) / 16
 
-    private fun uniHanIndexX(c: Char) = (c.toInt() - 0x3400) % 256
+    private fun unihanIndexX(c: Char) = (c.toInt() - 0x3400) % 256
-    private fun uniHanIndexY(c: Char) = (c.toInt() - 0x3400) / 256
+    private fun unihanIndexY(c: Char) = (c.toInt() - 0x3400) / 256
 
     private fun cyrilicIndexX(c: Char) = (c.toInt() - 0x400) % 16
     private fun cyrilicIndexY(c: Char) = (c.toInt() - 0x400) / 16
@@ -98,19 +96,13 @@ open class GameFontBase : Font {
     private fun uniPunctIndexX(c: Char) = (c.toInt() - 0x2000) % 16
     private fun uniPunctIndexY(c: Char) = (c.toInt() - 0x2000) / 16
 
-    private fun wenQuanYiIndexX(c: Char) =
-            (c.toInt() - if (c.toInt() <= 0x4DB5) 0x33F3 else 0x33F3 + 0x4A) % 32
-    private fun wenQuanYi1IndexY(c: Char) = (c.toInt() - (0x33F3 + 0x4A)) / 32
-    private fun wenQuanYi2IndexY(c: Char) = (c.toInt() - 0x69FD) / 32
-
     private fun greekIndexX(c: Char) = (c.toInt() - 0x370) % 16
     private fun greekIndexY(c: Char) = (c.toInt() - 0x370) / 16
 
     private val unihanWidthSheets = arrayOf(
             SHEET_UNIHAN,
             SHEET_FW_UNI,
-            SHEET_WENQUANYI_1,
+            SHEET_UNIHAN
-            SHEET_WENQUANYI_2
     )
     private val zeroWidthSheets = arrayOf(
             SHEET_COLOURCODE
@@ -132,15 +124,14 @@ open class GameFontBase : Font {
             val chr = s[i]
             val ctype = getSheetType(s[i])
 
-            if (chr.toInt() == 0x21B) // Romanian t; HAX!
+            if (variableWidthSheets.contains(ctype)) {
-                len += 6
+                len += try {
-            else if (variableWidthSheets.contains(ctype)) {
+                    asciiWidths[chr.toInt()]!!
-                try {
-                    len += asciiWidths[chr.toInt()]!!
                 }
                 catch (e: kotlin.KotlinNullPointerException) {
                     println("KotlinNullPointerException on glyph number ${Integer.toHexString(chr.toInt()).toUpperCase()}")
-                    System.exit(1)
+                    //System.exit(1)
+                    W_LATIN_WIDE // failsafe
                 }
             }
             else if (zeroWidthSheets.contains(ctype))
@@ -200,57 +191,37 @@ 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
                 )
             }
         }
         //hangulSheet.endUse()
 
-        // unihan fonts
+        // WenQuanYi
-        /*uniHan.startUse();
+        //uniHan.startUse()
-        for (int i = 0; i < s.length(); i++) {
+
-            char ch = s.charAt(i);
+        for (i in 0..s.length - 1) {
+            val ch = s[i]
+
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
 
             if (isUniHan(ch)) {
-                int glyphW = getWidth("" + ch);
-                uniHan.renderInUse(
-                        Math.round(x
-                                + getWidthSubstr(s, i + 1) - glyphW
-                        )
-                        , Math.round((H - H_UNIHAN) / 2 + y)
-                        , uniHanIndexX(ch)
-                        , uniHanIndexY(ch)
-                );
-            }
-        }
-
-        uniHan.endUse();*/
-
-        // WenQuanYi 1
-        //wenQuanYi_1.startUse()
-
-        for (i in 0..s.length - 1) {
-            val ch = s[i]
-
-            if (ch.isColourCode()) {
-                thisCol = colourKey[ch]!!
-                continue
-            }
-
-            if (isWenQuanYi1(ch)) {
                 val glyphW = getWidth("" + ch)
-                wenQuanYi_1.getSubImage(wenQuanYiIndexX(ch), wenQuanYi1IndexY(ch)).drawWithShadow(
+                uniHan.getSubImage(unihanIndexX(ch), unihanIndexY(ch)).drawWithShadow(
                         Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
                         Math.round((H - H_UNIHAN) / 2 + y).toFloat(),
                         scale.toFloat(), thisCol
@@ -258,29 +229,7 @@ open class GameFontBase : Font {
             }
         }
 
-        //wenQuanYi_1.endUse()
+        //uniHan.endUse()
-        // WenQuanYi 2
-        //wenQuanYi_2.startUse()
-
-        for (i in 0..s.length - 1) {
-            val ch = s[i]
-
-            if (ch.isColourCode()) {
-                thisCol = colourKey[ch]!!
-                continue
-            }
-
-            if (isWenQuanYi2(ch)) {
-                val glyphW = getWidth("" + ch)
-                wenQuanYi_2.getSubImage(wenQuanYiIndexX(ch), wenQuanYi2IndexY(ch)).drawWithShadow(
-                        Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-                        Math.round((H - H_UNIHAN) / 2 + y).toFloat(),
-                        scale.toFloat(), thisCol
-                )
-            }
-        }
-
-        //wenQuanYi_2.endUse()
 
         // regular fonts
         var prevInstance = -1
@@ -346,12 +295,7 @@ open class GameFontBase : Font {
                 try {
                     sheetKey[prevInstance]!!.getSubImage(sheetX, sheetY).drawWithShadow(
                             Math.round(x + getWidthSubstr(s, i + 1) - glyphW).toFloat(),
-
+                            Math.round(y).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(),
-
                             scale.toFloat(), thisCol
                     )
                 }
@@ -495,12 +439,10 @@ open class GameFontBase : Font {
         lateinit internal var extBSheet: SpriteSheet
         lateinit internal var kanaSheet: SpriteSheet
         lateinit internal var cjkPunct: SpriteSheet
-        // static SpriteSheet uniHan;
+        lateinit internal var uniHan: SpriteSheet
         lateinit internal var cyrilic: SpriteSheet
         lateinit internal var fullwidthForms: SpriteSheet
         lateinit internal var uniPunct: SpriteSheet
-        lateinit internal var wenQuanYi_1: SpriteSheet
-        lateinit internal var wenQuanYi_2: SpriteSheet
         lateinit internal var greekSheet: SpriteSheet
 
         internal val JUNG_COUNT = 21
@@ -513,9 +455,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
@@ -527,9 +467,7 @@ open class GameFontBase : Font {
         internal val SHEET_CYRILIC_VARW = 8
         internal val SHEET_FW_UNI = 9
         internal val SHEET_UNI_PUNCT = 10
-        internal val SHEET_WENQUANYI_1 = 11
+        internal val SHEET_GREEK_VARW = 11
-        internal val SHEET_WENQUANYI_2 = 12
-        internal val SHEET_GREEK_VARW = 13
 
 
         internal val SHEET_UNKNOWN = 254

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,16 +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"))
-                        ? "_ja" : "")
-                        +".tga"
-                , W_UNIHAN, H_UNIHAN
-        );*/
         GameFontBase.cyrilic = SpriteSheet(
                 when (GameFontDemo.gameLocale.substring(0..1)) {
                     "bg" -> "./assets/graphics/fonts/cyrilic_bulgarian_variable.tga"
@@ -39,10 +32,8 @@ class GameFontImpl : GameFontBase() {
                 "./assets/graphics/fonts/fullwidth_forms.tga", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN)
         GameFontBase.uniPunct = SpriteSheet(
                 "./assets/graphics/fonts/unipunct.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
-        GameFontBase.wenQuanYi_1 = SpriteSheet(
+        GameFontBase.uniHan = SpriteSheet(
-                "./assets/graphics/fonts/wenquanyi_11pt_part1.tga", 16, 18, 2)
+                "./assets/graphics/fonts/wenquanyi.tga", 16, 16)
-        GameFontBase.wenQuanYi_2 = SpriteSheet(
-                "./assets/graphics/fonts/wenquanyi_11pt_part2.tga", 16, 18, 2)
         GameFontBase.greekSheet = SpriteSheet(
                 "./assets/graphics/fonts/greek_variable.tga", 15, 19, 1)
 
@@ -54,12 +45,10 @@ class GameFontImpl : GameFontBase() {
                 GameFontBase.extBSheet,
                 GameFontBase.kanaSheet,
                 GameFontBase.cjkPunct,
-                null, // Full unihan, filler because we're using WenQuanYi
+                GameFontBase.uniHan,
                 GameFontBase.cyrilic,
                 GameFontBase.fullwidthForms,
                 GameFontBase.uniPunct,
-                GameFontBase.wenQuanYi_1,
-                GameFontBase.wenQuanYi_2,
                 GameFontBase.greekSheet
         )
         GameFontBase.sheetKey = shk
@@ -73,6 +62,7 @@ class GameFontImpl : GameFontBase() {
     }
 
     fun reload() {
+        GameFontBase.cyrilic.destroy()
         GameFontBase.cyrilic = SpriteSheet(
                 when (GameFontDemo.gameLocale.substring(0..1)) {
                     "bg" -> "./assets/graphics/fonts/cyrilic_bulgarian_variable.tga"

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 12345?
-abcdefghijklm nopqrstuvwxyz
+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.
+There are many bitmap fonts on the internet. You care for the multilingual support, but alas!
-It lives only in the U.S. state of Washington, at middle elevations on the Olympic Peninsula.
+most of them does not support your language, vector fonts takes too much time to be loaded,
-About the size of a domestic cat, an adult weighs around 8 kg (18 lb) in summer.
+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í
+No more suffering. This font has everything you need.
-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.
 
-Malaysia er en forholdsvis ung stat. Sin endelige udstrækning fik den først i 1965 efter
+while (isVisible(BadFonts)) { ripAndTear(BadFonts).scope(Guts); }
-at Singapore trak sig ud. Staten blev grundlagt ved en sammenslutning af flere tidligere
+How multilingual? Real multilingual!
-britiske besiddelser, foreløbigt i 1957 og endeligt i 1963.
 
-Το θάλλιο συνοδεύει κυρίως θειούχα ορυκτά βασικών μετάλλων, όπως ο σφαλερίτης, ο σιδηροπυρίτης
+Příliš žluťoučký kůň úpěl ďábelské ódy
-και ο γαληνίτης ενώ αναφέρονται και εμφανίσεις του σε κονδύλους μαγγανίου στους βυθούς των ωκεανών.
+Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich
 διαφυλάξτε γενικά τη ζωή σας από βαθειά ψυχικά τραύματα
 ΔΙΑΦΥΛΆΞΤΕ ΓΕΝΙΚΆ ΤΗ ΖΩΉ ΣΑΣ ΑΠΌ ΒΑΘΕΙΆ ΨΥΧΙΚΆ ΤΡΑΎΜΑΤΑ
-Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства.
+Pack my box with five dozen liquor jugs
-Příliš žluťoučký kůň úpěl ďábelské ódy.    Árvíztűrő tükörfúrógép.
+Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwi
-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.
+Kæmi ný öxi hér, ykist þjófum nú bæði víl og ádrepa
-Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwi.
+Árvíztűrő tükörfúrógép    Kŕdeľ ďatľov učí koňa žrať kôru
-Înjurând pițigăiat, zoofobul comandă vexat whisky și tequila.
-
-sjaldgæft    ekki stjórnarskrárvarin
-
-Also supports:
-‛Unicode’ „quotation marks“—dashes…‼
-으웽~. 얘! 위에 이 애 우유의 양 외워와! 아오~ 왜요? 어여! 예...  웬 초콜릿? 제가 원했던 건 뻥튀기 쬐끔과 의류예요. 얘야, 왜 또 불평?  퀡퇣풿횂
 とりなくこゑす ゆめさませ みよあけわたる ひんかしを そらいろはえて おきつへに ほふねむれゐぬ もやのうち
-鳥啼く声す 夢覚ませ 見よ明け渡る 東を 空色栄えて 沖つ辺に 帆船群れゐぬ 靄の中,
+鳥啼く声す 夢覚ませ 見よ明け渡る 東を 空色栄えて 沖つ辺に 帆船群れゐぬ 靄の中
+Î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