diff --git a/assets/fullwidth_forms.tga b/assets/fullwidth_forms.tga deleted file mode 100755 index 4b75f2a..0000000 Binary files a/assets/fullwidth_forms.tga and /dev/null differ diff --git a/assets/halfwidth_fullwidth_variable.tga b/assets/halfwidth_fullwidth_variable.tga new file mode 100644 index 0000000..0647e27 --- /dev/null +++ b/assets/halfwidth_fullwidth_variable.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e6f1a160ba4e07700198c26ba9aa00cdbb6747e805666032f18b052f6f28019 +size 327698 diff --git a/demo.PNG b/demo.PNG index 56ec419..772d2f2 100644 Binary files a/demo.PNG and b/demo.PNG differ diff --git a/demotext.txt b/demotext.txt index bfbddfc..25f0b3f 100755 --- a/demotext.txt +++ b/demotext.txt @@ -104,7 +104,7 @@ How multilingual? Real multilingual! 􎳌Rejoice, now we can render Old Korean in a correct way!􀀀 -􏃯Unicode References:􀀀 +􏃯Supported Unicode Blocks:􀀀 Basic Latin Latin-1 Supplement Latin Extended-A Latin Extended-B IPA Extension Greek Cyrillic Cyrillic Supplement Armenian Devanagari Bengali Thai Georgian Hangul Jamo Cherokee Runic @@ -112,7 +112,7 @@ How multilingual? Real multilingual! General Punctuations Superscripts and Subscripts Currency Symbols Letterlike Symbols CJK Symbols Latin Extended-C Kana Hangul Compatibility Jamo Kana Phonetic Extensions CJK Unihan Extension A CJK Unihan Latin Extended-D Hangul Jamo Extended-A Hangul Syllables Hangul Jamo Extended-B - Fullwidth Forms Kana Supplement Enclosed Alphanumeric Supplement + Halfwidth and Fullwidth Forms Kana Supplement Enclosed Alphanumeric Supplement GitHub’s issue page is open! You can report any 􏽕errors􀀀, or leave 􏽕suggestions􀀀. You can help this font to be more versatile. (for more languages, more frameworks) 􏽕Clone􀀀 this repo, make diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index d88b7ae..7010233 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -261,8 +261,6 @@ class TerrarumSansBitmap( else if (index == SHEET_UNIHAN) PixmapRegionPack(pixmap, W_UNIHAN, H_UNIHAN) // the only exception that is height is 16 // below they all have height of 20 'H' - else if (index == SHEET_FW_UNI) - PixmapRegionPack(pixmap, W_UNIHAN, H) else if (index == SHEET_CJK_PUNCT) PixmapRegionPack(pixmap, W_ASIAN_PUNCT, H) else if (index == SHEET_KANA) @@ -522,7 +520,7 @@ class TerrarumSansBitmap( else if (isCJKPunct(c)) return SHEET_CJK_PUNCT else if (isFullwidthUni(c)) - return SHEET_FW_UNI + return SHEET_HALFWIDTH_FULLWIDTH_VARW else if (isGreek(c)) return SHEET_GREEK_VARW else if (isThai(c)) @@ -596,7 +594,7 @@ class TerrarumSansBitmap( sheetX = cyrilicIndexX(ch) sheetY = cyrilicIndexY(ch) } - SHEET_FW_UNI -> { + SHEET_HALFWIDTH_FULLWIDTH_VARW -> { sheetX = fullwidthUniIndexX(ch) sheetY = fullwidthUniIndexY(ch) } @@ -796,7 +794,6 @@ class TerrarumSansBitmap( // fixed-width props codeRange[SHEET_CJK_PUNCT].forEach { glyphProps[it] = GlyphProps(W_ASIAN_PUNCT) } codeRange[SHEET_CUSTOM_SYM].forEach { glyphProps[it] = GlyphProps(20) } - codeRange[SHEET_FW_UNI].forEach { glyphProps[it] = GlyphProps(W_UNIHAN) } codeRange[SHEET_HANGUL].forEach { glyphProps[it] = GlyphProps(W_HANGUL_BASE) } codeRangeHangulCompat.forEach { glyphProps[it] = GlyphProps(W_HANGUL_BASE) } codeRange[SHEET_KANA].forEach { glyphProps[it] = GlyphProps(W_KANA) } @@ -1481,7 +1478,7 @@ class TerrarumSansBitmap( internal val SHEET_CJK_PUNCT = 5 internal val SHEET_UNIHAN = 6 internal val SHEET_CYRILIC_VARW = 7 - internal val SHEET_FW_UNI = 8 + internal val SHEET_HALFWIDTH_FULLWIDTH_VARW = 8 internal val SHEET_UNI_PUNCT_VARW = 9 internal val SHEET_GREEK_VARW = 10 internal val SHEET_THAI_VARW = 11 @@ -1534,7 +1531,7 @@ class TerrarumSansBitmap( "cjkpunct.tga", "wenquanyi.tga.gz", "cyrilic_variable.tga", - "fullwidth_forms.tga", + "halfwidth_fullwidth_variable.tga", "unipunct_variable.tga", "greek_variable.tga", "thai_variable.tga", @@ -1568,7 +1565,7 @@ class TerrarumSansBitmap( 0x3000..0x303F, // SHEET_CJK_PUNCT 0x3400..0x9FFF, // SHEET_UNIHAN 0x400..0x52F, // SHEET_CYRILIC_VARW - 0xFF00..0xFF1F, // SHEET_FW_UNI + 0xFF00..0xFFFF, // SHEET_HALFWIDTH_FULLWIDTH_VARW 0x2000..0x209F, // SHEET_UNI_PUNCT_VARW 0x370..0x3CE, // SHEET_GREEK_VARW 0xE00..0xE5F, // SHEET_THAI_VARW @@ -1724,7 +1721,7 @@ class TerrarumSansBitmap( private fun isCJKPunct(c: CodePoint) = c in codeRange[SHEET_CJK_PUNCT] private fun isUniHan(c: CodePoint) = c in codeRange[SHEET_UNIHAN] private fun isCyrilic(c: CodePoint) = c in codeRange[SHEET_CYRILIC_VARW] - private fun isFullwidthUni(c: CodePoint) = c in codeRange[SHEET_FW_UNI] + private fun isFullwidthUni(c: CodePoint) = c in codeRange[SHEET_HALFWIDTH_FULLWIDTH_VARW] private fun isUniPunct(c: CodePoint) = c in codeRange[SHEET_UNI_PUNCT_VARW] private fun isGreek(c: CodePoint) = c in codeRange[SHEET_GREEK_VARW] private fun isThai(c: CodePoint) = c in codeRange[SHEET_THAI_VARW] diff --git a/testing.PNG b/testing.PNG index 31a7d29..1df16e7 100755 Binary files a/testing.PNG and b/testing.PNG differ diff --git a/testtext.txt b/testtext.txt index 8a876ce..f9588b9 100755 --- a/testtext.txt +++ b/testtext.txt @@ -11,4 +11,6 @@ UIJTuijt Mℂ℄ℇ℀℈jℊ№℗CKℵ℡Z℥ ℵ₀ -🄅🄵🅅🄕🄩🄪🄭🅭🄏🄎🅯🅮🆞🆠🆐🄯🆒🆓 \ No newline at end of file +🄅🄵🅅🄕🄩🄪🄭🅭🄏🄎🅯🅮🆞🆠🆐🄯🆒🆓 + +ﾧￌﾷﾾￃ ﾱￓﾩﾡￍ ﾲￃﾡﾧￓﾵￂﾤ ﾾￂﾤￚﾤￜﾱﾷￜ ﾲￌﾷￓﾾￂﾵￂ \ No newline at end of file diff --git a/work_files/fullwidth_forms.psd b/work_files/fullwidth_forms.psd deleted file mode 100644 index c7303b7..0000000 Binary files a/work_files/fullwidth_forms.psd and /dev/null differ diff --git a/work_files/halfwidth_fullwidth_variable.psd b/work_files/halfwidth_fullwidth_variable.psd new file mode 100644 index 0000000..8adc582 --- /dev/null +++ b/work_files/halfwidth_fullwidth_variable.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:200544f427eb8412ef34e27194cbd94906e4f078bdccdb97248dc4f80e8fd131 +size 368184