From 6c9200c3786f259b2d09700decd1a1e42eadee5c Mon Sep 17 00:00:00 2001
From: "Amir E. Aharoni" <amir.aharoni@mail.huji.ac.il>
Date: Mon, 12 Jun 2023 18:14:12 +0300
Subject: [PATCH] Update jquery.ime and jquery.uls from upstream

jquery.ime
* Major update of Javanese keyboard rules.
* Rename "Batak QWERTY" to "Toba Transliteration".
* Change bbc autonym to "Batak Toba".
* Internal code cleanup for Cherokee.
Updating to
https://github.com/wikimedia/jquery.ime/commit/5943600f153f8ab11d217984c31fdc31b486f59a

jquery.uls
* Update language-data: bew, bzs, cho, cpx, gcf
* Localization updates
Updating to
https://github.com/wikimedia/jquery.uls/commit/07452b3ca1befe2ce3c088df0c5b6502cf67d5f8

Change-Id: Ia96c4894bfeedd3846ff3fec49bcdff8c0b37d17
---
 lib/jquery.ime/jquery.ime.js                  |  12 +-
 .../rules/bbc/bbc-transliteration.js          |  89 +++++
 lib/jquery.ime/rules/chr/chr.js               | 202 +++++------
 lib/jquery.ime/rules/jv/jv-transliteration.js | 341 +++++++-----------
 lib/jquery.uls/i18n/ike-cans.json             |  15 -
 lib/jquery.uls/i18n/ku-latn.json              |   2 +-
 lib/jquery.uls/src/jquery.uls.data.js         |  37 +-
 7 files changed, 371 insertions(+), 327 deletions(-)
 create mode 100644 lib/jquery.ime/rules/bbc/bbc-transliteration.js
 delete mode 100644 lib/jquery.uls/i18n/ike-cans.json

diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 4f6f88ab..e693aa9c 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.2.0+20230521
+/*! jquery.ime - v0.2.0+20230612
 * https://github.com/wikimedia/jquery.ime
 * Copyright (c) 2023 Santhosh Thottingal; License: (GPL-2.0-or-later OR MIT) */
 ( function ( $ ) {
@@ -1706,9 +1706,9 @@
 			name: 'Ɓasaá tilde',
 			source: 'rules/bas/bas-tilde.js'
 		},
-		'batak-qwerty': {
-			name: 'Batak QWERTY',
-			source: 'rules/bbc/batak-qwerty.js'
+		'bbc-transliteration': {
+			name: 'Toba Transliteration',
+			source: 'rules/bbc/bbc-transliteration.js'
 		},
 		'bci-tilde': {
 			name: 'Baoulé tilde keyboard',
@@ -2645,8 +2645,8 @@
 			inputmethods: [ 'bas-tilde', 'mul-cm' ]
 		},
 		bbc: {
-			autonym: 'Batak',
-			inputmethods: [ 'batak-qwerty' ]
+			autonym: 'Batak Toba',
+			inputmethods: [ 'bbc-transliteration' ]
 		},
 		bci: {
 			autonym: 'wawle',
diff --git a/lib/jquery.ime/rules/bbc/bbc-transliteration.js b/lib/jquery.ime/rules/bbc/bbc-transliteration.js
new file mode 100644
index 00000000..b0401161
--- /dev/null
+++ b/lib/jquery.ime/rules/bbc/bbc-transliteration.js
@@ -0,0 +1,89 @@
+( function ( $ ) {
+	'use strict';
+
+	var tobaKbd = {
+		id: 'bbc-transliteration',
+		name: 'Toba Transliteration',
+		description: 'QWERTY-based Batak Toba transliteration',
+		date: '2014-04-20',
+		URL: 'http://evertype.com/fonts/batak/',
+		author: 'design by Michael Everson, implementation by Amir E. Aharoni',
+		version: '1.0',
+		patterns: [
+			[ 'q', 'ᯥ' ],
+			[ 'w', 'ᯋ' ],
+			[ 'e', 'ᯧ' ],
+			[ 'r', 'ᯒ' ],
+			[ 't', 'ᯖ' ],
+			[ 'y', 'ᯛ' ],
+			[ 'u', 'ᯮ' ],
+			[ 'i', 'ᯪ' ],
+			[ 'o', 'ᯬ' ],
+			[ 'p', 'ᯇ' ],
+
+			[ 'a', 'ᯀ' ],
+			[ 's', 'ᯘ' ],
+			[ 'd', 'ᯑ' ],
+			[ 'f', '᯲' ],
+			[ 'g', 'ᯎ' ],
+			[ 'h', 'ᯂ' ],
+			[ 'j', 'ᯐ' ],
+			[ 'k', 'ᯤ' ],
+			[ 'l', 'ᯞ' ],
+
+			[ 'z', 'ᯝ' ],
+			[ 'x', 'ᯢ' ],
+			[ 'c', 'ᯡ' ],
+			[ 'v', 'ᯣ' ],
+			[ 'b', 'ᯅ' ],
+			[ 'n', 'ᯉ' ],
+			[ 'm', 'ᯔ' ],
+
+			[ 'Q', 'ᯍ' ],
+			[ 'W', 'ᯌ' ],
+			[ 'E', 'ᯨ' ],
+			[ 'R', 'ᯓ' ],
+			[ 'T', 'ᯗ' ],
+			[ 'Y', 'ᯜ' ],
+			[ 'U', 'ᯯ' ],
+			[ 'I', 'ᯫ' ],
+			[ 'O', 'ᯭ' ],
+			[ 'P', 'ᯈ' ],
+
+			[ 'A', 'ᯁ' ],
+			[ 'S', 'ᯙ' ],
+
+			[ 'F', '᯳' ],
+			[ 'G', 'ᯏ' ],
+			[ 'H', 'ᯃ' ],
+			[ 'J', 'ᯄ' ],
+
+			[ 'L', 'ᯟ' ],
+
+			[ 'Z', 'ᯚ' ],
+
+			[ 'B', 'ᯆ' ],
+			[ 'N', 'ᯊ' ],
+			[ 'M', 'ᯕ' ],
+
+			[ '`', 'ᯠ' ],
+			[ '=', 'ᯱ' ],
+			[ '\\+', '᯦' ],
+			[ '-', '' ],
+			[ '_', 'ᯩ' ],
+
+			[ 'B', 'ᯆ' ]
+		],
+		patterns_x: [
+			[ '4', '᯼' ],
+			[ '5', '᯽' ],
+			[ '6', '᯾' ],
+			[ '7', '᯿' ],
+
+			[ 'w', 'ᯍ' ],
+			[ '`', '`' ]
+		]
+	};
+
+	$.ime.register( tobaKbd );
+}( jQuery ) );
diff --git a/lib/jquery.ime/rules/chr/chr.js b/lib/jquery.ime/rules/chr/chr.js
index 215991b8..11a2b3e0 100644
--- a/lib/jquery.ime/rules/chr/chr.js
+++ b/lib/jquery.ime/rules/chr/chr.js
@@ -12,120 +12,120 @@
 		version: '1.0',
 		maxKeyLength: 3,
 		patterns: [
-			[ 'ga', 'Ꭶ'],
-			[ 'ka', 'Ꭷ'],
-			[ 'ge', 'Ꭸ'],
-			[ 'gi', 'Ꭹ'],
-			[ 'go', 'Ꭺ'],
-			[ 'gu', 'Ꭻ'],
-			[ 'gv', 'Ꭼ'],
+			[ 'ga', 'Ꭶ' ],
+			[ 'ka', 'Ꭷ' ],
+			[ 'ge', 'Ꭸ' ],
+			[ 'gi', 'Ꭹ' ],
+			[ 'go', 'Ꭺ' ],
+			[ 'gu', 'Ꭻ' ],
+			[ 'gv', 'Ꭼ' ],
 
 			// Apostrophes allow disambiguation, see: https://en.wikipedia.org/w/index.php?title=Cherokee_syllabary&oldid=1124646659#Transliteration_issues
-			[ '\'ha', 'Ꭽ'],
-			[ '\'he', 'Ꭾ'],
-			[ '\'hi', 'Ꭿ'],
-			[ '\'ho', 'Ꮀ'],
-			[ '\'hu', 'Ꮁ'],
-			[ '\'hv', 'Ꮂ'],
-			[ 'ha', 'Ꭽ'],
-			[ 'he', 'Ꭾ'],
-			[ 'hi', 'Ꭿ'],
-			[ 'ho', 'Ꮀ'],
-			[ 'hu', 'Ꮁ'],
-			[ 'hv', 'Ꮂ'],
+			[ '\'ha', 'Ꭽ' ],
+			[ '\'he', 'Ꭾ' ],
+			[ '\'hi', 'Ꭿ' ],
+			[ '\'ho', 'Ꮀ' ],
+			[ '\'hu', 'Ꮁ' ],
+			[ '\'hv', 'Ꮂ' ],
+			[ 'ha', 'Ꭽ' ],
+			[ 'he', 'Ꭾ' ],
+			[ 'hi', 'Ꭿ' ],
+			[ 'ho', 'Ꮀ' ],
+			[ 'hu', 'Ꮁ' ],
+			[ 'hv', 'Ꮂ' ],
 
-			[ 'dla', 'Ꮬ'],
-			[ 'tla', 'Ꮭ'],
-			[ 'tle', 'Ꮮ'],
-			[ 'tli', 'Ꮯ'],
-			[ 'tlo', 'Ꮰ'],
-			[ 'tlu', 'Ꮱ'],
-			[ 'tlv', 'Ꮲ'],
+			[ 'dla', 'Ꮬ' ],
+			[ 'tla', 'Ꮭ' ],
+			[ 'tle', 'Ꮮ' ],
+			[ 'tli', 'Ꮯ' ],
+			[ 'tlo', 'Ꮰ' ],
+			[ 'tlu', 'Ꮱ' ],
+			[ 'tlv', 'Ꮲ' ],
 
-			[ 'la', 'Ꮃ'],
-			[ 'le', 'Ꮄ'],
-			[ 'li', 'Ꮅ'],
-			[ 'lo', 'Ꮆ'],
-			[ 'lu', 'Ꮇ'],
-			[ 'lv', 'Ꮈ'],
+			[ 'la', 'Ꮃ' ],
+			[ 'le', 'Ꮄ' ],
+			[ 'li', 'Ꮅ' ],
+			[ 'lo', 'Ꮆ' ],
+			[ 'lu', 'Ꮇ' ],
+			[ 'lv', 'Ꮈ' ],
 
-			[ 'ma', 'Ꮉ'],
-			[ 'me', 'Ꮊ'],
-			[ 'mi', 'Ꮋ'],
-			[ 'mo', 'Ꮌ'],
-			[ 'mu', 'Ꮍ'],
-			[ 'mv', 'Ᏽ'], // Note that this letter is not in use anymore. I'm open to removing it.
+			[ 'ma', 'Ꮉ' ],
+			[ 'me', 'Ꮊ' ],
+			[ 'mi', 'Ꮋ' ],
+			[ 'mo', 'Ꮌ' ],
+			[ 'mu', 'Ꮍ' ],
+			[ 'mv', 'Ᏽ' ], // Note that this letter is not in use anymore. I'm open to removing it.
 
-			[ '\'hna', 'Ꮏ'],
-			[ 'hna', 'Ꮏ'],
-			[ '\'na', 'Ꮎ'],
-			[ 'na', 'Ꮎ'],
-			[ 'Ꮎh', 'Ꮐ'],
-			[ 'Ꮎh', 'Ꮐ'],
-			[ 'ne', 'Ꮑ'],
-			[ 'ni', 'Ꮒ'],
-			[ 'no', 'Ꮓ'],
-			[ 'nu', 'Ꮔ'],
-			[ 'nv', 'Ꮕ'],
+			[ '\'hna', 'Ꮏ' ],
+			[ 'hna', 'Ꮏ' ],
+			[ '\'na', 'Ꮎ' ],
+			[ 'na', 'Ꮎ' ],
+			[ 'Ꮎh', 'Ꮐ' ],
+			[ 'Ꮎh', 'Ꮐ' ],
+			[ 'ne', 'Ꮑ' ],
+			[ 'ni', 'Ꮒ' ],
+			[ 'no', 'Ꮓ' ],
+			[ 'nu', 'Ꮔ' ],
+			[ 'nv', 'Ꮕ' ],
 
-			[ 'qᎤa', 'Ꮖ'],
-			[ 'qᎤe', 'Ꮗ'],
-			[ 'qᎤi', 'Ꮘ'],
-			[ 'qᎤo', 'Ꮙ'],
-			[ 'qᎤu', 'Ꮚ'],
-			[ 'qᎤv', 'Ꮛ'],
+			[ 'qᎤa', 'Ꮖ' ],
+			[ 'qᎤe', 'Ꮗ' ],
+			[ 'qᎤi', 'Ꮘ' ],
+			[ 'qᎤo', 'Ꮙ' ],
+			[ 'qᎤu', 'Ꮚ' ],
+			[ 'qᎤv', 'Ꮛ' ],
 
-			[ 'tsa', 'Ꮳ'],
-			[ 'tse', 'Ꮴ'],
-			[ 'tsi', 'Ꮵ'],
-			[ 'tso', 'Ꮶ'],
-			[ 'tsu', 'Ꮷ'],
-			[ 'tsv', 'Ꮸ'],
+			[ 'tsa', 'Ꮳ' ],
+			[ 'tse', 'Ꮴ' ],
+			[ 'tsi', 'Ꮵ' ],
+			[ 'tso', 'Ꮶ' ],
+			[ 'tsu', 'Ꮷ' ],
+			[ 'tsv', 'Ꮸ' ],
 
-			[ 'sa', 'Ꮜ'],
-			[ 'se', 'Ꮞ'],
-			[ 'si', 'Ꮟ'],
-			[ 'so', 'Ꮠ'],
-			[ 'su', 'Ꮡ'],
-			[ 'sv', 'Ꮢ'],
-			[ 's\'', 'Ꮝ'],
+			[ 'sa', 'Ꮜ' ],
+			[ 'se', 'Ꮞ' ],
+			[ 'si', 'Ꮟ' ],
+			[ 'so', 'Ꮠ' ],
+			[ 'su', 'Ꮡ' ],
+			[ 'sv', 'Ꮢ' ],
+			[ 's\'', 'Ꮝ' ],
 
-			[ 'da', 'Ꮣ'],
-			[ 'ta', 'Ꮤ'],
-			[ 'de', 'Ꮥ'],
-			[ 'te', 'Ꮦ'],
-			[ 'di', 'Ꮧ'],
-			[ 'ti', 'Ꮨ'],
-			[ 'do', 'Ꮩ'],
-			[ 'du', 'Ꮪ'],
-			[ 'dv', 'Ꮫ'],
+			[ 'da', 'Ꮣ' ],
+			[ 'ta', 'Ꮤ' ],
+			[ 'de', 'Ꮥ' ],
+			[ 'te', 'Ꮦ' ],
+			[ 'di', 'Ꮧ' ],
+			[ 'ti', 'Ꮨ' ],
+			[ 'do', 'Ꮩ' ],
+			[ 'du', 'Ꮪ' ],
+			[ 'dv', 'Ꮫ' ],
 
-			[ 'wa', 'Ꮹ'],
-			[ 'we', 'Ꮺ'],
-			[ 'wi', 'Ꮻ'],
-			[ 'wo', 'Ꮼ'],
-			[ 'wu', 'Ꮽ'],
-			[ 'wv', 'Ꮾ'],
+			[ 'wa', 'Ꮹ' ],
+			[ 'we', 'Ꮺ' ],
+			[ 'wi', 'Ꮻ' ],
+			[ 'wo', 'Ꮼ' ],
+			[ 'wu', 'Ꮽ' ],
+			[ 'wv', 'Ꮾ' ],
 
-			[ 'ya', 'Ꮿ'],
-			[ 'ye', 'Ᏸ'],
-			[ 'yi', 'Ᏹ'],
-			[ 'yo', 'Ᏺ'],
-			[ 'yu', 'Ᏻ'],
-			[ 'yv', 'Ᏼ'],
+			[ 'ya', 'Ꮿ' ],
+			[ 'ye', 'Ᏸ' ],
+			[ 'yi', 'Ᏹ' ],
+			[ 'yo', 'Ᏺ' ],
+			[ 'yu', 'Ᏻ' ],
+			[ 'yv', 'Ᏼ' ],
 
-			[ '\'a', 'Ꭰ'],
-			[ '\'e', 'Ꭱ'],
-			[ '\'i', 'Ꭲ'],
-			[ '\'o', 'Ꭳ'],
-			[ '\'u', 'Ꭴ'],
-			[ '\'v', 'Ꭵ'],
-			[ 'a', 'Ꭰ'],
-			[ 'e', 'Ꭱ'],
-			[ 'i', 'Ꭲ'],
-			[ 'o', 'Ꭳ'],
-			[ 'u', 'Ꭴ'],
-			[ 'v', 'Ꭵ'],
+			[ '\'a', 'Ꭰ' ],
+			[ '\'e', 'Ꭱ' ],
+			[ '\'i', 'Ꭲ' ],
+			[ '\'o', 'Ꭳ' ],
+			[ '\'u', 'Ꭴ' ],
+			[ '\'v', 'Ꭵ' ],
+			[ 'a', 'Ꭰ' ],
+			[ 'e', 'Ꭱ' ],
+			[ 'i', 'Ꭲ' ],
+			[ 'o', 'Ꭳ' ],
+			[ 'u', 'Ꭴ' ],
+			[ 'v', 'Ꭵ' ]
 		]
 	};
 
diff --git a/lib/jquery.ime/rules/jv/jv-transliteration.js b/lib/jquery.ime/rules/jv/jv-transliteration.js
index aaa0e5f6..863f21a6 100644
--- a/lib/jquery.ime/rules/jv/jv-transliteration.js
+++ b/lib/jquery.ime/rules/jv/jv-transliteration.js
@@ -5,76 +5,70 @@
 		id: 'jv-transliteration',
 		name: 'Javanese',
 		description: 'Javanese transliteration',
-		date: '2013-08-10',
+		date: '2023-04-06',
 		URL: 'http://github.com/wikimedia/jquery.ime',
 		author: 'Bennylin',
 		license: 'GPLv3',
-		version: '1.2',
+		version: '1.3',
 		contextLength: 1,
 		maxKeyLength: 2,
 		patterns: [
 			[ '\\\\([A-Za-z\\>_~\\.0-9])', '\\\\', '$1' ],
-			// TOC:
-			// VII. Vocal ended with special pasangan followed by vocal = back to normal
-			// VI. Vocal (lowercase, uppercase, extended) ended with h/r/ng = special pasangan (-h, -r, -ng)
-			// V. Lower case consonant followed by lower case consonant: Basic
-			// IV. Special consonant and vowels
-			// III. Symbols
-			// II. Basic Letters
-			// I. Number
-
-			// About the TOC:
-			// The TOC are reversed, and the most basic letters are at the bottom.
 
 			// VII. Vocal ended with special pasangan followed by vocal = back to normal
-			[ 'ꦃa', '', 'ꦲ' ], // vocal ended with -h followed by a
-			[ 'ꦃe', '', 'ꦲꦺ' ], // vocal ended with -h followed by e
-			[ 'ꦃi', '', 'ꦲꦶ' ], // vocal ended with -h followed by i
-			[ 'ꦃo', '', 'ꦲꦺꦴ' ], // vocal ended with -h followed by o
-			[ 'ꦃu', '', 'ꦲꦸ' ], // vocal ended with -h followed by u
-			[ 'ꦃx', '', 'ꦲꦼ' ], // vocal ended with -h followed by ê
+			[ 'ꦃ(a|A)', '', 'ꦲ' ], // vocal ended with -h followed by a
+			[ 'ꦃ(e|E)', '', 'ꦲꦺ' ], // vocal ended with -h followed by e
+			[ 'ꦃ(i|I)', '', 'ꦲꦶ' ], // vocal ended with -h followed by i
+			[ 'ꦃ(o|O)', '', 'ꦲꦺꦴ' ], // vocal ended with -h followed by o
+			[ 'ꦃ(u|U)', '', 'ꦲꦸ' ], // vocal ended with -h followed by u
+			[ 'ꦃ(x|X)', '', 'ꦲꦼ' ], // vocal ended with -h followed by x/ê
 
-			[ 'ꦂa', '', 'ꦫ' ], // vocal ended with -r followed by a
-			[ 'ꦂe', '', 'ꦫꦺ' ], // vocal ended with -r followed by e
-			[ 'ꦂi', '', 'ꦫꦶ' ], // vocal ended with -r followed by i
-			[ 'ꦂo', '', 'ꦫꦺꦴ' ], // vocal ended with -r followed by o
-			[ 'ꦂu', '', 'ꦫꦸ' ], // vocal ended with -r followed by u
-			[ 'ꦂx', '', 'ꦉ' ], // vocal ended with -r followed by ê (Special)
+			[ 'ꦂ(a|A)', '', 'ꦫ' ], // vocal ended with -r followed by a
+			[ 'ꦂ(e|E)', '', 'ꦫꦺ' ], // vocal ended with -r followed by e
+			[ 'ꦂ(i|I)', '', 'ꦫꦶ' ], // vocal ended with -r followed by i
+			[ 'ꦂ(o|O)', '', 'ꦫꦺꦴ' ], // vocal ended with -r followed by o
+			[ 'ꦂ(u|U)', '', 'ꦫꦸ' ], // vocal ended with -r followed by u
+			[ 'ꦂX', '', 'ꦫꦼ' ], // vocal ended with -r followed by X
+			[ 'ꦂx', '', 'ꦉ' ], // vocal ended with -r followed by x/ê - special character rê
 
-			[ 'ꦁa', '', 'ꦔ' ], // vocal ended with -ng followed by a
-			[ 'ꦁe', '', 'ꦔꦺ' ], // vocal ended with -ng followed by e
-			[ 'ꦁi', '', 'ꦔꦶ' ], // vocal ended with -ng followed by i
-			[ 'ꦁo', '', 'ꦔꦺꦴ' ], // vocal ended with -ng followed by o
-			[ 'ꦁu', '', 'ꦔꦸ' ], // vocal ended with -ng followed by u
-			[ 'ꦁx', '', 'ꦔꦼ' ], // vocal ended with -ng followed by ê
+			[ 'ꦁ(a|A)', '', 'ꦔ' ], // vocal ended with -ng followed by a
+			[ 'ꦁ(e|E)', '', 'ꦔꦺ' ], // vocal ended with -ng followed by e
+			[ 'ꦁ(i|I)', '', 'ꦔꦶ' ], // vocal ended with -ng followed by i
+			[ 'ꦁ(o|O)', '', 'ꦔꦺꦴ' ], // vocal ended with -ng followed by o
+			[ 'ꦁ(u|U)', '', 'ꦔꦸ' ], // vocal ended with -ng followed by u
+			[ 'ꦁ(x|X)', '', 'ꦔꦼ' ], // vocal ended with -ng followed by x/ê
 
-			[ 'ꦿa', '', 'ꦿ' ], // cakra (medial -r-) followed by a
-			[ 'ꦿe', '', 'ꦿꦺ' ], // cakra (medial -r-) followed by e
-			[ 'ꦿi', '', 'ꦿꦶ' ], // cakra (medial -r-) followed by i
-			[ 'ꦿo', '', 'ꦿꦺꦴ' ], // cakra (medial -r-) followed by o
-			[ 'ꦿu', '', 'ꦿꦸ' ], // cakra (medial -r-) followed by u
-			[ 'ꦿx', '', 'ꦽ' ], // cakra (medial -r-) followed by ê (Special biconsonant -rê)
-			// if you want to write "cakra" + aksara "hi" instead, use "hi" instead of "i", etc.
+			[ 'ꦿ(a|A)', '', 'ꦿ' ], // medial consonant -r- followed by a
+			[ 'ꦿ(e|E)', '', 'ꦿꦺ' ], // medial consonant -r- followed by e
+			[ 'ꦿ(i|I)', '', 'ꦿꦶ' ], // medial consonant -r- followed by i
+			[ 'ꦿ(o|O)', '', 'ꦿꦺꦴ' ], // medial consonant -r- followed by o
+			[ 'ꦿ(u|U)', '', 'ꦿꦸ' ], // medial consonant -r- followed by u
+			[ 'ꦿ(x|X)', '', 'ꦽ' ], // special biconsonant -rê
 
-			[ 'ꦾa', '', 'ꦾ' ], // pengkal (medial -y-) followed by a
-			[ 'ꦾe', '', 'ꦾꦺ' ], // pengkal (medial -y-) followed by e
-			[ 'ꦾi', '', 'ꦾꦶ' ], // pengkal (medial -y-) followed by i
-			[ 'ꦾo', '', 'ꦾꦺꦴ' ], // pengkal (medial -y-) followed by o
-			[ 'ꦾu', '', 'ꦾꦸ' ], // pengkal (medial -y-) followed by u
-			[ 'ꦾx', '', 'ꦾꦼ' ], // pengkal (medial -y-) followed by u
-			// if you want to write "pengkal" + aksara "hi" instead, use "hi" instead of "i", etc.
+			[ 'ꦾ(a|A)', '', 'ꦾ' ], // medial consonant -y- followed by a
+			[ 'ꦾ(e|E)', '', 'ꦾꦺ' ], // medial consonant -y- followed by e
+			[ 'ꦾ(i|I)', '', 'ꦾꦶ' ], // medial consonant -y- followed by i
+			[ 'ꦾ(o|O)', '', 'ꦾꦺꦴ' ], // medial consonant -y- followed by o
+			[ 'ꦾ(u|U)', '', 'ꦾꦸ' ], // medial consonant -y- followed by u
+			[ 'ꦾ(x|X)', '', 'ꦾꦼ' ],
 
-			// VI. Vocal (lowercase, uppercase, extended) ended with h/r/ng = special pasangan (-h, -r, -ng)
-			[ '꧀​h', '', '꧀ꦲ꧀' ],
-			// vocal a ended with h/r/ng
-			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦿ|ꦾ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ|꦳)h', '', '$1ꦃ' ], // hanacaraka + h = -h
-			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦿ|ꦾ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ|꦳)H', '', '$1ꦴ' ], // hanacaraka + H = -ā
-			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦿ|ꦾ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ|꦳)(r|R)', '', '$1ꦂ' ], // hanacaraka + r = -r
-			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦿ|ꦾ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ|꦳)(ꦤ|ꦟ)꧀(g|G)', '', '$1ꦁ' ], // hanacaraka + ng = -ng
-			// other vocals ended with h/r/ng
-			[ '(ꦴ|ꦻ|ꦍ|ꦺ|ꦼ|ꦶ|ꦷ|ꦸ|ꦹ|ꦄ|ꦌ|ꦆ|ꦎ|ꦈ)(h|H)', '', '$1ꦃ' ], // other vocal ended with -h
-			[ '(ꦴ|ꦻ|ꦍ|ꦺ|ꦼ|ꦶ|ꦷ|ꦸ|ꦹ|ꦄ|ꦌ|ꦆ|ꦎ|ꦈ)(r|R)', '', '$1ꦂ' ], // other vocal ended with -r
-			[ '(ꦴ|ꦻ|ꦍ|ꦺ|ꦼ|ꦶ|ꦷ|ꦸ|ꦹ|ꦄ|ꦌ|ꦆ|ꦎ|ꦈ)(ꦤ|ꦟ)꧀(g|G)', '', '$1ꦁ' ], // other vocal ended with -ng
+			[ '꧀a', '', '' ], // default vowel is a, so, remove the pangkon
+			[ '꧀A', '', 'ꦄ' ], // A
+			[ '꧀e', '', 'ꦺ' ], // é|è
+			[ '꧀E', '', 'ꦌ' ], // É|È
+			[ '꧀i', '', 'ꦶ' ], // i
+			[ '꧀I', '', 'ꦆ' ], // I
+			[ '꧀o', '', 'ꦺꦴ' ], // o
+			[ '꧀O', '', 'ꦎ' ], // O
+			[ '꧀u', '', 'ꦸ' ], // u
+			[ '꧀U', '', 'ꦈ' ], // U
+			[ 'ꦭ꧀X', '', 'ꦭꦼ' ], // normal lê - use X capital
+			[ 'ꦭ꧀x', '', 'ꦊ' ], // special character lê
+			[ 'ꦫ꧀X', '', 'ꦫꦼ' ], // normal rê - use X capital
+			[ 'ꦫ꧀x', '', 'ꦉ' ], // special character rê
+			[ '꧀x', '', 'ꦼ' ], // x is another way to write ê
+			[ '꧀X', '', 'ꦄꦼ' ], // X is another way to write Ê
+			[ 'ꦌx', '', 'ꦄꦼ' ], // Ê
 
 			// V. Lower case consonant followed by lower case consonant: Basic
 			// Note: not all of these combination are valid in Javanese language, for example -hn-,
@@ -93,118 +87,96 @@
 			// the letter 'c' can only be found followed by consonant r/l, and ch
 			// the letter 'y' can only be found followed by consonant w (nasal for 'i')
 
-			[ '꧀a', '', '' ], // default vowel is 'a', so, remove the pangkon
-			[ '(ꦾ|ꦿ)a', '', '$1' ], // default vowels for cakra and pengkal are 'a', so, don't do anything
-			[ '꧀A', '', '꧀ꦄ' ], // A
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀b', '', '$1꧀ꦧ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀B', '', '$1꧀ꦨ꧀' ], // pasangan Ba murda
-			[ 'ꦤ꧀​(c|C)', '', 'ꦚ꧀ꦕ꧀' ], // n+zero-width-space+c
-			// TODO: the above code doesn't seem to work
-			[ 'ꦤ꧀(c|C)', '', 'ꦚ꧀ꦕ꧀' ], // n followed by c became nasalized (nasal sound 'ny' + c)(REF:nyc)
-			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀c', '', '$1꧀ꦕ꧀' ],
-			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀C', '', '$1꧀ꦖ꧀' ], // pasangan Ca murda(?)
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀d', '', '$1꧀ꦢ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀D', '', '$1꧀ꦣ꧀' ], // pasangan Da murda
-			[ '꧀e', '', 'ꦺ' ], // é|è
-			[ '꧀E', '', '꧀ꦌ' ], // É|È
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀(f|F)', '', '$1꧀ꦥ꦳꧀' ],
-			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀g', '', '$1꧀ꦒ꧀' ], // can't be started with n, reserved for bigraf ng
-			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀G', '', '$1꧀ꦓ꧀' ], // pasangan Ga murda (can't be started with n - see II. 2.)
-			[ '(ꦤ|ꦭ|ꦥ|ꦩ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ|ꦉ|ꦊ|ꦋ)꧀(h|H)', '', '$1꧀ꦲ꧀' ], // can't be started with k/d/t/g/j/s, reserved for bigraf kh/dh/th/gh/jh/sh
-			[ '꧀i', '', 'ꦶ' ], // i
-			[ '꧀I', '', '꧀ꦆ' ], // I
-			[ 'ꦤ꧀​(j|J)', '', 'ꦤ꧀ꦗ꧀' ], // n+zero-width-space+j
-			// TODO: the above code doesn't seem to work
-			[ 'ꦤ꧀(j|J)', '', 'ꦚ꧀ꦗ꧀' ], // n followed by j became nasalized (nasal sound 'ny' + j)(REF:nyj)
-			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀j', '', '$1꧀ꦗ꧀' ],
-			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀J', '', '$1꧀ꦙ꧀' ], // pasangan Ja mahaprana
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀k', '', '$1꧀ꦏ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀K', '', '$1꧀ꦑ꧀' ], // pasangan Ka murda
-			[ 'ꦃl', '', 'ꦲ꧀ꦭ꧀' ], // vocal ended with -h followed by l (Special panjingan)
-			[ 'ꦂl', '', 'ꦫ꧀ꦭ꧀' ], // vocal ended with -r followed by l (Special panjingan)
-			[ 'ꦁl', '', 'ꦔ꧀ꦭ꧀' ], // vocal ended with -ng followed by l (Special panjingan)
-			// if you want to write panyigeg + aksara "la" instead, put a space between the panyigeg and "l"
-			[ '(ꦲ|ꦤ|ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦗ|ꦚ|ꦩ|ꦒ|ꦧ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀(l|L)', '', '$1꧀ꦭ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀(m|M)', '', '$1꧀ꦩ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀n', '', '$1꧀ꦤ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀N', '', '$1꧀ꦟ꧀' ], // pasangan Na murda
-			[ '꧀o', '', 'ꦺꦴ' ], // o
-			[ '꧀O', '', '꧀ꦎ' ], // O
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀p', '', '$1꧀ꦥ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀P', '', '$1꧀ꦦ꧀' ], // pasangan Pa murda
-			// q - a Pangkon + q would result in Cecak telu. See III.
-			[ '(ꦲ|ꦃ|ꦤ|ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦁ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀​r', '', '$1꧀ꦫ꧀' ], // consonant+zero-width-space+(r|R) doesn't make special biconsonant -ra
-			[ '(ꦲ|ꦃ|ꦤ|ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦁ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀​R', '', '$1꧀ꦬ꧀' ], // consonant+zero-width-space+(r|R) doesn't make special biconsonant -ra
-			// TODO: these two above doesn't seem to work
-			[ 'ꦃr', '', 'ꦲꦿ' ], // vocal ended with -h followed by r (Special cakra)
-			[ 'ꦂr', '', 'ꦫꦿ' ], // vocal ended with -r followed by r (Special cakra) -- TODO: impossible combination?
-			[ 'ꦁr', '', 'ꦔꦿ' ], // vocal ended with -ng followed by r (Special cakra)
-			// if you want to write panyigeg + aksara "ra" instead, put a space between the panyigeg and "r"
-			[ '(ꦲ|ꦃ|ꦤ|ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦁ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ|ꦉ|ꦊ|ꦋ)꧀(r|R)', '', '$1ꦿ' ], // special biconsonant -ra, cakra
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀s', '', '$1꧀ꦱ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀S', '', '$1꧀ꦯ꧀' ], // pasangan Sa murda
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀t', '', '$1꧀ꦠ꧀' ],
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀T', '', '$1꧀ꦡ꧀' ], // pasangan Ta murda
-			[ '꧀u', '', 'ꦸ' ], // u
-			[ '꧀U', '', '꧀ꦈ' ], // U
-			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀(v|V)', '', '$1꧀ꦮ꦳꧀' ],
-			[ 'ꦃw', '', 'ꦲ꧀ꦮ꧀' ], // vocal ended with -h followed by w (Special panjingan)
-			[ 'ꦂw', '', 'ꦫ꧀ꦮ꧀' ], // vocal ended with -r followed by w (Special panjingan)
-			[ 'ꦁw', '', 'ꦔ꧀ꦮ꧀' ], // vocal ended with -ng followed by w (Special panjingan)
-			// if you want to write panyigeg + aksara "wa" instead, put a space between the panyigeg and "w"
-			[ '(ꦲ|ꦤ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀(w|W)꧀', '', '$1꧀ꦮ' ],
-			[ 'ꦭ꧀x', '', 'ꦊ' ], // special character lê
-			[ 'ꦫ꧀x', '', 'ꦉ' ], // special character rê
-			[ '꧀x', '', 'ꦼ' ], // x is another way to write ê
-			// [ '꧀X', '', '꧀ꦄꦼ' ], // X is another way to write Ê
-			[ 'ꦃy', '', 'ꦲꦾ' ], // vocal ended with -h followed by y (Special pengkal)
-			[ 'ꦂy', '', 'ꦫꦾ' ], // vocal ended with -r followed by y (Special pengkal)
-			[ 'ꦁy', '', 'ꦔꦾ' ], // vocal ended with -ng followed by y (Special pengkal)
-			// if you want to write panyigeg + aksara "ya" instead, put a space between the panyigeg and "y"
-			[ '(ꦲ|ꦃ|ꦫ|ꦂ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦩ|ꦒ|ꦧ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀​(y|Y)', '', '$1꧀ꦪ꧀' ], // consonant+zero-width-space+(y|Y) doesn't make special biconsonant -ya
-			// TODO: the above code doesn't seem to work
-			[ '(ꦲ|ꦃ|ꦫ|ꦂ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦩ|ꦒ|ꦧ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀(y|Y)', '', '$1ꦾ' ], // special biconsonant -ya, pengkal
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀b', '', '$1꧀ꦧ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀B', '', '$1꧀ꦨ꧀' ], // pasangan Ba murda
+			[ 'ꦤ꧀C', '', 'ꦤ꧀ꦕ꧀' ], // n + ZWS + C (delete the zero-width-space)
+			[ 'ꦤ꧀c', '', 'ꦚ꧀ꦕ꧀' ], // n followed by c became nasalized (nasal sound 'ny' + c)(REF:nyc)
+			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀c', '', '$1꧀ꦕ꧀' ],
+			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀C', '', '$1꧀ꦖ꧀' ], // pasangan Ca murda(?)
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀d', '', '$1꧀ꦢ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀D', '', '$1꧀ꦣ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀(f|v|F|V)', '', '$1꧀ꦥ꦳꧀' ],
+			[ 'ꦤ꧀G', '', 'ꦤ꧀ꦒ꧀' ], // n + ZWS + G (delete the zero-width-space)
+			[ 'ꦤ꧀g', '', 'ꦁ' ], // ng -> cecak
+			[ 'ꦟ꧀g', '', 'ꦟ꧀ꦒ꧀' ],
+			[ '(ꦤ|ꦟ)꧀G', '', 'ꦔ꧀' ], // nga
+			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦐ|ꦑ|ꦓ|ꦖ|ꦘ|ꦙ|ꦜ|ꦞ|ꦟ|ꦡ|ꦣ|ꦦ|ꦨ|ꦬ|ꦯ|ꦰ|ꦿ|ꦾ|꦳|ꦴ|ꦻ|ꦍ|ꦺ|ꦼ|ꦶ|ꦷ|ꦸ|ꦹ|ꦄ|ꦌ|ꦅ|ꦆ|ꦇ|ꦎ|ꦈ)(ꦤ|ꦟ)꧀(g|G)', '', '$1ꦁ' ], // characters + ng = -ng (cecak)
+			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀g', '', '$1꧀ꦒ꧀' ], // can't be started with n, reserved for bigraf ng
+			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀G', '', '$1꧀ꦓ꧀' ], // pasangan Ga murda (can't be started with n - see II. 2.)
+			[ 'ꦠ꧀​h', '', 'ꦠ꧀ꦲ꧀' ], // t_h (with zero-width-space)
+			[ 'ꦢ꧀​h', '', 'ꦢ꧀ꦲ꧀' ], // d_h (with zero-width-space)
+			[ '꧀​h', '', '꧀ꦲ꧀' ], // (with zws)
+			[ 'ꦢ꧀h', '', 'ꦝ꧀' ], // dha
+			[ 'ꦣ꧀h', '', 'ꦞ꧀' ], // Dha murda
+			[ 'ꦠ꧀h', '', 'ꦛ꧀' ], // tha
+			[ 'ꦡ꧀h', '', 'ꦜ꧀' ], // Tha murda
+			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦐ|ꦑ|ꦓ|ꦖ|ꦘ|ꦙ|ꦜ|ꦞ|ꦟ|ꦡ|ꦣ|ꦦ|ꦨ|ꦬ|ꦯ|ꦰ|ꦿ|ꦾ|꦳|ꦴ|ꦻ|ꦍ|ꦺ|ꦼ|ꦶ|ꦷ|ꦸ|ꦹ|ꦄ|ꦌ|ꦅ|ꦆ|ꦇ|ꦎ|ꦈ)h', '', '$1ꦃ' ], // characters + h = -h (wignyan)
+			[ '(ꦤ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ)꧀h', '', '$1꧀ꦲ꧀' ], // can't be started with k/d/t/g, reserved for bigraf kh/dh/th/gh
+			[ '(ꦢ|ꦣ)꧀H', '', 'ꦞ꧀' ], // Dha murda
+			[ '(ꦠ|ꦡ)꧀H', '', 'ꦜ꧀' ], // Tha murda
+			[ '(꧀|ꦿ|ꦾ|꦳)H', '', 'ꦴ' ], // tarung
+			[ 'ꦤ꧀J', '', 'ꦤ꧀ꦗ꧀' ], // n + ZWS + J (delete the zero-width-space)
+			[ 'ꦤ꧀j', '', 'ꦚ꧀ꦗ꧀' ], // n followed by j became nasalized (nasal sound 'ny' + j)(REF:nyj)
+			[ '(ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀(j|J)', '', '$1꧀ꦗ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀k', '', '$1꧀ꦏ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀K', '', '$1꧀ꦑ꧀' ], // pasangan Ka murda
+			[ 'ꦁl', '', 'ꦔ꧀ꦭ꧀' ], // cecak + l = nga + panjingan la
+			[ '(ꦲ|ꦃ|ꦤ|ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦗ|ꦚ|ꦩ|ꦒ|ꦧ|ꦔ|ꦁ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀(l|L)', '', '$1꧀ꦭ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀(m|M)', '', '$1꧀ꦩ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀n', '', '$1꧀ꦤ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀N', '', '$1꧀ꦟ꧀' ], // pasangan Na murda
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀p', '', '$1꧀ꦥ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀P', '', '$1꧀ꦦ꧀' ], // pasangan Pa murda
+			// q
+			[ '꧀​r', '', '꧀ꦫ꧀' ], // pangkon + ZWS + y (delete the zero-width-space)
+			[ 'ꦁR', '', 'ꦔꦿ' ], // cecak + R capital = nga + cakra
+			[ 'ꦂR', '', 'ꦫꦿ' ], // layar + R capital = ra + cakra
+			[ 'ꦃR', '', 'ꦲꦿ' ], // wignyan + R capital = ha + cakra
+			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦐ|ꦑ|ꦓ|ꦖ|ꦘ|ꦙ|ꦜ|ꦞ|ꦟ|ꦡ|ꦣ|ꦦ|ꦨ|ꦬ|ꦯ|ꦰ|ꦿ|ꦾ|꦳|ꦴ|ꦻ|ꦍ|ꦺ|ꦼ|ꦶ|ꦷ|ꦸ|ꦹ|ꦄ|ꦌ|ꦅ|ꦆ|ꦇ|ꦎ|ꦈ)r', '', '$1ꦂ' ], // characters + r = -r (layar)
+			[ '(ꦲ|ꦤ|ꦕ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀(r|R)', '', '$1ꦿ' ], // special biconsonant -ra
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀s', '', '$1꧀ꦱ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀S', '', '$1꧀ꦯ꧀' ], // pasangan Sa murda
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀t', '', '$1꧀ꦠ꧀' ],
+			[ '(ꦤ|ꦏ|ꦢ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀T', '', '$1꧀ꦡ꧀' ], // pasangan Ta murda
+			// v = f
+			[ 'ꦁw', '', 'ꦔ꧀ꦮ꧀' ], // cecak + w = nga + panjingan wa
+			[ '(ꦲ|ꦃ|ꦤ|ꦫ|ꦂ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦔ|ꦁ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀(w|W)꧀', '', '$1꧀ꦮ' ],
+			// x = vowel
+			[ '꧀​y', '', '꧀ꦪ꧀' ], // pangkon + ZWS + y (delete the zero-width-space)
+			[ 'ꦁY', '', 'ꦔꦾ' ], // cecak + Y capital = nga + pengkal
+			[ 'ꦂY', '', 'ꦫꦾ' ], // layar + Y capital = ra + pengkal
+			[ 'ꦃY', '', 'ꦲꦾ' ], // wignya + Y capital = ha + pengkal
+			[ 'ꦗ꧀ꦤ꧀y', '', 'ꦘ꧀' ], // Nya murda - jnya
+			[ 'ꦤ꧀y', '', 'ꦚ꧀' ], // nya
+			[ 'ꦟ꧀y', '', 'ꦘ꧀' ], // Nya murda
+			[ '(ꦤ|ꦟ)꧀Y', '', 'ꦘ꧀' ], // NYA murda
+			[ '(ꦲ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦩ|ꦒ|ꦧ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦦ|ꦯ|ꦡ)꧀(y|Y)', '', '$1ꦾ' ], // special biconsonant -ya,
 			// can't be started with n or y, reserved for bigraf ny (REF:-yy-)
-			[ '(ꦤ|ꦏ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ)꧀(z|Z)', '', '$1ꦾꦗ꦳꧀' ], // can't be started with d, reserved for bigraf dz
+			[ '(ꦤ|ꦏ|ꦠ|ꦱ|ꦭ|ꦥ|ꦗ|ꦩ|ꦒ|ꦧ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ)꧀(z|Z)', '', '$1ꦾꦗ꦳꧀' ], // can't be started with d, reserved for bigraf dz
 
-			// IV Special consonant and vowels
-			// IV. 1. Special consonant
-			[ 'ꦊq', '', 'ꦋ' ], // special character lê Raswadi
-			// [ 'ꦭ꧀x', '', 'ꦊ' ], // special character lê
-			// [ 'ꦫ꧀x', '', 'ꦉ' ], // special character rê
-			// not need for alternate input
-			// [ 'ꦌx', '', 'ꦄꦼ' ], // Ê
-			// [ 'ꦝ꧀q', '', 'ꦞ꧀' ], // Da mahaprana
-			// [ 'ꦛ꧀q', '', 'ꦜ꧀' ], // Ta mahaprana
-			// [ 'ꦚ꧀q', '', 'ꦘ꧀' ], // Nya murda
-			// [ 'ꦧ꧀q', '', 'ꦨ꧀' ], // Ba murda
-			// [ 'ꦕ꧀q', '', 'ꦖ꧀' ], // Ca murda(?)
-			// [ 'ꦢ꧀q', '', 'ꦣ꧀' ], // Da murda
-			// [ 'ꦒ꧀q', '', 'ꦓ꧀' ], // Ga murda
-			// [ 'ꦗ꧀q', '', 'ꦙ꧀' ], // Ja Mahaprana
-			// [ 'ꦏ꧀q', '', 'ꦑ꧀' ], // Ka murda
-			// [ 'ꦤ꧀q', '', 'ꦟ꧀' ], // Na murda
-			// [ 'ꦥ꧀q', '', 'ꦦ꧀' ], // Pa murda
-			// [ 'ꦱ꧀q', '', 'ꦯ꧀' ], // Sa murda
-			// [ 'ꦠ꧀q', '', 'ꦡ꧀' ], // Ta murda
-
-			// IV. 2. Extended consonant
-			// see II. 1.
-
-			// IV. 3. Extended vowel
-			// long a (aa) - see VI. and II. - 'H'
-			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ|꦳)i', '', '$1ꦻ' ], // hanacaraka + i = -ai
-			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦣ|ꦡ|ꦞ|ꦜ|ꦙ|ꦬ|꦳)u', '', '$1ꦻꦴ' ], // hanacaraka + u = -au
+			// IV. 1. Extended vowel
+			// long a (aa) - see II.
+			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ|꦳)i', '', '$1ꦻ' ], // hanacaraka + i = -ai
+			[ '(ꦲ|ꦤ|ꦕ|ꦫ|ꦏ|ꦢ|ꦠ|ꦱ|ꦮ|ꦭ|ꦥ|ꦝ|ꦗ|ꦪ|ꦚ|ꦩ|ꦒ|ꦧ|ꦛ|ꦔ|ꦘ|ꦨ|ꦖ|ꦓ|ꦑ|ꦟ|ꦦ|ꦯ|ꦡ|꦳)u', '', '$1ꦻꦴ' ], // hanacaraka + u = -au
 			[ 'ꦄi', '', 'ꦍ' ], // Ai
 			[ 'ꦄu', '', 'ꦎꦴ' ], // Au
 			[ 'ꦶi', '', 'ꦷ' ], // long i (ii)
 			[ 'ꦆi', '', 'ꦇ' ], // long i (Ii)
+			[ 'ꦆI', '', 'ꦅ' ], // ?( II) - another glyph for I
 			[ 'ꦸu', '', 'ꦹ' ], // long u (uu)
 			[ 'ꦈu', '', 'ꦈꦴ' ], // long u (Uu)
 			[ 'ꦺꦴo', '', 'ꦵ' ], // Sundanese -o
 
-			// III. Symbols
+			// III. Non-words
 			// q and Q are special characters for choosing less used characters by pressing q/Q multiple times (rotating back)
+			[ 'ꦏ꧀Q', '', 'ꦐ꧀' ], // ka sasak
+			[ 'ꦫ꧀q', '', 'ꦿ' ], // another way to write -ra
+			[ 'ꦂq', '', 'ꦿ' ], // another way to write -ra
+			[ 'ꦪ꧀q', '', 'ꦾ' ], // another way to write -ya
+			[ 'ꦊq', '', 'ꦋ' ], // special character lê Raswadi
+			[ 'ꦺq', '', 'ꦻ' ], // ai - dirga mure
+			[ 'ꦺꦴq', '', 'ꦻꦴ' ], // au - dirga mure + tarung
+
 			[ ' ', '', '​' ], // zero-width-space, since javanese have no space
 			[ '꧅q', '', '꧁' ], // rêrênggan kiwa
 			[ '꧄q', '', '꧅' ], // pada luhur
@@ -220,28 +192,13 @@
 			[ '꧀[Q|q]', '', '꦳' ], // cecak telu
 			[ 'q', '', '꧀' ], // pangkon - to cut off the default -a vowel
 
-			// doesn't work, not need for alternate input
-			// [ 'ꦫq', '', 'ꦿ' ], // another way to write -ra
-			// [ 'ꦪq', '', 'ꦾ' ], // another way to write -ya
-
-			// II Basic Letters
 			// II. 1. Alphabetical ha-na-ca-ra-ka
-			// bigraf
-			[ 'ꦠ꧀​h', '', 'ꦠ꧀ꦲ꧀' ], // t_h (with zero-width-space)
-			[ 'ꦢ꧀​h', '', 'ꦢ꧀ꦲ꧀' ], // d_h (with zero-width-space)
-			[ 'ꦤ꧀​y', '', 'ꦚ꧀ꦪ꧀' ], // n_y (with zero-width-space)
-			[ 'ꦤ꧀​g', '', 'ꦔ꧀ꦒ꧀' ], // n_g (with zero-width-space)
-			// TODO: the above 2 lines of code doesn't seem to work
-			[ 'ꦠ꧀h', '', 'ꦛ꧀' ], // th
-			[ 'ꦢ꧀h', '', 'ꦝ꧀' ], // dh
-			[ 'ꦤ꧀y', '', 'ꦚ꧀' ], // ny
-			[ 'ꦤ꧀g', '', 'ꦁ' ], // ng
 			[ 'a', '', 'ꦲ' ],
 			[ 'b', '', 'ꦧ꧀' ],
 			[ 'c', '', 'ꦕ꧀' ],
 			[ 'd', '', 'ꦢ꧀' ],
 			[ 'e', '', 'ꦲꦺ' ], // é|è
-			[ 'f', '', 'ꦥ꦳꧀' ],
+			[ '(f|v)', '', 'ꦥ꦳꧀' ],
 			[ 'g', '', 'ꦒ꧀' ],
 			[ 'h', '', 'ꦲ꧀' ],
 			[ 'i', '', 'ꦲꦶ' ],
@@ -257,40 +214,22 @@
 			[ 's', '', 'ꦱ꧀' ],
 			[ 't', '', 'ꦠ꧀' ],
 			[ 'u', '', 'ꦲꦸ' ],
-			[ 'v', '', 'ꦮ꦳꧀' ],
+			// v = f
 			[ 'w', '', 'ꦮ꧀' ],
 			[ 'x', '', 'ꦲꦼ' ], // ê
 			[ 'y', '', 'ꦪ꧀' ],
 			[ 'z', '', 'ꦗ꦳꧀' ],
-			// extended consonants
-			[ 'ꦱ꧀​h', '', 'ꦱ꧀ꦲ꧀' ], // s_h (with zero-width-space)
-			[ 'ꦏ꧀​h', '', 'ꦏ꧀ꦲ꧀' ], // k_h (with zero-width-space)
-			[ 'ꦒ꧀​h', '', 'ꦒ꧀ꦲ꧀' ], // g_h (with zero-width-space)
-			[ 'ꦢ꧀​z', '', 'ꦢ꧀ꦗ꦳꧀' ], // d_z (with zero-width-space)
-			// TODO: the above code doesn't seem to work
-			[ 'ꦗ꧀​h', '', 'ꦗ꧀ꦲ꧀' ], // j_h (with zero-width-space)
-			[ 'ꦱ꧀h', '', 'ꦯ꧀' ], // sh
-			[ 'ꦏ꧀h', '', 'ꦏ꦳꧀' ], // kh
-			[ 'ꦒ꧀h', '', 'ꦒ꦳꧀' ], // gh
-			[ 'ꦢ꧀z', '', 'ꦢ꦳꧀' ], // dz
-			[ 'ꦗ꧀h', '', 'ꦙ꧀' ], // jh/Ja mahaprana
 
+			// II. Basic Letters:
 			// II. 2. Capital Ha-Na-Ca-Ra-Ka (Aksara Murda)
-			[ 'ꦡ꧀h', '', 'ꦜ꧀' ], // Ta mahaprana
-			[ '(ꦠ|ꦡ)꧀H', '', 'ꦜ꧀' ], // Ta mahaprana
-			[ 'ꦣ꧀h', '', 'ꦞ꧀' ], // Da murda
-			[ '(ꦢ|ꦣ)꧀H', '', 'ꦞ꧀' ], // Da murda
-			[ 'ꦟ꧀y', '', 'ꦘ꧀' ], // Nya murda
-			[ '(ꦤ|ꦟ)꧀Y', '', 'ꦘ꧀' ], // NYA murda
-			[ '(ꦤ|ꦟ)꧀(g|G)', '', 'ꦔ꧀' ], // nga
 			[ 'A', '', 'ꦄ' ], // A
 			[ 'B', '', 'ꦨ꧀' ], // Ba murda
 			[ 'C', '', 'ꦖ꧀' ], // Ca murda(?)
-			[ 'D', '', 'ꦣ꧀' ], // Da mahaprana
+			[ 'D', '', 'ꦣ꧀' ],
 			[ 'E', '', 'ꦌ' ], // É|È
-			[ 'F', '', 'ꦥ꦳꧀' ],
+			[ '(F|V)', '', 'ꦥ꦳꧀' ],
 			[ 'G', '', 'ꦓ꧀' ], // Ga murda
-			[ 'H', '', 'ꦴ' ], // tarung/Long a. eg. for Cakra & Pengkal with long a ꦏꦿꦴ or ꦠꦾꦴ
+			[ 'H', '', 'ꦴ' ],
 			[ 'I', '', 'ꦆ' ], // I
 			[ 'J', '', 'ꦙ꧀' ], // Ja Mahaprana
 			[ 'K', '', 'ꦑ꧀' ], // Ka murda
@@ -300,15 +239,15 @@
 			[ 'O', '', 'ꦎ' ], // O
 			[ 'P', '', 'ꦦ꧀' ], // Pa murda
 			// Q = special letters, see III.
-			[ 'R', '', 'ꦬ꧀' ], // Ra agung
+			[ 'R', '', 'ꦬ꧀' ],
 			[ 'S', '', 'ꦯ꧀' ], // Sa murda
-			[ 'T', '', 'ꦡ꧀' ], // Ta mahaprana
+			[ 'T', '', 'ꦡ꧀' ], // Ta murda
 			[ 'U', '', 'ꦈ' ], // U
-			[ 'V', '', 'ꦮ꦳꧀' ],
+			// V = F
 			[ 'W', '', 'ꦮ꧀' ],
 			[ 'X', '', 'ꦄꦼ' ], // X is another way to write Ê
 			[ 'Y', '', 'ꦪ꧀' ],
-			[ 'Z', '', 'ꦰ꧀' ], // sa kembang - ṣa (ssa)
+			[ 'Z', '', 'ꦰ꧀' ],
 
 			// I. Number
 			[ '0', '', '꧐' ],
@@ -322,7 +261,7 @@
 			[ '8', '', '꧘' ],
 			[ '9', '', '꧙' ],
 			[ ':', '', '꧇' ], // 'enclose Javanese numbers, e.g. ":1:"'
-			[ ',', '', '꧈' ], // 'comma'
+			[ ', ', '', '꧈' ], // 'comma'
 			[ '\\.', '', '꧉' ], // 'period'
 			[ '꧊\\|', '', '꧋' ], // 'opening paragraph character'
 			[ '\\|', '', '꧊' ], // 'poem character'
diff --git a/lib/jquery.uls/i18n/ike-cans.json b/lib/jquery.uls/i18n/ike-cans.json
deleted file mode 100644
index 1bc4677a..00000000
--- a/lib/jquery.uls/i18n/ike-cans.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"ArticleEditor404"
-		]
-	},
-	"uls-region-WW": "ᓄᓇᕐᔪᐊᓕᒫᒥ",
-	"uls-region-SP": "ᐊᔾᔨᐅᙱᑦᑐᖅ",
-	"uls-region-AM": "America",
-	"uls-region-AF": "ᐋᕗᕆᑲ",
-	"uls-region-EU": "ᑕᕆᐅᑉ ᐊᑭᐊᓂᕐᒥᐅᑦ",
-	"uls-region-AS": "ᐊᓲᓯ",
-	"uls-region-all": "ᐅᖃᐅᓯᖅᑕᓕᒫᑦ",
-	"uls-no-results-found": "ᖃᐅᔨᓴᕈᑎᕕᓃᑦ ᓇᓂᔭᐅᓚᐅᙱᑦᑐᑦ"
-}
diff --git a/lib/jquery.uls/i18n/ku-latn.json b/lib/jquery.uls/i18n/ku-latn.json
index 81579f7a..638b1813 100644
--- a/lib/jquery.uls/i18n/ku-latn.json
+++ b/lib/jquery.uls/i18n/ku-latn.json
@@ -20,6 +20,6 @@
 	"uls-no-results-found": "Tu encam nehatin dîtin",
 	"uls-common-languages": "Zimanên pêşniyarkirî",
 	"uls-no-results-suggestion-title": "Pêwendîya we dikara bikişîne:",
-	"uls-search-help": "Hûn lêgerîna xwe li gor nava zimanê, koda ISOyê an jî li gor herêmê dikarin bikin.",
+	"uls-search-help": "Hûn lêgerîna xwe li gor navê zimanê, navê skrîptê, koda ISOyê an jî li gor herêmê dikarin bikin.",
 	"uls-search-placeholder": "Li zimanekî bigere"
 }
diff --git a/lib/jquery.uls/src/jquery.uls.data.js b/lib/jquery.uls/src/jquery.uls.data.js
index b55773ad..429cfe10 100644
--- a/lib/jquery.uls/src/jquery.uls.data.js
+++ b/lib/jquery.uls/src/jquery.uls.data.js
@@ -525,7 +525,7 @@
             [
                 "AS"
             ],
-            "Bahasa Betawi"
+            "Betawi"
         ],
         "bfa": [
             "Latn",
@@ -750,6 +750,13 @@
             ],
             "Bileez Kriol"
         ],
+        "bzs": [
+            "Sgnw",
+            [
+                "AM"
+            ],
+            "Língua brasileira de sinais"
+        ],
         "ca": [
             "Latn",
             [
@@ -838,7 +845,7 @@
             [
                 "AM"
             ],
-            "Choctaw"
+            "Chahta anumpa"
         ],
         "chr": [
             "Cher",
@@ -945,6 +952,30 @@
             ],
             "Capiceño"
         ],
+        "cpx-hans": [
+            "Hans",
+            [
+                "AS"
+            ],
+            "莆仙语（简体）"
+        ],
+        "cpx-hant": [
+            "Hant",
+            [
+                "AS"
+            ],
+            "莆仙語（繁體）"
+        ],
+        "cpx-latn": [
+            "Latn",
+            [
+                "AS"
+            ],
+            "Pó-sing-gṳ̂ (Báⁿ-uā-ci̍)"
+        ],
+        "cpx": [
+            "cpx-hant"
+        ],
         "cr": [
             "Cans",
             [
@@ -1525,7 +1556,7 @@
             [
                 "AM"
             ],
-            "Guadeloupean Creole French"
+            "kréyòl Gwadloup"
         ],
         "gcr": [
             "Latn",