diff --git a/assets/devanagari_variable.tga b/assets/devanagari_variable.tga index 1aa982c..b030cf3 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:1bd3d2a78cead096c09ea95e309e25aad61005ae1df8ceceba69e9f8acf93618 +oid sha256:aaf2b6436ac2f93fd0839f6e1cb2cfe44f432dc641d0a54b0fab5102d14a9920 size 1474578 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index 47236e0..975f5b4 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -1728,9 +1728,9 @@ class TerrarumSansBitmap( 0x091F.toDevaInternal() -> return listOf(0xF018D) // GH.TT 0x0920.toDevaInternal() -> return listOf(0xF018E) // GH.TTH 0x0922.toDevaInternal() -> return listOf(0xF018F) // GH.DDH - 0xF032A -> return listOf(0xF036D) // GH.TTR - 0xF032B -> return listOf(0xF036E) // GH.TTHR - 0xF032D -> return listOf(0xF036F) // GH.DDHR + 0xF032A -> return listOf(0xF036D) // GH.TT.R + 0xF032B -> return listOf(0xF036E) // GH.TTH.R + 0xF032D -> return listOf(0xF036F) // GH.DDH.R else -> return c1.toHalfFormOrVirama() + c2 } 0x0919.toDevaInternal() -> /* Devanagari NGA */ when (c2) { @@ -1805,18 +1805,20 @@ class TerrarumSansBitmap( 0x091F.toDevaInternal() -> return listOf(0xF0190) // P.TT 0x0920.toDevaInternal() -> return listOf(0xF0191) // P.TTH 0x0922.toDevaInternal() -> return listOf(0xF0192) // P.DDH - 0xF032A -> return listOf(0xF0370) // P.TTR - 0xF032B -> return listOf(0xF0371) // P.TTHR - 0xF032D -> return listOf(0xF0372) // P.DDHR + 0xF032A -> return listOf(0xF0370) // P.TT.R + 0xF032B -> return listOf(0xF0371) // P.TTH.R + 0xF032D -> return listOf(0xF0372) // P.DDH.R else -> return c1.toHalfFormOrVirama() + c2 } 0x0937.toDevaInternal() -> /* Devanagari SSA */ when (c2) { 0x091F.toDevaInternal() -> return listOf(0xF0193) // SS.TT 0x0920.toDevaInternal() -> return listOf(0xF0194) // SS.TTH 0x0922.toDevaInternal() -> return listOf(0xF0195) // SS.DDH + 0x092A.toDevaInternal() -> return listOf(0xF0177) // SS.P 0xF032A -> return listOf(0xF0373) // SS.TTR 0xF032B -> return listOf(0xF0374) // SS.TTHR 0xF032D -> return listOf(0xF0375) // SS.DDHR + 0xF0335 -> return listOf(0xF0357) // SS.PR else -> return c1.toHalfFormOrVirama() + c2 } 0x0938.toDevaInternal() -> /* Devanagari SA */ when (c2) { @@ -1839,7 +1841,7 @@ class TerrarumSansBitmap( DEVANAGARI_YA -> return listOf(MARWARI_LIG_DD_Y) // DD.Y else -> return c1.toHalfFormOrVirama() + c2 } - in 0xF0180..0xF0189 -> /* Devanagari D.@A */ when (c2) { + in (0xF0180..0xF01AF) + (0xF0360..0xF038F) -> when (c2) { DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA else -> return c1.toHalfFormOrVirama() + c2 } @@ -2091,6 +2093,7 @@ class TerrarumSansBitmap( private val DEVANAGARI_LIG_N_T = 0xF0174 private val DEVANAGARI_LIG_N_N = 0xF0175 private val DEVANAGARI_LIG_S_V = 0xF0176 + private val DEVANAGARI_LIG_SS_P = 0xF0177 private val MARWARI_LIG_DD_DD = 0xF018A private val MARWARI_LIG_DD_DDH = 0xF018B diff --git a/testing.PNG b/testing.PNG index 1a47b3f..e990b79 100755 Binary files a/testing.PNG and b/testing.PNG differ diff --git a/testtext.txt b/testtext.txt index b2b3b68..872c519 100755 --- a/testtext.txt +++ b/testtext.txt @@ -6,8 +6,8 @@ विकिपीडिया का शुभारम्भ जुलाई 2003 में हुआ। सहायता पृष्ठ पर जाएं और प्रयोगस्थल में प्रयोग करके देखें कि आप स्वयं किसी लेख को कैसे परिवर्तित कर सकते हैं। - पुनर्वितरण < RAsup on व परिवर्तित < RAsup on त क्या‽ र्के र्कॆ र्कै -स्वतन्त्र स्व्र \ No newline at end of file +स्वतन्त्र स्व्र +ष्क ष्क्र ष्ट ष्ट्य ष्ट्र ष्ट्व ष्ठ ष्ठ्य ष्ण ष्ण्य ष्प ष्प्र ष्म ष्य ष्व \ No newline at end of file diff --git a/work_files/devanagari_variable.psd b/work_files/devanagari_variable.psd index b9e9148..0bf6098 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:f90104136e4955b6813dc4d8f5d09c196464c6e7ae2a45f8b6a2b18eefb01674 -size 1420615 +oid sha256:613194f499627f23b2fa4a7d064146223f7c4fa6ae39fe8ba38335aa3f9527fa +size 1421184