From b128312e2ca0466109e1d28c481b7f8a9ff4f2bc Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 19 Jan 2022 11:16:28 +0900 Subject: [PATCH] wippie --- assets/devanagari_variable.tga | 2 +- .../gdx/TerrarumSansBitmap.kt | 11 +++++++++++ testing.PNG | Bin 16651 -> 17471 bytes testtext.txt | 5 +++-- work_files/devanagari_variable.psd | 4 ++-- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/assets/devanagari_variable.tga b/assets/devanagari_variable.tga index 008d26f..27d8d32 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:dfe372a7dd72b36f6b496321c6604990110304bfdc80dc7c6eadac4f92fdf813 +oid sha256:73d3c5e9adbebfb30b3be3173468a871bc5979b5b1902765b6de653cd8b4cef8 size 409618 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index 31cd85c..efe9b58 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -1700,6 +1700,7 @@ class TerrarumSansBitmap( private val DEVANAGARI_VIRAMA = 0x94D private val DEVANAGARI_RA = 0x930 private val DEVANAGARI_RRA = 0x931 + private val DEVANAGARI_YA = 0x92F private val DEVANAGARI_SYLL_RU = 0xF0100 private val DEVANAGARI_SYLL_RUU = 0xF0101 @@ -1765,29 +1766,39 @@ class TerrarumSansBitmap( 0x0919 -> /* Devanagari NGA */ when (c2) { 0x0917 -> return listOf(0xF0182) // NG.G 0x092E -> return listOf(0xF0183) // NG.M + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // NG.Y + else -> return c1.toHalfFormOrVirama() + c2 + } + 0x091B -> /* Devanagari CHA */ when (c2) { + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // CH.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x091C -> /* Devanagari JA */ when (c2) { 0x091E -> return listOf(DEVANAGARI_LIG_J_NY) // J.NY + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // J.Y 0xF014E -> return listOf(DEVANAGARI_LIG_J_NY_R) // J.NY.R else -> return c1.toHalfFormOrVirama() + c2 } 0x091F -> /* Devanagari TTA */ when (c2) { 0x091F -> return listOf(0xF0185) // TT.TT 0x0920 -> return listOf(0xF0186) // TT.TTH + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // TT.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x0920 -> /* Devanagari TTHA */ when (c2) { 0x0920 -> return listOf(0xF0187) // TTH.TTH + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // TTH.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x0921 -> /* Devanagari DDA */ when (c2) { 0x0921 -> return listOf(0xF0188) // DD.DD 0x0922 -> return listOf(0xF0189) // DD.DDH + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // DD.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x0922 -> /* Devanagari DDHA */ when (c2) { 0x0922 -> return listOf(0xF018A) // DDH.DDH + DEVANAGARI_YA -> return c1.toHalfFormOrVirama() + DEVANAGARI_OPEN_YA // DDH.Y else -> return c1.toHalfFormOrVirama() + c2 } 0x0924 -> /* Devanagari TA */ when (c2) { diff --git a/testing.PNG b/testing.PNG index c420425859ab865947e68d23df76e5abab51c737..489d0a819fd5e58146dd8e730b78fd6e7fceb0bf 100755 GIT binary patch literal 17471 zcmeI3`(IM&zQSpg`+nAX)}{D;u`Y|f76Sm_vh%OozXgB=833>tShNuO=D|?!D*)KOaOd`~|CU=d zF}#yBq4?pe1eZ24cs0vRdI=)JJ9pP?oew9 z(_vye=axXBJe@NWe}O*Vu+Mn`z*mLw3jpBaa;PaFc$*6Ve1^U|4*(u7+5!NlJ#Im5 zFY|u}ojd$T|9Euwc@>-Kuri$vZ3)Vu$2n(}e0BtjX`6^-m}if@r2@c=uX;rWzvxL# z_==j~8aC55*@R;{=PYr<%jPB`xm>1E;Or`zY0$6o1{r2>IdB?mTlXvlabyk^E;|W5jxX!yF(aOphMeZw+apNDm^9M?lTVB5+P#zEBGq!N?4$C^D`vyrlh%ysD4Hu^&yL zNtvU`?4)YvcOOFDco8o|U`*e9o;i~fS>B-K`COoqQ!2@Mk6Im?ye7q#$-Na^BdUx| zGa=o;)_QSwOL4BmWIe4M`(;|JGtKZoRFUx1^(j`%Jb<3_=vLUIE~z@|{;9#=NflPP ze~ISciR>XxP8D@uY$~Ha$0yp{<;|n-Yg9`T@VF~NEw_kjo>Luk_@lmwV~AyKcxf64 zu9aE-VVHBISPKDwz77iNyk}7zDxxuaQ-VUA)K_mYdQTtAQ6CI#v6)xZyhV|SRraPf z?ExQgC;t*@imcFx!$wOR_)mu4DhyG!d}5%plzl6ty@^&5ZK^J^t7S&Nxk9MJ0VOPs zd1|FEYIe;clhs*Int85ZBvxmpVL4i^XmwwzChOs4Zm`kYH~i((q_{Tm$24~P@>t`5 zy4iH^F>i7mIpI@aBp`3?v$6uu6w#u`cH|A+tuj6n6|59Z%Q7n!jO^$A10d#rax52v zkW2YEj|zDwJwO_)bS;UpS(BpT2(6P(Z)HQVDSPrsofm>}(Lq*yq8io;{-%C~3a?I3;YR>!``g zlj4wE);akRelEbwrG4jBbbqQi;Baf^tZ{7NYt_Qx%~P_J-Yny?UzbbCM@CV67K$vv z^YmS*$})Crf4?Z0p!d9FvZjs6k>y;eawAGfPIPtiVfCr+%<3juOs`cm`^0N{GZ z;}OFrMXxttLr45m-;L*BBTHWYhoZVlqi8lBRI1OT8&mFau2dtVCAt{`*o4Je)aO%W zvhj&#sf7DPrJ_UG(Xbo5+s&-bj3*MWvZCe3C(VLjbcd+^>!xr+=ZiDAEG!NE@~A_M zW$=qThJ}+SMvT~_N3u`EiEwz=ie%yZQC5zxsKlS#y4hfNlrD4bV)o1fnqQhNcLO)3 zpS<7Y4vCI3DQrTIlG3&IiMjrqXzO#i>e19dDsno1Z^67`x?~s^)_&I5wN+V$U`YnD z*tx8j*`A}o=@N72>XgL5jXsX$xUZH{itJg3sMp^{#b^>8o%4VPA>y37-EMet!hG@N zFD{y6_!!)`bG;@27>S0?hzh-L?3CN*d!nWpQM9B9VM+~qc6I?kzmw^gLEq~tTmWg% zJ!5U;ge!2Gz2|OedK^?xP^BLVil?h!1I~NyM=tgwZGiX!ZZ2o0)>^I*;;Fsm+(+>^Yahg-