averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

keyboard: japanese: always put digits as the south gesture for latin (#8443)

Browse Source 
This is to match GBoard's layout for the latin keyboard mode.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
This commit is contained in:
Aleksa Sarai
2021-11-15 00:10:25 +11:00
committed by GitHub
parent 26ec5bafe3
commit 7e611ac50c
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/ui/data/keyboardlayouts/ja_keyboard_keys.lua
View File

@@ -47,19 +47,19 @@ return {
l_1 = { label = "@-_/", alt_label = "１",
"@", west = "-", north = "_", east = "/", south = "１" },
l_2 = { label = "abc", alt_label = "２",
"a", west = "b", north = "c", east = "２" },
"a", west = "b", north = "c", south = "２" },
l_3 = { label = "def", alt_label = "３",
"d", west = "e", north = "f", east = "３" },
"d", west = "e", north = "f", south = "３" },
l_4 = { label = "ghi", alt_label = "４",
"g", west = "h", north = "i", east = "４" },
"g", west = "h", north = "i", south = "４" },
l_5 = { label = "jkl", alt_label = "５",
"j", west = "k", north = "l", east = "５" },
"j", west = "k", north = "l", south = "５" },
l_6 = { label = "mno", alt_label = "６",
"m", west = "n", north = "o", east = "６" },
"m", west = "n", north = "o", south = "６" },
l_7 = { label = "pqrs", alt_label = "７",
"p", west = "q", north = "r", east = "s", south = "７" },
l_8 = { label = "tuv", alt_label = "８",
"t", west = "u", north = "v", east = "８" },
"t", west = "u", north = "v", south = "８" },
l_9 = { label = "wxyz", alt_label = "９",
"w", west = "x", north = "y", east = "z", south = "９" },
l_0 = { label = "'\":;", alt_label = "０",

21
tools/ja_keyboard_generate.py
View File

@@ -151,10 +151,11 @@ class Key(object):
if lua_items:
lua_items.append("\n") # Put the labels on a separate line.
for direction, key in zip(["", "west", "north", "east", "south"], self.popout):
if direction:
lua_items.append(f'{direction} = {escape_luastring(key)}')
else:
lua_items.append(f'{escape_luastring(key)}')
if key != '\0':
if direction:
lua_items.append(f'{direction} = {escape_luastring(key)}')
else:
lua_items.append(f'{escape_luastring(key)}')
lua_item = f'{self.name} = {{ {", ".join(lua_items)} }}'
# Fix newlines to match the indentation and remove the doubled comma.
indent = len(self.name) + 4 * (indent_level + 1)
@@ -200,13 +201,13 @@ KEYPADS = [
# Latin alphabet.
Key("l_1", "@-_/１", label="@-_/", alt_label="１"),
Key("l_2", "abc２", loop="abcABC２", label="abc", alt_label="２"),
Key("l_3", "def３", loop="defDEF３", label="def", alt_label="３"),
Key("l_4", "ghi４", loop="ghiGHI４", label="ghi", alt_label="４"),
Key("l_5", "jkl５", loop="jklJKL５", label="jkl", alt_label="５"),
Key("l_6", "mno６", loop="mnoMNO６", label="mno", alt_label="６"),
Key("l_2", "abc\0２", loop="abcABC２", label="abc", alt_label="２"),
Key("l_3", "def\0３", loop="defDEF３", label="def", alt_label="３"),
Key("l_4", "ghi\0４", loop="ghiGHI４", label="ghi", alt_label="４"),
Key("l_5", "jkl\0５", loop="jklJKL５", label="jkl", alt_label="５"),
Key("l_6", "mno\0６", loop="mnoMNO６", label="mno", alt_label="６"),
Key("l_7", "pqrs７", loop="pqrsPQRS７", label="pqrs", alt_label="７"),
Key("l_8", "tuv８", loop="tuvTUV８", label="tuv", alt_label="８"),
Key("l_8", "tuv\0８", loop="tuvTUV８", label="tuv", alt_label="８"),
Key("l_9", "wxyz９", loop="wxyzWXYZ９", label="wxyz", alt_label="９"),
Key("l_0", "'\":;０", label="'\":;", alt_label="０"),
Key("l_P", ",.?!", label=",.?!"),