diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index ab3ed849..ac5930e8 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.2.0+20210331 +/*! jquery.ime - v0.2.0+20210414 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2021 Santhosh Thottingal; License: (GPL-2.0-or-later OR MIT) */ ( function ( $ ) { @@ -718,7 +718,7 @@ $.ime.languages = {}; /** - * @property {string} Relative/absolute path for the rules folder of jquery.ime + * @property {string} Relative or absolute path for the rules folder of jquery.ime */ $.ime.path = '../'; $.ime.textEntryFactory = TextEntryFactory.static.singleton; @@ -2615,6 +2615,10 @@ autonym: 'Dagbani', inputmethods: [ 'dag-alt', 'dag-tilde' ] }, + dar: { + autonym: 'дарган', + inputmethods: [ 'cyrl-palochka' ] + }, de: { autonym: 'Deutsch', inputmethods: [ 'de-transliteration' ] diff --git a/lib/jquery.ime/rules/bas/bas-tilde.js b/lib/jquery.ime/rules/bas/bas-tilde.js index b4b46aa8..cb5cfc0b 100644 --- a/lib/jquery.ime/rules/bas/bas-tilde.js +++ b/lib/jquery.ime/rules/bas/bas-tilde.js @@ -21,7 +21,9 @@ [ '~o', 'ɔ' ], [ '~\\\\', '\u0300' ], // Combining grave accent [ '~/', '\u0301' ], // Combining acute accent - [ '~\\^', '\u0302' ] // Combining circumflex accent + [ '~\\^', '\u0302' ], // Combining circumflex accent + [ '~-', '\u0304' ], // Combining macron + [ '~v', '\u030C' ] // Combining caron ] }; diff --git a/lib/jquery.ime/rules/cyrl/cyrl-palochka.js b/lib/jquery.ime/rules/cyrl/cyrl-palochka.js index f4e8d8e4..36046e99 100644 --- a/lib/jquery.ime/rules/cyrl/cyrl-palochka.js +++ b/lib/jquery.ime/rules/cyrl/cyrl-palochka.js @@ -6,17 +6,27 @@ * * This layout assumes that the standard Russian keyboard layout is used. All the rules produce the * same character palochka, and the characters used are the same that are often used by the speakers - * of these languages online: 1. Latin small 'l'. 2. Latin capital 'I'. 3. Ukrainian capital 'І'. 4. - * Alt-1 (the digit one). 5. Alt-д (Cyrillic small 'de', on the same key as Latin 'l'). 6. Alt-ш - * (Cyrillic small 'sha', on the same key as Latin 'i'). 7. Alt-Ш (Cyrillic capital 'sha', on the - * same key as Latin 'I'). + * of these languages online: + * 1. Latin small 'l'. + * 2. Latin capital 'I'. + * 3. Ukrainian capital 'І'. + * 4. Alt-1 (the digit one). + * 5. Alt-д (Cyrillic small 'de', on the same key as Latin 'l'). + * 6. Alt-ш (Cyrillic small 'sha', on the same key as Latin 'i'). + * 7. Alt-Ш (Cyrillic capital 'sha', on the same key as Latin 'I'). */ ( function ( $ ) { 'use strict'; - // All the characters are very similar in appearance, - // so it's better to give them names to avoid confusion. - var cyrlPalochka; + + var cyrlPalochka, + // All the characters are very similar in appearance, + // so it's better to give them names to avoid confusion. + latinSmallL = 'l', + latinCapitalI = 'I', + ukrainianCapitalI = 'І', + palochka = 'Ӏ', + digitOne = '1'; cyrlPalochka = { id: 'cyrl-palochka', @@ -26,16 +36,22 @@ URL: 'http://github.com/wikimedia/jquery.ime', author: 'Amir E. Aharoni', license: 'GPLv3', - version: '1.0', + version: '1.1', + contextLength: 2, + maxKeyLength: 3, patterns: [ - [ 'l', 'Ӏ' ], - [ 'I', 'Ӏ' ], - [ 'І', 'Ӏ' ] ], + [ '~~' + digitOne, '~~', '~1' ], + [ '~' + digitOne, palochka ], + [ latinSmallL, palochka ], + [ latinCapitalI, palochka ], + [ ukrainianCapitalI, palochka ] + ], patterns_x: [ - [ '1', 'Ӏ' ], - [ 'д', 'Ӏ' ], - [ 'ш', 'Ӏ' ], - [ 'Ш', 'Ӏ' ] ] + [ digitOne, palochka ], + [ 'д', palochka ], + [ 'ш', palochka ], + [ 'Ш', palochka ] + ] }; $.ime.register( cyrlPalochka ); diff --git a/lib/jquery.uls/src/jquery.uls.data.js b/lib/jquery.uls/src/jquery.uls.data.js index 38b0e5c3..cb1c9993 100644 --- a/lib/jquery.uls/src/jquery.uls.data.js +++ b/lib/jquery.uls/src/jquery.uls.data.js @@ -899,6 +899,13 @@ ], "dagbanli" ], + "dar": [ + "Cyrl", + [ + "EU" + ], + "дарган" + ], "de-at": [ "Latn", [ @@ -5710,6 +5717,7 @@ "os", "kbd", "myv", + "dar", "mdf", "kum", "kv",