From 87915de32ba01845c826abe9526fe57316e0c630 Mon Sep 17 00:00:00 2001 From: sonix-github <29783895+sonix-github@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:19:16 +0100 Subject: [PATCH] Fix missing diacritics on first row of Slovak keyboard layout (#11343) --- .../keyboardlayouts/keypopup/sk_popup.lua | 240 ++++++++++++++++++ .../ui/data/keyboardlayouts/sk_keyboard.lua | 40 +-- 2 files changed, 260 insertions(+), 20 deletions(-) diff --git a/frontend/ui/data/keyboardlayouts/keypopup/sk_popup.lua b/frontend/ui/data/keyboardlayouts/keypopup/sk_popup.lua index f6ba407e2..3eb583dc2 100644 --- a/frontend/ui/data/keyboardlayouts/keypopup/sk_popup.lua +++ b/frontend/ui/data/keyboardlayouts/keypopup/sk_popup.lua @@ -360,4 +360,244 @@ return { southeast = "ʒ", -- ezh, voiced palato-alveolar fricative IPA southwest = "ż", }, + _1_ = { + "+", + north = "1", + northeast = "¡", + east = "-", + southeast = "?", + south = "!", + southwest = nil, + west = nil, + northwest = nil, + alt_label = "1", + }, + _1p = { + "1", + north = "+", + northeast = "¡", + east = "-", + southeast = "?", + south = "!", + southwest = nil, + west = nil, + northwest = nil, + alt_label = "+", + }, + _2_ = { + "ľ", + north = "2", + northeast = "Ľ", + east = "~", + southeast = "/", + south = "@", + southwest = "https://", + west = "http://", + northwest = "ĺ", + alt_label = "2", + }, + _2p = { + "2", + north = "ľ", + northeast = "Ľ", + east = "~", + southeast = "/", + south = "@", + southwest = "https://", + west = "http://", + northwest = "Ĺ", + alt_label = "ľ", + }, + _3_ = { + "š", + north = "3", + northeast = "Š", + east = "☑", + southeast = "☐", + south = "#", + southwest = "☆", + west = "★", + northwest = "ó", + alt_label = "3", + }, + _3p = { + "3", + north = "š", + northeast = "Š", + east = "☑", + southeast = "☐", + south = "#", + southwest = "☆", + west = "★", + northwest = "Ó", + alt_label = "š", + }, + _4_ = { + "č", + north = "4", + northeast = "Č", + east = "¥", + southeast = "¢", + south = "$", + southwest = "₪", + west = "₸", + northwest = "ú", + alt_label = "4", + }, + _4p = { + "4", + north = "č", + northeast = "Č", + east = "¥", + southeast = "¢", + south = "$", + southwest = "₪", + west = "₸", + northwest = "Ú", + alt_label = "č", + }, + _5_ = { + "ť", + north = "5", + northeast = "Ť", + east = "¼", + southeast = "‱", + south = "%", + southwest = "‰", + west = "½", + northwest = "ŕ", + alt_label = "5", + }, + _5p = { + "5", + north = "ť", + northeast = "Ť", + east = "¾", + southeast = "‱", + south = "%", + southwest = "‰", + west = "⅔", + northwest = "Ŕ", + alt_label = "ť", + }, + _6_ = { + "ž", + north = "6", + northeast = "Ž", + east = { label = "◌̈", key = "̈", }, -- Combining Diaeresis (Umlaut) + southeast = { label = "◌̂", key = "̂", }, -- Combining Circumflex Accent + south = "^", + southwest = { label = "◌́", key = "́", }, -- Combining Acute Accent + west = { label = "◌̌", key = "̌", }, -- Combining Caron + northwest = "ď", + alt_label = "6", + }, + _6p = { + "6", + north = "ž", + northeast = "Ž", + east = { label = "◌̈", key = "̈", }, -- Combining Diaeresis (Umlaut) + southeast = { label = "◌̂", key = "̂", }, -- Combining Circumflex Accent + south = "^", + southwest = { label = "◌́", key = "́", }, -- Combining Acute Accent + west = { label = "◌̌", key = "̌", }, -- Combining Caron + northwest = "Ď", + alt_label = "ž", + }, + _7_ = { + "ý", + north = "7", + northeast = "Ý", + east = "«", + southeast = "§", + south = "&", + southwest = "¤", + west = "»", + northwest = "ň", + alt_label = "7", + }, + _7p = { + "7", + north = "ý", + northeast = "Ý", + east = "«", + southeast = "§", + south = "&", + southwest = "¤", + west = "»", + northwest = "Ň", + alt_label = "ý", + }, + _8_ = { + "á", + north = "8", + northeast = "Á", + east = "≠", + southeast = ">", + south = "*", + southwest = "<", + west = "=", + northwest = "ä", + alt_label = "8", + }, + _8p = { + "8", + north = "á", + northeast = "Á", + east = "≠", + southeast = ">", + south = "*", + southwest = "<", + west = "=", + northwest = "Ä", + alt_label = "á", + }, + _9_ = { + "í", + north = "9", + northeast = "Í", + east = "_", + southeast = "[", + south = "(", + southwest = "{", + west = "-", + northwest = "ô", + alt_label = "9", + }, + _9p = { + "9", + north = "í", + northeast = "Í", + east = "_", + southeast = "[", + south = "(", + southwest = "{", + west = "-", + northwest = "Ô", + alt_label = "í", + }, + _0_ = { + "é", + north = "0", + northeast = "É", + east = "”", + southeast = "]", + south = ")", + southwest = "}", + west = "’", + northwest = "¶", + alt_label = "0", + }, + _0p = { + "0", + north = "é", + northeast = "É", + east = "”", + southeast = "]", + south = ")", + southwest = "}", + west = "’", + northwest = "¶", + alt_label = "é", + } } diff --git a/frontend/ui/data/keyboardlayouts/sk_keyboard.lua b/frontend/ui/data/keyboardlayouts/sk_keyboard.lua index 263dba588..c4466728f 100644 --- a/frontend/ui/data/keyboardlayouts/sk_keyboard.lua +++ b/frontend/ui/data/keyboardlayouts/sk_keyboard.lua @@ -60,44 +60,44 @@ local _y_ = sk_popup._y_ local _Z_ = sk_popup._Z_ local _z_ = sk_popup._z_ -- other -local _1_ = en_popup._1_ -- numeric key 1 -local _1p = en_popup._1p -- numeric key 1, popup sibling (they have north swipe ups of each other, the rest is the same) +local _1_ = sk_popup._1_ -- numeric key 1 +local _1p = sk_popup._1p -- numeric key 1, popup sibling (they have north swipe ups of each other, the rest is the same) local _1n = en_popup._1n -- numpad key 1 local _1s = en_popup._1s -- superscript key 1 -local _2_ = en_popup._2_ -local _2p = en_popup._2p +local _2_ = sk_popup._2_ +local _2p = sk_popup._2p local _2n = en_popup._2n local _2s = en_popup._2s -local _3_ = en_popup._3_ -local _3p = en_popup._3p +local _3_ = sk_popup._3_ +local _3p = sk_popup._3p local _3n = en_popup._3n local _3s = en_popup._3s -local _4_ = en_popup._4_ -local _4p = en_popup._4p +local _4_ = sk_popup._4_ +local _4p = sk_popup._4p local _4n = en_popup._4n local _4s = en_popup._4s -local _5_ = en_popup._5_ -local _5p = en_popup._5p +local _5_ = sk_popup._5_ +local _5p = sk_popup._5p local _5n = en_popup._5n local _5s = en_popup._5s -local _6_ = en_popup._6_ -local _6p = en_popup._6p +local _6_ = sk_popup._6_ +local _6p = sk_popup._6p local _6n = en_popup._6n local _6s = en_popup._6s -local _7_ = en_popup._7_ -local _7p = en_popup._7p +local _7_ = sk_popup._7_ +local _7p = sk_popup._7p local _7n = en_popup._7n local _7s = en_popup._7s -local _8_ = en_popup._8_ -local _8p = en_popup._8p +local _8_ = sk_popup._8_ +local _8p = sk_popup._8p local _8n = en_popup._8n local _8s = en_popup._8s -local _9_ = en_popup._9_ -local _9p = en_popup._9p +local _9_ = sk_popup._9_ +local _9p = sk_popup._9p local _9n = en_popup._9n local _9s = en_popup._9s -local _0_ = en_popup._0_ -local _0p = en_popup._0p +local _0_ = sk_popup._0_ +local _0p = sk_popup._0p local _0n = en_popup._0n local _0s = en_popup._0s local sla = en_popup.sla