diff --git a/assets/devanagari_variable.tga b/assets/devanagari_variable.tga index ec84188..f95dfa0 100644 --- a/assets/devanagari_variable.tga +++ b/assets/devanagari_variable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e39e686cfdc068d08a3a245d110bf09920f4fd6c4c6a6e1b83c01c09621ca34b +oid sha256:02a4a13d728fda9ac90d5c1ac6fc083515c91d576a94861acdbbe5eadf9c574a size 491538 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index d8200bf..44e80ab 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -1808,7 +1808,7 @@ class TerrarumSansBitmap( // TODO use proper version of Virama for respective scripts private fun CodePoint.toHalfFormOrVirama(): List = this.toHalfFormOrNull().let { -// println("[TerrarumSansBitmap] toHalfForm ${this.charInfo()} = ${it?.charInfo()}") + println("[TerrarumSansBitmap] toHalfForm ${this.charInfo()} = ${it?.charInfo()}") if (it == null) listOf(this, DEVANAGARI_VIRAMA) else listOf(it) } @@ -1822,7 +1822,7 @@ class TerrarumSansBitmap( } private fun ligateIndicConsonants(c1: CodePoint, c2: CodePoint): List { -// println("[TerrarumSansBitmap] Indic ligation ${c1.charInfo()} - ${c2.charInfo()}") + println("[TerrarumSansBitmap] Indic ligation ${c1.charInfo()} - ${c2.charInfo()}") if (c2 == DEVANAGARI_RA) return toRaAppended(c1) // Devanagari @.RA when (c1) { 0x0915 -> /* Devanagari KA */ when (c2) { @@ -1836,6 +1836,9 @@ class TerrarumSansBitmap( 0x091F -> return listOf(0xF01A2) // GH.TT 0x0920 -> return listOf(0xF01A3) // GH.TTH 0x0922 -> return listOf(0xF01A4) // GH.DDH + 0xF014F -> return listOf(0xF0172) // GH.TTR + 0xF0150 -> return listOf(0xF0173) // GH.TTHR + 0xF0152 -> return listOf(0xF0174) // GH.DDHR else -> return c1.toHalfFormOrVirama() + c2 } 0x0919 -> /* Devanagari NGA */ when (c2) { @@ -1907,12 +1910,18 @@ class TerrarumSansBitmap( 0x091F -> return listOf(0xF01A5) // P.TT 0x0920 -> return listOf(0xF01A6) // P.TTH 0x0922 -> return listOf(0xF01A7) // P.DDH + 0xF014F -> return listOf(0xF0175) // P.TTR + 0xF0150 -> return listOf(0xF0176) // P.TTHR + 0xF0152 -> return listOf(0xF0177) // P.DDHR else -> return c1.toHalfFormOrVirama() + c2 } 0x0937 -> /* Devanagari SSA */ when (c2) { 0x091F -> return listOf(0xF01A8) // SS.TT - 0x0920 -> return listOf(0xF01AA) // SS.TTH - 0x0922 -> return listOf(0xF01AB) // SS.DDH + 0x0920 -> return listOf(0xF01A9) // SS.TTH + 0x0922 -> return listOf(0xF01AA) // SS.DDH + 0xF014F -> return listOf(0xF0178) // SS.TTR + 0xF0150 -> return listOf(0xF0179) // SS.TTHR + 0xF0152 -> return listOf(0xF017A) // SS.DDHR else -> return c1.toHalfFormOrVirama() + c2 } 0x0939 -> /* Devanagari HA */ when (c2) { diff --git a/testing.PNG b/testing.PNG index c8826a7..9e0d3f5 100755 Binary files a/testing.PNG and b/testing.PNG differ diff --git a/testtext.txt b/testtext.txt index 8ba8df9..5ad595a 100755 --- a/testtext.txt +++ b/testtext.txt @@ -8,4 +8,6 @@ शर्करा « RAsup must be above KA अंग्रेजी ख्य -மோநௌ « check the sanity of glyph reordering \ No newline at end of file +மோநௌ « check the sanity of glyph reordering +भ्रष्ट ष्ट्रॉष्ठ्रॊष्ढ्रो प्ट्रॉप्ठ्रॊप्ढ्रो घ्ट्रॉघ्ठ्रॊघ्ढ्रो ष्ट्र्गौ ष्ठ्दॊ ष्ट्कष्ठ्कष्ढ्क +ष्ट्र्कष्ठ्र्कष्ढ्र्क प्ट्र्खप्ठ्र्खप्ढ्र्ख घ्ट्र्गघ्ठ्र्गघ्ढ्र्ग \ No newline at end of file diff --git a/work_files/devanagari_variable.psd b/work_files/devanagari_variable.psd index 7088f8a..5b30cea 100644 --- a/work_files/devanagari_variable.psd +++ b/work_files/devanagari_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e5ffee10b3f4546770ca6844d1d777a351a8477beb54a884c602cedbaa0d0d7 -size 543168 +oid sha256:44ca348ab5f236904e7a5ab330a49ee72252ecc1330898c08851830a6f3d2083 +size 551466