From f3aeba3d7007bc25b9f812e50cc25d53fa096b82 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 20 Jan 2022 14:47:21 +0900 Subject: [PATCH] eh whateves --- assets/devanagari_variable.tga | 2 +- .../gdx/TerrarumSansBitmap.kt | 14 ++++++++------ testing.PNG | Bin 19569 -> 19629 bytes testtext.txt | 2 +- work_files/devanagari_variable.psd | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) 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 8db9503b3c4f0b32c5b7920ea696308ac4ef590d..140310afce50ac4490032da01cb258a2942935d7 100755 GIT binary patch delta 5436 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 literal 19569 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 L{G7G->mU9df2Omm 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