From af76b82a67263b405d9538a1feec513f99462e29 Mon Sep 17 00:00:00 2001
From: Finn Bear <finnbearlabs@gmail.com>
Date: Wed, 13 Mar 2024 16:44:33 -0700
Subject: [PATCH] Cleanup replacements.

---
 Cargo.toml                 |    4 +-
 src/replacement_finder.rs  |    9 +-
 src/replacements.csv       | 1042 ++++++++++++++++++++++++++++++++++--
 src/replacements_extra.csv |    9 +-
 4 files changed, 1001 insertions(+), 63 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a9ddf64..1311350 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rustrict"
 authors = ["Finn Bear"]
-version = "0.7.21"
+version = "0.7.22"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/finnbear/rustrict/"
@@ -73,7 +73,7 @@ serde = {version = "1", features=["derive"], optional = true}
 rand = "0.8"
 csv = "1.1"
 censor_crate = {package = "censor", version = "0.3.0"}
-rustrict_old = {package = "rustrict", version = "0.7.17"}
+rustrict_old = {package = "rustrict", version = "0.7.21"}
 serial_test = "0.5"
 bincode = "1.3.3"
 serde_json = "1"
\ No newline at end of file
diff --git a/src/replacement_finder.rs b/src/replacement_finder.rs
index 21481d5..5782803 100644
--- a/src/replacement_finder.rs
+++ b/src/replacement_finder.rs
@@ -83,8 +83,9 @@ fn main() {
     // Extra confusables.
     include_str!("replacements_extra.csv")
         .split("\n")
-        .filter(|line| !line.is_empty())
-        .map(|line| {
+        .enumerate()
+        .filter(|(_, line)| !line.is_empty())
+        .map(|(n, line)| {
             let comma = line.find(",").unwrap();
             let before_comma = &line[..comma];
             let c = if before_comma.chars().count() == 1 {
@@ -92,7 +93,7 @@ fn main() {
             } else {
                 let escape = before_comma
                     .strip_prefix("\\u{")
-                    .expect(before_comma)
+                    .expect(&format!("line {}", n + 1))
                     .strip_suffix("}")
                     .unwrap();
                 let escape_int = u32::from_str_radix(escape, 16).unwrap();
@@ -112,7 +113,7 @@ fn main() {
             if c_string != c_string_2 {
                 println!("Warning (Mn): {c_string} -> {c_string_2}");
             }
-            assert_eq!(c_string_2.chars().count(), 1);
+            assert_eq!(c_string_2.chars().count(), 1, "line {}", n + 1);
 
             (
                 c_string_2.chars().next().unwrap(),
diff --git a/src/replacements.csv b/src/replacements.csv
index 546f800..4736581 100644
--- a/src/replacements.csv
+++ b/src/replacements.csv
@@ -370,7 +370,7 @@ z,sz
 ɑ,aoɑ
 ɒ,abo
 ɓ,b
-ɔ,c
+ɔ,co
 ɕ,Gcg
 ɖ,d
 ɗ,d
@@ -604,7 +604,7 @@ z,sz
 Б,bб
 В,BbВв
 Г,rг
-Д,Ddoд
+Д,ADadnoд
 Е,EeЕе
 Ж,HXhmwxж
 З,3EeЗз
@@ -629,14 +629,14 @@ z,sz
 Ъ,bъ
 Ы,Ibiluы
 Ь,BbЬь
-Э,Eeэ
+Э,3Eeэ
 Ю,HIhiloю
 Я,Rrя
 а,aа
 б,6abб
 в,Bb
 г,rг
-д,o
+д,no
 е,eе
 ж,Xx
 з,e
@@ -931,34 +931,290 @@ z,sz
 ۹,q
 ߀,o߀
 ߊ,lߊ
-।,il
+ठ,o
+ॐ,Bb
+।,Iil
 ॥,il
 ०,o०
+ॼ,co
+এ,Ddo
+ত,b
+ফ,BTbt
 ০,o০
 ৪,8b৪
 ৭,9g৭
+ਘ,w
+ਜ,Hh
+ਥ,pq
+ਧ,Topqt
+ਯ,Oopq
 ੦,o੦
 ੧,9g੧
 ੪,8੪
+ઇ,BDbd
+ક,fst
+ખ,iluw
+ગ,cilo
+ઘ,el
+ઙ,cos
+ચ,ciu
+છ,ceo
+જ,oy
+ઝ,hkno
+ઞ,chilo
+ટ,cos
+ઠ,cos
+ડ,cs
+ઢ,ceos
+ણ,cilos
+ત,iln
+થ,ilu
+દ,ceo
+ધ,ceil
+ન,hil
+પ,ilu
+ફ,fst
+બ,iluw
+ભ,hilo
+મ,hil
+ય,cilu
+ર,cor
+લ,chil
+વ,cil
+શ,clo
+ષ,iluy
+સ,chil
+હ,cs
 ૦,o૦
 ଃ,8ଃ
+କ,m
+ଟ,c
 ଠ,oଠ
+ଢ,n
 ୦,o୦
 ୨,9g୨
+உ,b
+ப,u
+ள,n
+ழ,e
 ௦,o௦
 ం,oం
+ఇ,Bb
+ఞ,Bbm
+డ,Ddow
+ఴ,ew
 ౦,o౦
 ಂ,oಂ
+ಆ,eu
+ಋ,Dcdo
+ದ,BObow
+ಫ,Ttw
+ವ,Ttw
+ಶ,Ddo
 ೦,o೦
 ം,oം
+ക,Oo
+ഖ,nou
+ഗ,cos
+ഘ,eu
+ങ,BCRbcr
+ച,Iilo
+ഛ,ceno
+ജ,Bbo
+ഝ,enuw
+ഞ,mno
+ട,Scs
 ഠ,oഠ
+ഡ,Bbnuw
+ഢ,nuw
+ണ,em
+ത,mo
+ഥ,bno
+ദ,BRbor
+ധ,nuw
+ന,mn
+പ,IUilnu
+ഫ,bno
+ബ,mnu
+ഭ,BCFRbcfr
+മ,o
+യ,ceow
+ര,ceno
+ല,eu
+ഴ,pu
+വ,nu
+ശ,eou
+ഷ,nouw
+സ,mnu
+ഹ,no
+ൈ,n
 ൦,o൦
 ൭,9൭
 ං,oං
+අ,DOPcdopq
+ආ,DOPcdopq
+ඇ,DOPcdopq
+ඈ,DEOPcdeopq
+ඉ,o
+ඊ,o
+උ,COco
+ඌ,COco
+ඎ,a
+එ,GOcgo
+ඒ,GOcgo
+ඔ,Oow
+ඕ,Oow
+ඖ,Oow
+ක,co
+ඛ,Ccen
+ග,co
+ඞ,Aaw
+ච,GOgo
+ඡ,Cbco
+ජ,Cbco
+ඣ,DOdow
+ඤ,cw
+ට,DGOcdgo
+ඨ,w
+ඪ,Oow
+ණ,Oco
+ඬ,Oow
+ත,o
+ථ,DGOcdgo
+ද,co
+ධ,AGagsw
+න,Ddo
+ප,Cco
+ඵ,Dcdo
+බ,Aae
+භ,Dcdo
+ම,DGOdgo
+ය,BEbeow
+ර,bo
+ල,COco
+ව,DGOdgo
+ශ,Dcdo
+ෂ,Cco
+ස,Bbw
+හ,Ddo
+ก,no
+ข,DIUdilu
+ฃ,DIdilu
+ค,cp
+ฅ,mnp
+ฆ,INilnu
+ง,Iiluv
+จ,Ddnq
+ฉ,Oanoq
+ช,DIUdilu
+ซ,Ddu
+ฌ,Iiln
+ญ,Iilnu
+ฎ,DIOdilo
+ฏ,DIOdilo
+ฐ,Sbos
+ฑ,INiln
+ฒ,Iilmq
+ณ,Iilu
+ด,noq
+ต,Mmnq
+ถ,ILiln
+ท,Nnuv
+ธ,Sbos
+น,Nnu
+บ,DIdilu
+ป,DIdilq
+ฝ,INilnw
+พ,IMNilmnw
+ฟ,IMilmw
+ภ,Iiln
+ม,Iilu
+ย,DIdilu
+ร,Ppq
+ฤ,Iiln
+ล,DIadil
+ฦ,Iil
+ว,Ibil
+ศ,bnop
+ษ,Iilu
+ส,DIadil
+ห,NVnuv
+ฬ,INWilnw
+อ,GOago
+ฮ,CDGOcdgop
+ฯ,Iil
+า,Iil
+ำ,Iil
+฿,BIbil
+เ,Ibil
+แ,Ibil
+โ,Ibil
+ใ,Ibil
+ไ,Ibil
+ๅ,Iil
+ๆ,Iil
 ๐,o๐
+๑,co
+๒,Ieilmu
+๓,Obcmo
+๔,DOcdeo
+๕,Dcdeo
+๖,Ddeo
+๗,Iilm
+๘,Ddw
+๙,Kkno
+ຜ,w
+ຝ,w
+ວ,Jj
+ຽ,Jej
 ໐,o໐
+ໞ,n
+ང,c
+ཎ,Tpt
+ཪ,Hh
+ཬ,Ii
+ྉ,cm
+က,cu
+ခ,eo
+ဂ,CNOcno
+ဃ,COUcou
+င,co
+စ,o
+ဆ,eo
+ဇ,COco
+ဉ,op
+ည,co
+ဋ,COco
+ဌ,cgoq
+ဍ,COco
+ဎ,OUou
+တ,co
+ထ,co
+ဒ,be
+ဓ,o
+န,s
+ပ,ou
+ဖ,eu
+ဗ,ou
+ဘ,co
+မ,ou
+ယ,cu
+ရ,op
+လ,co
 ဝ,oဝ
+သ,co
+ဟ,cu
+ဠ,COco
+ဥ,cop
+ဧ,CEOceo
+ဩ,co
 ၀,o၀
+၌,cgop
+၎,copq
+ၡ,q
+ၰ,cu
+ၽ,eu
+ၾ,eu
 Ⴀ,oⴀ
 Ⴁ,ouⴁ
 Ⴂ,noⴂ
@@ -988,45 +1244,158 @@ z,sz
 Ⴚ,ⴚ
 Ⴛ,ⴛ
 Ⴜ,ⴜ
-Ⴝ,ⴝ
+Ⴝ,Ssⴝ
 Ⴞ,ⴞ
 Ⴟ,ⴟ
 Ⴠ,ⴠ
-Ⴡ,ⴡ
+Ⴡ,Iiⴡ
 Ⴢ,ⴢ
 Ⴣ,ⴣ
 Ⴤ,ⴤ
 Ⴥ,ⴥ
 Ⴧ,ⴧ
-Ⴭ,ⴭ
+Ⴭ,Zzⴭ
+ა,co
+ბ,o
+გ,o
+დ,co
+ე,co
+ვ,beo
+ზ,o
+თ,cno
+ი,n
+კ,ceo
+ლ,mno
+მ,ao
+ნ,co
+ო,mn
+პ,eo
+ჟ,joy
+რ,mn
+ს,bo
+ტ,o
+უ,co
+ფ,ceo
+ქ,bo
+ღ,mno
 ყ,yყ
+შ,cdo
+ჩ,ho
+ც,beo
+ძ,cdo
+წ,o
+ჭ,cjot
+ხ,bo
+ჯ,cjot
+ჰ,e
 ჿ,oჿ
+ᄀ,Ii
+ᄁ,Ii
+ᄂ,Ll
+ᄃ,co
+ᄄ,co
+ᄅ,Scs
+ᄆ,o
+ᄇ,Aapu
+ᄈ,Aauw
+ᄉ,Aan
+ᄊ,AMUamu
+ᄋ,o
+ᄌ,Aan
+ᄍ,Mmu
+ᄎ,lt
+ᄏ,Ff
+ᄐ,Eceo
+ᄑ,co
+ᄒ,o
+ᅬ,Ii
+ᆡ,Ii
+ᆷ,o
+ᆿ,Ff
 ሀ,uvሀ
 ሁ,u
 ሃ,y
+ሌ,Ibin
 ል,a
+ሏ,Iily
+ሗ,Iilm
+መ,Dd
+ሟ,Tot
 ሠ,w
+ሦ,w
+ሧ,Tmntu
 ረ,l
+ሪ,l
 ር,c
+ሯ,CTct
+ሷ,ACOaco
 ሸ,x
+ሿ,Aan
+ቈ,IPilop
+ቘ,Tt
+ባ,ln
+ቧ,0ACac
+ቪ,n
+ቫ,n
+ቯ,ACOaco
+ቱ,Tt
+ቲ,Tt
+ቷ,HIThilt
+ቺ,ITilt
 ቻ,f
-ቿ,e
+ቿ,HITehilt
+ኈ,Iil
 ነ,s
-ኗ,g
+ኗ,CTcgt
+ኛ,Tt
+ኟ,CTct
+ኡ,hn
+እ,y
+ኧ,KTYknty
 ክ,n
+ኮ,n
+ኰ,n
+ዀ,n
+ወ,Ddop
+ው,Ddo
+ዏ,Bb
 ዐ,oዐ
 ዒ,q
 ዕ,d
 ዘ,h
-የ,p
+ዟ,HIhil
+ዤ,Hbh
+ዧ,HIhil
+የ,Peopq
 ዪ,r
+ዯ,op
+ዳ,eo
+ዷ,ceo
+ዹ,e
+ጃ,e
+ጇ,Teot
 ጊ,z
-ጋ,j
+ጋ,DIdij
 ጌ,b
+ግ,Ii
 ጎ,i
+ጐ,Iil
+ጒ,ILil
 ጕ,k
 ጠ,m
+ጡ,m
+ጧ,Tmnt
+ጯ,Tbmnt
+ጴ,no
+ጷ,o
+ጿ,o
+ፀ,DOdo
+ፃ,p
+ፎ,Ll
+ፏ,Tqt
 ፕ,t
+ፗ,ITilt
+ፘ,Ttu
 Ꭰ,dᎠꭰ
 Ꭱ,rᎡꭱ
 Ꭲ,tᎢꭲ
@@ -1041,10 +1410,10 @@ z,sz
 Ꭻ,jᎫꭻ
 Ꭼ,eᎬꭼ
 Ꭽ,ꭽ
-Ꭾ,ꭾ
+Ꭾ,pꭾ
 Ꭿ,ꭿ
 Ꮀ,ꮀ
-Ꮁ,ꮁ
+Ꮁ,Iiꮁ
 Ꮂ,ꮂ
 Ꮃ,wᎳꮃ
 Ꮄ,ꮄ
@@ -1073,7 +1442,7 @@ z,sz
 Ꮛ,ꮛ
 Ꮜ,ꮜ
 Ꮝ,ꮝ
-Ꮞ,4Ꮞꮞ
+Ꮞ,4IaiᏎꮞ
 Ꮟ,bᏏꮟ
 Ꮠ,ꮠ
 Ꮡ,ꮡ
@@ -1081,8 +1450,8 @@ z,sz
 Ꮣ,ꮣ
 Ꮤ,wᏔꮤ
 Ꮥ,sᏕꮥ
-Ꮦ,ꮦ
-Ꮧ,ꮧ
+Ꮦ,Tbotꮦ
+Ꮧ,Iilꮧ
 Ꮨ,ꮨ
 Ꮩ,vᏙꮩ
 Ꮪ,sᏚꮪ
@@ -1101,11 +1470,11 @@ z,sz
 Ꮷ,dᏧꮷ
 Ꮸ,ꮸ
 Ꮹ,ꮹ
-Ꮺ,ꮺ
-Ꮻ,ꮻ
+Ꮺ,uꮺ
+Ꮻ,oꮻ
 Ꮼ,ꮼ
-Ꮽ,ꮽ
-Ꮾ,6Ꮾꮾ
+Ꮽ,eoꮽ
+Ꮾ,6boᏮꮾ
 Ꮿ,ꮿ
 Ᏸ,ᏸ
 Ᏹ,ᏹ
@@ -1113,10 +1482,18 @@ z,sz
 Ᏻ,gᏳᏻ
 Ᏼ,bᏴᏼ
 Ᏽ,ᏽ
+ᏸ,Bb
+ᏼ,Bb
+ᐃ,o
+ᐘ,Ddov
 ᐯ,vᐯ
+ᐹ,v
+ᐽ,Aa
+ᑋ,h
 ᑌ,uᑌ
 ᑕ,Cc
 ᑖ,Cc
+ᑞ,co
 ᑡ,Cc
 ᑢ,Cc
 ᑣ,Cc
@@ -1125,6 +1502,7 @@ z,sz
 ᑦ,c
 ᑧ,Uu
 ᑨ,Nn
+ᑩ,cu
 ᑪ,Cc
 ᑫ,q
 ᑬ,p
@@ -1150,28 +1528,56 @@ z,sz
 ᒀ,b
 ᒁ,b
 ᒂ,b
+ᒆ,p
+ᒌ,n
 ᒍ,jᒍ
 ᒎ,Jj
 ᒏ,Jj
 ᒑ,Jj
+ᒛ,ij
+ᒝ,lu
+ᒠ,Jjlu
 ᒥ,r
 ᒦ,r
 ᒪ,Llᒪ
 ᒫ,Ll
+ᒳ,Ll
+ᒵ,JLijl
 ᒿ,2ᒿ
+ᓃ,bo
+ᓎ,bop
+ᓕ,Jjl
+ᓪ,Jj
+ᓬ,Ee
 ᔆ,s
+ᔕ,Ss
+ᔘ,Sls
+ᔠ,Ss
+ᔤ,Ss
+ᔮ,Lbil
 ᕁ,xᕁ
+ᕒ,EWew
+ᕕ,Aav
+ᕪ,ce
 ᕼ,hᕼ
 ᕽ,xᕽ
+ᖃ,bo
 ᖇ,rᖇ
 ᖈ,r
+ᖓ,Jjl
+ᖘ,p
 ᖯ,bᖯ
 ᖴ,fᖴ
+ᖼ,Iiv
+ᖾ,Ii
 ᗄ,AVav
 ᗅ,Aaᗅ
+ᗈ,Aav
 ᗉ,c
 ᗋ,Aa
 ᗕ,c
+ᗖ,AVav
+ᗛ,Eev
 ᗞ,dᗞ
 ᗡ,d
 ᗪ,Ddᗪ
@@ -1182,15 +1588,25 @@ z,sz
 ᗲ,Ee
 ᗳ,Ee
 ᗴ,Ee
+ᗵ,w
 ᗷ,bᗷ
 ᗾ,BEbe
 ᗿ,BEbe
 ᘀ,BEbe
+ᘆ,Jcjl
+ᘈ,uw
+ᘉ,Iilm
+ᘏ,en
+ᘣ,bcno
+ᘧ,bco
+ᘺ,uw
 ᘻ,m
+ᙃ,Dd
 ᙅ,Cc
 ᙆ,z
 ᙎ,Ww
 ᙏ,Mm
+ᙒ,BDbdw
 ᙔ,Ww
 ᙕ,Mm
 ᙖ,Bb
@@ -1207,11 +1623,171 @@ z,sz
 ᙬ,Bb
 ᙭,Xx᙭
 ᙮,x᙮
+ᙯ,q
+ᙵ,l
+ᙶ,i
+ᚮ,Ii
+ᚲ,c
+ᚳ,Ii
+ᚵ,IYiy
 ᚷ,xᚷ
 ᛁ,lᛁ
+ᛇ,Ii
+ᛓ,Ii
 ᛕ,kᛕ
 ᛖ,mᛖ
+ᛙ,Ii
+ᛡ,Iix
+ᜠ,v
+ᜣ, p
+ᜩ,Vkv
+ᜫ,x
+ᜱ,UVuv
+ᝋ,Aao
+ᝐ,Ii
+ᝦ,JTjt
+ᝨ,ITit
+ᝯ,co
+ក,n
+ខ,cos
+គ,an
+ឃ,uw
+ង,ow
+ច,osu
+ឆ,cino
+ជ,uw
+ឈ,nuw
+ញ,mn
+ដ,uw
+ឋ,u
+ឌ,cos
+ឍ,ilmn
+ណ,mnw
+ត,n
+ថ,cou
+ទ,co
+ធ,uw
+ន,cos
+ប,u
+ផ,uw
+ព,mn
+ភ,n
+ម,au
+យ,uw
+រ,ils
+ល,nsu
+វ,ils
+ស,nsu
+ហ,nsu
+ឡ,cgil
+អ,hil
+ឥ,n
+ឦ,iln
+ឧ,cos
+ឨ,Ss
+ឩ,cos
+ឪ,cos
+ឫ,uy
+ឬ,u
+ឭ,mn
+ឮ,mn
+ឯ,nw
+ឰ,mn
+ឱ,cs
+ឲ,co
+។,il
+៕,il
+ៗ,cijlo
 ᠐,o
+ᠼ,Tt
+ᡏ,Iio
+ᡗ,n
+ᡘ,n
+ᡙ,mu
+ᢋ,Tt
+ᢍ,Bbuv
+ᢗ,c
+ᢳ,o
+ᢶ,v
+ᢸ,bo
+ᣎ,u
+ᣐ,bn
+ᣑ,cop
+ᣩ,Rr
+ᣪ,pq
+ᤃ,oy
+ᤉ,Ee
+ᤎ,BEbeo
+ᤝ,hn
+ᥑ,a
+ᥒ,n
+ᥠ,ad
+ᥭ,Dcdu
+ᥴ,c
+ᦎ,o
+ᦒ,ow
+ᦸ,eo
+ᨃ,Ff
+ᨄ,Pp
+ᨻ,mo
+ᬌ,pu
+ᬏ,n
+ᬥ,uw
+ᭈ,uy
+ᮃ,Bbo
+ᮎ,u
+ᮖ,u
+ᮘ,DOdo
+ᯉ,o
+ᯊ,y
+ᯖ,x
+ᯜ,Ss
+ᯡ,o
+ᯢ,Ii
+ᰀ,BEbe
+ᰜ,Sos
+ᰟ,o
+᱑,Iil
+᱒,Scs
+᱓,Cce
+᱔,CGcg
+᱕,Icil
+᱖,Cce
+᱗,Scs
+᱘,Cce
+᱙,CGcg
+ᱚ,CDcdeo
+ᱛ,Oo
+ᱜ,CEOceo
+ᱝ,CEKOceko
+ᱞ,Icilopq
+ᱟ,CDcdeo
+ᱠ,bo
+ᱡ,",DNOUdnou"
+ᱢ,DNOUdnou
+ᱣ,DIcdilou
+ᱤ,AIailv
+ᱥ,KUYckuvy
+ᱦ,OUouw
+ᱧ,Icilopq
+ᱨ,CDIOcdilo
+ᱩ,9bc
+ᱪ,no
+ᱬ,CMOcmo
+ᱭ,cno
+ᱮ,Scos
+ᱯ,Ono
+ᱰ,IOilo
+ᱱ,CKYcky
+ᱲ,CKOcko
+ᱳ,COco
+ᱴ,Iilno
+ᱵ,IOilo
+ᱶ,ciou
+ᱷ,ouw
+ᱽ,Ieilo
+᱾,Iil
+᱿,Iil
 Ა,ა
 Ბ,ბ
 Გ,გ
@@ -1221,31 +1797,31 @@ z,sz
 Ზ,ზ
 Თ,თ
 Ი,ი
-Კ,კ
+Კ,Bbuკ
 Ლ,ლ
 Მ,მ
-Ნ,ნ
+Ნ,boნ
 Ო,ო
 Პ,პ
-Ჟ,ჟ
-Რ,რ
+Ჟ,Jjჟ
+Რ,mრ
 Ს,ს
 Ტ,ტ
 Უ,უ
 Ფ,ფ
-Ქ,ქ
+Ქ,coქ
 Ღ,ღ
 Ყ,ყ
-Შ,შ
+Შ,acoშ
 Ჩ,ჩ
 Ც,ც
 Ძ,ძ
 Წ,წ
 Ჭ,ჭ
 Ხ,ხ
-Ჯ,ჯ
+Ჯ,Jjჯ
 Ჰ,ჰ
-Ჱ,ჱ
+Ჱ,Bbჱ
 Ჲ,ჲ
 Ჳ,ჳ
 Ჴ,ჴ
@@ -1253,11 +1829,12 @@ z,sz
 Ჶ,ჶ
 Ჷ,ჷ
 Ჸ,ჸ
-Ჹ,ჹ
+Ჹ,oჹ
 Ჺ,ჺ
-Ჽ,ჽ
+Ჽ,Ssჽ
 Ჾ,ჾ
 Ჿ,ჿ
+ᳬ,u
 ᴀ,a
 ᴂ,ae
 ᴃ,b
@@ -1279,9 +1856,11 @@ z,sz
 ᴙ,r
 ᴛ,t
 ᴜ,uᴜ
+ᴝ,nu
 ᴠ,vᴠ
 ᴡ,wᴡ
 ᴢ,zᴢ
+ᴤ,Scs
 ᴦ,rᴦ
 ᴬ,a
 ᴮ,b
@@ -1296,6 +1875,7 @@ z,sz
 ᴹ,m
 ᴺ,n
 ᴼ,o
+ᴽ,o
 ᴾ,p
 ᴿ,r
 ᵀ,t
@@ -1309,6 +1889,7 @@ z,sz
 ᵏ,k
 ᵐ,m
 ᵒ,o
+ᵓ,cou
 ᵖ,p
 ᵗ,t
 ᵘ,u
@@ -1320,6 +1901,8 @@ z,sz
 ᵥ,v
 ᵦ,b
 ᵧ,y
+ᵨ,p
+ᵫ,eu
 ᵬ,b
 ᵭ,d
 ᵮ,f
@@ -1333,9 +1916,14 @@ z,sz
 ᵶ,z
 ᵷ,g
 ᶃ,gᶃ
+ᶅ,l
 ᶌ,yᶌ
+ᶐ,Ddoq
+ᶒ,e
 ᶜ,c
 ᶠ,f
+ᶭ,Iiuw
+ᶴ,ISis
 ᶻ,z
 Ḁ,ḁ
 Ḃ,ḃ
@@ -1666,17 +2254,17 @@ z,sz
 ⅇ,eⅇ
 ⅈ,iⅈ
 ⅉ,ijⅉ
-Ⅰ,lⅠⅰ
+Ⅰ,IilⅠⅰ
 Ⅱ,ⅱ
 Ⅲ,ⅲ
-Ⅳ,ⅳ
+Ⅳ,IVivⅳ
 Ⅴ,vⅤⅴ
 Ⅵ,ⅵ
 Ⅶ,ⅶ
 Ⅷ,ⅷ
 Ⅸ,ⅸ
 Ⅹ,xⅩⅹ
-Ⅺ,ⅺ
+Ⅺ,IXixⅺ
 Ⅻ,ⅻ
 Ⅼ,lⅬⅼ
 Ⅽ,cⅭⅽ
@@ -1684,6 +2272,7 @@ z,sz
 Ⅿ,mⅯⅿ
 ⅰ,iⅰ
 ⅴ,vⅴ
+ⅸ,ix
 ⅹ,xⅹ
 ⅼ,lⅼ
 ⅽ,cⅽ
@@ -1806,7 +2395,7 @@ z,sz
 Ⰰ,ⰰ
 Ⰱ,ⰱ
 Ⰲ,ⰲ
-Ⰳ,ⰳ
+Ⰳ,Vovⰳ
 Ⰴ,ⰴ
 Ⰵ,ⰵ
 Ⰶ,ⰶ
@@ -1822,35 +2411,38 @@ z,sz
 Ⱀ,ⱀ
 Ⱁ,ⱁ
 Ⱂ,ⱂ
-Ⱃ,ⱃ
+Ⱃ,boⱃ
 Ⱄ,ⱄ
 Ⱅ,ⱅ
 Ⱆ,ⱆ
 Ⱇ,ⱇ
-Ⱈ,ⱈ
+Ⱈ,bⱈ
 Ⱉ,ⱉ
 Ⱊ,ⱊ
 Ⱋ,ⱋ
 Ⱌ,ⱌ
 Ⱍ,ⱍ
-Ⱎ,ⱎ
+Ⱎ,wⱎ
 Ⱏ,ⱏ
 Ⱐ,ⱐ
 Ⱑ,ⱑ
-Ⱒ,ⱒ
+Ⱒ,Ooⱒ
 Ⱓ,ⱓ
 Ⱔ,ⱔ
 Ⱕ,ⱕ
 Ⱖ,ⱖ
 Ⱗ,ⱗ
-Ⱘ,ⱘ
+Ⱘ,CEceⱘ
 Ⱙ,ⱙ
 Ⱚ,ⱚ
 Ⱛ,ⱛ
 Ⱜ,ⱜ
-Ⱝ,ⱝ
+Ⱝ,DIdiⱝ
 Ⱞ,ⱞ
 Ⱟ,ⱟ
+ⱊ,n
+ⱚ,o
+ⱟ,Oo
 Ⱡ,Lilⱡ
 ⱡ,Iil
 Ɫ,Llɫ
@@ -1898,6 +2490,7 @@ z,sz
 Ⲗ,ⲗ
 Ⲙ,MmⲘⲙ
 Ⲛ,NnⲚⲛ
+ⲛ,nv
 Ⲝ,ⲝ
 Ⲟ,OoⲞⲟ
 ⲟ,oⲟ
@@ -1907,11 +2500,14 @@ z,sz
 Ⲥ,cⲤⲥ
 ⲥ,cⲥ
 Ⲧ,tⲦⲧ
+ⲧ,Tt
 Ⲩ,yⲨⲩ
 Ⲫ,ⲫ
+ⲫ,Iio
 Ⲭ,xⲬⲭ
-Ⲯ,ⲯ
+Ⲯ,IYivyⲯ
 Ⲱ,ⲱ
+ⲱ,Ddow
 Ⲳ,ⲳ
 Ⲵ,ⲵ
 Ⲷ,ⲷ
@@ -1931,34 +2527,230 @@ z,sz
 Ⳓ,6Ⳓⳓ
 Ⳕ,ⳕ
 Ⳗ,ⳗ
-Ⳙ,ⳙ
+Ⳙ,uⳙ
 Ⳛ,ⳛ
 Ⳝ,ⳝ
 Ⳟ,ⳟ
 Ⳡ,ⳡ
 Ⳣ,ⳣ
+ⳤ,Kk
 Ⳬ,ⳬ
 Ⳮ,ⳮ
+ⳮ,Hhx
 Ⳳ,ⳳ
+ⳳ,BDbdo
+ⴚ,n
+ⴛ,ch
+ⴰ,o
+ⴱ,o
+ⴳ,x
+ⴶ,Ii
+ⴷ,a
 ⴸ,vⴸ
 ⴹ,eⴹ
-ⵏ,lⵏ
+ⴼ,h
+ⴽ,kr
+ⵀ,o
+ⵅ,x
+ⵇ,rz
+ⵉ,e
+ⵊ,Ii
+ⵍ,n
+ⵎ,c
+ⵏ,ilⵏ
 ⵔ,oⵔ
 ⵕ,qⵕ
+ⵖ,y
+ⵙ,o
+ⵛ,c
+ⵜ,t
 ⵝ,xⵝ
+ⵡ,Uu
+ⵢ,Ss
+ⵣ,hmx
+ⵦ,cv
+ⵯ,u
+ⶌ,ceo
+ⶰ,Hh
+ⶵ,HTht
+ⷉ,n
+ⷋ,n
+ⷎ,n
+ⷓ,n
+ⷕ,n
 ⸁,f
 〇,o〇
+〹,Hh
+え,h
+く,Vcv
+ひ,ou
+よ,d
+ら,bo
+れ,n
+ゐ,bo
 ん,h
+ォ,Iit
+ケ,Tt
+コ,co
 ズ,k
+ハ,Ii
+ヘ,Ll
+ヶ,Tt
+ㄎ,Ss
+ㄐ,IYiuy
+ㄕ,Pp
 ㄩ,Uu
+ㄮ,c
+ㅂ,Aa
+ㅊ,t
+ㅞ,ITit
+ㅟ,Tt
+ㅿ,o
+ㆤ,t
+ㆨ,EXex
+ㆿ,o
+㞯,OScosw
+㠮,Ii
+㧄,ILUilu
+䆰,co
+䋇,Ror
+䑩,Aat
+䖎,Bb
+䘨,x
+䡄,n
+䢾,Bb
+䩕,op
 丂,s
+丈,Xx
+丒,x
+业,IUiu
 乃,b
 乇,e
 乙,z
+亅,IJijl
+伬,ORor
+佋,AJaj
+冗,n
+冱,Sos
 刀,n
 匚,Cc
+區,Cco
 千,EFef
+厸,AGabg
+听,FTft
+囡,ox
+堬,Jj
+壬,EFTeft
+夙,n
+姹,Ff
+宎,Tt
 尺,r
+巵,e
+巾,Topt
+归,Ee
+征,EFIefi
+抠,cx
+攻,x
+杤,FJfhj
+校,x
+正,DEde
+況,o
+炉,Aao
+炬,CEceo
+牨,n
+犴,FTft
+瑅,Ee
+生,EIei
+盻,Ss
+笿,Aax
+籽,Jjt
+紆,FTft
+纴,Ee
+绯,Ee
+罓,x
+耓,ITit
+肛,Ii
+蔀,Bb
+蚇,Ror
+訊,Aal
+跍,Aaot
+鿈,Ror
+鿽,Oo
+ꀂ,Aau
+ꀎ,ou
+ꀩ,m
+ꀯ,c
+ꀸ,bcdo
+ꁖ,Oo
+ꁜ,Cc
+ꁥ,Ddoq
+ꁭ,Ii
+ꁱ,n
+ꂚ,Nn
+ꂧ,u
+ꂬ,Iiow
+ꃎ,HIhi
+ꃞ,Ff
+ꃟ,IYiy
+ꃡ,u
+ꃩ,Ii
+ꃺ,x
+ꃼ,u
+ꄆ,NXZnxz
+ꄇ,Aa
+ꄠ,Ii
+ꄩ,Ee
+ꄭ,Ll
+ꅔ,AOaow
+ꅧ,o
+ꆀ,d
+ꆰ,Oo
+ꆽ,Jj
+ꇋ,Ii
+ꈅ,CLcl
+ꈚ,Hh
+ꈜ,s
+ꈫ,x
+ꈮ,o
+ꈲ,Oo
+ꉧ,Cc
+ꊁ,Nn
+ꊌ,FIZfiz
+ꊗ,uw
+ꊢ,Oo
+ꋁ,Oo
+ꋑ,bd
+ꋗ,Nn
+ꋙ,Xx
+ꋡ,Bb
+ꋢ,o
+ꌙ,Ifi
+ꌚ,Ss
+ꌠ,HIhi
+ꌤ,u
+ꌬ,t
+ꌻ,Ofo
+ꍹ,Ll
+ꎇ,ITZitz
+ꎜ,Hh
+ꎞ,Ede
+ꎣ,o
+ꎧ,Hh
+ꎾ,c
+ꏁ,BEbe
+ꏐ,Xx
+ꏮ,uw
+ꏵ,Uu
+ꏶ,FIfit
+ꏻ,Ii
+ꏼ,d
+ꏾ,Xx
+ꐂ,IXix
+ꐲ,wy
+ꑑ,Hh
+ꑥ,o
+ꑧ,cuw
+ꑱ,bcdo
 ꓐ,Bbꓐ
 ꓑ,Ppꓑ
 ꓒ,dꓒ
@@ -1999,6 +2791,36 @@ z,sz
 ꓵ,Nn
 ꓶ,ILil
 ꓷ,DOdo
+ꔟ,m
+ꔤ,Ii
+ꔻ,o
+ꕀ,muw
+ꕐ,w
+ꕙ,Bb
+ꕡ,Oo
+ꕨ,IMTimt
+ꕪ,c
+ꕺ,o
+ꕽ,w
+ꖅ,Ii
+ꖈ,uw
+ꖊ,o
+ꖍ,Iil
+ꖐ,Hho
+ꖝ,o
+ꖡ,w
+ꖹ,OUou
+ꗂ,Sfs
+ꗔ,Ff
+ꗘ,BPbp
+ꗙ,BPbp
+ꗫ,CIci
+ꘃ,Iiw
+ꘆ,w
+ꘋ,b
+ꘐ,n
+ꘒ,Ee
+ꘪ,HMhm
 Ꙁ,Zzꙁ
 Ꙃ,Zzꙃ
 Ꙅ,2SsꙄꙅ
@@ -2026,20 +2848,33 @@ z,sz
 Ꚁ,oꚁ
 Ꚃ,Ssꚃ
 Ꚅ,Kkꚅ
+ꚅ,BKbk
 Ꚇ,muwꚇ
 Ꚉ,nꚉ
+ꚉ,Aao
 Ꚋ,Tbtꚋ
 Ꚍ,Ttꚍ
 Ꚏ,Uuꚏ
 Ꚑ,Ttꚑ
+ꚑ,Tt
 Ꚓ,huꚓ
 Ꚕ,hꚕ
+ꚕ,h
 Ꚗ,Wwꚗ
 Ꚙ,Ooꚙ
 Ꚛ,Ooꚛ
+ꚛ,o
+ꚜ,b
+ꚴ,UVuv
+ꛄ,p
+ꛑ,Cc
+ꛔ,m
+ꛕ,c
 ꛟ,vꛟ
-ꛯ,2ꛯ
+ꛭ,p
+ꛯ,2Ssꛯ
 ꜀,c
+ꜟ,i
 Ꜣ,Eeꜣ
 ꜣ,Ee
 Ꜥ,rꜥ
@@ -2093,12 +2928,13 @@ z,sz
 Ꝕ,ꝕ
 Ꝗ,Qqꝗ
 ꝗ,q
-Ꝙ,ꝙ
+Ꝙ,Qqꝙ
 Ꝛ,2iꝚꝛ
 ꝛ,i
 Ꝝ,ꝝ
 Ꝟ,ꝟ
-Ꝡ,ꝡ
+Ꝡ,Wwꝡ
+ꝡ,w
 Ꝣ,ꝣ
 Ꝥ,Ddpꝥ
 ꝥ,p
@@ -2111,6 +2947,7 @@ z,sz
 Ꝯ,9goꝮꝯ
 ꝯ,go
 ꝰ,o
+ꝵ,r
 Ꝺ,Ooqꝺ
 ꝺ,o
 Ꝼ,ilrꝼ
@@ -2139,6 +2976,7 @@ z,sz
 ꞙ,fꞙ
 Ꞛ,ꞛ
 Ꞝ,ꞝ
+ꞝ,BDbdo
 Ꞟ,ꞟ
 ꞟ,uꞟ
 Ꞡ,Ggꞡ
@@ -2156,7 +2994,7 @@ z,sz
 Ɡ,ɡ
 Ɬ,ɬ
 Ɪ,ɪ
-Ʞ,ʞ
+Ʞ,Kkʞ
 Ʇ,ʇ
 Ʝ,jʝꞲ
 Ꭓ,xꞳꭓ
@@ -2185,22 +3023,128 @@ z,sz
 ꟽ,MWmw
 ꟾ,Iil
 ꟿ,MWmw
+ꠑ,bo
+ꠕ,Mm
+ꡈ,Ece
+ꡖ,Oou
+ꡙ,Sos
+ꡞ,Cbcno
+ꡤ,Vv
+ꢄ,BDbdou
+ꢚ,mo
+ꢜ,Scos
+ꤠ,Mm
+ꥹ,Ee
+ꦦ,nuw
+ꧤ,ce
+ꧻ,o
+ꧾ,co
+ꨁ,m
+ꨄ,m
+ꨖ,u
+ꨟ,u
+ꨢ,m
+ꨤ,m
+ꩪ,o
+ꩱ,cn
+ꪱ,Ii
+ꫳ,bo
+ꬒ,Hh
+ꬓ,Hh
+ꬖ,Hh
 ꬲ,eꬲ
+ꬴ,e
 ꬵ,fꬵ
 ꬽ,oꬽ
+ꬾ,Dd
 ꭇ,rꭇ
 ꭈ,rꭈ
 ꭎ,uꭎ
+ꭏ,u
 ꭒ,uꭒ
+ꭖ,x
+ꭙ,xy
 ꭚ,yꭚ
+ꭜ,h
+ꭳ,no
 ꭵ,iꭵ
 ꮁ,rꮁ
 ꮃ,wꮃ
 ꮓ,zꮓ
+ꮞ,AIai
 ꮩ,vꮩ
-ꮪ,sꮪ
+ꮪ,csꮪ
+ꮬ,Sos
 ꮯ,cꮯ
+ꮶ,Kk
+ꮺ,u
+ꮼ,u
+ꮾ,Dbdo
+ꯀ,Iilw
+ꯁ,mo
+ꯂ,co
+ꯃ,Hch
+ꯄ,CIMcilm
+ꯅ,Cco
+ꯆ,ACHach
+ꯇ,co
+ꯈ,ho
+ꯉ,IOilo
+ꯊ,ITiltuw
+ꯋ,AHahn
+ꯌ,Rcor
+ꯍ,ISTilst
+ꯎ,cmos
+ꯏ,hos
+ꯐ,Ee
+ꯑ,CIOcilo
+ꯒ,Tnt
+ꯓ,Ncn
+ꯔ,AHahou
+ꯕ,Yoy
+ꯖ,c
+ꯗ,cho
+ꯘ,Tcht
+ꯙ,IJTijlt
+ꯚ,IJTijlt
+ꯛ,OTUWotuw
+ꯜ,FIfil
+ꯝ,AFTaft
+ꯞ,CIMTcilmt
+ꯟ,Cco
+ꯠ,Yoy
+ꯡ,IOTWilotw
+ꯢ,cho
+꯫,Iil
+걭,Ee
+놩,o
+돋,c
+드,co
+땀,o
+뚘,c
+망,Iio
+뮽,Eeo
+므,o
+믌,o
+믘,Ffo
+믱,Iio
+쇁,Ee
+쌬,Hh
+욺,o
 유,i
+이,IOio
+죜,FIfi
+짐,Iio
+짿,Hch
+쨛,c
+쵃,Hh
+컴,Iio
+탦,EHOeho
+탱,EHeho
+틐,Ee
+핵,Hh
+ힿ,Hh
+ퟁ,Iil
 ff,f
 fi,fi
 fl,fl
diff --git a/src/replacements_extra.csv b/src/replacements_extra.csv
index 96c0e0a..b59abce 100644
--- a/src/replacements_extra.csv
+++ b/src/replacements_extra.csv
@@ -1818,12 +1818,6 @@ B,Bb
 ჟ,yjo
 ძ,doc
 ჩ,ho
-ް,o
-ޭ,co
-ު,co
-ޫ,co
-ޮ,xc
-ޯ,co
 ક,sft
 ચ,uci
 ટ,sco
@@ -2060,7 +2054,7 @@ B,Bb
 ඔ,wO
 ඕ,wO
 ඖ,wO
-අං,Dqpo
+අ,Dqpo
 ක,oc
 ඛ,Cne
 ග,oc
@@ -2136,7 +2130,6 @@ B,Bb
 ๘,wD
 ๙,nKo
 ๐,o
-",Il
 ฎ,IlDO
 ฑ,NIl
 ธ,bSo