latin ext e

Autokem/eval.sh

@@ -7,7 +7,7 @@
 set -euo pipefail
 cd "$(dirname "$0")"
 
-RUNS="${1:-10}"
+RUNS="${1:-42}"
 shift 2>/dev/null || true
 EXTRA_ARGS="$*"
 PYTHON="${PYTHON:-.venv/bin/python3}"

Autokem/train_torch.py

@@ -188,10 +188,10 @@ def build_model():
     class Keminet(nn.Module):
         def __init__(self):
             super().__init__()
-            self.conv1 = nn.Conv2d(1, 32, 5, padding=1)
+            self.conv1 = nn.Conv2d(1, 32, 7, padding=1)
             self.conv2 = nn.Conv2d(32, 64, 7, padding=1)
             self.fc1 = nn.Linear(64, 256)
-            # self.fc2 = nn.Linear(256, 48)
+            # self.fc2 = nn.Linear(256, 128)
             self.output = nn.Linear(256, 12)
             self.tf = nn.SiLU()
 

OTFbuild/sheet_config.py

@@ -75,6 +75,9 @@ SHEET_LEGACY_COMPUTING_VARW = 41
 SHEET_CYRILIC_EXTB_VARW = 42
 SHEET_CYRILIC_EXTA_VARW = 43
 SHEET_CYRILIC_EXTC_VARW = 44
+SHEET_LATIN_EXTE_VARW = 45
+SHEET_LATIN_EXTF_VARW = 46
+SHEET_LATIN_EXTG_VARW = 47
 
 SHEET_UNKNOWN = 254
 
@@ -124,6 +127,9 @@ FILE_LIST = [
     "cyrilic_extB_variable.tga",
     "cyrilic_extA_variable.tga",
     "cyrilic_extC_variable.tga",
+    "latinExtE_variable.tga",
+    "latinExtF_variable.tga",
+    "latinExtG_variable.tga",
 ]
 
 CODE_RANGE = [
@@ -171,7 +177,10 @@ CODE_RANGE = [
     list(range(0x1FB00, 0x1FC00)),                                                  # 41: Legacy Computing
     list(range(0xA640, 0xA6A0)),                                                    # 42: Cyrillic Ext B
     list(range(0x2DE0, 0x2E00)),                                                    # 43: Cyrillic Ext A
-    list(range(0x1C80, 0x1C8F)),                                                    # 43: Cyrillic Ext C
+    list(range(0x1C80, 0x1C8F)),                                                    # 44: Cyrillic Ext C
+    list(range(0xAB30, 0xAB70)),                                                    # 45: Latin Ext E
+    list(range(0x10780, 0x107C0)),                                                  # 46: Latin Ext F
+    list(range(0x1DF00, 0x1E000)),                                                  # 47: Latin Ext G
 ]
 
 CODE_RANGE_HANGUL_COMPAT = range(0x3130, 0x3190)
@@ -551,5 +560,8 @@ def index_y(sheet_index, c):
         SHEET_CYRILIC_EXTB_VARW: lambda: (c - 0xA640) // 16,
         SHEET_CYRILIC_EXTA_VARW: lambda: (c - 0x2DE0) // 16,
         SHEET_CYRILIC_EXTC_VARW: lambda: (c - 0x1C80) // 16,
+        SHEET_LATIN_EXTE_VARW: lambda: (c - 0xAB30) // 16,
+        SHEET_LATIN_EXTF_VARW: lambda: (c - 0x10780) // 16,
+        SHEET_LATIN_EXTG_VARW: lambda: (c - 0x1DF00) // 16,
         SHEET_HANGUL: lambda: 0,
     }.get(sheet_index, lambda: c // 16)()

src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt

@@ -891,6 +891,9 @@ class TerrarumSansBitmap(
             SHEET_CYRILIC_EXTB_VARW -> cyrilicExtBIndexY(ch)
             SHEET_CYRILIC_EXTA_VARW -> cyrilicExtAIndexY(ch)
             SHEET_CYRILIC_EXTC_VARW -> cyrilicExtCIndexY(ch)
+            SHEET_LATIN_EXTE_VARW -> latinExtEIndexY(ch)
+            SHEET_LATIN_EXTF_VARW -> latinExtFIndexY(ch)
+            SHEET_LATIN_EXTG_VARW -> latinExtGIndexY(ch)
             else -> ch / 16
         }
 
@@ -2609,6 +2612,9 @@ class TerrarumSansBitmap(
         internal const val SHEET_CYRILIC_EXTB_VARW = 42
         internal const val SHEET_CYRILIC_EXTA_VARW = 43
         internal const val SHEET_CYRILIC_EXTC_VARW = 44
+        internal const val SHEET_LATIN_EXTE_VARW = 45
+        internal const val SHEET_LATIN_EXTF_VARW = 46
+        internal const val SHEET_LATIN_EXTG_VARW = 47
 
         internal const val SHEET_UNKNOWN = 254
 
@@ -2676,6 +2682,9 @@ class TerrarumSansBitmap(
             "cyrilic_extB_variable.tga",
             "cyrilic_extA_variable.tga",
             "cyrilic_extC_variable.tga",
+            "latinExtE_variable.tga",
+            "latinExtF_variable.tga",
+            "latinExtG_variable.tga",
         )
         internal val codeRange = arrayOf( // MUST BE MATCHING WITH SHEET INDICES!!
             0..0xFF, // SHEET_ASCII_VARW
@@ -2723,6 +2732,9 @@ class TerrarumSansBitmap(
             0xA640..0xA69F, // SHEET_CYRILIC_EXTB_VARW
             0x2DE0..0x2DFF, // SHEET_CYRILIC_EXTA_VARW
             0x1C80..0x1C8F, // SHEET_CYRILIC_EXTC_VARW
+            0xAB30..0xAB6F, // SHEET_LATIN_EXTE_VARW
+            0x10780..0x107BF, // SHEET_LATIN_EXTF_VARW
+            0x1DF00..0x1DFFF, // SHEET_LATIN_EXTG_VARW
         )
         private val codeRangeHangulCompat = 0x3130..0x318F
 
@@ -3071,6 +3083,9 @@ class TerrarumSansBitmap(
         private fun cyrilicExtBIndexY(c: CodePoint) = (c - 0xA640) / 16
         private fun cyrilicExtAIndexY(c: CodePoint) = (c - 0x2DE0) / 16
         private fun cyrilicExtCIndexY(c: CodePoint) = (c - 0x1C80) / 16
+        private fun latinExtEIndexY(c: CodePoint) = (c - 0xAB30) / 16
+        private fun latinExtFIndexY(c: CodePoint) = (c - 0x10780) / 16
+        private fun latinExtGIndexY(c: CodePoint) = (c - 0x1DF00) / 16
 
         val charsetOverrideDefault = Character.toChars(CHARSET_OVERRIDE_DEFAULT).toSurrogatedString()
         val charsetOverrideBulgarian = Character.toChars(CHARSET_OVERRIDE_BG_BG).toSurrogatedString()