diff --git a/OTFbuild/sheet_config.py b/OTFbuild/sheet_config.py index 1bbff4b..55bfb60 100644 --- a/OTFbuild/sheet_config.py +++ b/OTFbuild/sheet_config.py @@ -85,6 +85,7 @@ SHEET_COPTIC_VARW = 49 SHEET_CYRILIC_EXTD_VARW = 50 SHEET_MATHS1_VARW = 51 SHEET_EMOJI1 = 52 +SHEET_ENCLOSED_ALPHNUM_VARW = 53 SHEET_UNKNOWN = 254 @@ -142,6 +143,7 @@ FILE_LIST = [ "cyrilic_extD_variable.tga", "maths1_extrawide_variable.tga", "emoji1.tga", + "enclosed_alphanumeric_variable.tga", ] CODE_RANGE = [ @@ -198,6 +200,7 @@ CODE_RANGE = [ list(range(0x1E030, 0x1E090)), # 50: Cyrillic Ext D list(range(0x2200, 0x2400)), # 51: Maths1 list(range(0x1F600, 0x1F650)), # 52: Emoji1 + list(range(0x2460, 0x2500)), # 53: Enclosed Alphanum ] CODE_RANGE_HANGUL_COMPAT = range(0x3130, 0x3190) @@ -589,5 +592,6 @@ def index_y(sheet_index, c): SHEET_CYRILIC_EXTD_VARW: lambda: (c - 0x1E030) // 16, SHEET_MATHS1_VARW: lambda: (c - 0x2200) // 16, SHEET_EMOJI1: lambda: (c - 0x1F600) // 16, + SHEET_ENCLOSED_ALPHNUM_VARW: lambda: (c - 0x2460) // 16, SHEET_HANGUL: lambda: 0, }.get(sheet_index, lambda: c // 16)() diff --git a/demo.PNG b/demo.PNG index 220b52e..691126a 100644 Binary files a/demo.PNG and b/demo.PNG differ diff --git a/demotext_unaligned.txt b/demotext_unaligned.txt index 56aa8c3..713ee86 100755 --- a/demotext_unaligned.txt +++ b/demotext_unaligned.txt @@ -132,6 +132,7 @@ How multilingual? Real multilingual! ⁃ Cyrillic Supplement ⁃ Cyrillic Extended-A/B/C/D ⁃ Devanagari +⁃ Enclosed Alphanumerics ⁃ Enclosed Alphanumeric Supplement ⁃ General Punctuations ⁃ Georgian􏿆ჼ􀀀 diff --git a/src/assets/coptic_variable.tga b/src/assets/coptic_variable.tga index 3789f07..16d08f9 100644 --- a/src/assets/coptic_variable.tga +++ b/src/assets/coptic_variable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dac06c68e1f179a56f61561bd7ad69b6ae79ede50e116ffdf30cac389c63525 +oid sha256:67b7dabccb8a70cea34ab8fc24263dfaab40bba6af96ba4e91804ea23a124ca1 size 163858 diff --git a/src/assets/cyrilic_variable.tga b/src/assets/cyrilic_variable.tga index d701e1f..bf3c11e 100755 --- a/src/assets/cyrilic_variable.tga +++ b/src/assets/cyrilic_variable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69cba59d4b01726ba07c136b977ba8d85c22fcf82bd48b3c7110598329089d65 +oid sha256:d3e86cd0ed7bfdc05cdb967a7c111988a992de89cafdce756864071955dc12f1 size 389138 diff --git a/src/assets/enclosed_alphanumeric_variable.tga b/src/assets/enclosed_alphanumeric_variable.tga new file mode 100644 index 0000000..41d892a --- /dev/null +++ b/src/assets/enclosed_alphanumeric_variable.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f933044b329535d3a3cac40d4500d25154abd1734b821a9b0cdd5cfd65556b89 +size 204818 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index d5d690c..e8b31dc 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -904,6 +904,7 @@ class TerrarumSansBitmap( SHEET_CYRILIC_EXTD_VARW -> cyrilicExtDIndexY(ch) SHEET_MATHS1_VARW -> maths1IndexY(ch) SHEET_EMOJI1 -> emoji1IndexY(ch) + SHEET_ENCLOSED_ALPHNUM_VARW -> enclosedAlphnumIndexY(ch) else -> ch / 16 } @@ -2643,6 +2644,7 @@ class TerrarumSansBitmap( internal const val SHEET_CYRILIC_EXTD_VARW = 50 internal const val SHEET_MATHS1_VARW = 51 internal const val SHEET_EMOJI1 = 52 + internal const val SHEET_ENCLOSED_ALPHNUM_VARW = 53 internal const val SHEET_UNKNOWN = 254 @@ -2718,6 +2720,7 @@ class TerrarumSansBitmap( "cyrilic_extD_variable.tga", "maths1_extrawide_variable.tga", "emoji1.tga", + "enclosed_alphanumeric_variable.tga", ) internal val codeRange = arrayOf( // MUST BE MATCHING WITH SHEET INDICES!! 0..0xFF, // SHEET_ASCII_VARW @@ -2773,6 +2776,7 @@ class TerrarumSansBitmap( 0x1E030..0x1E08F, // SHEET_CYRILIC_EXTD_VARW 0x2200..0x23FF, // SHEET_MATHS1_VARW 0x1F600..0x1F64F, // SHEET_EMOJI1 + 0x2460..0x24FF, // SHEET_ENCLOSED_ALPHNUM_VARW ) private val codeRangeHangulCompat = 0x3130..0x318F @@ -3136,6 +3140,7 @@ class TerrarumSansBitmap( private fun cyrilicExtDIndexY(c: CodePoint) = (c - 0x1E030) / 16 private fun maths1IndexY(c: CodePoint) = (c - 0x2200) / 16 private fun emoji1IndexY(c: CodePoint) = (c - 0x1F600) / 16 + private fun enclosedAlphnumIndexY(c: CodePoint) = (c - 0x2460) / 16 val charsetOverrideDefault = Character.toChars(CHARSET_OVERRIDE_DEFAULT).toSurrogatedString() val charsetOverrideBulgarian = Character.toChars(CHARSET_OVERRIDE_BG_BG).toSurrogatedString() diff --git a/work_files/coptic_variable.kra b/work_files/coptic_variable.kra index 4644605..2527017 100644 --- a/work_files/coptic_variable.kra +++ b/work_files/coptic_variable.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f410e0567dcd76ce25d4f823a8c0d32ff249dc2b0d40cfe69233812f4361511 -size 51717 +oid sha256:fe1e240aa84c20f46cab99343f832fca16ffc8150c898181a59ce01af81f3ec1 +size 51536 diff --git a/work_files/cyrilic_variable.psd b/work_files/cyrilic_variable.psd index e0c1219..bda4182 100644 --- a/work_files/cyrilic_variable.psd +++ b/work_files/cyrilic_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:202bea4772ab1ac1208fc18dd7aacdfa49ea44e4676e2f97519c729461a5fd24 -size 445192 +oid sha256:96f8b4df35feb4507e488f3a0e72847618248a586d87380cc9041c52d27e593c +size 445376 diff --git a/work_files/enclosed_alphanumeric_variable.kra b/work_files/enclosed_alphanumeric_variable.kra new file mode 100644 index 0000000..ede584e --- /dev/null +++ b/work_files/enclosed_alphanumeric_variable.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5643755fef554d93fdb662f132fc5a6f75fc0fe478684d4310627d7b05eef5cf +size 71143