diff --git a/assets/devanagari_variable.tga b/assets/devanagari_variable.tga index b6058c2..42f577a 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:480fc4d70b89895e8e50311572cbbc79d5fb1e4e83b254fdb0382c3bd5580a01 +oid sha256:43d0c132455fcfb1713f81756625e029b8bac68ef869e547f2a99237a10fad39 size 1474578 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index 516851a..acdf589 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -1720,7 +1720,7 @@ class TerrarumSansBitmap( 0x0915.toDevaInternal() -> /* Devanagari KA */ when (c2) { 0x0924.toDevaInternal() -> return listOf(DEVANAGARI_LIG_K_T) // K.T 0x0937.toDevaInternal() -> return listOf(DEVANAGARI_LIG_K_SS) // K.SS - 0xF0337 -> return listOf(0xF0351) // K.SS.R + 0xF0337 -> return listOf(0xF0351) // K+SS.R DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // K.Y else -> return c1.toHalfFormOrVirama() + c2 } @@ -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.TT.R - 0xF032B -> return listOf(0xF036E) // GH.TTH.R - 0xF032D -> return listOf(0xF036F) // GH.DDH.R + 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) { @@ -1793,6 +1793,16 @@ class TerrarumSansBitmap( 0x092E.toDevaInternal() -> return listOf(0xF0187) // D.M 0x092F.toDevaInternal() -> return listOf(0xF0188) // D.Y 0x0935.toDevaInternal() -> return listOf(0xF0189) // D.V + 0xF0322 -> return listOf(0xF0360) // D+G.R + 0xF0323 -> return listOf(0xF0361) // D+GH.R + 0xF0331 -> return listOf(0xF0362) // D+D.R + 0xF0332 -> return listOf(0xF0363) // D+DH.R + 0xF0333 -> return listOf(0xF0364) // D+N.R + 0xF0337 -> return listOf(0xF0365) // D+B.R + 0xF0338 -> return listOf(0xF0366) // D+BH.R + 0xF0339 -> return listOf(0xF0367) // D+M.R + 0xF033A -> return listOf(0xF0368) // D+Y.R + 0xF0340 -> return listOf(0xF0369) // D+V.R else -> return c1.toHalfFormOrVirama() + c2 } 0x0928.toDevaInternal() -> /* Devanagari NA */ when (c2) { @@ -1805,9 +1815,9 @@ 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.TT.R - 0xF032B -> return listOf(0xF0371) // P.TTH.R - 0xF032D -> return listOf(0xF0372) // P.DDH.R + 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) { @@ -1815,10 +1825,10 @@ class TerrarumSansBitmap( 0x0920.toDevaInternal() -> return listOf(0xF0194) // SS.TTH 0x0922.toDevaInternal() -> return listOf(0xF0195) // SS.DDH 0x092A.toDevaInternal() -> return listOf(DEVANAGARI_LIG_SS_P) // 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 + 0xF032A -> return listOf(0xF0373) // SS+TT.R + 0xF032B -> return listOf(0xF0374) // SS+TTH.R + 0xF032D -> return listOf(0xF0375) // SS+DDH.R + 0xF0335 -> return listOf(0xF0357) // SS+P.R else -> return c1.toHalfFormOrVirama() + c2 } 0x0938.toDevaInternal() -> /* Devanagari SA */ when (c2) { @@ -1841,6 +1851,10 @@ class TerrarumSansBitmap( DEVANAGARI_YA -> return listOf(MARWARI_LIG_DD_Y) // DD.Y else -> return c1.toHalfFormOrVirama() + c2 } + 0xF0331 -> /* Devanagari D.RA */ when (c2) { + DEVANAGARI_YA -> return listOf(DEVANAGARI_LIG_D_R_Y) // D.R+Y + else -> return c1.toHalfFormOrVirama() + c2 + } in (0xF0180..0xF01AF) + (0xF0360..0xF038F) -> when (c2) { DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA else -> return c1.toHalfFormOrVirama() + c2 @@ -2087,6 +2101,7 @@ class TerrarumSansBitmap( private val MARWARI_DD = 0x978 private val DEVANAGARI_LIG_K_T = 0xF018C + private val DEVANAGARI_LIG_D_R_Y = 0xF0170 private val DEVANAGARI_LIG_K_SS = 0xF0171 private val DEVANAGARI_LIG_J_NY = 0xF0172 private val DEVANAGARI_LIG_T_T = 0xF0173 diff --git a/testing.PNG b/testing.PNG index 40ff8a2..5644b0d 100755 Binary files a/testing.PNG and b/testing.PNG differ diff --git a/work_files/devanagari_variable.psd b/work_files/devanagari_variable.psd index 606a52a..9ebf68c 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:dd3c53a4e41fcc7fddbe28cb99482f574fd40c13db8f89cfe2575820a9f77b07 -size 1421765 +oid sha256:4d08974e99771ef7c6befec48ff7677d4f7841e925481fd04b995b466e686a90 +size 1433187