Merge branch 'rel-1.42.2' into 'squeekboard-1.42.x'

treewide: Document changes and release 1.42.2

See merge request World/Phosh/squeekboard!694

.gitignore

@@ -1,9 +1,21 @@
 _build/
+debian/*.debhelper
+debian/.debhelper/
+debian/cargo/registry/
+debian/cargo/.*cache*
+debian/debhelper-build-stamp
+debian/files
+debian/*.substvars
+debian/squeekboard/
+debian/squeekboard-devel/
+debian/tmp/
+meson_Cargo.toml.in
 po/squeekboard.pot
 po/*.mo
 TAGS
 tags
 target/
+vendor/
 vgdump
 *.swp
 *~

.gitlab-ci.yml

@@ -23,9 +23,6 @@ stages:
   - deploy
 
 before_script:
-# Workaround for unavailable dependencies
-  - mv debian/control.debian-testing debian/control
-# End of workaround for unavailable dependencies
   - apt-get -y update
   - apt-get -y install ca-certificates
 
@@ -65,17 +62,6 @@ build_deb:
       - '*.deb'
   script:
     - rm -f ../*.deb
-# Workaround for unavailable dependencies
-# TODO: Port Squeekboard to GTK4/GTK4-layer-shell
-# https://gitlab.gnome.org/World/Phosh/squeekboard/-/issues/64
-    - echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list
-    - echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/experimental.list
-    - echo "APT::Default-Release \"trixie\";" > /etc/apt/apt.conf.d/default-release
-    - apt-get -y update
-    - apt-get -y --no-upgrade install librust-gio-dev librust-glib-dev librust-glib-sys-dev
-      librust-gtk-dev librust-gtk-sys-dev
-    - apt-get -y --no-upgrade install -t experimental librust-serde-yaml-dev
-# End of workaround for unavailable dependencies
     - apt-get -y build-dep .
     - apt-get -y install devscripts
     - REV=$(git log -1 --format=%h)

Cargo.lock

@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "async-io"
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -74,9 +74,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "byteorder"
@@ -90,7 +90,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -111,9 +111,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-expr"
@@ -133,18 +136,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -152,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "concurrent-queue"
@@ -167,9 +170,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "derivative"
@@ -211,9 +214,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -315,7 +318,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -444,7 +447,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -472,7 +475,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -545,7 +548,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -574,9 +577,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -584,9 +587,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
@@ -610,9 +613,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "linux-raw-sys"
@@ -622,9 +625,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "maplit"
@@ -634,15 +637,15 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
 dependencies = [
  "libc",
 ]
@@ -690,9 +693,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "pango"
@@ -721,9 +727,9 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "pin-project-lite"
@@ -739,9 +745,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polling"
@@ -759,6 +765,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
 [[package]]
 name = "proc-macro-crate"
 version = "0.1.5"
@@ -814,18 +826,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -855,9 +867,9 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
@@ -878,9 +890,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "scoped-tls"
@@ -890,28 +902,28 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.200"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.200"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -922,14 +934,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -947,6 +959,12 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -991,9 +1009,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1015,28 +1033,28 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1095,9 +1113,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unsafe-libyaml"
@@ -1113,15 +1131,15 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "waker-fn"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "winapi"
@@ -1160,7 +1178,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1180,18 +1198,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.5",
+ "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.5",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.5",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -1202,9 +1220,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1214,9 +1232,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1226,15 +1244,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1244,9 +1262,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1256,9 +1274,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1268,9 +1286,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1280,9 +1298,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -1295,14 +1313,21 @@ dependencies = [
 
 [[package]]
 name = "xkbcommon"
-version = "0.5.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88"
+checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
 dependencies = [
  "libc",
  "memmap2",
+ "xkeysym",
 ]
 
+[[package]]
+name = "xkeysym"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+
 [[package]]
 name = "zbus"
 version = "1.9.3"

Cargo.toml

@@ -5,62 +5,62 @@ edition = "2021"
 
 [lib]
 name = "rs"
-path = "@path@/src/lib.rs"
+path = "src/lib.rs"
 crate-type = ["staticlib", "rlib"]
 
 # Cargo can't do autodiscovery if Cargo.toml is not in the root.
 [[bin]]
 name = "test_layout"
-path = "@path@/src/bin/test_layout.rs"
+path = "src/bin/test_layout.rs"
 
 [[example]]
 name = "test_layout"
-path = "@path@/examples/test_layout.rs"
+path = "examples/test_layout.rs"
 
 [[example]]
 name = "find_orphan_layouts"
-path = "@path@/examples/find_orphan_layouts.rs"
+path = "examples/find_orphan_layouts.rs"
 
 [features]
 zbus_v1_5 = []
 clap_v4 = []
 
 [dependencies]
-maplit = "1.0.*"
+maplit = "1.0"
-serde = { version = "1.0.*", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
-serde_yaml = "0.9.*"
+serde_yaml = "0.9"
-bitflags = "1.3.*"
+bitflags = "1.3"
-clap = { version = "4.4.*", features=["std"], default-features = false }
+clap = { version = "4.4", features=["std"], default-features = false }
-zbus = "1.9.*"
+zbus = "1.9"
-zvariant = "2.10.*"
+zvariant = "2.10"
-zvariant_derive = "2.10.*"
+zvariant_derive = "2.10"
-xkbcommon = { version = "0.5.*", features = ["wayland"] }
+xkbcommon = { version = "0.7", features = ["wayland"] }
 
 [dependencies.cairo-rs]
-version = "0.18.*"
+version = "0.18"
 
 [dependencies.cairo-sys-rs]
-version = "0.18.*"
+version = "0.18"
 
 [dependencies.gdk]
-version = "0.18.*"
+version = "0.18"
 
 [dependencies.gio]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 
 [dependencies.glib]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 
 [dependencies.glib-sys]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 
 [dependencies.gtk]
-version = "0.18.*"
+version = "0.18"
 features = ["v3_24"]
 
 [dependencies.gtk-sys]
-version = "0.18.*"
+version = "0.18"
 features = ["v3_24"]

NEWS

@@ -0,0 +1,163 @@
+squeekboard 1.42.2
+------------------
+Released November 2024
+* Fixes:
+    * Compatibility: Squeekboard should now work better with apps that do not use the text-input-protocol of Wayland and rely on specific keycodes being assigned to specific characters/functions.
+    * Documentation: The recommended settings for creating layouts while using Phoc in a nested session, have been updated to work correctly with the changes to the scaling-algorithm.
+* Contributors:
+    * MoonlightWave-12
+
+squeekboard 1.42.1
+------------------
+Released October 2024
+* Fixes:
+    * With some apps, in particular apps made with Electron, text-input did not work with some buttons, depending on which layout was used. Text-input should now work normally with those apps.
+    * In some situations, modifiers were cleared after pressing another button (for example: when pressing `C`, for `Ctrl + C`), resulting in text-input without the modifiers. The modifiers will remain active in those situations from now on.
+* Contributors:
+    * MoonlightWave-12
+    * Sebastian Krzyszkowiak
+
+squeekboard 1.42.0
+------------------
+Released September 2024
+* New layouts:
+    * Belarusian (by)
+    * French (fr+bepo) terminal-layout
+    * Japanese (jp)
+    * Serbian (rs), (rs+latin), (rs+latinunicode)
+* Changed layouts:
+    * Thai (th):
+        * There is less empty space now.
+        * Most buttons are wider now.
+        * The arrangement of buttons for the `symbols` and `numbers` views, is more consistent with other layouts now.
+* Fixes:
+    * "Keyboard Settings" in the language-selection-popover will now open the correct panel in GNOME Settings.
+    * On some relatively small screens in horizontal orientation, the compact shape was used instead of the wide shape,
+      even though the wide shape can fit into the same height. The wide shape will be used on those screens now.
+* Changes:
+    * The height of the panel will adapt to screens differently.
+      In particular, the panel will be 1/3 of the screen's height on most monitors in horizontal orientation,
+      and as tall as it can be, while maintaining the aspect-ratio of the wide shape (16:5) without empty space next to it,
+      for most monitors in vertical orientation.
+    * GSettings for adjusting the height of the panel for the keyboard have been added.
+    * The documentation has been improved. In particular, it should now be much easier to learn how to test changes to Squeekboard and layouts.
+    * After building a Debian-package for Squeekboard and installing it, `update-alternatives` is now supported.
+    * The layout-files now have the English name of the language for which the respective layout is, in a comment at the top of the file.
+    * For a few languages which do not have a layout yet, a more appropriate fallback-layout will be chosen.
+* Contributors:
+    * Guido Günther
+    * MoonlightWave-12
+* UI translations:
+    * Sabri Ünal (tr)
+
+squeekboard 1.41.0
+------------------
+Released August 2024
+* New layouts:
+    * Malayalam
+    * German (Bone)
+    * German (Neo 2)
+* New icons:
+    * zwsp (zero-width-space)
+    * zwj (zero-width-joiner)
+
+squeekboard 1.39.0
+------------------
+Released May 2024
+* New button-styles:
+    * `change-view`: Highlighted like `special`, but with a border at the bottom.
+    * `character-group`: Like `change-view`, but with less highlighting.
+    * `placeholder`: Less contrast to the background and does not visually change when pressed.
+    * `subtle-highlight`: For highlighting commonly used characters in accent-views, for example.
+* New layouts:
+    * Portuguese
+    * Slovenian
+    * Turkish (F-layout)
+    * Turkish (Q-layout)
+* Remade layout:
+    * Portuguese (Brazil): A view for accents has been added.
+* Changes:
+    * The new button-styles are used in the available layouts, where appropriate.
+    * The top rows of the terminal-layouts are a little taller.
+    * Squeekboard will choose the wide shape of layouts, for more displays in horizontal orientation.
+    * Highlighted buttons now show visual feedback too, when pressed.
+    * Many layouts have been adjusted, so that those change their form less when switching views.
+    * Various small issues have been fixed, to make layouts more consistent.
+* Development:
+    * Scaling-tests for many display-types have been added.
+
+squeekboard 1.38.0
+------------------
+Released March 2024
+* Changes:
+    * 25 wide shapes have been added, so that every available layout now has a wide shape
+    * "PgUp" and "PgDn" on the terminal-layouts have been relabeled to "Page ↑" and "Page ↓"
+    * The Spanish and French terminal-layouts now have translated key-names
+    * The Spanish terminal-layout has been updated with the additional keys that are already available on the US-terminal-layout.
+    * The wide and base shapes of the German layout had a different key-arrangement and the wide shape did not have a button to access additional characters; this has been fixed.
+* Development:
+    * Squeekboard's versioning now follows Phosh's versioning (for example: Squeekboard 1.38 was released in time for Phosh 0.38)
+    * The build-system has been simplified
+    * A single Cargo.toml file is used, instead of assembling it from multiple parts
+    * Newer dependencies are now used for building Squeekboard by default
+    * Squeekboard's main development-platform is now Debian Testing
+    * The layout-files have been cleaned up, so that those are easier to understand and edit
+
+squeekboard 1.24.0
+------------------
+Released March 2024
+* Changes:
+    * The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
+
+squeekboard 1.23.0
+------------------
+Released March 2024
+* New or updated translations:
+    * Belarusian
+    * Haitian Creole
+* New layouts:
+    * French Canadian (QWERTY + accented letters)
+    * German terminal-layout
+    * Spanish terminal-layout
+* Changes:
+    * Fixed Persian and Swiss layouts
+    * Fixed various small style-issues in many layouts
+    * Improved the US-terminal-layout
+
+squeekboard 1.22.0 "Superposition"
+------------------
+Released April 2023
+* New or updated translations:
+    * Basque
+* Changes:
+    * fixed panel sizing when scaling
+    * fixed panel sizing when rotating
+    * fixed Dvorak terminal layout
+
+squeekboard 1.21.0 "Expected value"
+------------------
+Released February 2023
+* New or updated translations:
+    * Hindi
+    * Czech
+    * German
+* New layouts:
+    * wide Swedish
+    * Hungarian
+* Changes:
+    * use a custom font for gr+polytonic, where the default is unreadable
+    * require newer Rust
+    * fixed panel sizing when rotating
+    * internal improvements.
+
+squeekboard 1.20.0 "PID controller"
+------------------
+Released September 2023
+* New translations:
+    * Greek
+    * Croatian
+* New layouts:
+    * US Dvorak terminal
+* Improvements:
+    * forcing the panel to hide now takes effect immediately
+    * Squeekboard icon will present itself when other applications need to show it

NEWS.md

@@ -1,112 +0,0 @@
-1.39.0
-------------------
-
-New button-styles:
- - `change-view`: Highlighted like `special`, but with a border at the bottom.
- - `character-group`: Like `change-view`, but with less highlighting.
- - `placeholder`: Less contrast to the background and does not visually change when pressed.
- - `subtle-highlight`: For highlighting commonly used characters in accent-views, for example.
-
-New layouts:
- - Portuguese
- - Slovenian
- - Turkish (F-layout)
- - Turkish (Q-layout)
-
-Remade layout:
- - Portuguese (Brazil): A view for accents has been added.
-
-Changes:
- - The new button-styles are used in the available layouts, where appropriate.
- - The top rows of the terminal-layouts are a little taller.
- - Squeekboard will choose the wide shape of layouts, for more displays in horizontal orientation.
- - Highlighted buttons now show visual feedback too, when pressed.
- - Many layouts have been adjusted, so that those change their form less when switching views.
- - Various small issues have been fixed, to make layouts more consistent.
-
-Development:
- - Scaling-tests for many display-types have been added.
-
-1.38.0
-------------------
-
-Changes:
-- 25 wide shapes have been added, so that every available layout now has a wide shape
-- "PgUp" and "PgDn" on the terminal-layouts have been relabeled to "Page ↑" and "Page ↓"
-- The Spanish and French terminal-layouts now have translated key-names
-- The Spanish terminal-layout has been updated with the additional keys that are already available on the US-terminal-layout.
-- The wide and base shapes of the German layout had a different key-arrangement and the wide shape did not have a button to access additional characters; this has been fixed.
-
-Development:
-- Squeekboard's versioning now follows Phosh's versioning (for example: Squeekboard 1.38 was released in time for Phosh 0.38)
-- The build-system has been simplified
-  - A single Cargo.toml file is used, instead of assembling it from multiple parts
-  - Newer dependencies are now used for building Squeekboard by default
-- Squeekboard's main development-platform is now Debian Testing
-- The layout-files have been cleaned up, so that those are easier to understand and edit
-
-1.24.0
-------------------
-
-Changes:
-- The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
-
-1.23.0
-------------------
-
-New or updated translations:
-- Belarusian
-- Haitian Creole
-
-New layouts:
-- French Canadian (QWERTY + accented letters)
-- German terminal-layout
-- Spanish terminal-layout
-
-Changes:
-- Fixed Persian and Swiss layouts
-- Fixed various small style-issues in many layouts
-- Improved the US-terminal-layout
-
-1.22.0 "Superposition"
-------------------
-
-New or updated translations:
-- Basque
-
-Changes:
-- fixed panel sizing when scaling
-- fixed panel sizing when rotating
-- fixed Dvorak terminal layout
-
-1.21.0 "Expected value"
-------------------
-
-New or updated translations:
-- Hindi
-- Czech
-- German
-
-New layouts:
-- wide Swedish
-- Hungarian
-
-Changes:
-- use a custom font for gr+polytonic, where the default is unreadable
-- require newer Rust
-- fixed panel sizing when rotating
-- internal improvements.
-
-1.20.0 "PID controller"
-------------------
-
-New translations:
-- Greek
-- Croatian
-
-New layouts:
-- US Dvorak terminal
-
-Improvements:
-- forcing the panel to hide now takes effect immediately
-- Squeekboard icon will present itself when other applications need to show it

README.md

@@ -1,7 +1,7 @@
 *squeekboard* - a Wayland on-screen keyboard
 ========================================
 
-*Squeekboard* is the on-screen keyboard for Phosh. It is primarily designed for smartphones, tablet-PCs, and other devices with touchscreens.
+*Squeekboard* is the on-screen-keyboard input-method for Phosh. It is primarily designed for smartphones, tablet-PCs, and other devices with touchscreens.
 
 It squeaks because some Rust got inside.
 
@@ -30,6 +30,12 @@ Creating layouts
 
 If you want to work on layouts, check out the [guide](doc/tutorial.md).
 
+Nightly builds
+--------------
+
+For testing the latest commits of the `main`-branch, one can install the nightly builds of Squeekboard.
+For more information about the nightly builds, read the ["Phosh Nightly Package Builds"-blog-post](https://phosh.mobi/posts/phosh-nightly/).
+
 Building
 --------
 
@@ -43,7 +49,7 @@ See `.gitlab-ci.yml` or run `apt-get build-dep .`
 $ git clone https://gitlab.gnome.org/World/Phosh/squeekboard.git
 $ cd squeekboard
 $ mkdir _build
-$ meson _build/
+$ meson setup _build/
 $ cd _build
 $ ninja
 ```
@@ -54,11 +60,16 @@ Running
 -------
 
 ```sh
-$ phoc # if no compatible Wayland compositor is running yet
 $ cd ../build/
 $ src/squeekboard
 ```
 
+If no compatible Wayland compositor is running yet, you can use Phoc (after installing it):
+
+```sh
+$ phoc --exec 'src/squeekboard'
+```
+
 Squeekboard's panel will appear whenever a compatible application requests an input method. Click a text field in any GTK application, like `python3 ./tools/entry.py`.
 
 Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
@@ -73,6 +84,8 @@ Alternatively, force panel visibility manually with:
 $ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
 ```
 
+or by using the environment-variable `SQUEEKBOARD_DEBUG=force_show`.
+
 ### What the compositor has to support
 
 A compatible compositor has to support the protocols:
@@ -84,6 +97,25 @@ It's strongly recommended to support:
 
 - input-method-v2
 
+Settings
+--------
+
+You can change the height of the panel for the keyboard with:
+
+```sh
+$ gsettings set sm.puri.Squeekboard scale-in-horizontal-screen-orientation 1.0
+$ gsettings set sm.puri.Squeekboard scale-in-vertical-screen-orientation 1.0
+```
+
+Note: If the keyboard is open when the settings for the panel-height are changed, the height of the keyboard will not change until it is opened again, or the layout is changed.
+While using Phosh, you can long-click/long-tap the home-bar at the bottom, to open and close the keyboard.
+
+To reset the settings to the default, you can use:
+
+```sh
+$ gsettings reset-recursively sm.puri.Squeekboard
+```
+
 Developing
 ----------
 

cargo.sh

@@ -12,6 +12,9 @@ SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
 CARGO_TARGET_DIR="$(pwd)"
 export CARGO_TARGET_DIR
 
+GSETTINGS_SCHEMA_DIR="${CARGO_TARGET_DIR}/data:${GSETTINGS_SCHEMA_DIR}"
+export GSETTINGS_SCHEMA_DIR
+
 cd "$SOURCE_DIR"
 
 # the 'run" command takes arguments at the end,

data/common.css

@@ -11,10 +11,22 @@ sq_view.gr_polytonic {
     font-size: 2em;
 }
 
+sq_view.in_mal {
+    font-size: 1em;
+}
+
+sq_view.wide.in_mal {
+    font-size: 1.25em;
+}
+
 sq_view.ir_azb {
     font-size: 1.368em;
 }
 
+sq_view.wide.jp {
+    font-size: 1.15em;
+}
+
 sq_button {
     border-radius: 4px;
     margin: 2px;

data/dbus/sm.puri.OSK0.xml

@@ -1,20 +1,31 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      sm.puri.OSK0:
+
+      This interface is exported by on screen keyboards (OSK) to
+      indicate and set state like visibility.
+  -->
+
   <interface name="sm.puri.OSK0">
+    <!--
+        SetVisible:
+        @visible: %TRUE if the OSK should be shown to the user, %FALSE otherwise
+
+        Toggle keyboard visibility.
+    -->
     <method name="SetVisible">
-      <arg name="visible" type="b" direction="in"/>
+      <arg type="b" direction="in" name="visible"/>
-      <doc:doc><doc:description>
-        Switch keyboard visibility
-      </doc:description></doc:doc>
     </method>
-    <method name="GetVisible">
+    <!--
-      <arg name="visible" type="b" direction="out"/>
+        Visible:
-      <doc:doc><doc:description>
+
-        Get keyboard visibility
+        Indicates whether the on screen keyboard is currently
-      </doc:description></doc:doc>
+        unfolded. %TRUE if the OSK is currently visible to the user,
-    </method>
+        %FALSE otherwise.
-    <property name="Visible" type="b" access="read">
+    -->
-    </property>
+    <property name="Visible" type="b" access="read"/>
   </interface>
 </node>

data/icons/zwj.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" stroke="#000">
+  <path d="m135.66 182.97a51.681 32.879 0 0 1-71.332 9.8e-4" stroke-width="12.123"/>
+  <path d="m135.66 17.029a51.681 32.879 0 0 0-71.332-0.0011" stroke-width="12.123"/>
+  <path d="m100 7.7071v184.59" stroke-width="10"/>
+ </g>
+</svg>

data/icons/zwsp.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" stroke="#000">
+  <circle cx="100" cy="20.429" r="14.118" stroke-width="9.05"/>
+  <circle cx="100" cy="179.57" r="14.118" stroke-width="9.05"/>
+  <path d="m100 34.739v130.52" stroke-width="8.5856"/>
+ </g>
+</svg>

data/keyboards/am+phonetic.yaml

@@ -1,3 +1,4 @@
+# Language: Armenian (phonetic)
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021

data/keyboards/am+phonetic_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Armenian (phonetic)
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021

data/keyboards/am.yaml

@@ -1,3 +1,4 @@
+# Language: Armenian
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021

data/keyboards/am_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Armenian
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021

data/keyboards/ara.yaml

@@ -1,3 +1,4 @@
+# Language: Arabic
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:

data/keyboards/ara_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Arabic
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:

data/keyboards/be.yaml

@@ -1,3 +1,4 @@
+# Language: Belgian
 ---
 outlines:
     default:       { width: 35.33,  height: 52 }

data/keyboards/be_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Belgian
 ---
 outlines:
     default:       { width: 54,  height: 42 }

data/keyboards/bg+phonetic.yaml

@@ -1,3 +1,4 @@
+# Language: Bulgarian (phonetic)
 ---
 outlines:
     default:       { width: 32.72,  height: 52 }

data/keyboards/bg+phonetic_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Bulgarian (phonetic)
 ---
 outlines:
     default:       { width: 48.75, height: 42 }

data/keyboards/bg.yaml

@@ -1,3 +1,4 @@
+# Language: Bulgarian
 ---
 outlines:
     default:       { width: 32.72,  height: 52 }

data/keyboards/bg_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Bulgarian
 ---
 outlines:
     default:       { width: 48.75, height: 42 }

data/keyboards/br.yaml

@@ -1,3 +1,4 @@
+# Language: Portuguese (Brazil)
 ---
 outlines:
     default:       { width: 35.67, height: 52 }

data/keyboards/br_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Portuguese (Brazil)
 ---
 outlines:
     default:     { width: 53.75, height: 42 }

data/keyboards/by.yaml

@@ -0,0 +1,91 @@
+# Language: Belarusian
+---
+outlines:
+    default:       { width: 32.45,  height: 52 }
+    altline:       { width: 32,     height: 52 }
+    wide:          { width: 64.55,  height: 52 }
+    change-view:   { width: 32,     height: 52 }
+    change-view-2: { width: 64.55,  height: 52 }
+    spaceline:     { width: 91.96,  height: 52 }
+    fill:          { width: 156.86, height: 52 }
+    fill-2:        { width: 64.9,   height: 52 }
+    special:       { width: 35.67,  height: 52 }
+    large:         { width: 35.67,  height: 52 }
+
+views:
+    base:
+        - "й ц у к е н г ш ў з х"
+        - "ф ы в а п р о л д ж э"
+        - "Shift_L  я ч с м і т ь б ю  BackSpace"
+        - "show_numbers preferences    ё  space  ,  . Return"
+    upper:
+        - "Й Ц У К Е Н Г Ш Ў З Х"
+        - "Ф Ы В А П Р О Л Д Ж Э"
+        - "Shift_L   Я Ч С М І Т Ь Б Ю  BackSpace"
+        - "show_numbers preferences    Ё  space   , . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
+        - "show_letters preferences         space-fill   . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers \\ / < > = [ ] BackSpace-wide"
+        - "show_letters preferences         space-fill   . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "wide"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "АБВ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    .:
+        outline: "large"
+    space:
+        outline: "spaceline"
+        text: " "
+    space-fill:
+        outline: "fill"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    5:
+        outline: "fill-2"
+    "&":
+        outline: "fill-2"
+    √:
+        outline: "fill-2"
+    ¥:
+        outline: "fill-2"

data/keyboards/by_wide.yaml

@@ -0,0 +1,88 @@
+# Language: Belarusian
+---
+outlines:
+    default:       { width: 48.75, height: 42 }
+    altline:       { width: 48.75, height: 42 }
+    wide:          { width: 97.5,  height: 42 }
+    change-view:   { width: 48.75, height: 42 }
+    change-view-2: { width: 97.5,  height: 42 }
+    spaceline:     { width: 146.5, height: 42 }
+    fill:          { width: 244,   height: 42 }
+    fill-2:        { width: 97.5,  height: 42 }
+    special:       { width: 48.75, height: 42 }
+
+views:
+    base:
+        - "й ц у к е н г ш ў з х"
+        - "ф ы в а п р о л д ж э"
+        - "Shift_L  я ч с м і т ь б ю  BackSpace"
+        - "show_numbers preferences    ё  space  ,  . Return"
+    upper:
+        - "Й Ц У К Е Н Г Ш Ў З Х"
+        - "Ф Ы В А П Р О Л Д Ж Э"
+        - "Shift_L   Я Ч С М І Т Ь Б Ю  BackSpace"
+        - "show_numbers preferences    Ё  space  ,  . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
+        - "show_letters preferences         space-fill   . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers \\ / < > = [ ] BackSpace-wide"
+        - "show_letters preferences         space-fill   . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "wide"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "АБВ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    space-fill:
+        outline: "fill"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    5:
+        outline: "fill-2"
+    "&":
+        outline: "fill-2"
+    √:
+        outline: "fill-2"
+    ¥:
+        outline: "fill-2"

data/keyboards/ca.yaml

@@ -1,3 +1,4 @@
+# Language: French (Canada)
 ---
 outlines:
     default:       { width: 35.5,  height: 52 }

data/keyboards/ca_wide.yaml

@@ -1,3 +1,4 @@
+# Language: French (Canada)
 ---
 outlines:
     default:       { width: 53.7,  height: 42 }

data/keyboards/ch+de.yaml

@@ -1,3 +1,4 @@
+# Language: German (Switzerland) (ch+de)
 # Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 
 ---

data/keyboards/ch+de_wide.yaml

@@ -1,3 +1,4 @@
+# Language: German (Switzerland) (ch+de)
 # Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 
 ---

data/keyboards/ch+fr.yaml

@@ -1,3 +1,4 @@
+# Language: French (Switzerland)
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:

data/keyboards/ch+fr_wide.yaml

@@ -1,3 +1,4 @@
+# Language: French (Switzerland)
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:

data/keyboards/ch.yaml

@@ -1,3 +1,4 @@
+# Language: German (Switzerland)
 # Maintained by: Jordy Bossy <jordi@bossy.space>
 # and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 

data/keyboards/ch_wide.yaml

@@ -1,3 +1,4 @@
+# Language: German (Switzerland)
 # Maintained by: Jordy Bossy <jordy@bossy.space>
 # and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 

data/keyboards/cz+qwerty.yaml

@@ -1,3 +1,4 @@
+# Language: Czech (QWERTY)
 ---
 outlines:
     default:       { width: 35.33, height: 52 }

data/keyboards/cz+qwerty_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Czech (QWERTY)
 ---
 outlines:
     default:       { width: 54,  height: 42 }

data/keyboards/cz.yaml

@@ -1,3 +1,4 @@
+# Language: Czech
 ---
 outlines:
     default:       { width: 35.33, height: 52 }

data/keyboards/cz_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Czech
 ---
 outlines:
     default:       { width: 54,  height: 42 }

data/keyboards/de+bone.yaml

@@ -0,0 +1,122 @@
+# Language: German (Bone)
+---
+outlines:
+    default:            { width: 32.12,  height: 52 }
+    subtle-highlight:   { width: 32.12,  height: 52 }
+    special:            { width: 32.12,  height: 52 }
+    altline:            { width: 48.17,  height: 52 }
+    change-view:        { width: 48.17,  height: 52 }
+    fill:               { width: 64.24,  height: 52 }
+    subtle-highlight-2: { width: 64.24,  height: 52 }
+    spaceline:          { width: 112.45, height: 52 }
+
+
+views:
+    base:
+        - "j d u a x p h l m w ß"
+        - "c t i e o b n r s g q"
+        - "Shift_L   f v ü ä ö y z k BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "J D U A X P H L M W ẞ"
+        - "C T I E O B N R S G Q"
+        - "Shift_L   F V Ü Ä Ö Y Z K BackSpace"
+        - "show_numbers show_eschars preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    eschars:
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ää"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ä"
+    ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ö"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
+        text: "ü"
+    Ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ä"
+    Ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ö"
+    Ü-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ü"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    ·:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ô:
+        outline: "fill"
+    Ç:
+        outline: "fill"
+    ":":
+        outline: "fill"
+    π:
+        outline: "fill"

data/keyboards/de+bone_wide.yaml

@@ -0,0 +1,122 @@
+# Language: German (Bone)
+---
+outlines:
+    default:            { width: 48.87,  height: 42 }
+    subtle-highlight:   { width: 48.87,  height: 42 }
+    special:            { width: 48.87,  height: 42 }
+    altline:            { width: 73.31,  height: 42 }
+    change-view:        { width: 73.31,  height: 42 }
+    fill:               { width: 97.74,  height: 42 }
+    subtle-highlight-2: { width: 97.74,  height: 42 }
+    spaceline:          { width: 171.03, height: 42 }
+
+
+views:
+    base:
+        - "j d u a x p h l m w ß"
+        - "c t i e o b n r s g q"
+        - "Shift_L   f v ü ä ö y z k BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "J D U A X P H L M W ẞ"
+        - "C T I E O B N R S G Q"
+        - "Shift_L   F V Ü Ä Ö Y Z K BackSpace"
+        - "show_numbers show_eschars preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    eschars:
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ää"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ä"
+    ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ö"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
+        text: "ü"
+    Ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ä"
+    Ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ö"
+    Ü-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ü"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    ·:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ô:
+        outline: "fill"
+    Ç:
+        outline: "fill"
+    ":":
+        outline: "fill"
+    π:
+        outline: "fill"

data/keyboards/de+neo.yaml

@@ -0,0 +1,122 @@
+# Language: German (Neo 2)
+---
+outlines:
+    default:            { width: 32.12,  height: 52 }
+    subtle-highlight:   { width: 32.12,  height: 52 }
+    special:            { width: 32.12,  height: 52 }
+    altline:            { width: 48.17,  height: 52 }
+    change-view:        { width: 48.17,  height: 52 }
+    fill:               { width: 64.24,  height: 52 }
+    subtle-highlight-2: { width: 64.24,  height: 52 }
+    spaceline:          { width: 112.45, height: 52 }
+
+
+views:
+    base:
+        - "x v l c w k h g f q ß"
+        - "u i a e o s n r t d y"
+        - "Shift_L   ü ö ä p z b m j BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "X V L C W K H G F Q ẞ"
+        - "U I A E O S N R T D Y"
+        - "Shift_L   Ü Ö Ä P Z B M J BackSpace"
+        - "show_numbers show_eschars preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    eschars:
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ää"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ä"
+    ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ö"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
+        text: "ü"
+    Ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ä"
+    Ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ö"
+    Ü-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ü"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    ·:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ô:
+        outline: "fill"
+    Ç:
+        outline: "fill"
+    ":":
+        outline: "fill"
+    π:
+        outline: "fill"

data/keyboards/de+neo_wide.yaml

@@ -0,0 +1,122 @@
+# Language: German (Neo 2)
+---
+outlines:
+    default:            { width: 48.87,  height: 42 }
+    subtle-highlight:   { width: 48.87,  height: 42 }
+    special:            { width: 48.87,  height: 42 }
+    altline:            { width: 73.31,  height: 42 }
+    change-view:        { width: 73.31,  height: 42 }
+    fill:               { width: 97.74,  height: 42 }
+    subtle-highlight-2: { width: 97.74,  height: 42 }
+    spaceline:          { width: 171.03, height: 42 }
+
+
+views:
+    base:
+        - "x v l c w k h g f q ß"
+        - "u i a e o s n r t d y"
+        - "Shift_L   ü ö ä p z b m j BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "X V L C W K H G F Q ẞ"
+        - "U I A E O S N R T D Y"
+        - "Shift_L   Ü Ö Ä P Z B M J BackSpace"
+        - "show_numbers show_eschars preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    eschars:
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ää"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ä"
+    ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ö"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
+        text: "ü"
+    Ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ä"
+    Ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ö"
+    Ü-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ü"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    ·:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ô:
+        outline: "fill"
+    Ç:
+        outline: "fill"
+    ":":
+        outline: "fill"
+    π:
+        outline: "fill"

data/keyboards/de.yaml

@@ -1,3 +1,4 @@
+# Language: German
 ---
 outlines:
     default:          { width: 35.33, height: 52 }

data/keyboards/de_wide.yaml

@@ -1,3 +1,4 @@
+# Language: German
 ---
 outlines:
     default:            { width: 48.87,  height: 42 }

data/keyboards/dk.yaml

@@ -1,3 +1,4 @@
+# Language: Danish
 ---
 outlines:
     default:       { width: 32.4,   height: 52 }

data/keyboards/dk_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Danish
 ---
 outlines:
     default:     { width: 48.87,  height: 42 }

data/keyboards/emoji/us.yaml

@@ -37,7 +37,7 @@ views:
     face-neutral-skeptical:
         - "🤐 🤨 😐 😑 😶 🫥 😶‍🌫️"
         - "😏 😒 🙄 😬 😮‍💨 🤥 🫨"
-        - "preferences 🙂‍↔️ 🙂‍↕️ 0 0 BackSpace"
+        - "preferences 🙂‍↔️ 🙂‍↕️ 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     face-sleepy:
         - "😌 😔 😪 🤤 😴 0 0"

data/keyboards/emoji/us_wide.yaml

@@ -37,7 +37,7 @@ views:
     face-neutral-skeptical:
         - "🤐 🤨 😐 😑 😶 🫥 😶‍🌫️"
         - "😏 😒 🙄 😬 😮‍💨 🤥 🫨"
-        - "preferences 🙂‍↔️ 🙂‍↕️ 0 0 BackSpace"
+        - "preferences 🙂‍↔️ 🙂‍↕️ 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     face-sleepy:
         - "😌 😔 😪 🤤 😴 0 0"

data/keyboards/epo.yaml

@@ -1,3 +1,4 @@
+# Language: Esperanto
 ---
 outlines:
     default:       { width: 35.67, height: 52 }

data/keyboards/epo_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Esperanto
 ---
 outlines:
     default:       { width: 53.75, height: 42 }

data/keyboards/es+cat.yaml

@@ -1,3 +1,4 @@
+# Language: Catalan (Spain, with middle-dot L)
 ---
 outlines:
     default:       { width: 35.67, height: 52 }

data/keyboards/es+cat_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Catalan (Spain, with middle-dot L)
 ---
 outlines:
     default:       { width: 53.75, height: 42 }

data/keyboards/es.yaml

@@ -1,3 +1,4 @@
+# Language: Spanish
 ---
 outlines:
     default:       { width: 35.67, height: 52 }

data/keyboards/es_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Spanish
 ---
 outlines:
     default:       { width: 53.75, height: 42 }

data/keyboards/fi.yaml

@@ -1,3 +1,4 @@
+# Language: Finnish
 ---
 outlines:
     default:       { width: 32.4,   height: 52 }

data/keyboards/fi_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Finnish
 ---
 outlines:
     default:     { width: 48.87,  height: 42 }

data/keyboards/fr+bepo.yaml

@@ -1,3 +1,4 @@
+# Language: French (BEPO)
 ---
 outlines:
     default:       { width: 35.33, height: 52 }

data/keyboards/fr+bepo_wide.yaml

@@ -1,3 +1,4 @@
+# Language: French (BEPO)
 ---
 outlines:
     default:       { width: 54,  height: 42 }

data/keyboards/fr.yaml

@@ -1,3 +1,4 @@
+# Language: French
 ---
 outlines:
     default:       { width: 35.33, height: 52 }

data/keyboards/fr_wide.yaml

@@ -1,3 +1,4 @@
+# Language: French
 ---
 outlines:
     default:       { width: 54,  height: 42 }

data/keyboards/ge.yaml

@@ -1,3 +1,4 @@
+# Language: Georgian
 ---
 outlines:
     default:       { width: 35.67, height: 52 }

data/keyboards/ge_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Georgian
 ---
 outlines:
     default:       { width: 53.5,  height: 42 }

data/keyboards/gr+polytonic.yaml

@@ -1,3 +1,4 @@
+# Language: Greek (polytonic)
 # Greek polytonic layout by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # March 2022

data/keyboards/gr+polytonic_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Greek (polytonic)
 # Greek polytonic layout by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # March 2022

data/keyboards/gr.yaml

@@ -1,3 +1,4 @@
+# Language: Greek
 # Greek layout originally created by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # Sep 2019

data/keyboards/gr_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Greek
 # Created by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:

data/keyboards/hu.yaml

@@ -1,3 +1,4 @@
+# Language: Hungarian
 # Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:

data/keyboards/hu_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Hungarian
 # Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:

data/keyboards/il.yaml

@@ -1,3 +1,4 @@
+# Language: Hebrew
 ---
 outlines:
     default:          { width: 41,  height: 60 }

data/keyboards/il_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Hebrew
 ---
 outlines:
     default:          { width: 53.75, height: 42 }

data/keyboards/in+mal.yaml

@@ -0,0 +1,89 @@
+# Language: Malayalam
+---
+outlines:
+    default:            { width: 29.44,  height: 44.5 }
+    altline:            { width: 58.88,  height: 44.5 }
+    change-view:        { width: 58.88,  height: 44.5 }
+    spaceline:          { width: 235.52, height: 44.5 }
+    special:            { width: 29.44,  height: 44.5 }
+    placeholder:        { width: 29.44,  height: 44.5 }
+
+views:
+    base:
+        - " ൊ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ - ൃ "
+        - " ൗ ൈ ാ ീ ൂ ബ ഹ ഗ ദ ജ ഡ zwj zwnj "
+        - " -- ോ േ ് ി ു പ ര ക ത ച ട zwsp "
+        - "Shift_L െ ം മ ന വ ല സ യ -- BackSpace"
+        - "show_numbers  preferences         space        Return"
+    upper:
+        - " ഒ ! @ # ₹ % ^ & ൾ ( ) ഃ ഋ "
+        - " ഔ ഐ ആ ഈ ഊ ഭ ങ ഘ ധ ഝ ഢ ഞ ർ "
+        - " -- ഓ ഏ അ ഇ ഉ ഫ റ ഖ ഥ ഛ ഠ -- "
+        - "Shift_L എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ BackSpace"
+        - "show_numbers  preferences         space        Return"
+    numbers:
+        - " -- ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ -- -- "
+        - "-- 1 2 3 4 5 6 7 8 9 0 -- --"
+        - "-- @ # $ % & - _ + ( ) -- --"
+        - "show_symbols  ₹ , \" ' : ; ! ? --  BackSpace"
+        - "show_letters  preferences         space        Return"
+    symbols:
+        - "-- -- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- ~ ` | · √ π τ ÷ × ¶ -- --"
+        - "-- © ® £ € ¥ ^ ° * { } -- --"
+        - "show_numbers  -- \\ / < > = [ ] -- BackSpace"
+        - "show_letters  preferences         space        Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+# U+200B - zero-width-space
+    zwsp:
+        icon: "zwsp"
+        text: "​"
+# U+200C - zero-width-non-joiner
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
+# U+200D - zero-width-joiner
+    zwj:
+        icon: "zwj"
+        text: "‍"

data/keyboards/in+mal_wide.yaml

@@ -0,0 +1,89 @@
+# Language: Malayalam
+---
+outlines:
+    default:            { width: 45.11,  height: 36.65 }
+    altline:            { width: 90.22,  height: 36.65 }
+    change-view:        { width: 90.22,  height: 36.65 }
+    spaceline:          { width: 360.88, height: 36.65 }
+    special:            { width: 45.11,  height: 36.65 }
+    placeholder:        { width: 45.11,  height: 36.65 }
+
+views:
+    base:
+        - " ൊ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ - ൃ "
+        - " ൗ ൈ ാ ീ ൂ ബ ഹ ഗ ദ ജ ഡ zwj zwnj "
+        - " -- ോ േ ് ി ു പ ര ക ത ച ട zwsp "
+        - "Shift_L െ ം മ ന വ ല സ യ -- BackSpace"
+        - "show_numbers  preferences         space        Return"
+    upper:
+        - " ഒ ! @ # ₹ % ^ & ൾ ( ) ഃ ഋ "
+        - " ഔ ഐ ആ ഈ ഊ ഭ ങ ഘ ധ ഝ ഢ ഞ ർ "
+        - " -- ഓ ഏ അ ഇ ഉ ഫ റ ഖ ഥ ഛ ഠ -- "
+        - "Shift_L എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ BackSpace"
+        - "show_numbers  preferences         space        Return"
+    numbers:
+        - " -- ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ -- -- "
+        - "-- 1 2 3 4 5 6 7 8 9 0 -- --"
+        - "-- @ # $ % & - _ + ( ) -- --"
+        - "show_symbols  ₹ , \" ' : ; ! ? --  BackSpace"
+        - "show_letters  preferences         space        Return"
+    symbols:
+        - "-- -- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- ~ ` | · √ π τ ÷ × ¶ -- --"
+        - "-- © ® £ € ¥ ^ ° * { } -- --"
+        - "show_numbers  -- \\ / < > = [ ] -- BackSpace"
+        - "show_letters  preferences         space        Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+# U+200B - zero-width-space
+    zwsp:
+        icon: "zwsp"
+        text: "​"
+# U+200C - zero-width-non-joiner
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
+# U+200D - zero-width-joiner
+    zwj:
+        icon: "zwj"
+        text: "‍"

data/keyboards/ir.yaml

@@ -1,3 +1,4 @@
+# Language: Azerbaijani (Iran)
 ---
 outlines:
     default:       { width: 32.75,  height: 52 }

data/keyboards/ir_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Azerbaijani (Iran)
 ---
 outlines:
     default:       { width: 44.75, height: 42 }

data/keyboards/it+fur.yaml

@@ -1,3 +1,4 @@
+# Language: Friulian (Italy)
 # Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---

data/keyboards/it+fur_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Friulian (Italy)
 # Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---

data/keyboards/it.yaml

@@ -1,3 +1,4 @@
+# Language: Italian
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---

data/keyboards/it_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Italian
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---

data/keyboards/jp+kana.yaml

@@ -1,3 +1,4 @@
+# Language: Japanese (Kana)
 # Based on work by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:

data/keyboards/jp+kana_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Japanese (Kana)
 # Based on work by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:

data/keyboards/jp.yaml

@@ -0,0 +1,787 @@
+# Language: Japanese
+---
+outlines:
+    default:       { width: 40,    height: 56 }
+    default-2:     { width: 48,    height: 56 }
+    thin:          { width: 36.92, height: 56 }
+    change-view:   { width: 36.92, height: 56 }
+    change-view-2: { width: 72,    height: 56 }
+    change-view-3: { width: 80,    height: 56 }
+    spaceline:     { width: 80,    height: 56 }
+    special:       { width: 36.92, height: 56 }
+    special-2:     { width: 40,    height: 56 }
+    special-3:     { width: 72,    height: 56 }
+    placeholder:   { width: 48,    height: 56 }
+    placeholder-2: { width: 80,    height: 56 }
+
+
+views:
+    base:
+        - "ぬ ふ あ う え お や ゆ よ わ ほ へ"
+        - "た て い す か ん な に ら せ  ゙  ゚ "
+        - "ち と し は き く ま の り れ け む"
+        - "show_hiragana_upper つ さ そ ひ こ み も ね る め ろ BackSpace"
+        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
+    hiragana_upper:
+        - "ぬ ふ ぁ ぅ ぇ ぉ ゃ ゅ ょ を ほ ゑ"
+        - "た て ぃ す ヵ ん な に ら せ  ゙ 「"
+        - "ち と し ゎ き く ま の り れ ヶ 」"
+        - "show_hiragana_upper っ さ そ ゐ こ み も 、 。 ・ ー BackSpace"
+        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
+    katakana:
+        - "ヌ フ ア ウ エ オ ヤ ユ ヨ ワ ホ ヘ"
+        - "タ テ イ ス カ ン ナ ニ ラ セ  ゙  ゚ "
+        - "チ ト シ ハ キ ク マ ノ リ レ ケ ム"
+        - "show_katakana_upper ツ サ ソ ヒ コ ミ モ ネ ル メ ロ BackSpace"
+        - "show_numbers show_romaji preferences         fullwidth-space     katakana_width_toggle_half show_hiragana Return"
+    katakana_upper:
+        - "ヌ フ ァ ゥ ェ ォ ャ ュ ョ ヲ ホ ヱ"
+        - "タ テ ィ ス ヵ ン ナ ニ ラ セ  ゙ 「"
+        - "チ ト シ ハ キ ク マ ノ リ レ ケ 」"
+        - "show_katakana_upper ッ サ ソ ヰ コ ミ モ 、 。 ・ ー BackSpace"
+        - "show_numbers show_romaji preferences         fullwidth-space      katakana_width_toggle_half show_hiragana Return"
+    katakana_halfwidth:
+        - "ﾇ ﾌ ｱ ｳ ｴ ｵ ﾔ ﾕ ﾖ ﾜ ﾎ ﾍ"
+        - "ﾀ ﾃ ｲ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙  ゚ "
+        - "ﾁ ﾄ ｼ ﾊ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ﾑ"
+        - "show_katakana_halfwidth_upper ﾂ ｻ ｿ ﾋ ｺ ﾐ ﾓ ﾈ ﾙ ﾒ ﾛ BackSpace"
+        - "show_numbers show_romaji preferences         space      katakana_halfwidth_width_toggle_full show_hiragana Return"
+    katakana_halfwidth_upper:
+        - "ﾇ ﾌ ｧ ｩ ｪ ｫ ｬ ｭ ｮ ｦ ｪ ﾍ"
+        - "ﾀ ﾃ ｨ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙ ｢"
+        - "ﾁ ﾄ ｼ ﾜ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ｣"
+        - "show_katakana_halfwidth_upper ｯ ｻ ｿ ﾋ ｺ ﾐ ﾓ ､ ｡ ･ ｰ BackSpace"
+        - "show_numbers show_romaji preferences         space      katakana_halfwidth_width_toggle_full show_hiragana Return"
+    numbers:
+        - " … -- -- -- -- -- -- -- -- --"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # ¥ % & - _ + ( )"
+        - "show_symbols ; \" ' : = < > BackSpace-special-3"
+        - "show_hiragana show_romaji preferences         space       numbers_width_toggle_full , . Return"
+    numbers_fullwidth:
+        - "゠ -- -- -- -- -- -- -- -- --"
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "＠ ＃ ￥ ％ ＆ － ＿ ＋ （ ）"
+        - "show_symbols_fullwidth  ； ＂ ＇ ： ＝ ＜ ＞  BackSpace-special-3"
+        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       numbers_fullwidth_width_toggle_half ， ． Return"
+    symbols:
+        - "ヽ ♪ -- -- -- -- -- ヿ 【 】"
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ € ^ ° * { }"
+        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-special-3"
+        - "show_hiragana show_romaji preferences         space       symbols_width_toggle_full ! ? Return"
+    symbols_fullwidth:
+        - "￣ ￤ -- -- -- -- -- ￢ ｟ ｠"
+        - "～ ｀ -- ｜ -- -- -- -- -- --"
+        - "-- -- ￡ ＄ -- ＾ -- ＊ ｛ ｝"
+        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-special-3"
+        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       symbols_fullwidth_width_toggle_half ！ ？ Return"
+    romaji:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l --"
+        - "show_romaji_upper   z x c v b n m BackSpace-special-3"
+        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full , . Return"
+    romaji_upper:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L --"
+        - "show_romaji_upper   Z X C V B N M BackSpace-special-3"
+        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full ! ? Return"
+    romaji_fullwidth:
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "ｑ ｗ ｅ ｒ ｔ ｙ ｕ ｉ ｏ ｐ"
+        - "ａ ｓ ｄ ｆ ｇ ｈ ｊ ｋ ｌ --"
+        - "show_romaji_fullwidth_upper   ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-special-3"
+        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ， ． Return"
+    romaji_fullwidth_upper:
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "Ｑ Ｗ Ｅ Ｒ Ｔ Ｙ Ｕ Ｉ Ｏ Ｐ"
+        - "Ａ Ｓ Ｄ Ｆ Ｇ Ｈ Ｊ Ｋ Ｌ --"
+        - "show_romaji_fullwidth_upper   Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-special-3"
+        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ！ ？ Return"
+
+
+#              k       s       t       n       h       m       y       r       w
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
+
+#      g       z       d       b       p       n
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
+#i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ
+#u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ
+#e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ
+#o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ
+
+
+buttons:
+    BackSpace:
+        outline: "special"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-special-3:
+        outline: "special-3"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special-2"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    numbers_fullwidth_width_toggle_half:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "半／全"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    symbols_fullwidth_width_toggle_half:
+        action:
+            set_view: "symbols"
+        outline: "change-view-3"
+        label: "半／全"
+    show_hiragana:
+        action:
+            set_view: "base"
+        outline: "change-view-3"
+        label: "あいう"
+    show_hiragana_upper:
+        action:
+            locking:
+                lock_view: "hiragana_upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    show_katakana:
+        action:
+            set_view: "katakana"
+        outline: "change-view-3"
+        label: "アイウ"
+    katakana_halfwidth_width_toggle_full:
+        action:
+            set_view: "katakana"
+        outline: "change-view-3"
+        label: "半／全"
+    show_katakana_upper:
+        action:
+            locking:
+                lock_view: "katakana_upper"
+                unlock_view: "katakana"
+        outline: "change-view"
+        icon: "key-shift"
+    show_romaji:
+        action:
+            set_view: "romaji"
+        outline: "change-view-3"
+        label: "ABC"
+    romaji_fullwidth_width_toggle_half:
+        action:
+            set_view: "romaji"
+        outline: "change-view-3"
+        label: "半／全"
+    show_romaji_upper:
+        action:
+            locking:
+                lock_view: "romaji_upper"
+                unlock_view: "romaji"
+        outline: "change-view-2"
+        icon: "key-shift"
+    katakana_width_toggle_half:
+        action:
+            set_view: "katakana_halfwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_katakana_halfwidth_upper:
+        action:
+            locking:
+                lock_view: "katakana_halfwidth_upper"
+                unlock_view: "katakana_halfwidth"
+        outline: "change-view"
+        icon: "key-shift"
+    show_romaji_fullwidth:
+        action:
+            set_view: "romaji_fullwidth"
+        outline: "change-view-3"
+        label: "ＡＢＣ"
+    romaji_width_toggle_full:
+        action:
+            set_view: "romaji_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_romaji_fullwidth_upper:
+        action:
+            locking:
+                lock_view: "romaji_fullwidth_upper"
+                unlock_view: "romaji_fullwidth"
+        outline: "change-view-2"
+        icon: "key-shift"
+    show_numbers_fullwidth:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-3"
+        label: "１２３"
+    show_numbers_fullwidth_from_symbols:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-2"
+        label: "１２３"
+    numbers_width_toggle_full:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_symbols_fullwidth:
+        action:
+            set_view: "symbols_fullwidth"
+        outline: "change-view-2"
+        label: "＊／＝"
+    symbols_width_toggle_full:
+        action:
+            set_view: "symbols_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    space:
+        outline: "spaceline"
+        text: " "
+        label: "␣"
+    fullwidth-space:
+        outline: "spaceline"
+        text: "　"
+        label: "␣"
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
+    つ:
+        outline: "thin"
+    さ:
+        outline: "thin"
+    そ:
+        outline: "thin"
+    ひ:
+        outline: "thin"
+    こ:
+        outline: "thin"
+    み:
+        outline: "thin"
+    も:
+        outline: "thin"
+    ね:
+        outline: "thin"
+    る:
+        outline: "thin"
+    め:
+        outline: "thin"
+    ろ:
+        outline: "thin"
+    っ:
+        outline: "thin"
+    ゐ:
+        outline: "thin"
+    、:
+        outline: "thin"
+    。:
+        outline: "thin"
+    ・:
+        outline: "thin"
+    ー:
+        outline: "thin"
+    ツ:
+        outline: "thin"
+    サ:
+        outline: "thin"
+    ソ:
+        outline: "thin"
+    ヒ:
+        outline: "thin"
+    コ:
+        outline: "thin"
+    ミ:
+        outline: "thin"
+    モ:
+        outline: "thin"
+    ネ:
+        outline: "thin"
+    ル:
+        outline: "thin"
+    メ:
+        outline: "thin"
+    ロ:
+        outline: "thin"
+    ッ:
+        outline: "thin"
+    ﾂ:
+        outline: "thin"
+    ｻ:
+        outline: "thin"
+    ｿ:
+        outline: "thin"
+    ヰ:
+        outline: "thin"
+    ﾋ:
+        outline: "thin"
+    ｺ:
+        outline: "thin"
+    ﾐ:
+        outline: "thin"
+    ﾓ:
+        outline: "thin"
+    ﾈ:
+        outline: "thin"
+    ﾙ:
+        outline: "thin"
+    ﾒ:
+        outline: "thin"
+    ﾛ:
+        outline: "thin"
+    ｯ:
+        outline: "thin"
+    ､:
+        outline: "thin"
+    ｡:
+        outline: "thin"
+    ･:
+        outline: "thin"
+    ｰ:
+        outline: "thin"
+    …:
+        outline: "default-2"
+    1:
+        outline: "default-2"
+    2:
+        outline: "default-2"
+    3:
+        outline: "default-2"
+    4:
+        outline: "default-2"
+    5:
+        outline: "default-2"
+    6:
+        outline: "default-2"
+    7:
+        outline: "default-2"
+    8:
+        outline: "default-2"
+    9:
+        outline: "default-2"
+    0:
+        outline: "default-2"
+    "@":
+        outline: "default-2"
+    "#":
+        outline: "default-2"
+    ¥:
+        outline: "default-2"
+    "%":
+        outline: "default-2"
+    "&":
+        outline: "default-2"
+    -:
+        outline: "default-2"
+    _:
+        outline: "default-2"
+    +:
+        outline: "default-2"
+    (:
+        outline: "default-2"
+    ):
+        outline: "default-2"
+    ;:
+        outline: "default-2"
+    "\"":
+        outline: "default-2"
+    "'":
+        outline: "default-2"
+    ":":
+        outline: "default-2"
+    =:
+        outline: "default-2"
+    <:
+        outline: "default-2"
+    ">":
+        outline: "default-2"
+    a:
+        outline: "default-2"
+    b:
+        outline: "default-2"
+    c:
+        outline: "default-2"
+    d:
+        outline: "default-2"
+    e:
+        outline: "default-2"
+    f:
+        outline: "default-2"
+    g:
+        outline: "default-2"
+    h:
+        outline: "default-2"
+    i:
+        outline: "default-2"
+    j:
+        outline: "default-2"
+    k:
+        outline: "default-2"
+    l:
+        outline: "default-2"
+    m:
+        outline: "default-2"
+    n:
+        outline: "default-2"
+    o:
+        outline: "default-2"
+    p:
+        outline: "default-2"
+    q:
+        outline: "default-2"
+    r:
+        outline: "default-2"
+    s:
+        outline: "default-2"
+    t:
+        outline: "default-2"
+    u:
+        outline: "default-2"
+    v:
+        outline: "default-2"
+    w:
+        outline: "default-2"
+    x:
+        outline: "default-2"
+    y:
+        outline: "default-2"
+    z:
+        outline: "default-2"
+    A:
+        outline: "default-2"
+    B:
+        outline: "default-2"
+    C:
+        outline: "default-2"
+    D:
+        outline: "default-2"
+    E:
+        outline: "default-2"
+    F:
+        outline: "default-2"
+    G:
+        outline: "default-2"
+    H:
+        outline: "default-2"
+    I:
+        outline: "default-2"
+    J:
+        outline: "default-2"
+    K:
+        outline: "default-2"
+    L:
+        outline: "default-2"
+    M:
+        outline: "default-2"
+    N:
+        outline: "default-2"
+    O:
+        outline: "default-2"
+    P:
+        outline: "default-2"
+    Q:
+        outline: "default-2"
+    R:
+        outline: "default-2"
+    S:
+        outline: "default-2"
+    T:
+        outline: "default-2"
+    U:
+        outline: "default-2"
+    V:
+        outline: "default-2"
+    W:
+        outline: "default-2"
+    X:
+        outline: "default-2"
+    Y:
+        outline: "default-2"
+    Z:
+        outline: "default-2"
+    １:
+        outline: "default-2"
+    ２:
+        outline: "default-2"
+    ３:
+        outline: "default-2"
+    ４:
+        outline: "default-2"
+    ５:
+        outline: "default-2"
+    ６:
+        outline: "default-2"
+    ７:
+        outline: "default-2"
+    ８:
+        outline: "default-2"
+    ９:
+        outline: "default-2"
+    ０:
+        outline: "default-2"
+    ａ:
+        outline: "default-2"
+    ｂ:
+        outline: "default-2"
+    ｃ:
+        outline: "default-2"
+    ｄ:
+        outline: "default-2"
+    ｅ:
+        outline: "default-2"
+    ｆ:
+        outline: "default-2"
+    ｇ:
+        outline: "default-2"
+    ｈ:
+        outline: "default-2"
+    ｉ:
+        outline: "default-2"
+    ｊ:
+        outline: "default-2"
+    ｋ:
+        outline: "default-2"
+    ｌ:
+        outline: "default-2"
+    ｍ:
+        outline: "default-2"
+    ｎ:
+        outline: "default-2"
+    ｏ:
+        outline: "default-2"
+    ｐ:
+        outline: "default-2"
+    ｑ:
+        outline: "default-2"
+    ｒ:
+        outline: "default-2"
+    ｓ:
+        outline: "default-2"
+    ｔ:
+        outline: "default-2"
+    ｕ:
+        outline: "default-2"
+    ｖ:
+        outline: "default-2"
+    ｗ:
+        outline: "default-2"
+    ｘ:
+        outline: "default-2"
+    ｙ:
+        outline: "default-2"
+    ｚ:
+        outline: "default-2"
+    Ａ:
+        outline: "default-2"
+    Ｂ:
+        outline: "default-2"
+    Ｃ:
+        outline: "default-2"
+    Ｄ:
+        outline: "default-2"
+    Ｅ:
+        outline: "default-2"
+    Ｆ:
+        outline: "default-2"
+    Ｇ:
+        outline: "default-2"
+    Ｈ:
+        outline: "default-2"
+    Ｉ:
+        outline: "default-2"
+    Ｊ:
+        outline: "default-2"
+    Ｋ:
+        outline: "default-2"
+    Ｌ:
+        outline: "default-2"
+    Ｍ:
+        outline: "default-2"
+    Ｎ:
+        outline: "default-2"
+    Ｏ:
+        outline: "default-2"
+    Ｐ:
+        outline: "default-2"
+    Ｑ:
+        outline: "default-2"
+    Ｒ:
+        outline: "default-2"
+    Ｓ:
+        outline: "default-2"
+    Ｔ:
+        outline: "default-2"
+    Ｕ:
+        outline: "default-2"
+    Ｖ:
+        outline: "default-2"
+    Ｗ:
+        outline: "default-2"
+    Ｘ:
+        outline: "default-2"
+    Ｙ:
+        outline: "default-2"
+    Ｚ:
+        outline: "default-2"
+    ヽ:
+        outline: "default-2"
+    ♪:
+        outline: "default-2"
+    ヿ:
+        outline: "default-2"
+    【:
+        outline: "default-2"
+    】:
+        outline: "default-2"
+    ~:
+        outline: "default-2"
+    "`":
+        outline: "default-2"
+    ´:
+        outline: "default-2"
+    "|":
+        outline: "default-2"
+    ·:
+        outline: "default-2"
+    √:
+        outline: "default-2"
+    µ:
+        outline: "default-2"
+    ÷:
+        outline: "default-2"
+    ×:
+        outline: "default-2"
+    ¶:
+        outline: "default-2"
+    ©:
+        outline: "default-2"
+    ®:
+        outline: "default-2"
+    £:
+        outline: "default-2"
+    $:
+        outline: "default-2"
+    €:
+        outline: "default-2"
+    ^:
+        outline: "default-2"
+    °:
+        outline: "default-2"
+    "*":
+        outline: "default-2"
+    "{":
+        outline: "default-2"
+    "}":
+        outline: "default-2"
+    "\\":
+        outline: "default-2"
+    /:
+        outline: "default-2"
+    §:
+        outline: "default-2"
+    π:
+        outline: "default-2"
+    τ:
+        outline: "default-2"
+    "[":
+        outline: "default-2"
+    "]":
+        outline: "default-2"
+    ゠:
+        outline: "default-2"
+    ＠:
+        outline: "default-2"
+    ＃:
+        outline: "default-2"
+    ￥:
+        outline: "default-2"
+    ％:
+        outline: "default-2"
+    ＆:
+        outline: "default-2"
+    －:
+        outline: "default-2"
+    ＿:
+        outline: "default-2"
+    ＋:
+        outline: "default-2"
+    （:
+        outline: "default-2"
+    ）:
+        outline: "default-2"
+    ；:
+        outline: "default-2"
+    ＂:
+        outline: "default-2"
+    ＇:
+        outline: "default-2"
+    ：:
+        outline: "default-2"
+    ＝:
+        outline: "default-2"
+    ＜:
+        outline: "default-2"
+    ＞:
+        outline: "default-2"
+    ￣:
+        outline: "default-2"
+    ￤:
+        outline: "default-2"
+    ￢:
+        outline: "default-2"
+    ｟:
+        outline: "default-2"
+    ｠:
+        outline: "default-2"
+    ～:
+        outline: "default-2"
+    ｀:
+        outline: "default-2"
+    ｜:
+        outline: "default-2"
+    ￡:
+        outline: "default-2"
+    ＄:
+        outline: "default-2"
+    ＾:
+        outline: "default-2"
+    ＊:
+        outline: "default-2"
+    ｛:
+        outline: "default-2"
+    ｝:
+        outline: "default-2"
+    ＼:
+        outline: "default-2"
+    ／:
+        outline: "default-2"
+    ［:
+        outline: "default-2"
+    ］:
+        outline: "default-2"

data/keyboards/jp_wide.yaml

@@ -0,0 +1,787 @@
+# Language: Japanese
+---
+outlines:
+    default:       { width: 40,    height: 30 }
+    default-2:     { width: 48,    height: 30 }
+    thin:          { width: 36.92, height: 30 }
+    change-view:   { width: 36.92, height: 30 }
+    change-view-2: { width: 72,    height: 30 }
+    change-view-3: { width: 80,    height: 30 }
+    spaceline:     { width: 80,    height: 30 }
+    special:       { width: 36.92, height: 30 }
+    special-2:     { width: 40,    height: 30 }
+    special-3:     { width: 72,    height: 30 }
+    placeholder:   { width: 48,    height: 30 }
+    placeholder-2: { width: 80,    height: 30 }
+
+
+views:
+    base:
+        - "ぬ ふ あ う え お や ゆ よ わ ほ へ"
+        - "た て い す か ん な に ら せ  ゙  ゚ "
+        - "ち と し は き く ま の り れ け む"
+        - "show_hiragana_upper つ さ そ ひ こ み も ね る め ろ BackSpace"
+        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
+    hiragana_upper:
+        - "ぬ ふ ぁ ぅ ぇ ぉ ゃ ゅ ょ を ほ ゑ"
+        - "た て ぃ す ヵ ん な に ら せ  ゙ 「"
+        - "ち と し ゎ き く ま の り れ ヶ 」"
+        - "show_hiragana_upper っ さ そ ゐ こ み も 、 。 ・ ー BackSpace"
+        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
+    katakana:
+        - "ヌ フ ア ウ エ オ ヤ ユ ヨ ワ ホ ヘ"
+        - "タ テ イ ス カ ン ナ ニ ラ セ  ゙  ゚ "
+        - "チ ト シ ハ キ ク マ ノ リ レ ケ ム"
+        - "show_katakana_upper ツ サ ソ ヒ コ ミ モ ネ ル メ ロ BackSpace"
+        - "show_numbers show_romaji preferences         fullwidth-space     katakana_width_toggle_half show_hiragana Return"
+    katakana_upper:
+        - "ヌ フ ァ ゥ ェ ォ ャ ュ ョ ヲ ホ ヱ"
+        - "タ テ ィ ス ヵ ン ナ ニ ラ セ  ゙ 「"
+        - "チ ト シ ハ キ ク マ ノ リ レ ケ 」"
+        - "show_katakana_upper ッ サ ソ ヰ コ ミ モ 、 。 ・ ー BackSpace"
+        - "show_numbers show_romaji preferences         fullwidth-space      katakana_width_toggle_half show_hiragana Return"
+    katakana_halfwidth:
+        - "ﾇ ﾌ ｱ ｳ ｴ ｵ ﾔ ﾕ ﾖ ﾜ ﾎ ﾍ"
+        - "ﾀ ﾃ ｲ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙  ゚ "
+        - "ﾁ ﾄ ｼ ﾊ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ﾑ"
+        - "show_katakana_halfwidth_upper ﾂ ｻ ｿ ﾋ ｺ ﾐ ﾓ ﾈ ﾙ ﾒ ﾛ BackSpace"
+        - "show_numbers show_romaji preferences         space      katakana_halfwidth_width_toggle_full show_hiragana Return"
+    katakana_halfwidth_upper:
+        - "ﾇ ﾌ ｧ ｩ ｪ ｫ ｬ ｭ ｮ ｦ ｪ ﾍ"
+        - "ﾀ ﾃ ｨ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙ ｢"
+        - "ﾁ ﾄ ｼ ﾜ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ｣"
+        - "show_katakana_halfwidth_upper ｯ ｻ ｿ ﾋ ｺ ﾐ ﾓ ､ ｡ ･ ｰ BackSpace"
+        - "show_numbers show_romaji preferences         space      katakana_halfwidth_width_toggle_full show_hiragana Return"
+    numbers:
+        - " … -- -- -- -- -- -- -- -- --"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # ¥ % & - _ + ( )"
+        - "show_symbols ; \" ' : = < > BackSpace-special-3"
+        - "show_hiragana show_romaji preferences         space       numbers_width_toggle_full , . Return"
+    numbers_fullwidth:
+        - "゠ -- -- -- -- -- -- -- -- --"
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "＠ ＃ ￥ ％ ＆ － ＿ ＋ （ ）"
+        - "show_symbols_fullwidth  ； ＂ ＇ ： ＝ ＜ ＞  BackSpace-special-3"
+        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       numbers_fullwidth_width_toggle_half ， ． Return"
+    symbols:
+        - "ヽ ♪ -- -- -- -- -- ヿ 【 】"
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ € ^ ° * { }"
+        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-special-3"
+        - "show_hiragana show_romaji preferences         space       symbols_width_toggle_full ! ? Return"
+    symbols_fullwidth:
+        - "￣ ￤ -- -- -- -- -- ￢ ｟ ｠"
+        - "～ ｀ -- ｜ -- -- -- -- -- --"
+        - "-- -- ￡ ＄ -- ＾ -- ＊ ｛ ｝"
+        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-special-3"
+        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       symbols_fullwidth_width_toggle_half ！ ？ Return"
+    romaji:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l --"
+        - "show_romaji_upper   z x c v b n m BackSpace-special-3"
+        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full , . Return"
+    romaji_upper:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L --"
+        - "show_romaji_upper   Z X C V B N M BackSpace-special-3"
+        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full ! ? Return"
+    romaji_fullwidth:
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "ｑ ｗ ｅ ｒ ｔ ｙ ｕ ｉ ｏ ｐ"
+        - "ａ ｓ ｄ ｆ ｇ ｈ ｊ ｋ ｌ --"
+        - "show_romaji_fullwidth_upper   ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-special-3"
+        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ， ． Return"
+    romaji_fullwidth_upper:
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "Ｑ Ｗ Ｅ Ｒ Ｔ Ｙ Ｕ Ｉ Ｏ Ｐ"
+        - "Ａ Ｓ Ｄ Ｆ Ｇ Ｈ Ｊ Ｋ Ｌ --"
+        - "show_romaji_fullwidth_upper   Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-special-3"
+        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ！ ？ Return"
+
+
+#              k       s       t       n       h       m       y       r       w
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
+
+#      g       z       d       b       p       n
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
+#i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ
+#u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ
+#e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ
+#o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ
+
+
+buttons:
+    BackSpace:
+        outline: "special"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-special-3:
+        outline: "special-3"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special-2"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    numbers_fullwidth_width_toggle_half:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "半／全"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    symbols_fullwidth_width_toggle_half:
+        action:
+            set_view: "symbols"
+        outline: "change-view-3"
+        label: "半／全"
+    show_hiragana:
+        action:
+            set_view: "base"
+        outline: "change-view-3"
+        label: "あいう"
+    show_hiragana_upper:
+        action:
+            locking:
+                lock_view: "hiragana_upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    show_katakana:
+        action:
+            set_view: "katakana"
+        outline: "change-view-3"
+        label: "アイウ"
+    katakana_halfwidth_width_toggle_full:
+        action:
+            set_view: "katakana"
+        outline: "change-view-3"
+        label: "半／全"
+    show_katakana_upper:
+        action:
+            locking:
+                lock_view: "katakana_upper"
+                unlock_view: "katakana"
+        outline: "change-view"
+        icon: "key-shift"
+    show_romaji:
+        action:
+            set_view: "romaji"
+        outline: "change-view-3"
+        label: "ABC"
+    romaji_fullwidth_width_toggle_half:
+        action:
+            set_view: "romaji"
+        outline: "change-view-3"
+        label: "半／全"
+    show_romaji_upper:
+        action:
+            locking:
+                lock_view: "romaji_upper"
+                unlock_view: "romaji"
+        outline: "change-view-2"
+        icon: "key-shift"
+    katakana_width_toggle_half:
+        action:
+            set_view: "katakana_halfwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_katakana_halfwidth_upper:
+        action:
+            locking:
+                lock_view: "katakana_halfwidth_upper"
+                unlock_view: "katakana_halfwidth"
+        outline: "change-view"
+        icon: "key-shift"
+    show_romaji_fullwidth:
+        action:
+            set_view: "romaji_fullwidth"
+        outline: "change-view-3"
+        label: "ＡＢＣ"
+    romaji_width_toggle_full:
+        action:
+            set_view: "romaji_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_romaji_fullwidth_upper:
+        action:
+            locking:
+                lock_view: "romaji_fullwidth_upper"
+                unlock_view: "romaji_fullwidth"
+        outline: "change-view-2"
+        icon: "key-shift"
+    show_numbers_fullwidth:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-3"
+        label: "１２３"
+    show_numbers_fullwidth_from_symbols:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-2"
+        label: "１２３"
+    numbers_width_toggle_full:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_symbols_fullwidth:
+        action:
+            set_view: "symbols_fullwidth"
+        outline: "change-view-2"
+        label: "＊／＝"
+    symbols_width_toggle_full:
+        action:
+            set_view: "symbols_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    space:
+        outline: "spaceline"
+        text: " "
+        label: "␣"
+    fullwidth-space:
+        outline: "spaceline"
+        text: "　"
+        label: "␣"
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
+    つ:
+        outline: "thin"
+    さ:
+        outline: "thin"
+    そ:
+        outline: "thin"
+    ひ:
+        outline: "thin"
+    こ:
+        outline: "thin"
+    み:
+        outline: "thin"
+    も:
+        outline: "thin"
+    ね:
+        outline: "thin"
+    る:
+        outline: "thin"
+    め:
+        outline: "thin"
+    ろ:
+        outline: "thin"
+    っ:
+        outline: "thin"
+    ゐ:
+        outline: "thin"
+    、:
+        outline: "thin"
+    。:
+        outline: "thin"
+    ・:
+        outline: "thin"
+    ー:
+        outline: "thin"
+    ツ:
+        outline: "thin"
+    サ:
+        outline: "thin"
+    ソ:
+        outline: "thin"
+    ヒ:
+        outline: "thin"
+    コ:
+        outline: "thin"
+    ミ:
+        outline: "thin"
+    モ:
+        outline: "thin"
+    ネ:
+        outline: "thin"
+    ル:
+        outline: "thin"
+    メ:
+        outline: "thin"
+    ロ:
+        outline: "thin"
+    ッ:
+        outline: "thin"
+    ﾂ:
+        outline: "thin"
+    ｻ:
+        outline: "thin"
+    ｿ:
+        outline: "thin"
+    ヰ:
+        outline: "thin"
+    ﾋ:
+        outline: "thin"
+    ｺ:
+        outline: "thin"
+    ﾐ:
+        outline: "thin"
+    ﾓ:
+        outline: "thin"
+    ﾈ:
+        outline: "thin"
+    ﾙ:
+        outline: "thin"
+    ﾒ:
+        outline: "thin"
+    ﾛ:
+        outline: "thin"
+    ｯ:
+        outline: "thin"
+    ､:
+        outline: "thin"
+    ｡:
+        outline: "thin"
+    ･:
+        outline: "thin"
+    ｰ:
+        outline: "thin"
+    …:
+        outline: "default-2"
+    1:
+        outline: "default-2"
+    2:
+        outline: "default-2"
+    3:
+        outline: "default-2"
+    4:
+        outline: "default-2"
+    5:
+        outline: "default-2"
+    6:
+        outline: "default-2"
+    7:
+        outline: "default-2"
+    8:
+        outline: "default-2"
+    9:
+        outline: "default-2"
+    0:
+        outline: "default-2"
+    "@":
+        outline: "default-2"
+    "#":
+        outline: "default-2"
+    ¥:
+        outline: "default-2"
+    "%":
+        outline: "default-2"
+    "&":
+        outline: "default-2"
+    -:
+        outline: "default-2"
+    _:
+        outline: "default-2"
+    +:
+        outline: "default-2"
+    (:
+        outline: "default-2"
+    ):
+        outline: "default-2"
+    ;:
+        outline: "default-2"
+    "\"":
+        outline: "default-2"
+    "'":
+        outline: "default-2"
+    ":":
+        outline: "default-2"
+    =:
+        outline: "default-2"
+    <:
+        outline: "default-2"
+    ">":
+        outline: "default-2"
+    a:
+        outline: "default-2"
+    b:
+        outline: "default-2"
+    c:
+        outline: "default-2"
+    d:
+        outline: "default-2"
+    e:
+        outline: "default-2"
+    f:
+        outline: "default-2"
+    g:
+        outline: "default-2"
+    h:
+        outline: "default-2"
+    i:
+        outline: "default-2"
+    j:
+        outline: "default-2"
+    k:
+        outline: "default-2"
+    l:
+        outline: "default-2"
+    m:
+        outline: "default-2"
+    n:
+        outline: "default-2"
+    o:
+        outline: "default-2"
+    p:
+        outline: "default-2"
+    q:
+        outline: "default-2"
+    r:
+        outline: "default-2"
+    s:
+        outline: "default-2"
+    t:
+        outline: "default-2"
+    u:
+        outline: "default-2"
+    v:
+        outline: "default-2"
+    w:
+        outline: "default-2"
+    x:
+        outline: "default-2"
+    y:
+        outline: "default-2"
+    z:
+        outline: "default-2"
+    A:
+        outline: "default-2"
+    B:
+        outline: "default-2"
+    C:
+        outline: "default-2"
+    D:
+        outline: "default-2"
+    E:
+        outline: "default-2"
+    F:
+        outline: "default-2"
+    G:
+        outline: "default-2"
+    H:
+        outline: "default-2"
+    I:
+        outline: "default-2"
+    J:
+        outline: "default-2"
+    K:
+        outline: "default-2"
+    L:
+        outline: "default-2"
+    M:
+        outline: "default-2"
+    N:
+        outline: "default-2"
+    O:
+        outline: "default-2"
+    P:
+        outline: "default-2"
+    Q:
+        outline: "default-2"
+    R:
+        outline: "default-2"
+    S:
+        outline: "default-2"
+    T:
+        outline: "default-2"
+    U:
+        outline: "default-2"
+    V:
+        outline: "default-2"
+    W:
+        outline: "default-2"
+    X:
+        outline: "default-2"
+    Y:
+        outline: "default-2"
+    Z:
+        outline: "default-2"
+    １:
+        outline: "default-2"
+    ２:
+        outline: "default-2"
+    ３:
+        outline: "default-2"
+    ４:
+        outline: "default-2"
+    ５:
+        outline: "default-2"
+    ６:
+        outline: "default-2"
+    ７:
+        outline: "default-2"
+    ８:
+        outline: "default-2"
+    ９:
+        outline: "default-2"
+    ０:
+        outline: "default-2"
+    ａ:
+        outline: "default-2"
+    ｂ:
+        outline: "default-2"
+    ｃ:
+        outline: "default-2"
+    ｄ:
+        outline: "default-2"
+    ｅ:
+        outline: "default-2"
+    ｆ:
+        outline: "default-2"
+    ｇ:
+        outline: "default-2"
+    ｈ:
+        outline: "default-2"
+    ｉ:
+        outline: "default-2"
+    ｊ:
+        outline: "default-2"
+    ｋ:
+        outline: "default-2"
+    ｌ:
+        outline: "default-2"
+    ｍ:
+        outline: "default-2"
+    ｎ:
+        outline: "default-2"
+    ｏ:
+        outline: "default-2"
+    ｐ:
+        outline: "default-2"
+    ｑ:
+        outline: "default-2"
+    ｒ:
+        outline: "default-2"
+    ｓ:
+        outline: "default-2"
+    ｔ:
+        outline: "default-2"
+    ｕ:
+        outline: "default-2"
+    ｖ:
+        outline: "default-2"
+    ｗ:
+        outline: "default-2"
+    ｘ:
+        outline: "default-2"
+    ｙ:
+        outline: "default-2"
+    ｚ:
+        outline: "default-2"
+    Ａ:
+        outline: "default-2"
+    Ｂ:
+        outline: "default-2"
+    Ｃ:
+        outline: "default-2"
+    Ｄ:
+        outline: "default-2"
+    Ｅ:
+        outline: "default-2"
+    Ｆ:
+        outline: "default-2"
+    Ｇ:
+        outline: "default-2"
+    Ｈ:
+        outline: "default-2"
+    Ｉ:
+        outline: "default-2"
+    Ｊ:
+        outline: "default-2"
+    Ｋ:
+        outline: "default-2"
+    Ｌ:
+        outline: "default-2"
+    Ｍ:
+        outline: "default-2"
+    Ｎ:
+        outline: "default-2"
+    Ｏ:
+        outline: "default-2"
+    Ｐ:
+        outline: "default-2"
+    Ｑ:
+        outline: "default-2"
+    Ｒ:
+        outline: "default-2"
+    Ｓ:
+        outline: "default-2"
+    Ｔ:
+        outline: "default-2"
+    Ｕ:
+        outline: "default-2"
+    Ｖ:
+        outline: "default-2"
+    Ｗ:
+        outline: "default-2"
+    Ｘ:
+        outline: "default-2"
+    Ｙ:
+        outline: "default-2"
+    Ｚ:
+        outline: "default-2"
+    ヽ:
+        outline: "default-2"
+    ♪:
+        outline: "default-2"
+    ヿ:
+        outline: "default-2"
+    【:
+        outline: "default-2"
+    】:
+        outline: "default-2"
+    ~:
+        outline: "default-2"
+    "`":
+        outline: "default-2"
+    ´:
+        outline: "default-2"
+    "|":
+        outline: "default-2"
+    ·:
+        outline: "default-2"
+    √:
+        outline: "default-2"
+    µ:
+        outline: "default-2"
+    ÷:
+        outline: "default-2"
+    ×:
+        outline: "default-2"
+    ¶:
+        outline: "default-2"
+    ©:
+        outline: "default-2"
+    ®:
+        outline: "default-2"
+    £:
+        outline: "default-2"
+    $:
+        outline: "default-2"
+    €:
+        outline: "default-2"
+    ^:
+        outline: "default-2"
+    °:
+        outline: "default-2"
+    "*":
+        outline: "default-2"
+    "{":
+        outline: "default-2"
+    "}":
+        outline: "default-2"
+    "\\":
+        outline: "default-2"
+    /:
+        outline: "default-2"
+    §:
+        outline: "default-2"
+    π:
+        outline: "default-2"
+    τ:
+        outline: "default-2"
+    "[":
+        outline: "default-2"
+    "]":
+        outline: "default-2"
+    ゠:
+        outline: "default-2"
+    ＠:
+        outline: "default-2"
+    ＃:
+        outline: "default-2"
+    ￥:
+        outline: "default-2"
+    ％:
+        outline: "default-2"
+    ＆:
+        outline: "default-2"
+    －:
+        outline: "default-2"
+    ＿:
+        outline: "default-2"
+    ＋:
+        outline: "default-2"
+    （:
+        outline: "default-2"
+    ）:
+        outline: "default-2"
+    ；:
+        outline: "default-2"
+    ＂:
+        outline: "default-2"
+    ＇:
+        outline: "default-2"
+    ：:
+        outline: "default-2"
+    ＝:
+        outline: "default-2"
+    ＜:
+        outline: "default-2"
+    ＞:
+        outline: "default-2"
+    ￣:
+        outline: "default-2"
+    ￤:
+        outline: "default-2"
+    ￢:
+        outline: "default-2"
+    ｟:
+        outline: "default-2"
+    ｠:
+        outline: "default-2"
+    ～:
+        outline: "default-2"
+    ｀:
+        outline: "default-2"
+    ｜:
+        outline: "default-2"
+    ￡:
+        outline: "default-2"
+    ＄:
+        outline: "default-2"
+    ＾:
+        outline: "default-2"
+    ＊:
+        outline: "default-2"
+    ｛:
+        outline: "default-2"
+    ｝:
+        outline: "default-2"
+    ＼:
+        outline: "default-2"
+    ／:
+        outline: "default-2"
+    ［:
+        outline: "default-2"
+    ］:
+        outline: "default-2"

data/keyboards/no.yaml

@@ -1,3 +1,4 @@
+# Language: Norwegian
 ---
 outlines:
     default:       { width: 32.4,   height: 52 }

data/keyboards/no_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Norwegian
 ---
 outlines:
     default:     { width: 48.87,  height: 42 }

data/keyboards/pl.yaml

@@ -1,3 +1,4 @@
+# Language: Polish
 ---
 outlines:
     default:       { width: 35.67, height: 52 }

data/keyboards/pl_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Polish
 ---
 outlines:
     default:       { width: 54,  height: 42 }

data/keyboards/pt.yaml

@@ -1,3 +1,4 @@
+# Language: Portuguese
 # This layout-file is a copy of "br.yaml"
 ---
 outlines:

data/keyboards/pt_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Portuguese
 # This layout-file is a copy of "br_wide.yaml"
 ---
 outlines:

data/keyboards/ro.yaml

@@ -1,3 +1,4 @@
+# Language: Romanian
 ---
 outlines:
     default:       { width: 35.67,  height: 52 }

data/keyboards/ro_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Romanian
 ---
 outlines:
     default:       { width: 54,     height: 42 }

data/keyboards/rs+latin.yaml

@@ -0,0 +1,88 @@
+# Language: Serbian (Latin)
+---
+outlines:
+    default:       { width: 32.42, height: 52 }
+    fill:          { width: 64.84, height: 52 }
+    altline:       { width: 32.42, height: 52 }
+    wide:          { width: 48.63, height: 52 }
+    change-view:   { width: 32.42, height: 52 }
+    change-view-2: { width: 48.63, height: 52 }
+    spaceline:     { width: 162.1, height: 52 }
+    special:       { width: 32.42, height: 52 }
+    placeholder:   { width: 32.42, height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p š"
+        - "a s d f g h j k l č ć"
+        - "Shift_L    y x c v b n m đ ž BackSpace"
+        - "show_numbers preferences     space    , . Return"
+    upper:
+        - "Q W E R T Z U I O P Š"
+        - "A S D F G H J K L Č Ć"
+        - "Shift_L    Y X C V B N M Đ Ž BackSpace"
+        - "show_numbers preferences     space    ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols    , \" ' : ; ! ? -- BackSpace-wide"
+        - "show_letters preferences     space    , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers    \\ / < > = [ ] -- BackSpace-wide"
+        - "show_letters preferences     space    , . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "wide"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/rs+latin_wide.yaml

@@ -0,0 +1,96 @@
+# Language: Serbian (Latin)
+---
+outlines:
+    default:       { width: 48.87,  height: 42 }
+    fill:          { width: 73.31,  height: 42 }
+    altline:       { width: 48.87,  height: 42 }
+    wide:          { width: 73.31,  height: 42 }
+    change-view:   { width: 48.87,  height: 42 }
+    change-view-2: { width: 73.31,  height: 42 }
+    spaceline:     { width: 244.34, height: 42 }
+    special:       { width: 48.87,  height: 42 }
+    placeholder:   { width: 48.87,  height: 42 }
+
+views:
+    base:
+        - "q w e r t z u i o p š"
+        - "a s d f g h j k l č ć"
+        - "Shift_L    y x c v b n m đ ž BackSpace"
+        - "show_numbers preferences     space    , . Return"
+    upper:
+        - "Q W E R T Z U I O P Š"
+        - "A S D F G H J K L Č Ć"
+        - "Shift_L    Y X C V B N M Đ Ž BackSpace"
+        - "show_numbers preferences     space    ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols    , \" ' : ; ! ? -- BackSpace-wide"
+        - "show_letters preferences     space    , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers    \\ / < > = [ ] -- BackSpace-wide"
+        - "show_letters preferences     space    , . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "wide"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    6:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    -:
+        outline: "fill"
+    √:
+        outline: "fill"
+    π:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ^:
+        outline: "fill"

data/keyboards/rs+latinunicode.yaml

@@ -0,0 +1,89 @@
+# Language: Serbian (Latin, Unicode)
+---
+outlines:
+    default:       { width: 32.42,  height: 52 }
+    fill:          { width: 64.84,  height: 52 }
+    altline:       { width: 48.63,  height: 52 }
+    wide:          { width: 64.84,  height: 52 }
+    change-view:   { width: 48.63,  height: 52 }
+    change-view-2: { width: 64.84,  height: 52 }
+    spaceline:     { width: 129.68, height: 52 }
+    special:       { width: 32.42,  height: 52 }
+    placeholder:   { width: 32.42,  height: 52 }
+
+views:
+    base:
+        - "lj nj e r t z u i o p š"
+        - "a s d f g h j k l č ć"
+        - "Shift_L    ž dž c v b n m đ BackSpace"
+        - "show_numbers preferences     space    , . Return"
+    upper:
+        - "Lj Nj E R T Z U I O P Š"
+        - "A S D F G H J K L Č Ć"
+        - "Shift_L    Ž Dž C V B N M Đ BackSpace"
+        - "show_numbers preferences     space    ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences     space    , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols    \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences     space    , . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/rs+latinunicode_wide.yaml

@@ -0,0 +1,91 @@
+# Language: Serbian (Latin, Unicode)
+---
+outlines:
+    default:     { width: 48.87,  height: 42 }
+    fill:        { width: 73.31,  height: 42 }
+    altline:     { width: 73.31,  height: 42 }
+    wide:        { width: 73.31,  height: 42 }
+    change-view: { width: 73.31,  height: 42 }
+    spaceline:   { width: 244.34, height: 42 }
+    special:     { width: 48.87,  height: 42 }
+    placeholder: { width: 48.87,  height: 42 }
+
+views:
+    base:
+        - "lj nj e r t z u i o p š"
+        - "a s d f g h j k l č ć"
+        - "Shift_L    ž dž c v b n m đ BackSpace"
+        - "show_numbers preferences     space    , . Return"
+    upper:
+        - "Lj Nj E R T Z U I O P Š"
+        - "A S D F G H J K L Č Ć"
+        - "Shift_L    Ž Dž C V B N M Đ BackSpace"
+        - "show_numbers preferences     space    ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences     space    , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers    \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences     space    , . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    6:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    -:
+        outline: "fill"
+    √:
+        outline: "fill"
+    π:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ^:
+        outline: "fill"

data/keyboards/rs.yaml

@@ -0,0 +1,89 @@
+# Language: Serbian
+---
+outlines:
+    default:       { width: 32.12,  height: 52 }
+    fill:          { width: 64.24,  height: 52 }
+    altline:       { width: 48.18,  height: 52 }
+    wide:          { width: 64.24,  height: 52 }
+    change-view:   { width: 48.18,  height: 52 }
+    change-view-2: { width: 64.24,  height: 52 }
+    spaceline:     { width: 128.48, height: 52 }
+    special:       { width: 32.12,  height: 52 }
+    placeholder:   { width: 32.12,  height: 52 }
+
+views:
+    base:
+        - "љ њ е р т з у и о п ш"
+        - "а с д ф г х ј к л ч ћ"
+        - "Shift_L џ ц в б н м ђ ж BackSpace"
+        - "show_numbers preferences     space    , . Return"
+    upper:
+        - "Љ Њ Е Р Т З У И О П Ш"
+        - "А С Д Ф Г Х Ј К Л Ч Ћ"
+        - "Shift_L Џ Ц В Б Н М Ђ Ж BackSpace"
+        - "show_numbers preferences     space    ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences     space    , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols    \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences     space    , . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/rs_wide.yaml

@@ -0,0 +1,91 @@
+# Language: Serbian
+---
+outlines:
+    default:     { width: 48.87,  height: 42 }
+    fill:        { width: 73.31,  height: 42 }
+    altline:     { width: 73.31,  height: 42 }
+    wide:        { width: 73.31,  height: 42 }
+    change-view: { width: 73.31,  height: 42 }
+    spaceline:   { width: 244.35, height: 42 }
+    special:     { width: 48.87,  height: 42 }
+    placeholder: { width: 48.87,  height: 42 }
+
+views:
+    base:
+        - "љ њ е р т з у и о п ш"
+        - "а с д ф г х ј к л ч ћ"
+        - "Shift_L  џ ц в б н м ђ ж BackSpace"
+        - "show_numbers preferences     space    , . Return"
+    upper:
+        - "Љ Њ Е Р Т З У И О П Ш"
+        - "А С Д Ф Г Х Ј К Л Ч Ћ"
+        - "Shift_L   Џ Ц В Б Н М Ђ Ж BackSpace"
+        - "show_numbers preferences     space    ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences     space    , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers    \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences     space    , . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    6:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    -:
+        outline: "fill"
+    √:
+        outline: "fill"
+    π:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ^:
+        outline: "fill"

data/keyboards/ru.yaml

@@ -1,3 +1,4 @@
+# Language: Russian
 ---
 outlines:
     default:       { width: 32.45,  height: 52 }

data/keyboards/ru_wide.yaml

@@ -1,3 +1,4 @@
+# Language: Russian
 ---
 outlines:
     default:       { width: 48.75, height: 42 }