diff --git a/assets/devanagari_variable.tga b/assets/devanagari_variable.tga index 008d26f..27d8d32 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:dfe372a7dd72b36f6b496321c6604990110304bfdc80dc7c6eadac4f92fdf813 +oid sha256:73d3c5e9adbebfb30b3be3173468a871bc5979b5b1902765b6de653cd8b4cef8 size 409618 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index 31cd85c..efe9b58 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -1700,6 +1700,7 @@ class TerrarumSansBitmap( private val DEVANAGARI_VIRAMA = 0x94D private val DEVANAGARI_RA = 0x930 private val DEVANAGARI_RRA = 0x931 + private val DEVANAGARI_YA = 0x92F private val DEVANAGARI_SYLL_RU = 0xF0100 private val DEVANAGARI_SYLL_RUU = 0xF0101 @@ -1765,29 +1766,39 @@ class TerrarumSansBitmap( 0x0919 -> /* Devanagari NGA */ when (c2) { 0x0917 -> return listOf(0xF0182) // NG.G 0x092E -> return listOf(0xF0183) // NG.M + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // NG.Y + else -> return c1.toHalfFormOrVirama() + c2 + } + 0x091B -> /* Devanagari CHA */ when (c2) { + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // CH.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x091C -> /* Devanagari JA */ when (c2) { 0x091E -> return listOf(DEVANAGARI_LIG_J_NY) // J.NY + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // J.Y 0xF014E -> return listOf(DEVANAGARI_LIG_J_NY_R) // J.NY.R else -> return c1.toHalfFormOrVirama() + c2 } 0x091F -> /* Devanagari TTA */ when (c2) { 0x091F -> return listOf(0xF0185) // TT.TT 0x0920 -> return listOf(0xF0186) // TT.TTH + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // TT.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x0920 -> /* Devanagari TTHA */ when (c2) { 0x0920 -> return listOf(0xF0187) // TTH.TTH + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // TTH.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x0921 -> /* Devanagari DDA */ when (c2) { 0x0921 -> return listOf(0xF0188) // DD.DD 0x0922 -> return listOf(0xF0189) // DD.DDH + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // DD.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x0922 -> /* Devanagari DDHA */ when (c2) { 0x0922 -> return listOf(0xF018A) // DDH.DDH + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // DDH.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x0924 -> /* Devanagari TA */ when (c2) { diff --git a/testing.PNG b/testing.PNG index c420425..489d0a8 100755 Binary files a/testing.PNG and b/testing.PNG differ diff --git a/testtext.txt b/testtext.txt index 86627de..263372c 100755 --- a/testtext.txt +++ b/testtext.txt @@ -1,3 +1,4 @@ -फ़ॊण्ज़ीणू क्की क्कि र्क र्त्सा र्र्ल ऱ्ड क्राप् ठ्री त्र् त्र्मोत्र्यो -ह्णह्नह्मह्यह्लह्वह्र णनमयलव ज़्लतान छात्त्र क्ष्र ज्ञ्र +फ़ॊण्ज़ीणू क्की क्कि र्क र्त्सा र्र्ल ऱ्ड क्राप् ठ्री त्र् स्त्रक्ष्य +ह्णह्नह्मह्यह्लह्वह्र णनमयलव ज़्लतान छात्त्र छात्र क्ष्र ज्ञ्र +ङ्यछ्यट्यठ्यड्यढ्यद्यश्यह्य ढा \ No newline at end of file diff --git a/work_files/devanagari_variable.psd b/work_files/devanagari_variable.psd index 251b79e..710cec3 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:649fe18658de750206c08dad8c9b0f69dfa00b25c680e9f4601ac19dca41d1e7 -size 448154 +oid sha256:208d0aed2e5389e7d8ead6fa6f5886bfb0a75583bef3fcdd028555d0dda91c0e +size 448253