From 04c39a8591838d28b7b18210a322173e0fd885bc Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Wed, 17 Apr 2019 20:47:30 +0200
Subject: [PATCH] [UX] Keyboard popup: add R diacritics (IPA edition) (#4934)

---
 .../ui/data/keyboardlayouts/en_keyboard.lua   |  4 ++-
 .../keyboardlayouts/keypopup/en_popup.lua     | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/frontend/ui/data/keyboardlayouts/en_keyboard.lua b/frontend/ui/data/keyboardlayouts/en_keyboard.lua
index 93a30501a..84a6394a6 100644
--- a/frontend/ui/data/keyboardlayouts/en_keyboard.lua
+++ b/frontend/ui/data/keyboardlayouts/en_keyboard.lua
@@ -36,6 +36,8 @@ local _P_ = en_popup._P_
 local _p_ = en_popup._p_
 local _Q_ = en_popup._Q_
 local _q_ = en_popup._q_
+local _R_ = en_popup._R_
+local _r_ = en_popup._r_
 local _S_ = en_popup._S_
 local _s_ = en_popup._s_
 local _T_ = en_popup._T_
@@ -58,7 +60,7 @@ return {
             { _Q_,        _q_,    "„",    "0",    "Й",    "й",    "?",    "!",    "Å",    "å",    "1",    "ª", },
             { _W_,        _w_,    "!",    "1",    "Ц",    "ц",    "(",    "1",    "Ä",    "ä",    "2",    "º", },
             { _E_,        _e_,    _at,    "2",    "У",    "у",    ")",    "2",    "Ö",    "ö",    "3",    "¡", },
-            { "R",        "r",    "#",    "3",    "К",    "к",    "~",    "3",    "ß",    "ß",    "4",    "¿", },
+            { _R_,        _r_,    "#",    "3",    "К",    "к",    "~",    "3",    "ß",    "ß",    "4",    "¿", },
             { _T_,        _t_,    "+",    "=",    "Е",    "е",    "Ә",    "ә",    "À",    "à",    "5",    "¼", },
             { "Y",        "y",    "€",    "(",    "Н",    "н",    "І",    "і",    "Â",    "â",    "6",    "½", },
             { _U_,        _u_,    "‰",    ")",    "Г",    "г",    "Ң",    "ң",    "Æ",    "æ",    "7",    "¾", },
diff --git a/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua b/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
index 25b332e50..dea1a3996 100644
--- a/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
+++ b/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
@@ -319,6 +319,32 @@ return {
         -- todo render q̃ correctly on key (not a problem in textbox?)
         --east = {"q̃"}, -- Old/Middle French abbreviation of que
     },
+    _R_ = {
+        "R",
+        north = "ρ", -- lowercase rho
+        northeast = "Ŕ",
+        northwest = "Ρ ", -- uppercase rho
+        east = "ɾ", -- alveolar flap or tap IPA
+        west = "Ř", -- r with háček (Czech)
+        south = "Ŗ", -- r cedilla (Latvian)
+        southeast = "ɻ", -- retroflex approximant IPA
+        southwest = "ɹ", -- alveolar approximant IPA
+        "ʀ", -- uvular trill IPA
+        "ʁ", -- voiced uvular fricative IPA
+    },
+    _r_ = {
+        "r",
+        north = "ρ", -- lowercase rho
+        northeast = "ŕ",
+        northwest = "Ρ ", -- uppercase rho
+        east = "ɾ", -- alveolar flap or tap IPA
+        west = "ř", -- r with háček (Czech)
+        south = "ŗ", -- r cedilla (Latvian)
+        southeast = "ɻ", -- retroflex approximant IPA
+        southwest = "ɹ", -- alveolar approximant IPA
+        "ʀ", -- uvular trill IPA
+        "ʁ", -- voiced uvular fricative IPA
+    },
     _S_ = {
         "S",
         north = "ẞ", -- uppercase eszett