diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a155fb..5ef4401 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,7 +60,12 @@ Rightmost vertical column (should be 20 px tall) contains the tags. Tags are def A -' 0 left 0 right 1 centre 1 the glyph D --Diacritics Type Bit (see below; not all diacritics are marked as one on the spritesheet) S -,_ 0 Stack 1 Stack 0 Before 1 Up & -(MSB) S -' 0 up 0 down 1 &After 1 Down (e.g. U+0C48) +(MSB) S -' 0 up 0 down 1 &After 1 Down* (e.g. U+0C48) + +Up&Down: +1. when two pixels are both #00FF00 it's "don't stack" +2. otherwise, it's actually up&down + ``` #### Nudging Bits Encoding diff --git a/assets/devanagari_variable.tga b/assets/devanagari_variable.tga index e58a2e9..7ceb05d 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:4630071de6a33e3716094b4b476c1c038b3ea2763309cfb08cf00d42566f3187 +oid sha256:2cb34d180b24d96bb15c88359dbd33287b056dfe0b5e3ce284af090e397ffd43 size 491538 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index b845151..5609985 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -1823,25 +1823,25 @@ class TerrarumSansBitmap( private val DEVANAGARI_LIG_K_SS = 0xF0181 private val DEVANAGARI_LIG_J_NY = 0xF0184 private val DEVANAGARI_LIG_T_T = 0xF018B + private val DEVANAGARI_LIG_N_T = 0xF01B0 private val MARWARI_LIG_DD_DD = 0xF01AB private val MARWARI_LIG_DD_DDH = 0xF01AC private val MARWARI_LIG_DD_Y = 0xF01AD private val DEVANAGARI_LIG_T_R = 0xF0154 - private val DEVANAGARI_LIG_SH_R = 0xF0166 private val MARWARI_LIG_DD_R = 0xF016A private val DEVANAGARI_LIG_K_SS_R = 0xF016B private val DEVANAGARI_LIG_J_NY_R = 0xF016C private val DEVANAGARI_LIG_T_T_R = 0xF016D + private val DEVANAGARI_LIG_N_T_R = 0xF016E private val DEVANAGARI_HALFLIG_K_SS = 0xF012B private val DEVANAGARI_HALFLIG_J_NY = 0xF012C private val DEVANAGARI_HALFLIG_T_T = 0xF012D + private val DEVANAGARI_HALFLIG_N_T = 0xF01C4 private val MARWARI_HALFLIG_DD_Y = 0xF01AE -// private val DEVANAGARI_HALFLIG_T_R = 0xF012E -// private val DEVANAGARI_HALFLIG_SH_R = 0xF012F private val DEVANAGARI_HALF_FORMS = 0xF0100 // starting point for Devanagari half forms private val DEVANAGARI_LIG_X_R = 0xF0140 // starting point for Devanagari ligature CONSONANT+RA @@ -1852,6 +1852,7 @@ class TerrarumSansBitmap( 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_LIG_N_T) return DEVANAGARI_HALFLIG_N_T if (this == DEVANAGARI_OPEN_YA) return DEVANAGARI_OPEN_HALF_YA if (this == MARWARI_LIG_DD_Y) return MARWARI_HALFLIG_DD_Y if (this in devanagariBaseConsonants) return (this - 0x0910 + DEVANAGARI_HALF_FORMS) @@ -1958,7 +1959,9 @@ class TerrarumSansBitmap( else -> return c1.toHalfFormOrVirama() + c2 } 0x0928 -> /* Devanagari NA */ when (c2) { + 0x0924 -> return listOf(DEVANAGARI_LIG_N_T) // N.T 0x0928 -> return listOf(0xF0193) // N.N + DEVANAGARI_LIG_T_R -> return listOf(DEVANAGARI_LIG_N_T_R) // N.T.R else -> return c1.toHalfFormOrVirama() + c2 } 0x092A -> /* Devanagari PA */ when (c2) { diff --git a/testing.PNG b/testing.PNG index f0cf6e4..db5669b 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 4cb9db9..9bc58b3 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:0fb2247dba25c3c1b4f0c40148b6c602129e06c1d36ff6fc9b52ca2e247507c9 -size 555959 +oid sha256:426c5dc48f164f8930306fdc8d1940c8d1d0516dc8e341ed38f3b590743f13e4 +size 557533