From dc6bd89497fd68d4be015eb973cbf3ec5ff1a839 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Tue, 21 Dec 2021 12:01:48 +0900
Subject: [PATCH] expanding diacritics types to correctly implement thai
 diacritics

---
 CONTRIBUTING.md                               |  65 ++++++++----------
 assets/ascii_variable.tga                     |   2 +-
 assets/diacritical_marks_variable.tga         | Bin 143378 -> 131 bytes
 assets/ipa_ext_variable.tga                   |   2 +-
 assets/thai_variable.tga                      |   2 +-
 .../torvald/terrarumsansbitmap/GlyphProps.kt  |   4 +-
 .../gdx/TerrarumSansBitmap.kt                 |  36 ++++++----
 testing.PNG                                   | Bin 19149 -> 14091 bytes
 testtext.txt                                  |  16 +----
 work_files/ascii_variable.psd                 |   4 +-
 work_files/diacritical_marks_variable.psd     | Bin 132187 -> 131 bytes
 work_files/ipa_ext_variable.psd               |   4 +-
 work_files/thai_variable.psd                  |   4 +-
 13 files changed, 67 insertions(+), 72 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c846d38..c99529e 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ Font Spritesheets are stored in ```assets/graphics/fonts``` directory. Image for
 
 #### Before getting started, you did read our design goals, right? Good. Now you may continue your awesome work.
 
-### Ascenders, descenders, width informations (aka Glyph Tags)
+## Ascenders, descenders, width informations (aka Glyph Tags)
 
 ![Alas, use more modern browser or get better internet connexion!](glyph_height_pos_annotation.png)
 
@@ -26,11 +26,11 @@ Each cell is 16 px wide, and any glyph you draw **must be contained within lefts
 
 
 
-### Font Metrics
+## Font Metrics for variable-width font sheets
 
 Although the font is basically a Spritesheet, some of the sheet expects variable widths to be supported. Any sheets with ```_variable``` means it expects variable widths. Anything else expects fixed width (regular Spritesheet behaviour). ```cjkpunct``` has width of 10, ```kana``` and ```hangul_johab``` has width of 12, ```wenquanyi``` has width of 16.
 
-### Parsing glyph widths for variable font sheets
+### Parsing Glyph Tags
 
 ![Sample of Font Spritesheet with annotation](width_bit_encoding_annotated.png)
 
@@ -61,26 +61,28 @@ Rightmost vertical column (should be 20 px tall) contains the tags. Tags are def
       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)
+```
 
-
-* Nudging Bits Encoding:
+#### Nudging Bits Encoding
 
     <MSB,Red> SXXXXXXX SYYYYYYY 00000000 <LSB,Blue>
 
 Each X and Y numbers are Signed 8-Bit Integer.
-X-positive: nudges towards left
-Y-positive: nudges towards up
 
-* Diacritics Anchor Point Encoding:
+X-positive: nudges towards left  
+Y-positive: nudges towards up  
+
+#### Diacritics Anchor Point Encoding
 
 4 Pixels are further divided as follows:
 
-(LSB)
-Y - Anchor point Y for undefined, undefined, undefined
-X - Anchor point X for undefined, undefined, undefined
-Y - Anchor point Y for (unused), undefined, undefined
-X - Anchor point X for Type-0 (centre-aligned) diacritics, undefined, undefined
-(MSB)
+| LSB |   |   |   |   |
+| ------------ | ------------ | ------------ | ------------ | ------------ |
+| Y | Anchor point Y for: | undefined | undefined | undefined |
+| X | Anchor point X for: | undefined | undefined | undefined |
+| Y | Anchor point Y for: | (unused) | (unused) | (unused) |
+| X | Anchor point X for: | Type-0 | Type-1 | Type-2 |
+| MSB |   |   |   |   |
 
     <MSB,Red> 1Y1Y1Y1Y 1Y2Y2Y2Y 1Y3Y3Y3Y <LSB,Blue>
     <MSB,Red> 1X1X1X1X 1X2X2X2X 1X3X3X3X <LSB,Blue>
@@ -89,38 +91,31 @@ where Red is first, Green is second, Blue is the third diacritics.
 MSB for each word must be set so that the pixel would appear brighter on the image editor.
 (the font program will only read low 7 bits for each RGB channel)
 
-* Diacritics Type Bit Encoding:
+#### Diacritics Type Bit Encoding
 
     <MSB,Red> FFFFFFFF FFFFFFFF FFFFFFFF <LSB,Blue> (For Type-0)
     <MSB,Red> TTTT0000 00000000 00000000 <LSB,Blue> (For Type-1 to Type-15)
 
-Right now, only the type-0 diacritics and its anchor point is used by the font.
+Certain types of diacritics have predefined meanings:
 
-* Compiler Directives:
+* Type-0: Above
+* Type-1: Below (when it should be separated from being above)
+* Type-2: Overlaid (will shift down 2 pixels for lowheight glyphs instead of the default of 4 pixels)
+
+
+#### Compiler Directives
 
     <MSB,Red> [Opcode] [arg1] [arg2] <LSB,Blue>
 
 Currently supported opcodes:
 
-    - 00000000: No-operation; does not use the Compiler Directive system.
+*00000000: No-operation; does not use the Compiler Directive system.
     
-    - 10000xxx: Replace a character with xxx subchars (yes, number 0 can be used).
-      Replacement characters are encoded vertically from X-zero, bit by bit
-      (colour of the pixel doesn't matter) with LSB sitting on Y-zero.
+*10000xxx: Replace a character with xxx subchars (yes, number 0 can be used).
+  Replacement characters are encoded vertically from X-zero, bit by bit
+  (colour of the pixel doesn't matter) with LSB sitting on Y-zero.
 
 
-
--= NOTE =-
-
-The code has remnants of one old HACK: using 0th diacritics' X-anchor pos as a type selector
-This hack applied only when write-on-top bit is set. Relevant codes are currently commented out instead of
-being completely removed for future debugging.
-Interpretation:
-    DIA_OVERLAY = 1
-    DIA_JOINER = 2
-    
-```
-
 #### Stack Up/Down
 
 When the tag is stack-up, it'll be drawn 4 px lower if the underlying
@@ -157,13 +152,13 @@ Also note that the font compiler will not "stack" these diacritics.
 
 (fun fact: it was drawn on Rhodia memopad with Lamy 2000, then photographed and edited on my iPhone. Letter used is a Cherokee WE Ꮺ)
 
-### Technical Limitations
+## Technical Limitations
 
 - Each spritesheet is 4096x4096 maximum, which is a size of 4K Texture. However it is recommended to be smaller or equal to 1024x1024.
 - Glyphs exceeding 15px of width needs to be broken down with 2 or more characters. Wider sheets WILL NOT BE IMPLEMENTED, can't waste much pixels just for few superwide glyphs.
 - Due to how the compiler is coded, actual glyph must have alpha value of 255, the tags must have alpha values LESS THAN 255 (and obviously greater than zero). RGB plane of the TGA image doesn't do anything, keep it as #FFFFFF white.
 
-### Implementing the Korean writing system
+## Implementation of the Korean writing system
 
 On this font, Hangul letters are printed by assemblying two or three letter pieces. There are 10 sets of Hangul letter pieces on the font. Top 6 are initials, middle 2 are medials, and bottom 2 are finals. On the rightmost side, there's eight assembled glyphs to help you with (assuming you have basic knowledge on the writing system). Top 6 tells you how to use 6 initials, and bottom 2 tells you how to use 2 finals.
 
diff --git a/assets/ascii_variable.tga b/assets/ascii_variable.tga
index d7a0dfe..4b0d226 100755
--- a/assets/ascii_variable.tga
+++ b/assets/ascii_variable.tga
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:677781e28cfb0892fda6902e47477fd7c5495e931010b0109079906e806d4232
+oid sha256:3491d4b10b0341e1a8b875162381694e587dff4d2e8f0cb6a95da479c8956d41
 size 327698
diff --git a/assets/diacritical_marks_variable.tga b/assets/diacritical_marks_variable.tga
index 36d06d9d34f848574438b4467e2ef0770c954411..c9542a30334dd666cea99659dee59c359a737d18 100755
GIT binary patch
literal 131
zcmWN?%MrpL5CG6SRnUNe1$H6nhOaQAl5sHytJimVSAFxCFWJ{R`B3UU*6q=F``<rl
z%k!!DtXW+k<|vYTG)M=;;M(p}G{$EHUv@GWHCS?Ftx1@RCtV12a1|OPjm|~eFyw$>
Nis13B5}dU@h#%PTCUF1&

literal 143378
zcmeI4Tax2A4n=b&V)ii~v(MZ>@41GTDX=an+7PYuBb^5kD!y<5@JO^>-DQ7#{QINX
zzyA67@Bi9p>-_oi=VQA{)A}(ty6?slO&4b;7$ydNr`1|!rr&9g=(G6uUf=2;Yj5Lw
z=RX^Nt6$GcSbKKLL>gW`b}5FBZ`HRrSpdrynrLes3wrr?+A_%GzSq!3yOKXN(H_#O
zxFYbY(`zlWZ`4QbXb<gS%O9Gt&B~9xOE=ol{G-mtNAoL}Thz6pj~Go`0<P$le-|SQ
zuxUJJ#Hn)&`p`xDX#H;Q+FNGwv8$_nQ6Ji9Pwzjg{T<fDc(|7My#s@1?%^7Htz~vr
zpT%b#0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z
z1Rwwb2tWV=5P$##AOHafKmY;|fWU7c@L9fTSFR7gvVFVnGxT1c^85Hm|Jn7Q&F_0;
z|J;9n9#;GHi?ypF^GCn_{24xd&w2Uv3;kaL@H_YX{3S^b0uX=z1Rwx`pG-g>DebBs
zk!+l9&3vT|YcaC`MbLaVv5zyk`|ffpc4n4;s<-uNt}H(55O`$*+w-kwe|)~{III1e
z^vV_Hb!6$?_b&Pp)N@3?<w^_00Rk^fz@G1Trq#xCe)q~PSLAQGwU*hS@3f10X=S?@
zley-X)yMid0@v7U4TAs#-j~4S{CBU@@4It$27#YX;L7<eOZgl46@C4j_VWp`0|>k?
zfeYt1{*J{5`1if_><j{N&M&o`f1VKtKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z
z1Rwwb2tWV=5P$##AOHafKmY;{An;lK6<4|V{lAUDfq%Y!`mPMTm-%}Ex_>@afB5&g
zW%#F?%kmHY%lfgNM~~0ee^#IE_YD6r_U!(TKG(+e=3aA1*3hq?KSw&_mpy+AdWDyD
z=YK&jU092e>3u!xD|qH}ZGEO!$nC1jHm>s?uR8cd>6^cn!`i&NYthH*Yihf+92Rq(
zyB52NL_hJ}=|>;Nk0qd6I$ZTO$J}TCd29FnAAS-Q8)J2wDY16<f6(k=EaX@2WqnuR
z69%PVXZG#&-<#jH`bV6z`#<_Hh5!U0009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=
z5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf
zKmY;|fB*zulYo9dWcWRk!-eXHRiu|478S=K-_7}zQ~6hNZyK**mtWhlt8UN6uC4ip
z{kV3cqY!^%4*tveeZM8vZvUREX13f~JDWe#dwsM1S-r=c?cdjD{j>R>t@l06_HXxp
zyZyCk&!y|N;^U+J(2ea;efWhw#%fiPUDd_L?kc}s{pMSj^+&N5(*x86pXl?4F4`Ky
z-4lJSPd>$N$sd|q^_?zixS{^2qqYb2%01euUj8y~J$;?;Cdy#*cTL2oYwlkce4^KT
zj2743ujsp+8Wda2|E2o+bEj1uHK-S~*#9gM%GJFmM4glNs}e12CVlkV;#a5EE7$QF
z^6m0Ryd$mWKjJT+EdNlicGK<QL3-s4>+<_PXZtTA_m3EA>-+=jAM2RrS6yCH)Tx4t
zNh52qZrFd*DvswW{oV6txgu}0HO``5T3M^%puW@82qng7s(+kg3;_s000Izzz&ZhY
zua5WNXzP1;7SZ(ap1-P>|J1VFtU~|-=LnR87w1;3%*Sc)!GBqwCcps#5V#uwJHK&u
zqphz4Sz^=2>&B{H{!`0xvkn0WJeNQ@xN+{)%6$CX;>iB?1jgsh#`RfzdjM<@0>7Am
zop*oVsb^nn7z7~jz63b`?|X0A+4~bXdwwVSGWGZGpzlwR9sXtl_N;f$eayc)o2b*;
zZXa3wri;)2OZqH6>kxQl0^9Q+&-~b?rJG(_w>VGNTKAv!vjU39<12=bGkNE`70}J4
z0dRo84<<04m+=g|`qr#|mEN6QjWZiGyBL|CbqKsOfzST?PP^}aWP882emlRra~tQ{
z>npYFUJ$}h0gCNjKhD<g`RPLd0<T5D&iwTJzgD$W0|5wpCxPw!PtU&AFbF{4eF<>>
z-}m0KGYDh^^u}Lo_xJvo%k-@OYyxqg^$-->JqNzK^5249@xOn4RX+dI%hzwYEPtRa
z8vhNLm)n20!DMic{SVKK?n3tr-J9Q*PkBeHbvTlH?BC<h`uE=dEa#=U+5QVOagxp2
zE>v~uX4>zk)d0gEJN_5+gRC2N*=G9AAsL`wfBkc$Gk#^R-e+s8TZ|9tJB<d#jy^yB
z+(s?8=tHAcb|}B^FYDK!nbVc^d+1}I*48vJ_HsT8k#hO_p)XJSga5bdRqPe(YEu2(
z1cTEA3i~*7YGpp|o)z&gS2wr$SK;tSjWhT!>wSaD?_>41oHf_1pXDFpF@^vHAn>XL
zhS%8DVZ2_h>cT%>XJ@T^cJmoW(@b+L=zVXkj!e(`IRe}L^LwZMVg9C%``5Hu%gpqp
z+w!)4rvGW{+SmyT#<zy(?oA02W5tWu-llkm7!fDpuIRhG5jPER(!utv+TH3NPKJMZ
z`L^M>UmAA(Yy+m>y0vNdazP&&1&A6l`Hx$7NH_GI(GBvyT%GaISKPz=&9~FVe0GDv
zPvT;+zr*>n_}Tg_XRTyokm-N=`nG@PzHR^O8OZi$`Y}emhX?gt&TVi=pT&Q*_1Nf*
zZ7{x3{`Xv$0B_0n)$TX-Tqm$S$n{yYhdRdB#XoS>_IOK|^Zx_yIVD3N2z-_keCt(S
zF!cX!PU#iHuc(U_0uZ=AflKGtKMY*)xp@AM>iz7ik3j$ek0UTU+d8{GKaOKf=QaA?
zj{f5~e5D_+$L*X<5P(3O#c1QKMmx^OSZ%T0`43&R;XjT;uNZ!DM<4)!#}SD08Lgkw
zOMUabc>d*cL|=S3|Bt)fWP(6PAkK2MerEj)kMrBw)$@Nu&-w3e2LlK^lt7$&Z^yGf
zj>A`HH~QX={^K}&r5~?{Zk}Wi_~iuRERL<tY}mLK<FY<I|5|qo|FM;RyngxZVEYhw
zD1q@zu8ehdSNuoc@$74iK>z}eBT&xV85`c|mqYRX|F~OCCJ5{ZET7n3!1>=1WdZ`X
z6DY^a-xGD(e0+Q03(EdDuZ{G1{)|a~p{$G3MWerS#I^hVmy5#5!aedA9)7=s$H!53
zw9EC|-W6k~w|vSS)@pDJ()(EbB8W>`^<^;^bw|6LzvK+<wEnT4aeP+q@k*@S{(XJc
z&+>oa>Y4f60e!GG*`Jtmb~o|!J!${XHm_&3ui95N?tc%xO0uh_u(7AF^t*}0K@GmB
zarc?tYOTxqqgdP1f<81$dXJy=Yv9c3%KCTf6>qb8Z(~r}HuiF~?ql`cSL<eV&Hc6J
z<JG>!zO~!-bz^|oZ);cg@M`|LCBr2&ZSM2r`(L(S%cZ<wEx+qaExYHZ2*Oud^<^=a
zzW=!I)?d<leLu0U&2HA1#YAaW`AO<=QvFY4M$Hg_00bZafmbImz8~uix>#EFms{?a
z2EqXX5O^8^o%PAJ9q;8e#agka?VH39fWTz}<q%&w%k}l*vXT`DKmY;|fB*y_009U<
z00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##o=f0AC;vg;PuD+}KG`7v0SG_<0uX=z
z1Rwwb2tWV=5P$##AOL~;5%?_MY${jxn<QDb!T;fUuTS;+_(=cR^`Fh}du0D#U%hoE
zm-^e6bT2Lc%6Tz4vvKtBdxhs`JKObH)+0S!b@@!4->DsHQ>};XJL@181m2Cng@aUI
z58iFB><0o6fPe^0UiZe&Kq;saV-`oDANu+k`6l%os^fyb@yI|-^i8X^%qIFW_4hOB
zg5Gtlzo1v$ZnyA@y(`YDzG*_MHnYuFT3PHN>d55H?@QkF5o<-i%dL7c+iD)Qx8!dc
zb&5?>j|=kCTrp>HX)b)e6njnR=E<iOotw0}eGjdlMIZFih1I=g`m^gLnKRw>v-o$?
zM;%%E=C{=m?9|q^EI{~eLTO|z?m>NM#x|3;JQ8l^bGPWbI9Y(=9QmZ%^%wNghSfNk
zR_jF&S7@V+`LWe{8hQ(o`ki%9E!(A(>W9_&EPinw^)X)6%U^b@-nFfNL;cdqR_kw?
z(5lVMd|luAi~7(-o5_Q9_>b*T{q)|IU@Q7*j4Xh1Y}c;##r&afb!55UVSQtFkzuyS
ziQYM8^2i%)r&a9C?v%gPabx~x=vz*8idCiu>kt32&E#?4)P~mQR`j9ULM_$r+UVCd
zE1)C`f3LsxGcD^7fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2teTDgWoUXDS!Y3
zAOHafKmY;|fB*y_009U<00Izz00bZa0SG`KCt%-S@b59?U!2K9?>s(BhTUW`Q8fO0
zhY$b#!n65(d+eY4@6W>{`j^hPzMyo$^g0msttBexnSkiw_nV)eGkd?J)sY-79kWyC
T^inS7ApijgKmY>2mB9Z2?^6S=

diff --git a/assets/ipa_ext_variable.tga b/assets/ipa_ext_variable.tga
index caa8b61..4ce33de 100755
--- a/assets/ipa_ext_variable.tga
+++ b/assets/ipa_ext_variable.tga
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3aee9600478b6d531ea5a43590d002bc1ecdec600ecc325e997032b51c4214da
+oid sha256:4f76c223c431d3f8da64a76aa4d0b77e4f2b4c0895e593f52615baa2add6079f
 size 225298
diff --git a/assets/thai_variable.tga b/assets/thai_variable.tga
index 065fbc9..4783b52 100755
--- a/assets/thai_variable.tga
+++ b/assets/thai_variable.tga
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4794221096551311bdddd5b11167c52401dec48ea1f629300ad39f40eccbc82
+oid sha256:134e9efce4e298b623bb3f977c5a8d65d05bdc3924e4be0564cebb4683ee5692
 size 122898
diff --git a/src/net/torvald/terrarumsansbitmap/GlyphProps.kt b/src/net/torvald/terrarumsansbitmap/GlyphProps.kt
index 14ce5cc..11a0b24 100755
--- a/src/net/torvald/terrarumsansbitmap/GlyphProps.kt
+++ b/src/net/torvald/terrarumsansbitmap/GlyphProps.kt
@@ -46,8 +46,8 @@ data class GlyphProps(
         const val STACK_BEFORE_N_AFTER = 2
         const val STACK_UP_N_DOWN = 3
 
-        const val DIA_OVERLAY = 1
-        const val DIA_JOINER = 2
+        const val DIA_OVERLAY = 2
+//        const val DIA_JOINER = 2
 
         private fun Boolean.toInt() = if (this) 1 else 0
     }
diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
index 7010233..6aa5fbf 100755
--- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
@@ -739,14 +739,14 @@ class TerrarumSansBitmap(
             val nudgeY = nudgingBits.ushr(16).toByte().toInt() // signed 8-bit int
 
             val diacriticsAnchors = (0..5).map {
-                val yPos = 11 + (it / 3) * 2
+                val yPos = 13 - (it / 3) * 2
                 val shift = (3 - (it % 3)) * 8
                 val yPixel = pixmap.getPixel(codeStartX, codeStartY + yPos).tagify()
                 val xPixel = pixmap.getPixel(codeStartX, codeStartY + yPos + 1).tagify()
-                val y = (yPixel ushr shift) and 127
-                val x = (xPixel ushr shift) and 127
-                val yUsed = (yPixel ushr shift) >= 128
-                val xUsed = (yPixel ushr shift) >= 128
+                val yUsed = (yPixel ushr shift) and 128 != 0
+                val xUsed = (xPixel ushr shift) and 128 != 0
+                val y = if (yUsed) (yPixel ushr shift) and 127 else 0
+                val x = if (xUsed) (xPixel ushr shift) and 127 else 0
 
                 DiacriticsAnchor(it, x, y, xUsed, yUsed)
             }.toTypedArray()
@@ -754,18 +754,22 @@ class TerrarumSansBitmap(
             val alignWhere = (0..1).fold(0) { acc, y -> acc or ((pixmap.getPixel(codeStartX, codeStartY + y + 15).and(255) != 0).toInt() shl y) }
 
             var writeOnTop = pixmap.getPixel(codeStartX, codeStartY + 17) // NO .tagify()
-            if (writeOnTop and 255 == 0) writeOnTop = -1
+            if (writeOnTop and 255 == 0) writeOnTop = -1 // look for the alpha channel
             else {
-                writeOnTop = writeOnTop.ushr(8)
-                if (writeOnTop == 0xFFFFFF) writeOnTop = 0
+                if (writeOnTop.ushr(8) == 0xFFFFFF) writeOnTop = 0
+                else writeOnTop = writeOnTop.ushr(28) and 15
             }
 
             val stackWhere = (0..1).fold(0) { acc, y -> acc or ((pixmap.getPixel(codeStartX, codeStartY + y + 18).and(255) != 0).toInt() shl y) }
 
             glyphProps[code] = GlyphProps(width, isLowHeight, nudgeX, nudgeY, diacriticsAnchors, alignWhere, writeOnTop, stackWhere, IntArray(15), hasKernData, isKernYtype, kerningMask, directiveOpcode, directiveArg1, directiveArg2)
 
+
+            // Debug prints //
 //            if (nudgingBits != 0) dbgprn("${code.charInfo()} nudgeX=$nudgeX, nudgeY=$nudgeY, nudgingBits=0x${nudgingBits.toString(16)}")
 //            if (writeOnTop >= 0) dbgprn("WriteOnTop: ${code.charInfo()} (Type-${writeOnTop})")
+//            if (diacriticsAnchors.any { it.xUsed || it.yUsed }) dbgprn("${code.charInfo()} ${diacriticsAnchors.filter { it.xUsed || it.yUsed }.joinToString()}")
+
 
             // extra info
             val extCount = glyphProps[code]?.requiredExtInfoCount() ?: 0
@@ -834,7 +838,10 @@ class TerrarumSansBitmap(
 
 
     /**
-     * posXbuffer's size is greater than the string, last element marks the width of entire string.
+     * THE function to typeset all the letters and their diacritics
+     *
+     * @return Pair of X-positions and Y-positions, of which the X-position's size is greater than the string
+     * and the last element marks the width of entire string.
      */
     private fun buildPosMap(str: List<Int>): Pair<IntArray, IntArray> {
         val posXbuffer = IntArray(str.size + 1) { 0 }
@@ -900,6 +907,7 @@ class TerrarumSansBitmap(
                     if (isHangul(thisChar) && !isHangulChoseong(thisChar) && !isHangulCompat(thisChar)) {
                         posXbuffer[charIndex] = posXbuffer[nonDiacriticCounter]
                     }
+                    // is this glyph NOT a diacritic?
                     else if (thisProp.writeOnTop < 0) {
                         posXbuffer[charIndex] = -thisProp.nudgeX +
                                 when (itsProp.alignWhere) {
@@ -929,15 +937,19 @@ class TerrarumSansBitmap(
 
                         }
                     }*/
+                    // is this glyph a diacritic?
                     else {
+                        val diacriticsType = thisProp.writeOnTop
                         // set X pos according to alignment information
                         posXbuffer[charIndex] = when (thisProp.alignWhere) {
                             GlyphProps.ALIGN_LEFT, GlyphProps.ALIGN_BEFORE -> posXbuffer[nonDiacriticCounter]
                             GlyphProps.ALIGN_RIGHT -> {
-                                posXbuffer[nonDiacriticCounter] - (W_VAR_INIT - itsProp.width)
+                                val alignXPos = if (!itsProp.diacriticsAnchors[diacriticsType].xUsed) itsProp.width else itsProp.diacriticsAnchors[diacriticsType].x
+
+                                posXbuffer[nonDiacriticCounter] - W_VAR_INIT + alignXPos
                             }
                             GlyphProps.ALIGN_CENTRE -> {
-                                val alignXPos = if (itsProp.diacriticsAnchors[0].x == 0) itsProp.width.div(2) else itsProp.diacriticsAnchors[0].x
+                                val alignXPos = if (!itsProp.diacriticsAnchors[diacriticsType].xUsed) itsProp.width.div(2) else itsProp.diacriticsAnchors[diacriticsType].x
 
                                 if (itsProp.alignWhere == GlyphProps.ALIGN_RIGHT) {
                                     posXbuffer[nonDiacriticCounter] + alignXPos + (itsProp.width + 1).div(2)
@@ -966,7 +978,7 @@ class TerrarumSansBitmap(
                                         //dbgprn("AAARRRRHHHH for character ${thisChar.toHex()}")
                                         //dbgprn("lastNonDiacriticChar: ${lastNonDiacriticChar.toHex()}")
                                         //dbgprn("cond: ${thisProp.alignXPos == GlyphProps.DIA_OVERLAY}, charIndex: $charIndex")
-                                        if (thisProp.diacriticsAnchors[0].x == GlyphProps.DIA_OVERLAY)
+                                        if (diacriticsType == GlyphProps.DIA_OVERLAY)
                                             posYbuffer[charIndex] -= H_OVERLAY_LOWERCASE_SHIFTDOWN * (!flipY).toSign() // if minus-assign doesn't work, try plus-assign
                                         else
                                             posYbuffer[charIndex] -= H_STACKUP_LOWERCASE_SHIFTDOWN * (!flipY).toSign() // if minus-assign doesn't work, try plus-assign
diff --git a/testing.PNG b/testing.PNG
index 1df16e7c98f74e14a2315c7055910a8d66384202..5dd3bb0794cea7162d53106575b82b6f30327363 100755
GIT binary patch
literal 14091
zcmeI3eKea_9LKNrEY)sQ*=U8fIX3>8W6UydX%tmfBy{WP7H?H=4M~w26Q-?I%UVyz
zIWl3)dWtiP)H@?$hb4`-tQ9g8wR8=82(76`blJ_H`*VLaJG*~9&$-X<xzBxm_xt<a
zPwsP4L=QV|w#Rl40KhCbC?EoWolF3B$C?sgi?)Bz0RZy-;DDnaW>+oG9?hsc{km`X
z-j=cvpS8F)x{IXXdM{6NDl_~_QT!#}#Se}o#W`7jd$Z`gNUjvli}UsCI{@&N2)SYt
z*j=9`>>9ZGnE`M(umQFVn!X3X#r?JLSr!focrES=TNr<xz7v3J`(AeN2=-dLTrTHf
z7)HH1u#kyymh&h8JZxs!GB=BhL_%(FbSR1N^P2#qsz^@E6#u3DRw_<Z@s}r+#G11>
z9_1zNt`UnwBJ<VEE=ei=jkmO0X;bh90M$SF7fzQ3c_lOk@wwH`jv>6U^lhz9r~5<K
z^2jble+Z^!ocwD0nG8<VUAz1#@$XMNMZ8JMP(&Z)avF}q+~xP^0$9DdY}sSG0USHy
zvH5FCxqY>FqNY@qB%0%I?gk)twW*f89YNjxY|NdVJMv^hwR)Z+vm(`Zy8v)U5bDRW
zqj7lD66`>9mQNx(&5W23BHjf+_JztYMPb(`mZ7S{4BJR9JJB_duqqb2QF78_U;?b+
z$ewg)xXlW47#!H>&)TY*ip7#7&)hz@X7^r_(bRna^s`dQ;oj}K`K+edq5NSCc-T~^
zBU{_n`FN;4@5H=%PRZcH?k);79k^<3VQ8RK*4;yh=0334r+SM&J{mGs5jb46bZ;7W
zrm$D>8!_)w<XKXv5}v@kom0m1w5lNe_{>A|K(3bDy)a(3w9(l&_viE5_u7;j<#RT0
zpe+-%pK5Hjx`!?6g+%IR+oLYe8SUPA%qg8$m!bSi*A!K*U6hW#&_lhA_29dr;c=}q
zvSG#b#sO+s!d9#ErWF8_!&jyc&S+^hw{r?Hi-t586A&wcLC5HDEFV$H2H}4Ha)kSX
z`9BmoHg9+VQDumt<SSTH{h1jj4u$>(Q(VJdrxX3~l@(TcvYC|qq8bkQplsHWsdh|~
z_FJXESX#%q20_I&LB${xmrt3YkCSf1Vi*{i)JmU;<9AGO;g#(8N}6JFc{14&3gu3C
zgJ22_y2FBg*f>#3o&)h;*Nqklmn5XRbMQ_*!=5?dzVbZNR6x4l#~^r`w=SISIRZT)
z)jgb;Z$FZEij`B9aMSSkPA^5%tWSKePsS(#RuqswcC5KYz8VDI$YX_F>-Y<73+rJR
zY$J_t90p+|K81#1go_876f`MD&NoP+NTNuh|Dhiws9;gSqJl*QYdl*d$dQmEAxA=v
zgdE8@x3G~vBY#HzjQsgu`m??zMhZ9S0VvoO)HmOHdq-jb+~SW7G<@kmrzj6d1gIF0
z6Cg)K%K=&z5fdObLSTrf7*R2zVnoG=iV+nfDn?X{s2EW(qGCkFh>HI&RLm5YyaHE#
wK+rO1XODmE?qK-)(!1Zm@51k(Q)A16N#0XV1iq+FHq2P?v9N$9zu3!v1C=9P&j0`b

literal 19149
zcmeHOYh04q)_-c68LO!or`wpRO?Ef6L@VzzO#_u>*~MF4N)t^*$_uE7cDhZLN>)mE
zoubkbWfBDy!J4U<5tT^P0ENoI8zOlD5(VDPob%!Qe&_d|4>RX|-w!X(2V_4!d+oi~
zUhBX9Ywd^ZL%xVb3sx?GAZXFvJ-ZJ>&_}TlH2;LzC*aQXlV`RNwC~p5-QONfEg9`Q
zkl4SSOn>`Xhp!~)^XA)Ol`Hzcg-f`aOUn7aUz>e1ckMdwT58qiF8Z^qhew(%m#VxC
z)4VLb)CS0U_Mx0A0e>O=-pV-;bkQ6P1D(9M5`w<@>JAv}3;3V7ojt#v$Kx6F)8pgg
zgGy;j7JhsHh|M6~J|v#2sA7PDR)4#{(&GD%Am~Fl_m01VA4TO5K&cSpGI3)Hg(ASc
zZ*(@G0z9{ewlwzmhbafY-d%E?PG^&U>>xuks}9j6krFWa0u+h}WLzH-+$Z2{15#EO
z4AXaxeE&+FL}KV0LphRJGAf>N6732`-&?q=I^;oM1Z9Q0>VD3;D<ZSF3h!VvT3>6W
zsBPV@qNC96;IYG7E(POB?+Q-GM#JfF?v7xfgp5xaA=*?-5e?4W{`YoxB2J%}_IoKg
zT+#krIx)JV_u@PVdQ(-Z&k3H^?T<lC-m=7v;w7k4Q_JQ=30Ww`0pmPlHVO8fs3-K0
zkCM%+)Z>y`HJpj;=1a_L8P#hRfz>iHh9hyCPFh&FudH6#cWFGPNRmW*ysj03&IKe7
z!(wF<yUJ(gLQn(m{-G*IN9Xj9A?OT&i^VUE0dv=AZ-^(sI9t~XK<j5S7tn3%E+BVx
z&LMEy%=VvdbML69r>ChLFE1~Be9OV=vIOO{qLIO1gtLZ4DOT0d&Y<5DyPyU2_E+g&
z#M(&z(7$2s!_q$<)DAlJ#e^cnoiz)=y1Po6rp}^|R^?SV^)2^ho!k6vx4xNC6U;1Q
zrGQOrzIy+V9dT3PSMp1T@S7sD@B3XW7)HqL<gpcwaz%9(IuuNodSa7cgu9fw|A=L7
zdT!y#y3c@dj3qQqjgLA<5Bz-}u>a8e$ghF8$?KAJw_!WJHW~>=3sj?l*+z>!WDjh}
zJZ3KYlONlp;xdV|Q8Mx$YPSs}^C?EPBMUnvF0~9#qs~*KxI`~H(V{T_F*%>Yw_1s4
z;k_u_2=v7+_9^$XBU)?se+5*5cL0Vld?()?C>0mNmXp5$k2LfUd&__yo!j;=&f@Tc
zNF5qmtXQr~*aCL!OrPw~q?OUTG>N!O<Hi{6K84an^z7y_SA7XVC;ARoqRhLQf^pyh
zJu@>iS!7BkJ99QK7i{u}`M`X42U>=yHU{f@m!FORGe6OOxKibS_9)841OvJHo`<~3
zdZKp%8L2@5c~5vowE$a(w}bzVC5@<Ojq81Lwh+C(Hgw>%<h=Ag!8o5FHtAQ)ryQUd
z`<du6u&OuGLPvZEtDP;L04<8E$^uvtWR3Xmpy266$qFVq-1BYC0|@f?`N(%Dci{oo
zM*9ttO=4KT1xL9oj7)v~V&eH2d&L*fx#-lu%3S#BvA`EyOQsU<W<^=>UWyF}M+125
z%LBX|#YB{HUAKQv^zOybxn-X(tXHqaxj*gGhq!LTAKhOddr-dC+iiWg%4IXZP8UL-
zwxFxZat8xG`~XZL(PN81v}6>vp@FdA;nX*FW!v^0HR$(I{nGS&a$a;jF`C_q17bhp
z-svtor}lD8p0c>hpH%hpN(N$zuaaaXp@z05H9aXs%I=I4bkH^t5rySAP8zx>2u2n5
z$>%|DW^ma|FG<Sel`dIb`Aw1UPYj<i>$8cvwiM5w16XiY8lzlpnI+&PB8v)A)L}IB
z16wS033N`WT(?VMC)m&<+uc-hQR7>qT#!Rbc}&%B5e_9q;W{bJg*e+3#o#L>9XQqY
z@jL#$MLu=2s+SLAf<k@q*}>WOSvTcs-;2?L4LWM_8pAOvzl>Cj?M(~#Z982f*?<rO
zOBuhTKIY#7led<d$+y05ypN;gU9Kk(dlKR3-BYcYInX!Bm0gdI63%!gx!P^$j#lpe
z&>DWP<o(J%h4OuH-e&VppeLbaU&bnOokqA~<U1s~NRkNWPv#tN(sX+>b790D&sIA&
z9477!CJl_Ph%Fa7Ku~3$b*$`nx+lL+PiZ;wsCNq)E1tOPNwPUWW7G&`9<kxkjK>u_
zq%^v_!o`i&&Uz9|dVn1j4K>9vA?Qc?s#w;N5tj5C>E>I^(z~V9(hBy`gt{7%j53Nq
zTWZuPQI<HatEhvFDw$?64#4DD198bc+o}6u!BVnOT~}p?<fZ4vbnIFRX;5@?nkL`L
zw82(qVTxe3j?!_LrrLH^n$m4O7QF(3;_sr@1D|}qWd6T{NWVM&?9WnXBHolw+<(G`
zrt8ym04^?a@6byt6KYB*g;DYJJ<O&9)O#0)tvKTqd#|je0xTe$aTU;)bY6^Vex$gk
z2SJN7W~iFf&Vk;W5x-O9@h_Bn%^mO57`lw&8pIC)kROY8REcmk9^OS2A#hAxFMpCI
zKQ3&c$=%$5o<+yu=pvRhS{*G*&7tGa(^#u(WJQ^fCyYE>$AfjYH3K|(Nm~^w+fAEg
zU+TgP2e^*+;>KdqWb4-;xTT@$AS@+LwX;stpYgmv=bFyKiPKb`XS>@nJN73TCG<`k
zr#EQ~eG@^xdl)x6wQK9WNT_o0ag67JuDm^6a(CJ&#wJ){#<7yS;Z~^&le+o(Rk^WU
z+?YXBx$;0#&*O%sayw20x;*-U1!@Tdwe3s+v22a#S~+<z9d7#t%jZ{rBEBvUL8;ma
z%fjz?T19M4anM-SRLy!_&BcVLi&F-15zqOVHO+LGa-4N~ECcB0Lz)8~t{7YLk`>jL
zVj*l(uMes95C0_n`OvFpS`FEK1^egf!Dw|-QcvhU!kW>Vp3k9k<)>W*?1_0(r2Ok&
zuEnAd%86elW~5K~p*>X}b0nGS2d<H_+xMCQ_NCeb7?|1rYFSirgc9b%IxRB4#dpTW
z^K83QFjm;zosy_@nMMs?P3}P^6MrjEc+kpWojK|xRfEz#YpT~a+#7_67H+v8^HB(f
zf!!43-u__G6}~geyr4jlCTL1O>rBf_FQUmUtfYJ=<oSDx?gAlh%Vl7F{^}%IgJw<g
zi%_H0cy}HKp!ks*K3_DL-l^Vor?h5A`~EW}7Ee>3HHrL+B~vhYOogi(n{4JDtdZyi
z1VW+rOxiD`$ZeuLHPV_klP0SVO{4NCz!}mDccGGRG-4-&?(@Ce``Y%7*?M)RaGE+K
zwRqJ8Q`nD*G9be{Nis=ViA|$2nsMaz9O%r8hdwp{LQ_}$ODy|~eDE)lN)W!iyuA${
zz%{7>bW&|?bAZ8URt)BoqH??4nIIxVn<C%>`t8l$Ei9JqQP!uxaP~&*s<!$#&Zd}u
zjVXzQ3qi;|we1e(hp^P_ZAQw{yt^`VIz9wl)Q(BJpAT?gHQ(o=sFc2S(qboQ2nh@8
zwTo}UUx9wRy&a6q>DAxS;^2Ij9SYFA%~%>MgRfF5m4>FyceVrWMPM7>xCaBqbb}ta
znL(G{dM&cFcXyZaXT?f8armvY+$o^nY!F<x@C9D}28rdSViGz<k7*K`H%V%N%)=$x
z91-74Ff=X9ucA#-b8`M5$%pZBrdLhI;>BQM&l!vB3wTd~pnD&>@2r0b<`*zk{hcwg
zFZ;J}_TLb}KYe@h<)N9`+1Y+@@c_p+Xcx<k)^quX%cA86(P(rF{rct>?==s~>aD>X
zqf=ulQIDtedVTaX{@O!@hG{zz^p6f%@anw#PVZE$f3)j{4>4DIi)B}`bmLVacV9C-
z#`B&O1$_=ulG@=zGw$c~ao2uiNpbYkB3bX_JV`Rb*lo{ttJtWck8%#z6S`V7@#PkF
z<}O7EXsaka<{~9j)0Pgjd&3?NuU>J8MjwuLK&`4K_ip`t2>vzgkM1cW$Tf(33<ouV
zo9ue*|8c1w3~2OtP!s7_{vdng8?iowbwJN|(}(G)>C-oh!F1j`6(R(1e#*cnws!Iu
z+ZyXocN*BCb4M8&gkZ}<0bX1>BTt=|=S48)5D3Oa5kGX5GMKadJY6>m161${mOkYf
zODlIhPQpa7waaJ4<qkNIN3hBFm3~#qh6aniuCr=?ZFCQRrUNk9bIOR}R~+rcFR;#z
z-jLr%+>kwhpIslJGrc<YGo5NNQMj?$_*FnKtuGN~4puz&&y@d9@AQ92NT4y};DD<f
zSc_iOB?ci_$_KFL`w~Y$6YABzV*$Q;c~trQ%T;&IBK5*ZY>E^vx3*70GFxX=$wr$J
z$r1>;^tWws?!hnGoQ*qw?$qZNepLrY<s8P6X^lpcu=Lg-VNIn+3!{y+wXyEPhFo>a
zZ6U)cG%mRfNo?G4&|MkM)A8X#HI7*Z<D@wsWU={le3yIy1YwUau2=7F$-SI-BixrF
zU;TPO-X8wIaf1l=x5E!M@l=JbOV$U#L#?gmkt2^=i?3Ds-5Rr^@+ai|K|j1wf7qVI
z8pD*;DyleX>$gWs0MU5gTBfzASI=u%VWn^;%SI1)H_bz1oE1Y8ztFZFIzJe*I}XiE
zCw`ScP}t85rPgz8+G+M#OGOF~tZOiP&qqc)SzPaC*1D%v5`8n6b#qvqgdi^&^UE0x
z6}=YI3%GhU{E^z>WIQ9SjxEuv9IQ}`DlF-3yjj`&GObH&xPkA1U5QE(mQ65ufWN=D
zY8Hgr$n#4jiyT^&tgS^B2i%h$zTu~fZhNkrjzuujJL`zcx?7ZeF_EX%H^9khxJkie
z_lQp@FT=kk%olCMxUSL#^=eoYFS$-a_St~jcI5oYWT7;Ec4`;36pK#F^41g1SbY30
z=6A(aQgO+xo=lZ0yzd3cXJvWH^g56s0L~MKNa@IVSF#Pai;bmav;2yfz7vGPBZNmf
zze~b`_l@aEw+ejL%Y7CH(5HvwmU#oi=BJHLRN;tkj$9hObPJ-~#SOPh!i@iEaDS?L
z?wO^R$PKLi#o5u-y+fx|N!i6DYS>19wDw&s!kEc*-obE)-}jWeip#1F4)7e3rg~c^
z(xry&?#dyj=Mp#nLiej8(Y`lzoT^NFQDB^Hg3{qSPVCL3s<yW~Ot$tp&w*CAD|Rdq
zF1*eXk2A<?SWCtvmAv?pI_Z2mcA=i+c-!k$p1O{6N_B(JKl`X>hgMG$_PboIudPN=
z>al<GxOxw^Ba##<895Mcj4z5i-Ffu7Z;w7WJ-F%XL)P+3f}t7$E2=Q6WV(zFgU{Is
z<BhtB%zq_EGSizyY5S&f&L>9AxQpLc;VJP)&<4@zbg_=Y+cy__Lbkso+UVgQ5u<bm
zxx>kU<!XgfbjwfLQO%hGri+^0Qq68Rw6RwOdD0P_xG9UK^fIz}gCvQp%y18Wz$=;q
zJ&CBS?(OZ*-|^yhDJI3TBP3Yp6%NNBm941*PAqqVq7CDjs29q*(!a$I(5@Ik=RW(r
zmXCB;7JuPK)+|r)&IYY?I>K26K<b-H7o_7d3c7Av6J?w))*f*M)t?OPuIfnDVeh}a
z&&UJi7%AzWDiR?J>S+ub2-+v&Hwob3zP&SvBknsu3j1b*tIJ(~cHAg+;|!VYg4dM<
z0>IlDy-6Taeinzm$@U!dF=l-=piH4%ct@NM3!egIgEIt~j}61ju6(cEV}HWEY$J5W
z6@FKpQ&L}kKzzm6lou+sf$)xf6b0U)y>B&;(OudkkJL5R9dPU(skG~Cuv`mp^s!HP
zs%O)@+HSZNK+_rDzOt5_97W&9wUzMhoO__x{y?^;VR_geJ4}ge*E|CEC?KKU!;`GL
z?tlki9!LW<9p!l9{8R3V<>+-Ub12}EwjlP@S#@Jrb7Q~lAH!hr9&6gb5Z#{6Mye6G
z!T9;_D>(n-aNfpPWUS+P8%sp9x)}|%s#Dsy1t`y!xXa#UPb;RYg>XwD)o0*vGb#|+
z3A)ClAcR<4!w4OdOo3%-#_P=MSx-(En7P6Z>H>8*tK*)a?89AYAH9$!jOr47G3wb3
zm&TeEM$z*klocJc33ePYX|TD<w%LyJd#kj%D$8*Wv=iedNdMc}Q%J2_YDXK55sKK5
zgMw6r_1JgK42ncMGTrLT;?Sc6T#-J`Ml7cCw+V|46+GI6#A~vwl%#2^j7Lwi{N627
zNV92^4((>p`(Hw>{f>Liu`C@`<n9sh1)sD_JnY2v3>1Rwj0#lP%VXFQH=o;J{m+7f
z4$eO>;o*olI@hY2R$7sXM-Du^5QU3JimhD_GL@>c6e$*FOTiIq##mBh<m{+kC0VE_
zXQ{g6Mbl|@eGrrb5EDi|U0pR<;p!f-)h#XIAO*2)$C3-G>?BYm^LwTk_dS|CxTzD(
z>uNE08qU<!F1nWPiW7H>HDOD;#fPbpXirxEPB;257Yqo4C);U_3+#LsJB&7iU3wZJ
z_HRibZ(RZqaxiqIpFB6Yx+5z}XSdH;P?MQCkaq&r_1KTDso_lv$oUA-5;YlbzhRoS
zdb7MN2+cAeh(D>zZ1CMx@d2J|{NbB4^y(G2XfwyCRSbJ<tfnG<hQEExUTHB2vP{OR
zSnTuPVy_6ub7_VVX-C${B!g_|)pI+Mk5$V=k{9cyUaJZAe02Czu>_-mpG6{W=qIRL
zCxkpUvN~s~J?wB`ahjovb5~M>c+m!v+K_!>7?C1o+j8ifO9etuQ?|6`a_7)tMpqPN
zzu_1+p2$q>zfL`xMUS1K%{#u#qmR2ooc|*NbsR@}!>1Pvi#SLJ^AHPG#`i{VOQqaD
z#GE<Y(zRr=fcMhlm90ZsJdu?cc>}SL(-eQuVw3BFV$8iN*4o-=l@m9;QKh8K_=krD
zb$bURSh+N=GVKLcidSjmjZ@~(8!xVHtn6aF*Vnl2n1lE=x3|{b`e_kPRJ>b|@6wdE
zTNj9Pjqp6&U0e~O?e?WH%Cw1%+QYBOsvLNr_*ZezL5;&D#Y8KQ%wy^B`!DZUeVTY&
z+Iz}bd6m@vdZAPjx>8)s6;Nd(>N@X_pr1gRgY>2*O$ljsWIt(?Gb*{_sidErVvXVs
zy;#Ni=Arj@$9SEV!eUYd%a6nNz<tdxu2`Hc8E>d9D|2&`%d8JbeVG%IVHR5v8K9<O
zN$>a@`z0Bwm`9*g*#N|=6GFXUO@gwvb_xC`QUX@u2erSp%za4gvOKn>)8_fHZQ9Jo
z{7@Ti5)0KQ=Bb@pFgV<#hW_@Mhrw+zZn8v3M|8l_rOQ~wB*A2dueg}8qqad47TDL)
zm0u%~X2T}uLR*y+E5dkXS4v$^y2E%w>d`8011^X>sE$C@m2|oLj^*le1`NMVW^`Rq
z4oz@bnx7@f<Y5B*BTeDis4xf`2whyy65rwN$0CIYQT|UPSq}WkScpGw=oxmvskxwk
zlG1Om8fg4-IpMa(T&z1bV+K7b0eO7V`n6-p1K~P?LoqWl$hL~}TecI3JLu2n*I&He
z0L#3%6!5YApBr-|sAGw-68l%rIsRf^J8=Iy#pL890bJgI5bNZ5!(r{V8aZ>7m?~jY
z!?F(kJTuVMTOTe}eE?-zT=t=)#P8gceC1QQ8FVi-+ZaJV><wEZpl7|+kD$(ZO32a+
zJ?7A!vzrBU?uA&g&!s#E+egGs-yTYTfbO-VF52;Utmbq?@#Riy`#6lNDxGJ|;ZM=z
zuC&p7a{u%(&d{hV0n0)}cY9A3_0`$*p-O~=0#$YM<sJI0-)%<v{TpQl7p$T5V<@vs
zcF1nSYE`6>l}n^jqVIN*td6^phawP9ryE2p&lX0>GQ><*O$7rWSEobV6jiNacQhp#
zl!59|wiSzj%v0HFB3}eFBW$7ulv8}Ekh*ookUtTkRHdoq9~LM-h2F^RK~3uL(ek75
z8!Q5dG<&kw$%hED)(qLaiZBg7(Vt$$2v=<HntAC9s{I(PB#Ctz*~c;j5It#Vn37D2
z>~lcZp$Km9aFsRw7E7aVlM18J%25MiWLSRs8Z(?jP4}J)Nx7i*f!p8~K<o@VUzZrs
zz$mfn*b=97dU$;M$ca*#xY>$B8n#Y}7e{F_TRLskwr@SP8_B5VIB%ph3s#fR8PJ?Z
zRf9TQnWG-LhMKzTNEZ8krpItN7eU0}pVLG9%1<eCBRpQ&u@No7?`D*FJ=@;u%%F_V
zLA^Fs<WqU$;7hdwFT(|#Xnf7ZrW@*;ZRVV-0(G1z$7fa8V!3_Aq7u?+YelQJqqlJ^
zXhuC6={_my?rdih(#5lFemT+BoM%0wqgrLKzbKKdHOhAM0j0{ATfBrEudFWp!bDG$
z>wKksg)ZmUHfI|0U?F^_zLs5EBdH$b^2p*lJ@O*gJepXL{`=!nA%mphkLU&7<rdGs
z!Xsmqfzq^91W^C2A?b#6_?_uWUQO13Qq)#ErZxPU;~vhzSQCGq3q{+9YXf~_(+TLT
zj<R@7VJEZknZ%i#qVlrDBuBUMYvCJWah-(jl;j+w8ilk(4&VikOFi=tN-`^@#v?PT
z$O5~H!_;?_gmx74#H&+0MVB!_Sbf$hB#Dq=Wjqsn-J96M5e|0j$00*m971=!)^RW(
z?`fCLs|bk+w>}%M%+v)iqA<9QgvnNnM}&^>fvIV0q0u@$C-KQ3MNX$SZut_5X(XBb
zrBlwo=>31@VAV9_|1o5nHtj$2hJeYCO@{mzUNAA4kI8&Y=JV%X&NBIq$#+b?WAdH<
z)XSbGJTc+P{}P_OHwdYb;PeDK_pQFW^R?gdIk3CnXnm`#v6yH2YSM$r2u#jkLIM*a
zn!<r8ESflhi5r=Sp@|inSh0x}n^>`l6`NSGi4~hzv56I%Sh0x}n^>`l75{%>#r5GF
z@H;yQx-eT^@tC}&$lUmocMCu8?(l8XSCbx0MqqM={}>XGpoYy$FFd4_(u|0+_j}*n
JHM>rn|1aN|z2E=<

diff --git a/testtext.txt b/testtext.txt
index f9588b9..481a614 100755
--- a/testtext.txt
+++ b/testtext.txt
@@ -1,16 +1,4 @@
-ถูกตำรว
-ถูกตรว
-aำ
-แป้นพิมพ์เกษมณี แป้นพิมพ์ปัตตะโชติ
-คำเตือน-อนามัยและความปลอดภัย
 
-UIJTuijt
+ A ดุ ตี ปู่ พี่ ป่ ม่ ปั มั พีุ
 
-দৌ ষৌ
-
-Mℂ℄ℇ℀℈jℊ№℗CKℵ℡Z℥
-ℵ₀
-
-🄅🄵🅅🄕🄩🄪🄭🅭🄏🄎🅯🅮🆞🆠🆐🄯🆒🆓
-
-ﾧￌﾷﾾￃ ﾱￓﾩﾡￍ ﾲￃﾡﾧￓﾵￂﾤ ﾾￂﾤￚﾤￜﾱﾷￜ ﾲￌﾷￓﾾￂﾵￂ
\ No newline at end of file
+ U̸ u̸
\ No newline at end of file
diff --git a/work_files/ascii_variable.psd b/work_files/ascii_variable.psd
index 3a3048a..de9b286 100644
--- a/work_files/ascii_variable.psd
+++ b/work_files/ascii_variable.psd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2a33657d6df816821ad8991515c4da297b1053966cdb0fc23e09168c70c9299
-size 317663
+oid sha256:1b80ce3760208ed5fd3ccd2dadbd2c6e6ab433c4c7058648e87df89dbe08b7b3
+size 317679
diff --git a/work_files/diacritical_marks_variable.psd b/work_files/diacritical_marks_variable.psd
index 4bec8eef876515cc0d10eeb209b8458419dae9bd..b0f1aeb573e18cdcdd82967324778bc12379ddae 100644
GIT binary patch
literal 131
zcmWN?%MrpL5CG6SRnUOpC$OZO1r}jOCF7DDtX|*cUG(8G-?FcD@UGNjtlP8k_P?Kb
zEAyrJprS4#=BSc8S|9e9?iIAfTmqPu5RAr5&K2iTqqjcR450x<hgC-+v=&3D2}}u&
NQ1JMYG|n2I#19%+C?5a-

literal 132187
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

diff --git a/work_files/ipa_ext_variable.psd b/work_files/ipa_ext_variable.psd
index e35d1de..cd0db25 100644
--- a/work_files/ipa_ext_variable.psd
+++ b/work_files/ipa_ext_variable.psd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59d023d16fd70a8d1bef17cda3fdf04b9607608d8083fc0fe4f326194a49623f
-size 271689
+oid sha256:8c0e41fe4e68560498509f9e29a467457408b63fd7c28bc9067cc97402c819b9
+size 271693
diff --git a/work_files/thai_variable.psd b/work_files/thai_variable.psd
index 3834931..3a4f11b 100644
--- a/work_files/thai_variable.psd
+++ b/work_files/thai_variable.psd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2e9745f9e505a926c4f036d5538b4ab5a20aed6c87aa2fdc28214ebf919d1c2
-size 122328
+oid sha256:b68e8c5f51f896fd24f4c93db2bc8488acb3959da791599733d9333f26117dd7
+size 122981