diff --git a/assets/devanagari_variable.tga b/assets/devanagari_variable.tga index 42502a7..d235b4a 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:c24125c03673e9eb13e97a4e4b37207f37c3cdf7eae6ff47bb956b9370d8ed58 +oid sha256:b56c3f5daa0c3948e758cc8a8bd7003899b856cb14fe52eb92cabc46293c30f1 size 491538 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index 259a409..ba48238 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -1709,13 +1709,13 @@ class TerrarumSansBitmap( private val TAMIL_KSSA = 0xF00ED private val TAMIL_SHRII = 0xF00EE - private val devanagariConsonants = ((0x0915..0x0939) + (0x0958..0x095F) + (0x0978..0x097F) + (0xF0140..0xF01FF)).toIntArray() + private val devanagariConsonants = ((0x0915..0x0939) + (0x0958..0x095F) + (0x0978..0x097F) + (0xF0105..0xF01FF)).toIntArray() private val devanagariBaseConsonants = 0x0915..0x0939 private val devanagariBaseConsonantsWithNukta = 0x0958..0x095F private val devanagariBaseConsonantsExtended = 0x0978..0x097F private val devanagariPresentationConsonants = 0xF0140..0xF01FF - private val devanagariPresentationConsonantsWithRa = 0xF0140..0xF017F + private val devanagariPresentationConsonantsWithRa = 0xF0145..0xF017F private val DEVANAGARI_VIRAMA = 0x94D private val DEVANAGARI_RA = 0x930 @@ -1733,7 +1733,8 @@ class TerrarumSansBitmap( private val DEVANAGARI_SYLL_HU = 0xF0130 private val DEVANAGARI_SYLL_HUU = 0xF0131 - private val DEVANAGARI_OPEN_YA = 0xF0137 + private val DEVANAGARI_OPEN_YA = 0xF0136 + private val DEVANAGARI_OPEN_HALF_YA = 0xF0137 private val DEVANAGARI_RA_SUPER = 0xF0104 private val DEVANAGARI_EYELASH_RA = 0xF012A @@ -1759,12 +1760,13 @@ class TerrarumSansBitmap( private val DEVANAGARI_LIG_X_R = 0xF0140 // starting point for Devanagari ligature CONSONANT+RA private fun CodePoint.toHalfFormOrNull(): CodePoint? { - if (this in devanagariBaseConsonants) return (this - 0x0910 + DEVANAGARI_HALF_FORMS) - if (this in devanagariBaseConsonantsWithNukta) return (this - 0x0920 + DEVANAGARI_HALF_FORMS) - if (this in devanagariPresentationConsonantsWithRa) return this + 0x80 if (this == DEVANAGARI_LIG_K_SS) return DEVANAGARI_HALFLIG_K_SS if (this == DEVANAGARI_LIG_J_NY) return DEVANAGARI_HALFLIG_J_NY if (this == DEVANAGARI_LIG_T_T) return DEVANAGARI_HALFLIG_T_T + if (this == DEVANAGARI_OPEN_YA) return DEVANAGARI_OPEN_HALF_YA + if (this in devanagariBaseConsonants) return (this - 0x0910 + DEVANAGARI_HALF_FORMS) + if (this in devanagariBaseConsonantsWithNukta) return (this - 0x0920 + DEVANAGARI_HALF_FORMS) + if (this in devanagariPresentationConsonantsWithRa) return this + 0x80 return null } diff --git a/testing.PNG b/testing.PNG index 8db9503..140310a 100755 Binary files a/testing.PNG and b/testing.PNG differ diff --git a/testtext.txt b/testtext.txt index e41405b..a054246 100755 --- a/testtext.txt +++ b/testtext.txt @@ -2,5 +2,5 @@ फ़ॊण्ज़ीणू क्की क्कि र्क र्त्सा र्र्ल ऱ्ड क्राप् ठ्री त्र् स्त्रक्ष्य ह्णह्नह्मह्यह्लह्वह्र णनमयलव ज़्लतान छात्त्र छात्र क्ष्र ज्ञ्र ङ्यछ्यट्यठ्यड्यढ्यद्यश्यह्य ढा ऱुमिक्युब हुहू दुदू द्गद्घद्द ढ्ढढ्वद्व -ग्र्क्र क्श्र त्रत्त्र क्ष्र्प ढ्य्ब +ग्र्क्र क्श्र त्रत्त्र क्ष्र्प ढ्य्ब न्न्ग तत्र अग्निः अस्ति। अष्टाध्यायी \ No newline at end of file diff --git a/work_files/devanagari_variable.psd b/work_files/devanagari_variable.psd index 2be8382..41230e1 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:f9a167c0fe7917e856283e6d9df8ba10d90c78418ebc6877ae25be09f73c3b56 -size 540521 +oid sha256:39d719fbabb5da57374da3394faa796ca2a1905e511afaddc0c7078a254f581f +size 540883