Kana suppelements and Insular script

2026-03-07 20:01:52 +09:00 · 2018-08-09 15:34:08 +09:00
parent 45532ca9b7
commit 15fb3d15c0
5 changed files with 82 additions and 47 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,7 +10,7 @@
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/FontTestGDX/demotext.txt" beforeDir="false" afterPath="$PROJECT_DIR$/FontTestGDX/demotext.txt" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/FontTestGDX/lib/TerrarumSansBitmap.jar" beforeDir="false" afterPath="$PROJECT_DIR$/FontTestGDX/lib/TerrarumSansBitmap.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/assets/ascii_variable.tga" beforeDir="false" afterPath="$PROJECT_DIR$/assets/ascii_variable.tga" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/assets/insular_variable.tga" beforeDir="false" afterPath="$PROJECT_DIR$/assets/insular_variable.tga" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/assets/kana.tga" beforeDir="false" afterPath="$PROJECT_DIR$/assets/kana.tga" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" afterDir="false" />
    </list>
@@ -32,8 +32,8 @@
          <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="true">
            <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="299">
-                  <caret line="877" column="14" lean-forward="true" selection-start-line="877" selection-start-column="14" selection-end-line="877" selection-end-column="14" />
+                <state relative-caret-position="521">
+                  <caret line="897" lean-forward="true" selection-start-line="897" selection-end-line="897" />
                </state>
              </provider>
            </entry>
@@ -81,26 +81,35 @@
          <file leaf-file-name="FontTestGDX.kt" pinned="false" current-in-tab="false">
            <entry file="file://$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1040">
-                  <caret line="178" lean-forward="true" selection-start-line="178" selection-end-line="178" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="demotext.txt" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/FontTestGDX/demotext.txt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="559">
-                  <caret line="43" column="42" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
+                <state>
+                  <caret line="8" column="54" lean-forward="true" selection-start-line="8" selection-start-column="54" selection-end-line="8" selection-end-column="54" />
                </state>
              </provider>
            </entry>
          </file>
          <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="false">
+            <entry file="jar://$PROJECT_DIR$/FontTestGDX/lib/TerrarumSansBitmap.jar!/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="273">
+                  <caret line="437" column="21" lean-forward="true" selection-start-line="437" selection-start-column="21" selection-end-line="437" selection-end-column="21" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="demotext.txt" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/FontTestGDX/demotext.txt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="494">
+                  <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="true">
            <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="8463">
-                  <caret line="1000" column="52" selection-start-line="1000" selection-start-column="45" selection-end-line="1000" selection-end-column="52" />
+                <state relative-caret-position="534">
+                  <caret line="1027" column="49" selection-start-line="1027" selection-start-column="49" selection-end-line="1027" selection-end-column="49" />
                </state>
              </provider>
            </entry>
@@ -132,7 +141,6 @@
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>fun getWidth</find>
      <find>fun dispo</find>
      <find>xHei</find>
      <find>not copy</find>
@@ -162,6 +170,7 @@
      <find>ArrayList&lt;Int&gt;</find>
      <find>har.toInt()</find>
      <find>println</find>
+      <find>!!</find>
    </findStrings>
    <replaceStrings>
      <replace>.141</replace>
@@ -183,10 +192,10 @@
        <option value="$PROJECT_DIR$/README.md" />
        <option value="$PROJECT_DIR$/CONTRIBUTING.md" />
        <option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/slick2d/GameFontBase.kt" />
-        <option value="$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt" />
        <option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/GlyphProps.kt" />
-        <option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" />
+        <option value="$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt" />
        <option value="$PROJECT_DIR$/FontTestGDX/demotext.txt" />
+        <option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" />
      </list>
    </option>
  </component>
@@ -823,13 +832,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="jar://$PROJECT_DIR$/FontTestGDX/lib/TerrarumSansBitmap.jar!/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="317">
-          <caret line="870" column="29" selection-start-line="870" selection-start-column="29" selection-end-line="870" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/README.md">
      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
        <state split_layout="SPLIT">
@@ -849,13 +851,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1040">
-          <caret line="178" lean-forward="true" selection-start-line="178" selection-end-line="178" />
-        </state>
-      </provider>
-    </entry>
    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/Character.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="515">
@@ -877,13 +872,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/FontTestGDX/demotext.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="559">
-          <caret line="43" column="42" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/CONTRIBUTING.md">
      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
        <state split_layout="SPLIT">
@@ -903,10 +891,31 @@
        </state>
      </provider>
    </entry>
+    <entry file="jar://$PROJECT_DIR$/FontTestGDX/lib/TerrarumSansBitmap.jar!/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="437" column="21" lean-forward="true" selection-start-line="437" selection-start-column="21" selection-end-line="437" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="8" column="54" lean-forward="true" selection-start-line="8" selection-start-column="54" selection-end-line="8" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FontTestGDX/demotext.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="877" column="14" lean-forward="true" selection-start-line="877" selection-start-column="14" selection-end-line="877" selection-end-column="14" />
+        <state relative-caret-position="521">
+          <caret line="897" lean-forward="true" selection-start-line="897" selection-end-line="897" />
        </state>
      </provider>
    </entry>
--- a/FontTestGDX/demotext.txt
+++ b/FontTestGDX/demotext.txt
@@ -36,6 +36,7 @@ How multilingual? Real multilingual!
    􌿽ΔΙΑΦΥΛΆΞΤΕ ΓΕΝΙΚΆ ΤΗ ΖΩΉ ΣΑΣ ΑΠΌ ΒΑΘΕΙΆ ΨΥΧΙΚΆ ΤΡΑΎΜΑΤΑ􀀀
    􌿽სწრაფი ყავისფერი მელა გადაახტა ზარმაც ძაღლს􀀀
    􌿽Kæmi ný öxi hér, ykist þjófum nú bæði víl og ádrepa􀀀
+    􌿽Ꝺꝼuaꞅcail Íoꞅa Úꞃṁac na hÓiᵹe Beannaiꞇe póꞃ Éaḃa aᵹus Áꝺaiṁ􀀀
    􌿽Ċuaiġ bé ṁórṡáċ le dlúṫspád fíorḟinn trí hata mo ḋea-ṗorcáin ḃig􀀀
    􌿽あめつちほしそら やまかはみねたに くもきりむろこけ ひといぬうへすゑ ゆわさるおふせよ えの𛀁をなれゐて􀀀
    􌿽トリナクコヱス ユメサマセ ミヨアケワタル ヒンカシヲ ソライロハエテ オキツヘニ ホフネムレヰヌ モヤノウチ􀀀
--- a/assets/insular_variable.tga
+++ b/assets/insular_variable.tga
--- a/assets/kana.tga
+++ b/assets/kana.tga
--- a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
@@ -116,7 +116,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
    private fun isRunic(c: Int) = c in codeRange[SHEET_RUNIC]
    private fun isExtA(c: Int) = c in codeRange[SHEET_EXTA_VARW]
    private fun isExtB(c: Int) = c in codeRange[SHEET_EXTB_VARW]
-    private fun isKana(c: Int) = c in codeRange[SHEET_KANA]
+    private fun isKana(c: Int) = c in codeRange[SHEET_KANA] || c in 0x31F0..0x31FF || c in 0x1B000..0x1B001
    private fun isCJKPunct(c: Int) = c in codeRange[SHEET_CJK_PUNCT]
    private fun isUniHan(c: Int) = c in codeRange[SHEET_UNIHAN]
    private fun isCyrilic(c: Int) = c in codeRange[SHEET_CYRILIC_VARW]
@@ -136,6 +136,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
    private fun isColourCode(c: Int) = c in 0x100000..0x10FFFF
    private fun isCharsetOverride(c: Int) = c in 0xFFFF8..0xFFFFF
    private fun isCherokee(c: Int) = c in codeRange[SHEET_TSALAGI_VARW]
+    private fun isInsular(c: Int) = c == 0x1D79 || c in 0xA779..0xA787


    private fun extAindexX(c: Int) = (c - 0x100) % 16
@@ -150,7 +151,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
    private fun kanaIndexX(c: Int) = (c - 0x3040) % 16
    private fun kanaIndexY(c: Int) =
            if (c in 0x31F0..0x31FF) 12
-            else if (c in 0x31F0..0x31FF) 13
+            else if (c in 0x1B000..0x1B00F) 13
            else (c - 0x3040) / 16

    private fun cjkPunctIndexX(c: Int) = (c - 0x3000) % 16
@@ -192,6 +193,11 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
    private fun cherokeeIndexX(c: Int) = (c - 0x13A0) % 16
    private fun cherokeeIndexY(c: Int) = (c - 0x13A0) / 16

+    private fun insularIndexX(c: Int) =
+            if (c == 0x1D79) 0 else (c - 0xA770) % 16
+    private fun insularIndexY(c: Int) =
+            if (c == 0x1D79) 0 else (c - 0xA770) / 16
+
    private fun getColour(codePoint: Int): Color { // input: 0x10ARGB, out: RGBA8888
        if (colourBuffer.containsKey(codePoint))
            return colourBuffer[codePoint]!!
@@ -228,7 +234,8 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
            SHEET_LATIN_EXT_ADD_VARW,
            SHEET_BULGARIAN_VARW,
            SHEET_SERBIAN_VARW,
-            SHEET_TSALAGI_VARW
+            SHEET_TSALAGI_VARW,
+            SHEET_INSUAR_VARW
    )

    private val fontParentDir = if (fontDir.endsWith('/') || fontDir.endsWith('\\')) fontDir else "$fontDir/"
@@ -253,7 +260,8 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
            "puae000-e0ff.tga",
            "cyrilic_bulgarian_variable.tga",
            "cyrilic_serbian_variable.tga",
-            "tsalagi_variable.tga"
+            "tsalagi_variable.tga",
+            "insular_variable.tga"
    )
    private val codeRange = arrayOf( // MUST BE MATCHING WITH SHEET INDICES!!
            0..0xFF,
@@ -276,7 +284,8 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
            0xE000..0xE0FF,
            0xF00000..0xF0005F, // assign them to PUA
            0xF00060..0xF000BF, // assign them to PUA
-            0x13A0..0x13F5
+            0x13A0..0x13F5,
+            0xA770..0xA787
    )
    private val glyphProps: HashMap<Int, GlyphProps> = HashMap()
    private val sheets: Array<TextureRegionPack>
@@ -724,6 +733,8 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
            return SHEET_LATIN_EXT_ADD_VARW
        else if (isCherokee(c))
            return SHEET_TSALAGI_VARW
+        else if (isInsular(c))
+            return SHEET_INSUAR_VARW
        else
            return SHEET_UNKNOWN
        // fixed width
@@ -805,6 +816,10 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
                sheetX = cherokeeIndexX(ch)
                sheetY = cherokeeIndexY(ch)
            }
+            SHEET_INSUAR_VARW -> {
+                sheetX = insularIndexX(ch)
+                sheetY = insularIndexY(ch)
+            }
            else -> {
                sheetX = ch % 16
                sheetY = ch / 16
@@ -868,6 +883,15 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
        (0xD800..0xDFFF).forEach { glyphProps[it] = GlyphProps(0, 0) }
        (0x100000..0x10FFFF).forEach { glyphProps[it] = GlyphProps(0, 0) }
        (0xFFFF8..0xFFFFF).forEach { glyphProps[it] = GlyphProps(0, 0) }
+
+
+        // manually build width table of Kana Supplements
+        (0x31F0..0x31FF).forEach { glyphProps[it] = GlyphProps(W_KANA, 0) }
+        (0x1B000..0x1B001).forEach { glyphProps[it] = GlyphProps(W_KANA, 0) }
+
+        // manually add width of one orphan insular letter
+        // WARNING: glyphs in 0xA770..0xA778 has invalid data, further care is required
+        glyphProps[0x1D79] = GlyphProps(9, 0)
    }

    private val glyphLayout = GlyphLayout()
@@ -1001,6 +1025,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
        internal val SHEET_BULGARIAN_VARW =    18
        internal val SHEET_SERBIAN_VARW =      19
        internal val SHEET_TSALAGI_VARW =      20
+        internal val SHEET_INSUAR_VARW =       21

        internal val SHEET_UNKNOWN = 254