curioustorvald/Terrarum-sans-bitmap
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum-sans-bitmap.git synced 2026-03-07 11:51:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

cjkpunct is now variable

Browse Source
This commit is contained in:
minjaesong
2024-03-30 21:46:48 +09:00
parent 1bf78cc5bb
commit 35325cb852
6 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cjkpunct.tga LFS
View File

Binary file not shown.

BIN
assets/cjkpunct_variable.tga LFS Normal file
View File

Binary file not shown.

2
src/net/torvald/terrarumsansbitmap/MovableType.kt
View File

@@ -269,7 +269,7 @@ class MovableType(
private val hangableFW = listOf(0x3001, 0x3002, 0xff0c, 0xff0e).toSortedSet() private val hangableFW = listOf(0x3001, 0x3002, 0xff0c, 0xff0e).toSortedSet()
private const val spaceWidth = 5 private const val spaceWidth = 5
private const val hangWidth = 6 private const val hangWidth = 6
private const val hangWidthFW = TerrarumSansBitmap.W_ASIAN_PUNCT private const val hangWidthFW = 16
private fun CodePoint.toHex() = "U+${this.toString(16).padStart(4, '0').toUpperCase()}" private fun CodePoint.toHex() = "U+${this.toString(16).padStart(4, '0').toUpperCase()}"

6
src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
View File

@@ -280,8 +280,6 @@ class TerrarumSansBitmap(
else if (index == SHEET_UNIHAN) else if (index == SHEET_UNIHAN)
PixmapRegionPack(pixmap, W_UNIHAN, H_UNIHAN) // the only exception that is height is 16 PixmapRegionPack(pixmap, W_UNIHAN, H_UNIHAN) // the only exception that is height is 16
// below they all have height of 20 'H' // below they all have height of 20 'H'
else if (index == SHEET_CJK_PUNCT)
PixmapRegionPack(pixmap, W_ASIAN_PUNCT, H)
else if (index == SHEET_HANGUL) else if (index == SHEET_HANGUL)
PixmapRegionPack(pixmap, W_HANGUL_BASE, H) PixmapRegionPack(pixmap, W_HANGUL_BASE, H)
else if (index == SHEET_CUSTOM_SYM) else if (index == SHEET_CUSTOM_SYM)
@@ -726,7 +724,6 @@ class TerrarumSansBitmap(
private fun buildWidthTableFixed() { private fun buildWidthTableFixed() {
// fixed-width props // 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_CUSTOM_SYM].forEach { glyphProps[it] = GlyphProps(20) }
codeRange[SHEET_HANGUL].forEach { glyphProps[it] = GlyphProps(W_HANGUL_BASE) } codeRange[SHEET_HANGUL].forEach { glyphProps[it] = GlyphProps(W_HANGUL_BASE) }
codeRangeHangulCompat.forEach { glyphProps[it] = GlyphProps(W_HANGUL_BASE) } codeRangeHangulCompat.forEach { glyphProps[it] = GlyphProps(W_HANGUL_BASE) }
@@ -2096,7 +2093,6 @@ class TerrarumSansBitmap(
internal const val JUNG_COUNT = 21 internal const val JUNG_COUNT = 21
internal const val JONG_COUNT = 28 internal const val JONG_COUNT = 28
internal const val W_ASIAN_PUNCT = 10
internal const val W_HANGUL_BASE = 13 internal const val W_HANGUL_BASE = 13
internal const val W_UNIHAN = 16 internal const val W_UNIHAN = 16
internal const val W_LATIN_WIDE = 9 // width of regular letters internal const val W_LATIN_WIDE = 9 // width of regular letters
@@ -2181,7 +2177,7 @@ class TerrarumSansBitmap(
"latinExtA_variable.tga", "latinExtA_variable.tga",
"latinExtB_variable.tga", "latinExtB_variable.tga",
"kana_variable.tga", "kana_variable.tga",
"cjkpunct.tga", "cjkpunct_variable.tga",
"wenquanyi.tga.gz", "wenquanyi.tga.gz",
"cyrilic_variable.tga", "cyrilic_variable.tga",
"halfwidth_fullwidth_variable.tga", "halfwidth_fullwidth_variable.tga",

BIN
work_files/cjkpunct.psd LFS
View File

Binary file not shown.

BIN
work_files/cjkpunct_variable.psd LFS Normal file
View File

Binary file not shown.