From 4f5565033d372080918f7792e2b5d653541ed31e Mon Sep 17 00:00:00 2001 From: Amir Aharoni Date: Fri, 10 May 2019 21:44:55 +0300 Subject: [PATCH] Update jquery.ime from upstream 1. Adding new input methods for languages of Africa without the need for replacement or key combinations: * Akan (ak, tw) * Bambara (bm) * Dagbani (dag) * Dinka (din) * Fula (ff) * Ga (gaa) * Wolof (wo) 2. Fixing the combining character in Yoruba Alt method from combining tone to combining accent, for better Unicode compliance. 3. Minor fixes in existing layouts with replacements and key combinations for Akan, Dagbani, Dinka, Fula, and Ga. Updating to https://github.com/wikimedia/jquery.ime/commit/1ff996f24ba7dbeb7de23797f36d2131e8855faf Change-Id: I3bbc0ac46def6b4e00f6155c14da9a40e2749b27 --- lib/jquery.ime/jquery.ime.js | 52 ++++++++++++++++++++------- lib/jquery.ime/rules/ak/ak-qx.js | 16 +++++---- lib/jquery.ime/rules/ak/ak-tilde.js | 23 ++++++++++++ lib/jquery.ime/rules/bm/bm-tilde.js | 31 ++++++++++++++++ lib/jquery.ime/rules/dag/dag-alt.js | 3 +- lib/jquery.ime/rules/dag/dag-tilde.js | 32 +++++++++++++++++ lib/jquery.ime/rules/din/din-fqsx.js | 2 +- lib/jquery.ime/rules/din/din-tilde.js | 28 +++++++++++++++ lib/jquery.ime/rules/ff/ff-alt.js | 2 +- lib/jquery.ime/rules/ff/ff-tilde.js | 32 +++++++++++++++++ lib/jquery.ime/rules/gaa/gaa-cqx.js | 10 ++++-- lib/jquery.ime/rules/gaa/gaa-tilde.js | 25 +++++++++++++ lib/jquery.ime/rules/wo/wo-tilde.js | 28 +++++++++++++++ lib/jquery.ime/rules/yo/yo-alt.js | 8 ++--- 14 files changed, 264 insertions(+), 28 deletions(-) create mode 100644 lib/jquery.ime/rules/ak/ak-tilde.js create mode 100644 lib/jquery.ime/rules/bm/bm-tilde.js create mode 100644 lib/jquery.ime/rules/dag/dag-tilde.js create mode 100644 lib/jquery.ime/rules/din/din-tilde.js create mode 100644 lib/jquery.ime/rules/ff/ff-tilde.js create mode 100644 lib/jquery.ime/rules/gaa/gaa-tilde.js create mode 100644 lib/jquery.ime/rules/wo/wo-tilde.js diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index 04b1d47b..e99f3935 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.2.0+20190329 +/*! jquery.ime - v0.2.0+20190510 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2019 Santhosh Thottingal; License: (GPL-2.0+ OR MIT) */ ( function ( $ ) { @@ -1702,9 +1702,13 @@ /* eslint-disable quote-props */ $.extend( $.ime.sources, { 'ak-qx': { - name: 'QX replacement', + name: 'Akan QX replacement', source: 'rules/ak/ak-qx.js' }, + 'ak-tilde': { + name: 'Akan tilde', + source: 'rules/ak/ak-tilde.js' + }, 'am-transliteration': { name: 'ትራንስልተራትዖን', source: 'rules/am/am-transliteration.js' @@ -1773,6 +1777,10 @@ name: 'Bamanankan Alt', source: 'rules/bm/bm-alt.js' }, + 'bm-tilde': { + name: 'Bamanankan tilde', + source: 'rules/bm/bm-tilde.js' + }, 'bn-avro': { name: 'অভ্র', source: 'rules/bn/bn-avro.js' @@ -1849,6 +1857,10 @@ name: 'Dagbani Alt', source: 'rules/dag/dag-alt.js' }, + 'dag-tilde': { + name: 'Dagbani tilde', + source: 'rules/dag/dag-tilde.js' + }, 'de-transliteration': { name: 'Deutsch Tilde', source: 'rules/de/de-transliteration.js' @@ -1857,6 +1869,10 @@ name: 'Dinka FQSX', source: 'rules/din/din-fqsx.js' }, + 'din-tilde': { + name: 'Dinka tilde', + source: 'rules/din/din-tilde.js' + }, 'doi-inscript2': { name: 'इनस्क्रिप्ट २', source: 'rules/doi/doi-inscript2.js' @@ -1902,9 +1918,13 @@ source: 'rules/fa/fa-kbd.js' }, 'ff-alt': { - name: 'Fulfulde', + name: 'Fulfulde alt', source: 'rules/ff/ff-alt.js' }, + 'ff-tilde': { + name: 'Fulfulde tilde', + source: 'rules/ff/ff-tilde.js' + }, 'fi-transliteration': { name: 'translitterointi', source: 'rules/fi/fi-transliteration.js' @@ -1918,9 +1938,13 @@ source: 'rules/fon/fon-tilde.js' }, 'gaa-cqx': { - name: 'Ga - CQX replacement', + name: 'Ga CQX replacement', source: 'rules/gaa/gaa-cqx.js' }, + 'gaa-tilde': { + name: 'Ga tilde', + source: 'rules/gaa/gaa-tilde.js' + }, 'gom-inscript2': { name: 'इनस्क्रिप्ट २', source: 'rules/gom/gom-inscript2.js' @@ -2483,6 +2507,10 @@ name: 'Wolof Alt', source: 'rules/wo/wo-alt.js' }, + 'wo-tilde': { + name: 'Wolof tilde', + source: 'rules/wo/wo-tilde.js' + }, 'yo-alt': { name: 'Yorùbá Alt', source: 'rules/yo/yo-alt.js' @@ -2509,7 +2537,7 @@ }, ak: { autonym: 'Akan', - inputmethods: [ 'ak-qx' ] + inputmethods: [ 'ak-qx', 'ak-tilde' ] }, am: { autonym: 'አማርኛ', @@ -2557,7 +2585,7 @@ }, bm: { autonym: 'Bamanankan', - inputmethods: [ 'bm-alt' ] + inputmethods: [ 'bm-alt', 'bm-tilde' ] }, bn: { autonym: 'বাংলা', @@ -2593,7 +2621,7 @@ }, dag: { autonym: 'Dagbani', - inputmethods: [ 'dag-alt' ] + inputmethods: [ 'dag-alt', 'dag-tilde' ] }, de: { autonym: 'Deutsch', @@ -2601,7 +2629,7 @@ }, din: { autonym: 'Thuɔŋjäŋ', - inputmethods: [ 'din-fqsx' ] + inputmethods: [ 'din-fqsx', 'din-tilde' ] }, diq: { autonym: 'Kirdkî', @@ -2633,7 +2661,7 @@ }, ff: { autonym: 'Fulfulde', - inputmethods: [ 'ff-alt' ] + inputmethods: [ 'ff-alt', 'ff-tilde' ] }, fi: { autonym: 'Suomi', @@ -2653,7 +2681,7 @@ }, gaa: { autonym: 'Ga', - inputmethods: [ 'gaa-cqx' ] + inputmethods: [ 'gaa-cqx', 'gaa-tilde' ] }, got: { autonym: '𐌲𐌿𐍄𐌹𐍃𐌺𐌰 𐍂𐌰𐌶𐌳𐌰', @@ -2957,7 +2985,7 @@ }, tw: { autonym: 'Twi', - inputmethods: [ 'ak-qx' ] + inputmethods: [ 'ak-qx', 'ak-tilde' ] }, tzm: { autonym: 'ⵜⴰⵎⴰⵣⵉⵖⵜ', @@ -2993,7 +3021,7 @@ }, wo: { autonym: 'Wolof', - inputmethods: [ 'wo-alt' ] + inputmethods: [ 'wo-alt', 'wo-tilde' ] }, yo: { autonym: 'Yorùbá', diff --git a/lib/jquery.ime/rules/ak/ak-qx.js b/lib/jquery.ime/rules/ak/ak-qx.js index 529e4df4..c3338bfc 100644 --- a/lib/jquery.ime/rules/ak/ak-qx.js +++ b/lib/jquery.ime/rules/ak/ak-qx.js @@ -1,18 +1,20 @@ ( function ( $ ) { 'use strict'; - var defs = { + var akQx = { id: 'ak-qx', - name: 'QX replacement', + name: 'Akan QX replacement', description: 'Akan input method with Q and X replaced by Ɛ and Ɔ', date: '2016-06-23', - URL: 'http://www.kasahorow.org/node/260', + URL: 'https://www.kasahorow.org/node/260', author: 'Amir E. Aharoni, based on Kasahorow', license: 'GPLv3', - version: '1.0', - contextLength: 1, - maxKeyLength: 1, + version: '1.1', patterns: [ + [ '\\\\Q', 'Q' ], + [ '\\\\q', 'q' ], + [ '\\\\X', 'X' ], + [ '\\\\x', 'x' ], [ 'Q', 'Ɛ' ], [ 'q', 'ɛ' ], [ 'X', 'Ɔ' ], @@ -20,5 +22,5 @@ ] }; - $.ime.register( defs ); + $.ime.register( akQx ); }( jQuery ) ); diff --git a/lib/jquery.ime/rules/ak/ak-tilde.js b/lib/jquery.ime/rules/ak/ak-tilde.js new file mode 100644 index 00000000..1f31a00e --- /dev/null +++ b/lib/jquery.ime/rules/ak/ak-tilde.js @@ -0,0 +1,23 @@ +( function ( $ ) { + 'use strict'; + + var akTilde = { + id: 'ak-tilde', + name: 'Akan tilde', + description: 'Akan tilde', + date: '2019-05-06', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + maxKeyLength: 2, + patterns: [ + [ '~E', 'Ɛ' ], + [ '~e', 'ɛ' ], + [ '~O', 'Ɔ' ], + [ '~o', 'ɔ' ] + ] + }; + + $.ime.register( akTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/bm/bm-tilde.js b/lib/jquery.ime/rules/bm/bm-tilde.js new file mode 100644 index 00000000..a3af6b2e --- /dev/null +++ b/lib/jquery.ime/rules/bm/bm-tilde.js @@ -0,0 +1,31 @@ +( function ( $ ) { + 'use strict'; + + var bmTilde = { + id: 'bm-tilde', + name: 'Bamanankan tilde', + description: 'Bamanankan tilde', + date: '2019-05-06', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + maxKeyLength: 1, + patterns: [ + [ '~E', 'Ɛ' ], + [ '~e', 'ɛ' ], + [ '~N', 'Ɲ' ], + [ '~n', 'ɲ' ], + [ '~G', 'Ŋ' ], + [ '~g', 'ŋ' ], + [ '~O', 'Ɔ' ], + [ '~o', 'ɔ' ], + [ '~\\\\', '\u0300' ], // Combining grave accent + [ '~/', '\u0301' ], // Combining acute accent + [ '~\\^', '\u0302' ], // Combining circumflex accent + [ '~v', '\u030C' ] // Combining caron + ] + }; + + $.ime.register( bmTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/dag/dag-alt.js b/lib/jquery.ime/rules/dag/dag-alt.js index 0be2db67..0444c823 100644 --- a/lib/jquery.ime/rules/dag/dag-alt.js +++ b/lib/jquery.ime/rules/dag/dag-alt.js @@ -6,13 +6,14 @@ name: 'Dagbani Alt', description: 'Dagbani Alt', date: '2017-05-27', - URL: 'http://github.com/wikimedia/jquery.ime', + URL: 'https://github.com/wikimedia/jquery.ime', author: 'Amir E. Aharoni', license: 'GPLv3', version: '1.0', patterns_x: [ [ 'E', 'Ɛ' ], [ 'e', 'ɛ' ], + // Both G and Y were requested by editors for Ɣ [ 'G', 'Ɣ' ], [ 'g', 'ɣ' ], [ 'Y', 'Ɣ' ], diff --git a/lib/jquery.ime/rules/dag/dag-tilde.js b/lib/jquery.ime/rules/dag/dag-tilde.js new file mode 100644 index 00000000..a1c57fbf --- /dev/null +++ b/lib/jquery.ime/rules/dag/dag-tilde.js @@ -0,0 +1,32 @@ +( function ( $ ) { + 'use strict'; + + var dagTilde = { + id: 'dag-tilde', + name: 'Dagbani tilde', + description: 'Dagbani tilde', + date: '2019-05-07', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + maxKeyLength: 2, + patterns: [ + [ '~E', 'Ɛ' ], + [ '~e', 'ɛ' ], + // Both G and Y were requested by editors for Ɣ + [ '~G', 'Ɣ' ], + [ '~g', 'ɣ' ], + [ '~Y', 'Ɣ' ], + [ '~y', 'ɣ' ], + [ '~N', 'Ŋ' ], + [ '~n', 'ŋ' ], + [ '~O', 'Ɔ' ], + [ '~o', 'ɔ' ], + [ '~Z', 'Ʒ' ], + [ '~z', 'ʒ' ] + ] + }; + + $.ime.register( dagTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/din/din-fqsx.js b/lib/jquery.ime/rules/din/din-fqsx.js index 715a96fc..a567d52d 100644 --- a/lib/jquery.ime/rules/din/din-fqsx.js +++ b/lib/jquery.ime/rules/din/din-fqsx.js @@ -6,7 +6,7 @@ name: 'FQSX replacement', description: 'Dinka input method with F, Q, S and X replaced by Ɣ, Ŋ, Ɛ, and Ɔ', date: '2017-04-26', - URL: 'http://keymanweb.com/#dib,Keyboard_dinkaweb11', + URL: 'https://keymanweb.com/#dib,Keyboard_dinkaweb11', author: 'Amir E. Aharoni, based on Keyman', license: 'GPLv3', version: '1.0', diff --git a/lib/jquery.ime/rules/din/din-tilde.js b/lib/jquery.ime/rules/din/din-tilde.js new file mode 100644 index 00000000..45230bb9 --- /dev/null +++ b/lib/jquery.ime/rules/din/din-tilde.js @@ -0,0 +1,28 @@ +( function ( $ ) { + 'use strict'; + + var dinTilde = { + id: 'din-tilde', + name: 'Dinka tilde', + description: 'Dinka tilde', + date: '2019-05-06', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + maxKeyLength: 2, + patterns: [ + [ '~E', 'Ɛ' ], + [ '~e', 'ɛ' ], + [ '~G', 'Ɣ' ], + [ '~g', 'ɣ' ], + [ '~N', 'Ŋ' ], + [ '~n', 'ŋ' ], + [ '~O', 'Ɔ' ], + [ '~o', 'ɔ' ], + [ '~:', '\u0308' ] // Combining diaeresis + ] + }; + + $.ime.register( dinTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/ff/ff-alt.js b/lib/jquery.ime/rules/ff/ff-alt.js index 4bc076f0..e96535df 100644 --- a/lib/jquery.ime/rules/ff/ff-alt.js +++ b/lib/jquery.ime/rules/ff/ff-alt.js @@ -6,7 +6,7 @@ name: 'Fulfulde Alt', description: 'Fulfulde Alt', date: '2017-05-30', - URL: 'http://github.com/wikimedia/jquery.ime', + URL: 'https://github.com/wikimedia/jquery.ime', author: 'Amir E. Aharoni', license: 'GPLv3', version: '1.0', diff --git a/lib/jquery.ime/rules/ff/ff-tilde.js b/lib/jquery.ime/rules/ff/ff-tilde.js new file mode 100644 index 00000000..357403ea --- /dev/null +++ b/lib/jquery.ime/rules/ff/ff-tilde.js @@ -0,0 +1,32 @@ +( function ( $ ) { + 'use strict'; + + var ffTilde = { + id: 'ff-tilde', + name: 'Fulfulde tilde', + description: 'Fulfulde tilde', + date: '2019-05-07', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + patterns: [ + [ '~b', 'ɓ' ], + [ '~B', 'Ɓ' ], + [ '~d', 'ɗ' ], + [ '~D', 'Ɗ' ], + [ '~g', 'ɠ' ], + [ '~G', 'Ɠ' ], + [ '~q', 'ŋ' ], + [ '~Q', 'Ŋ' ], + [ '~j', 'ɲ' ], + [ '~J', 'Ɲ' ], + [ '~n', 'ñ' ], + [ '~N', 'Ñ' ], + [ '~y', 'ƴ' ], + [ '~Y', 'Ƴ' ] + ] + }; + + $.ime.register( ffTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/gaa/gaa-cqx.js b/lib/jquery.ime/rules/gaa/gaa-cqx.js index f74b1bbc..d59cb8e3 100644 --- a/lib/jquery.ime/rules/gaa/gaa-cqx.js +++ b/lib/jquery.ime/rules/gaa/gaa-cqx.js @@ -6,13 +6,19 @@ name: 'Ga - CQX replacement', description: 'Ga input method with C, Q and X replaced by Ŋ, Ɛ and Ɔ', date: '2016-06-23', - URL: 'http://www.kasahorow.org/node/260', + URL: 'https://www.kasahorow.org/node/260', author: 'Amir E. Aharoni, based on Kasahorow Akan', license: 'GPLv3', - version: '1.0', + version: '1.1', contextLength: 1, maxKeyLength: 1, patterns: [ + [ '\\\\C', 'C' ], + [ '\\\\c', 'c' ], + [ '\\\\Q', 'Q' ], + [ '\\\\q', 'q' ], + [ '\\\\X', 'X' ], + [ '\\\\x', 'x' ], [ 'C', 'Ŋ' ], [ 'c', 'ŋ' ], [ 'Q', 'Ɛ' ], diff --git a/lib/jquery.ime/rules/gaa/gaa-tilde.js b/lib/jquery.ime/rules/gaa/gaa-tilde.js new file mode 100644 index 00000000..b0f3f8ba --- /dev/null +++ b/lib/jquery.ime/rules/gaa/gaa-tilde.js @@ -0,0 +1,25 @@ +( function ( $ ) { + 'use strict'; + + var gaaTilde = { + id: 'gaa-tilde', + name: 'Ga tilde', + description: 'Ga tilde', + date: '2019-05-06', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + maxKeyLength: 2, + patterns: [ + [ '~E', 'Ɛ' ], + [ '~e', 'ɛ' ], + [ '~N', 'Ŋ' ], + [ '~n', 'ŋ' ], + [ '~O', 'Ɔ' ], + [ '~o', 'ɔ' ] + ] + }; + + $.ime.register( gaaTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/wo/wo-tilde.js b/lib/jquery.ime/rules/wo/wo-tilde.js new file mode 100644 index 00000000..17044003 --- /dev/null +++ b/lib/jquery.ime/rules/wo/wo-tilde.js @@ -0,0 +1,28 @@ +( function ( $ ) { + 'use strict'; + + var woTilde = { + id: 'wo-tilde', + name: 'Wolof tilde', + description: 'Wolof tilde', + date: '2019-05-06', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + maxKeyLength: 2, + patterns: [ + [ '~E', 'Ë' ], + [ '~e', 'ë' ], + [ '~G', 'Ŋ' ], + [ '~g', 'ŋ' ], + [ '~n', 'ñ' ], + [ '~N', 'Ñ' ], + [ '~\\\\', '\u0300' ], // Combining grave + [ '~/', '\u0301' ], // Combining acute + [ '~:', '\u0308' ] // Combining diaeresis + ] + }; + + $.ime.register( woTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/yo/yo-alt.js b/lib/jquery.ime/rules/yo/yo-alt.js index 7ceab68f..c28905b3 100644 --- a/lib/jquery.ime/rules/yo/yo-alt.js +++ b/lib/jquery.ime/rules/yo/yo-alt.js @@ -13,10 +13,10 @@ patterns_x: [ // Combining dot below [ '\\.', '\u0323' ], - // Combining grave tone mark - [ '\\\\', '\u0340' ], - // Combining acute tone mark - [ '/', '\u0341' ] + // Combining grave accent + [ '\\\\', '\u0300' ], + // Combining acute accent + [ '/', '\u0301' ] ] };