diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/assets/enclosed_alphanumeric_supplement_variable.tga b/assets/enclosed_alphanumeric_supplement_variable.tga index 75d4f9a..f969297 100644 --- a/assets/enclosed_alphanumeric_supplement_variable.tga +++ b/assets/enclosed_alphanumeric_supplement_variable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:582d42ae7f1872d65161756fef488433305d6b240235fb2fcfd96ab30f1b2ca8 +oid sha256:5fc38ac28b36e49eea89fcccf60bfd91a8a1f2106982f21400fadf7933b5ee3a size 327698 diff --git a/assets/insular_variable.tga b/assets/insular_variable.tga deleted file mode 100755 index 966674d..0000000 --- a/assets/insular_variable.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8f28c03f0cdd3feda6c5bad2c479a97e1dc55777aaecdeb5ffeef32eaff4555 -size 5138 diff --git a/assets/phonetic_extensions_variable.tga b/assets/phonetic_extensions_variable.tga new file mode 100644 index 0000000..e573646 --- /dev/null +++ b/assets/phonetic_extensions_variable.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b4682a6dc0a237f795184d7a73c14094b0ca45020c71bcab8b1871569a55afe +size 245778 diff --git a/demo.PNG b/demo.PNG index bae1095..56ec419 100644 Binary files a/demo.PNG and b/demo.PNG differ diff --git a/demotext.txt b/demotext.txt index 3c77a59..bfbddfc 100755 --- a/demotext.txt +++ b/demotext.txt @@ -108,10 +108,11 @@ How multilingual? Real multilingual! 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 - Georgian Extended Greek Extended General Punctuations Superscripts and Subscripts Currency 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 + Georgian Extended Phonetic Extensions Phonetic Extensions Supplement Greek Extended + 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 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 1915a1b..d88b7ae 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -541,8 +541,8 @@ class TerrarumSansBitmap( return SHEET_LATIN_EXT_ADD_VARW else if (isCherokee(c)) return SHEET_TSALAGI_VARW - else if (isInsular(c)) - return SHEET_INSUAR_VARW + else if (isPhoneticExt(c)) + return SHEET_PHONETIC_EXT_VARW else if (isNagariBengali(c)) return SHEET_NAGARI_BENGALI_VARW else if (isKartvelianCaps(c)) @@ -644,9 +644,9 @@ class TerrarumSansBitmap( sheetX = cherokeeIndexX(ch) sheetY = cherokeeIndexY(ch) } - SHEET_INSUAR_VARW -> { - sheetX = insularIndexX(ch) - sheetY = insularIndexY(ch) + SHEET_PHONETIC_EXT_VARW -> { + sheetX = phoneticExtIndexX(ch) + sheetY = phoneticExtIndexY(ch) } SHEET_NAGARI_BENGALI_VARW -> { sheetX = nagariIndexX(ch) @@ -1494,7 +1494,7 @@ class TerrarumSansBitmap( internal val SHEET_BULGARIAN_VARW = 18 internal val SHEET_SERBIAN_VARW = 19 internal val SHEET_TSALAGI_VARW = 20 - internal val SHEET_INSUAR_VARW = 21 // currently only for U+1D79 + internal val SHEET_PHONETIC_EXT_VARW = 21 internal val SHEET_NAGARI_BENGALI_VARW=22 internal val SHEET_KARTULI_CAPS_VARW = 23 internal val SHEET_DIACRITICAL_MARKS_VARW = 24 @@ -1547,7 +1547,7 @@ class TerrarumSansBitmap( "cyrilic_bulgarian_variable.tga", "cyrilic_serbian_variable.tga", "tsalagi_variable.tga", - "insular_variable.tga", + "phonetic_extensions_variable.tga", "devanagari_bengali_variable.tga", "kartuli_allcaps_variable.tga", "diacritical_marks_variable.tga", @@ -1581,7 +1581,7 @@ class TerrarumSansBitmap( 0xF0000..0xF005F, // SHEET_BULGARIAN_VARW; assign them to PUA 0xF0060..0xF00BF, // SHEET_SERBIAN_VARW; assign them to PUA 0x13A0..0x13F5, // SHEET_TSALAGI_VARW - 0x1D79..0x1D79, // SHEET_INSULAR_VARW; todo: Phonetic Extensions et al, 1D00..1DFF + 0x1D00..0x1DBF, // SHEET_PHONETIC_EXT_VARW 0x900..0x9FF, // SHEET_NAGARI_BENGALI_VARW 0x1C90..0x1CBF, // SHEET_KARTULI_CAPS_VARW 0x300..0x36F, // SHEET_DIACRITICAL_MARKS_VARW @@ -1740,7 +1740,7 @@ class TerrarumSansBitmap( fun isColourCode(c: CodePoint) = c == 0x100000 || c in 0x10F000..0x10FFFF private fun isCharsetOverride(c: CodePoint) = c in 0xFFFC0..0xFFFFF private fun isCherokee(c: CodePoint) = c in codeRange[SHEET_TSALAGI_VARW] - private fun isInsular(c: CodePoint) = c == 0x1D79 + private fun isPhoneticExt(c: CodePoint) = c in codeRange[SHEET_PHONETIC_EXT_VARW] private fun isNagariBengali(c: CodePoint) = c in codeRange[SHEET_NAGARI_BENGALI_VARW] private fun isKartvelianCaps(c: CodePoint) = c in codeRange[SHEET_KARTULI_CAPS_VARW] private fun isDiacriticalMarks(c: CodePoint) = c in codeRange[SHEET_DIACRITICAL_MARKS_VARW] @@ -1808,8 +1808,8 @@ class TerrarumSansBitmap( private fun cherokeeIndexX(c: CodePoint) = (c - 0x13A0) % 16 private fun cherokeeIndexY(c: CodePoint) = (c - 0x13A0) / 16 - private fun insularIndexX(c: CodePoint) = 0 - private fun insularIndexY(c: CodePoint) = 0 + private fun phoneticExtIndexX(c: CodePoint) = (c - 0x1D00) % 16 + private fun phoneticExtIndexY(c: CodePoint) = (c - 0x1D00) / 16 private fun nagariIndexX(c: CodePoint) = (c - 0x900) % 16 private fun nagariIndexY(c: CodePoint) = (c - 0x900) / 16 diff --git a/testing.PNG b/testing.PNG index 44c2e2f..31a7d29 100755 Binary files a/testing.PNG and b/testing.PNG differ diff --git a/testtext.txt b/testtext.txt index 5045b72..8a876ce 100755 --- a/testtext.txt +++ b/testtext.txt @@ -6,4 +6,9 @@ aำ UIJTuijt -দৌ ষৌ \ No newline at end of file +দৌ ষৌ + +Mℂ℄ℇ℀℈jℊ№℗CKℵ℡Z℥ +ℵ₀ + +🄅🄵🅅🄕🄩🄪🄭🅭🄏🄎🅯🅮🆞🆠🆐🄯🆒🆓 \ No newline at end of file diff --git a/work_files/ascii_variable.psd b/work_files/ascii_variable.psd index 7f5cbd6..3a3048a 100644 --- a/work_files/ascii_variable.psd +++ b/work_files/ascii_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf2cd2f0be119ac3db58e039fff40d2424e9c4f7e5c1b291c5dd107c36e40972 +oid sha256:f2a33657d6df816821ad8991515c4da297b1053966cdb0fc23e09168c70c9299 size 317663 diff --git a/work_files/enclosed_alphanumeric_supplement_variable.psd b/work_files/enclosed_alphanumeric_supplement_variable.psd index 49d8f4a..d557d0f 100644 --- a/work_files/enclosed_alphanumeric_supplement_variable.psd +++ b/work_files/enclosed_alphanumeric_supplement_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f87411fd368e9443798f31efb8e868e29062327a2ff599309279ef3c2937e82b -size 393583 +oid sha256:30f855c4723c80db4e84613f31b2a92b03a1e0032b68a4e08a7ff5acc1368dc7 +size 393911 diff --git a/work_files/phonetic_extensions_variable.psd b/work_files/phonetic_extensions_variable.psd index e2e1adb..99357d7 100644 --- a/work_files/phonetic_extensions_variable.psd +++ b/work_files/phonetic_extensions_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:643943b79153daed130b50d939016268849ae1452a6388ccefda34257cf63f09 -size 303235 +oid sha256:a8f6d6989cdbb6c5dbbf70501ce31730a5a83e77c30d3c8264f390c9f3ebb21c +size 303005