From c0d85510c0b6d565de28c3acc1d3692e1b8e9d3b Mon Sep 17 00:00:00 2001
From: Amir Aharoni <amir.aharoni@mail.huji.ac.il>
Date: Wed, 31 Mar 2021 15:11:52 +0300
Subject: [PATCH] Update jquery.ime and jquery.uls from upstream

ime:
* Add keyboards for Basaa and Kom
** https://github.com/wikimedia/jquery.ime/commit/e2548891a9a1be4f8292572e15cef2ae492703ae

uls:
* Update language-data: add bas, bkm, bzj
** https://github.com/wikimedia/jquery.uls/commit/4495850b9cd35bf28b39fe2d67103044e0bd4d62

Change-Id: If0c6a6eca32319082fad954103b35c89164ab251
---
 lib/jquery.ime/jquery.ime.js          | 18 +++++++++++-
 lib/jquery.ime/rules/bas/bas-tilde.js | 29 +++++++++++++++++++
 lib/jquery.ime/rules/bkm/bkm-tilde.js | 41 +++++++++++++++++++++++++++
 lib/jquery.uls/src/jquery.uls.data.js | 23 +++++++++++++++
 4 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 lib/jquery.ime/rules/bas/bas-tilde.js
 create mode 100644 lib/jquery.ime/rules/bkm/bkm-tilde.js

diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 2e530ead..ab3ed849 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.2.0+20210301
+/*! jquery.ime - v0.2.0+20210331
 * https://github.com/wikimedia/jquery.ime
 * Copyright (c) 2021 Santhosh Thottingal; License: (GPL-2.0-or-later OR MIT) */
 ( function ( $ ) {
@@ -1685,6 +1685,10 @@
 			name: 'تۆرکجه',
 			source: 'rules/azb/azb-kbd.js'
 		},
+		'bas-tilde': {
+			name: 'Ɓasaá tilde',
+			source: 'rules/bas/bas-tilde.js'
+		},
 		'batak-qwerty': {
 			name: 'Batak QWERTY',
 			source: 'rules/bbc/batak-qwerty.js'
@@ -1713,6 +1717,10 @@
 			name: 'روچ کپتین بلوچی',
 			source: 'rules/bgn/bgn-kbd.js'
 		},
+		'bkm-tilde': {
+			name: 'Kom tilde',
+			source: 'rules/bkm/bkm-tilde.js'
+		},
 		'bm-alt': {
 			name: 'Bamanankan Alt',
 			source: 'rules/bm/bm-alt.js'
@@ -2531,6 +2539,10 @@
 			autonym: 'تۆرکجه',
 			inputmethods: [ 'azb-kbd' ]
 		},
+		bas: {
+			autonym: 'ɓasaá',
+			inputmethods: [ 'bas-tilde' ]
+		},
 		bbc: {
 			autonym: 'Batak',
 			inputmethods: [ 'batak-qwerty' ]
@@ -2559,6 +2571,10 @@
 			autonym: 'भोजपुरी',
 			inputmethods: [ 'hi-transliteration' ]
 		},
+		bkm: {
+			autonym: 'Itaŋikom',
+			inputmethods: [ 'bkm-tilde' ]
+		},
 		bm: {
 			autonym: 'Bamanankan',
 			inputmethods: [ 'bm-alt', 'bm-tilde' ]
diff --git a/lib/jquery.ime/rules/bas/bas-tilde.js b/lib/jquery.ime/rules/bas/bas-tilde.js
new file mode 100644
index 00000000..b4b46aa8
--- /dev/null
+++ b/lib/jquery.ime/rules/bas/bas-tilde.js
@@ -0,0 +1,29 @@
+( function ( $ ) {
+	'use strict';
+
+	var basTilde = {
+		id: 'bas-tilde',
+		name: 'bas-tilde',
+		description: 'Basaa tilde keyboard',
+		date: '2021-03-31',
+		URL: 'https://github.com/wikimedia/jquery.ime',
+		author: 'Amir E. Aharoni',
+		license: 'GPLv3',
+		version: '1.0',
+		patterns: [
+			[ '~B', 'Ɓ' ],
+			[ '~b', 'ɓ' ],
+			[ '~E', 'Ɛ' ],
+			[ '~e', 'ɛ' ],
+			[ '~N', 'Ŋ' ],
+			[ '~n', 'ŋ' ],
+			[ '~O', 'Ɔ' ],
+			[ '~o', 'ɔ' ],
+			[ '~\\\\', '\u0300' ], // Combining grave accent
+			[ '~/', '\u0301' ], // Combining acute accent
+			[ '~\\^', '\u0302' ] // Combining circumflex accent
+		]
+	};
+
+	$.ime.register( basTilde );
+}( jQuery ) );
diff --git a/lib/jquery.ime/rules/bkm/bkm-tilde.js b/lib/jquery.ime/rules/bkm/bkm-tilde.js
new file mode 100644
index 00000000..920c59f2
--- /dev/null
+++ b/lib/jquery.ime/rules/bkm/bkm-tilde.js
@@ -0,0 +1,41 @@
+( function ( $ ) {
+	'use strict';
+
+	var bkmTilde = {
+		id: 'bkm-tilde',
+		name: 'bkm-tilde',
+		description: 'Kom tilde keyboard',
+		date: '2021-03-31',
+		URL: 'https://github.com/wikimedia/jquery.ime',
+		author: 'Amir E. Aharoni',
+		license: 'GPLv3',
+		version: '1.0',
+		maxKeyLength: 2,
+		patterns: [
+			[ 'AE', 'Æ' ],
+			[ 'Ae', 'Æ' ],
+			[ 'ae', 'æ' ],
+			[ 'A~E', 'AE' ],
+			[ 'A~e', 'Ae' ],
+			[ 'a~e', 'ae' ],
+			[ '~A', 'Æ' ],
+			[ '~a', 'æ' ],
+			[ '~I', 'Ɨ' ],
+			[ '~i', 'ɨ' ],
+			[ '~N', 'Ŋ' ],
+			[ '~n', 'ŋ' ],
+			[ 'OE', 'Œ' ],
+			[ 'Oe', 'Œ' ],
+			[ 'oe', 'œ' ],
+			[ 'O~E', 'OE' ],
+			[ 'O~e', 'Oe' ],
+			[ 'o~e', 'oe' ],
+			[ '~O', 'Œ' ],
+			[ '~o', 'œ' ],
+			[ '~\\\\', '\u0300' ], // Combining grave accent
+			[ '~\\^', '\u0302' ] // Combining circumflex accent
+		]
+	};
+
+	$.ime.register( bkmTilde );
+}( jQuery ) );
diff --git a/lib/jquery.uls/src/jquery.uls.data.js b/lib/jquery.uls/src/jquery.uls.data.js
index de38e95c..38b0e5c3 100644
--- a/lib/jquery.uls/src/jquery.uls.data.js
+++ b/lib/jquery.uls/src/jquery.uls.data.js
@@ -360,6 +360,13 @@
             ],
             "Boarisch"
         ],
+        "bas": [
+            "Latn",
+            [
+                "AF"
+            ],
+            "ɓasaá"
+        ],
         "bat-smg": [
             "sgs"
         ],
@@ -493,6 +500,13 @@
             ],
             "Banjar"
         ],
+        "bkm": [
+            "Latn",
+            [
+                "AF"
+            ],
+            "Itaŋikom"
+        ],
         "blc": [
             "Latn",
             [
@@ -607,6 +621,13 @@
             ],
             "ብሊን"
         ],
+        "bzj": [
+            "Latn",
+            [
+                "AM"
+            ],
+            "Bileez Kriol"
+        ],
         "ca": [
             "Latn",
             [
@@ -4710,6 +4731,8 @@
             "fr",
             "en",
             "ff",
+            "bkm",
+            "bas",
             "ar",
             "ksf",
             "ha-arab",