From 35325cb8525fec0635a6187540cbdca6410e8b72 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 30 Mar 2024 21:46:48 +0900
Subject: [PATCH] cjkpunct is now variable

---
 assets/cjkpunct.tga                                         | 3 ---
 assets/cjkpunct_variable.tga                                | 3 +++
 src/net/torvald/terrarumsansbitmap/MovableType.kt           | 2 +-
 .../torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt    | 6 +-----
 work_files/cjkpunct.psd                                     | 3 ---
 work_files/cjkpunct_variable.psd                            | 3 +++
 6 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100755 assets/cjkpunct.tga
 create mode 100644 assets/cjkpunct_variable.tga
 delete mode 100644 work_files/cjkpunct.psd
 create mode 100644 work_files/cjkpunct_variable.psd

diff --git a/assets/cjkpunct.tga b/assets/cjkpunct.tga
deleted file mode 100755
index fb08315..0000000
--- a/assets/cjkpunct.tga
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9d06c86aa5349f57be589b75272c77c0faaec42f3cc1da25f2cc8beb9d6a54e
-size 51218
diff --git a/assets/cjkpunct_variable.tga b/assets/cjkpunct_variable.tga
new file mode 100644
index 0000000..3eb21d0
--- /dev/null
+++ b/assets/cjkpunct_variable.tga
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:523d141f7a5391543e3898b37607bf5a77ddfc9069970de6e690be85d508987f
+size 81938
diff --git a/src/net/torvald/terrarumsansbitmap/MovableType.kt b/src/net/torvald/terrarumsansbitmap/MovableType.kt
index bfad2e8..62958c3 100644
--- a/src/net/torvald/terrarumsansbitmap/MovableType.kt
+++ b/src/net/torvald/terrarumsansbitmap/MovableType.kt
@@ -269,7 +269,7 @@ class MovableType(
         private val hangableFW = listOf(0x3001, 0x3002, 0xff0c, 0xff0e).toSortedSet()
         private const val spaceWidth = 5
         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()}"
 
diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
index 6fcc0f0..ebdd4bc 100755
--- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
@@ -280,8 +280,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_CJK_PUNCT)
-                PixmapRegionPack(pixmap, W_ASIAN_PUNCT, H)
             else if (index == SHEET_HANGUL)
                 PixmapRegionPack(pixmap, W_HANGUL_BASE, H)
             else if (index == SHEET_CUSTOM_SYM)
@@ -726,7 +724,6 @@ class TerrarumSansBitmap(
 
     private fun buildWidthTableFixed() {
         // 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_HANGUL].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 JONG_COUNT = 28
 
-        internal const val W_ASIAN_PUNCT = 10
         internal const val W_HANGUL_BASE = 13
         internal const val W_UNIHAN = 16
         internal const val W_LATIN_WIDE = 9 // width of regular letters
@@ -2181,7 +2177,7 @@ class TerrarumSansBitmap(
             "latinExtA_variable.tga",
             "latinExtB_variable.tga",
             "kana_variable.tga",
-            "cjkpunct.tga",
+            "cjkpunct_variable.tga",
             "wenquanyi.tga.gz",
             "cyrilic_variable.tga",
             "halfwidth_fullwidth_variable.tga",
diff --git a/work_files/cjkpunct.psd b/work_files/cjkpunct.psd
deleted file mode 100644
index 8d51e7a..0000000
--- a/work_files/cjkpunct.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:152375a6932216449f9a5c44b659c80e7d405cf3f3c69ea587e00d83969f4ef6
-size 52341
diff --git a/work_files/cjkpunct_variable.psd b/work_files/cjkpunct_variable.psd
new file mode 100644
index 0000000..34c31e9
--- /dev/null
+++ b/work_files/cjkpunct_variable.psd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1b6f367b152c35fee8b8a529655734698b9e8434b0e9724f6dd36d3040897df
+size 92186