diff --git a/logo_repository.png b/logo_repository.png new file mode 100644 index 000000000..b7d1966c9 Binary files /dev/null and b/logo_repository.png differ diff --git a/res/books/hangul_test_2.txt b/res/books/hangul_test_2.txt deleted file mode 100644 index 6b6ac9911..000000000 --- a/res/books/hangul_test_2.txt +++ /dev/null @@ -1,3 +0,0 @@ -안녕하세요 こんにちわ - -《템페스트》 「テンペスト」 \ No newline at end of file diff --git a/res/graphics/fonts/han_johab.png b/res/graphics/fonts/han_johab.png index 390244021..376ca60a7 100644 Binary files a/res/graphics/fonts/han_johab.png and b/res/graphics/fonts/han_johab.png differ diff --git a/res/graphics/gui/progress_round_sheet.png b/res/graphics/gui/progress_round_sheet.png index 3ef7198b7..583ab2c22 100644 Binary files a/res/graphics/gui/progress_round_sheet.png and b/res/graphics/gui/progress_round_sheet.png differ diff --git a/res/graphics/logo_placeholder_noreflection.png b/res/graphics/logo_placeholder_noreflection.png index aca408a1a..93055dc12 100644 Binary files a/res/graphics/logo_placeholder_noreflection.png and b/res/graphics/logo_placeholder_noreflection.png differ diff --git a/src/net/torvald/imagefont/GameFontBase.kt b/src/net/torvald/imagefont/GameFontBase.kt index 765c39aeb..4dee7436f 100644 --- a/src/net/torvald/imagefont/GameFontBase.kt +++ b/src/net/torvald/imagefont/GameFontBase.kt @@ -23,29 +23,36 @@ constructor() : Font { 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 getHanChoseongRow(hanIndex: Int): Int { - val jungseongIndex = getHanJungseong(hanIndex) - val jungseongWide = arrayOf(8, 12, 13, 17, 18, 21) - 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 (jungseongWide.contains(jungseongIndex)) { + if (isJungseongWide(hanIndex)) ret = 2 - } - else if (jungseongComplex.contains(jungseongIndex)) { + else if (isJungseongComplex(hanIndex)) ret = 4 - } - else { + else ret = 0 - } + return if (getHanJongseong(hanIndex) == 0) ret else ret + 1 } - private fun getHanJungseongRow(hanIndex: Int) = if (getHanJongseong(hanIndex) == 0) 6 else 7 + private fun getHanMedialRow(hanIndex: Int) = if (getHanJongseong(hanIndex) == 0) 6 else 7 - private val hanJongseongRow: Int - get() = 8 + private fun getHanFinalRow(hanIndex: Int): Int { + val jungseongIndex = getHanJungseong(hanIndex) + + return if (jungseongWide.contains(jungseongIndex)) + 8 + else + 9 + + } private fun isAsciiEF(c: Char) = asciiEFList.contains(c) @@ -185,9 +192,9 @@ constructor() : Font { val indexJung = getHanJungseong(hIndex) val indexJong = getHanJongseong(hIndex) - val choRow = getHanChoseongRow(hIndex) - val jungRow = getHanJungseongRow(hIndex) - val jongRow = hanJongseongRow + val choRow = getHanInitialRow(hIndex) + val jungRow = getHanMedialRow(hIndex) + val jongRow = getHanFinalRow(hIndex) val glyphW = getWidth("" + ch)