Merge branch 'release-squeekboard-1.24.0' into 'main'

Release Squeekboard 1.24.0

See merge request World/Phosh/squeekboard!622

.gitlab-ci.yml

@@ -1,21 +1,39 @@
-image: pureos/byzantium
+image: debian:bookworm
+
+variables:
+  DEBIAN_FRONTEND: noninteractive
+
+default:
+  # Protect CI infra from rogue jobs
+  timeout: 15 minutes
+  # Allow jobs to be caneled on new commits
+  interruptible: true
+  # Retry on infra hickups automatically
+  retry:
+    max: 1
+    when:
+      - api_failure
+      - runner_system_failure
+      - scheduler_failure
+      - stuck_or_timeout_failure
 
 stages:
   - build
   - test
+  - deploy
 
 before_script:
   - apt-get -y update
   - apt-get -y install ca-certificates
 
 build_docs:
+  image: debian:trixie
   stage: build
   artifacts:
     paths:
       - _build
   script:
-    - apt-get -y install python3-pip python3-sphinx
-    - pip3 install recommonmark
+    - apt-get -y install --on-install-recommends python3-pip python3-sphinx python3-recommonmark
     - ./doc/build.sh _build
   except:
     variables:
@@ -29,31 +47,14 @@ build_meson:
     expire_in: 3h
   script:
     - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share --werror
+    - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
     - ninja -C _build install
   except:
     variables:
       - $PKG_ONLY == "1"
 
 build_deb:
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
-
-build_deb:arm64:
-  image: pureos/byzantium
+  image: debian:bookworm
   tags:
     - aarch64
   stage: build
@@ -72,14 +73,18 @@ build_deb:arm64:
     - debuild -i -us -uc -b
     - cp ../*.deb .
 
-test_lintian:
-  stage: test
+build_reference:
+  stage: build
   needs:
-    - job: build_deb
+    - job: build_meson
       artifacts: true
+  artifacts:
+    paths:
+      - _build/doc
   script:
-    - apt-get -y install lintian
-    - lintian *.deb
+    - apt-get -y install cargo
+    - cd _build
+    - ../cargo.sh doc --no-deps --document-private-items
   except:
     variables:
       - $PKG_ONLY == "1"
@@ -113,10 +118,24 @@ check_release:
   needs: []
   only:
     refs:
-      - master
+      - main
   script:
     - apt-get -y install git python3
     - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
   except:
     variables:
       - $PKG_ONLY == "1"
+
+pages:
+  stage: deploy
+  needs:
+    - build_docs
+    - build_reference
+  script:
+    - mv _build/ public/
+  artifacts:
+    paths:
+      - public
+  only:
+    refs:
+      - main

Cargo.deps

@@ -1,10 +1,17 @@
 # Dependencies which change based on build flags
 bitflags = "1.2.*"
 clap = { version = "2.33.*", default-features = false }
+zbus = "1.0.*"
+zvariant = "2.0.*"
+# Newer versions seem to confuse the version of Cargo on Debian Bullseye
+zvariant_derive = "2.0.*"
 
 [dependencies.cairo-rs]
 version = "0.7.*"
 
+[dependencies.cairo-sys-rs]
+version = "0.9"
+
 [dependencies.gdk]
 version = "0.11.*"
 
@@ -16,6 +23,14 @@ features = ["v2_44"]
 version = "0.8.*"
 features = ["v2_44"]
 
+[dependencies.glib-sys]
+version = "*"
+features = ["v2_44"]
+
 [dependencies.gtk]
 version = "0.7.*"
 features = ["v3_22"]
+
+[dependencies.gtk-sys]
+version = "0.9"
+features = ["v3_22"]

Cargo.deps.legacy

@@ -1,21 +0,0 @@
-# Dependencies which change based on build flags
-bitflags = "1.0.*"
-clap = { version = "2.32.*", default-features = false }
-
-[dependencies.cairo-rs]
-version = "0.5.*"
-
-[dependencies.gdk]
-version = "0.9.*"
-
-[dependencies.gio]
-version = "0.5.*"
-features = ["v2_44"]
-
-[dependencies.glib]
-version = "0.6.*"
-features = ["v2_44"]
-
-[dependencies.gtk]
-version = "0.5.*"
-features = ["v3_22"]

Cargo.deps.newer

@@ -0,0 +1,38 @@
+# Dependencies and tools which change based on build flags
+# For the newer-than-Byzantium config
+
+bitflags = "1.3.*"
+clap = { version = "4.*", features=["std"], default-features = false }
+zbus = "1.9.*"
+zvariant = "2.10.*"
+# Newer versions seem to confuse the version of Cargo on Debian Bullseye
+zvariant_derive = "2.10.*"
+
+[dependencies.cairo-rs]
+version = "0.14.*"
+
+[dependencies.cairo-sys-rs]
+version = "0.14.*"
+
+[dependencies.gdk]
+version = "0.14.*"
+
+[dependencies.gio]
+version = "0.14.*"
+features = ["v2_58"]
+
+[dependencies.glib]
+version = "0.14.*"
+features = ["v2_58"]
+
+[dependencies.glib-sys]
+version = "0.14.*"
+features = ["v2_58"]
+
+[dependencies.gtk]
+version = "0.14.*"
+features = ["v3_22"]
+
+[dependencies.gtk-sys]
+version = "0.14.*"
+features = ["v3_22"]

Cargo.deps.online

@@ -0,0 +1,4 @@
+# Dependencies which are only used with online, crates.io builds.
+[patch.crates-io]
+# Dependency was yanked, but gio 0.7 needs it.
+fragile = { git = "https://source.puri.sm/dorota.czaplejewicz/fragile.git", tag = "0.3.0" }

Cargo.lock

@@ -30,9 +30,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
@@ -40,6 +40,12 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
 [[package]]
 name = "cairo-rs"
 version = "0.7.1"
@@ -67,9 +73,21 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.72"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
@@ -82,11 +100,51 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "enumflags2"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fragile"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
+source = "git+https://source.puri.sm/dorota.czaplejewicz/fragile.git?tag=0.3.0#51048ca11824279c2114c77fef5bcb950838fc09"
 
 [[package]]
 name = "gdk"
@@ -261,20 +319,29 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "indexmap"
-version = "1.8.0"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -283,15 +350,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.113"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "maplit"
@@ -309,6 +376,19 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "nix"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 0.1.10",
+ "libc",
+ "void",
+]
+
 [[package]]
 name = "pango"
 version = "0.7.0"
@@ -338,24 +418,33 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.24"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "proc-macro-crate"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+dependencies = [
+ "toml",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.15"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -378,39 +467,59 @@ dependencies = [
  "serde",
  "serde_yaml",
  "xkbcommon",
+ "zbus",
+ "zvariant",
+ "zvariant_derive",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "serde"
-version = "1.0.135"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cf9235533494ea2ddcdb794665461814781c53f19d87b76e571a1c35acbad2b"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.135"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dcde03d87d4c973c04be249e7d8f0b35db1c848c487bd43032808e59dd8328d"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.52",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.23"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
  "indexmap",
  "ryu",
@@ -420,13 +529,24 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.86"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -439,16 +559,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "unicode-width"
-version = "0.1.9"
+name = "toml"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
 
 [[package]]
-name = "unicode-xid"
-version = "0.2.2"
+name = "unicode-ident"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "winapi"
@@ -474,9 +609,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "xkbcommon"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
+checksum = "032ed00cc755c31221bbd6aaf9fa4196a01bf33bca185f9316e14f26d28c28cf"
 dependencies = [
  "libc",
  "memmap",
@@ -490,3 +625,56 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
+
+[[package]]
+name = "zbus"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cb97c72cbfd5c7537ca730eeb810da7348f345ba67ab7673bcbe0d81c076427"
+dependencies = [
+ "byteorder",
+ "derivative",
+ "enumflags2",
+ "fastrand",
+ "nix",
+ "scoped-tls",
+ "serde",
+ "serde_repr",
+ "zbus_macros",
+ "zvariant",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0c1f2a20a4cb90922b44d3bebd232b246e52b3dd95ed5bea8aec83cde3a5a8a"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "zvariant"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0bf85e67d1a3780cb1c56c80227532354f21907cba14805a773eb507b444580"
+dependencies = [
+ "byteorder",
+ "enumflags2",
+ "serde",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d68726e8c12757384a8d1485080527e263dea67d91f19e97cd71b9292f22d7c5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]

Cargo.toml.in

@@ -1,6 +1,7 @@
 [package]
 name = "rs"
 version = "0.1.0"
+edition = "2021"
 
 [lib]
 name = "rs"
@@ -16,23 +17,16 @@ path = "@path@/src/bin/test_layout.rs"
 name = "test_layout"
 path = "@path@/examples/test_layout.rs"
 
+[[example]]
+name = "find_orphan_layouts"
+path = "@path@/examples/find_orphan_layouts.rs"
+
 [features]
-gio_v0_5 = []
-gtk_v0_5 = []
-rustc_less_1_36 = []
+glib_v0_14 = []
+zbus_v1_5 = []
+clap_v4 = []
 
 # Dependencies which don't change based on build flags
-[dependencies.cairo-sys-rs]
-version = "0.9"
-
-[dependencies.glib-sys]
-version = "*"
-features = ["v2_44"]
-
-[dependencies.gtk-sys]
-version = "0.9"
-features = ["v3_22"]
-
 [dependencies]
 maplit = "1.0.*"
 serde = { version = "1.0.*", features = ["derive"] }

NEWS.md

@@ -0,0 +1,65 @@
+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

@@ -86,4 +86,4 @@ It's strongly recommended to support:
 Developing
 ----------
 
-See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
+See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://world.pages.gitlab.gnome.org/Phosh/squeekboard) for the current release.

data/common.css

@@ -1,6 +1,39 @@
-/* Theme independent style */
+/* Theme independent styles */
+
+sq_view {
+    font-family: cantarell, sans-serif;
+    font-size: 1.5em;
+}
+
+/* Becomes readable with a special font */
+sq_view.gr_polytonic {
+    font-family: GFSDidotClassic, cantarell, sans-serif;
+    font-size: 2em;
+}
+
+sq_button {
+    border-radius: 4px;
+    margin: 2px;
+}
+
+sq_view.wide sq_button {
+    margin: 3px;
+}
+
+sq_button.latched,
+sq_button.locked {
+    font-weight: bold;
+}
+
+sq_button.action {
+    font-size: 0.75em;
+}
+
+sq_button.small {
+    font-size: 0.5em;
+}
 
 sq_view.pin sq_button {
     border-radius: 0px;
     margin: 1px 1px 1px 1px;
-}
+}

data/icons/zwnj.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+  <path d="M 3,0.5 V 1 c 2.5,0 4.5,1 4.5,2 v 12.5 h 1 V 3 c 0,-1 2,-2 4.5,-2 V 0.5 Z" />
+</svg>

data/keyboards/am+phonetic.yaml

@@ -3,11 +3,11 @@
 # Oct 2021
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 32, height: 32 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 32,    height: 32 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:

data/keyboards/am.yaml

@@ -3,11 +3,11 @@
 # Oct 2021
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 32, height: 32 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 32,    height: 32 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:

data/keyboards/ara.yaml

@@ -1,11 +1,11 @@
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default: { width: 32.66, height: 52 }
-    altline: { width: 48.99, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 32.66,  height: 52 }
+    altline:   { width: 48.99,  height: 52 }
+    wide:      { width: 62,     height: 52 }
     spaceline: { width: 195.96, height: 52 }
-    special: { width: 35.66, height: 52 }
+    special:   { width: 35.66,  height: 52 }
 
 views:
     base:

data/keyboards/ara_wide.yaml

@@ -1,11 +1,11 @@
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default: { width: 49, height: 42 }
-    altline: { width: 73.5, height: 42 }
-    wide: { width: 108, height: 42 }
-    spaceline: { width: 324, height: 42 }
-    special: { width: 49, height: 42 }
+    default:   { width: 49,   height: 42 }
+    altline:   { width: 73.5, height: 42 }
+    wide:      { width: 108,  height: 42 }
+    spaceline: { width: 324,  height: 42 }
+    special:   { width: 49,   height: 42 }
 
 views:
     base:

data/keyboards/be.yaml

@@ -63,7 +63,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/be_wide.yaml

@@ -63,7 +63,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/bg+phonetic.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 32.72, height: 52 }
-    altline: { width: 47, height: 52 }
-    wide: { width: 49.09, height: 52 }
-    spaceline: { width: 185, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 32.72, height: 52 }
+    altline:   { width: 47,    height: 52 }
+    wide:      { width: 49.09, height: 52 }
+    spaceline: { width: 185,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:
@@ -59,7 +59,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/bg.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 32.72, height: 52 }
-    altline: { width: 47, height: 52 }
-    wide: { width: 49.09, height: 52 }
-    spaceline: { width: 185, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 32.72, height: 52 }
+    altline:   { width: 47,    height: 52 }
+    wide:      { width: 49.09, height: 52 }
+    spaceline: { width: 185,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:
@@ -59,7 +59,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/br.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:

data/keyboards/ca.yaml

@@ -0,0 +1,93 @@
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    eschars:
+        - "à â ç é è ê ë î ï ô"
+        - "ù û À Â Ç É È Ê Î Ô"
+        - "show_numbers_from_symbols  ' ! ? . ,   BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    period:
+        outline: "special"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+
+
+

data/keyboards/ch+de.yaml

@@ -55,7 +55,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/ch+fr.yaml

@@ -32,7 +32,7 @@ views:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "show_letters show_eschars preferences  ñ Ñ   space        ° ß Return"
 
 buttons:
     Shift_L:
@@ -59,7 +59,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
@@ -71,14 +71,7 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "âÂ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
+        label: "Ââ"
     space:
         outline: "spaceline"
         label: " "

data/keyboards/ch.yaml

@@ -3,38 +3,39 @@
 
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 48,    height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
-    special:   { width: 28,    height: 52 }
+    default:     { width: 35.33,  height: 58 }
+    doublewidth: { width: 70.66,  height: 58 }
+    altline:     { width: 52.8,   height: 58 }
+    wide:        { width: 64.9,   height: 58 }
+    spaceline:   { width: 116.67, height: 58 }
+    special:     { width: 30.41,  height: 58 }
 
 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 show_eschars preferences    '   space        , . Return"
+        - "Shift_L   y x c v b n m ' BackSpace"
+        - "show_numbers show_eschars 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 show_eschars preferences    \"  space        , . Return"
+        - "Shift_L   Y X C V B N M \" 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"
+        - "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"
+        - "show_letters show_eschars preferences       Space    , .    Return"
     eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "à â ç é è ê î ô ù û ñ"
+        - "À Â Ç É È Ê Î Ô Ù Û Ñ"
+        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
+        - "show_letters show_eschars preferences       Space     °     Return"
 
 buttons:
     Shift_L:
@@ -47,7 +48,7 @@ buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -61,7 +62,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
@@ -73,15 +74,8 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "âÂ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
+        label: "Ââ"
+    Space:
         outline: "spaceline"
         label: " "
         text: " "
@@ -91,3 +85,11 @@ buttons:
         keysym: "Return"
     "\"":
         keysym: "quotedbl"
+    °:
+        outline: "doublewidth"
+    "|":
+        outline: "doublewidth"
+    "}":
+        outline: "doublewidth"
+    ×:
+        outline: "doublewidth"

data/keyboards/ch_wide.yaml

@@ -3,38 +3,41 @@
 
 ---
 outlines:
-    default: { width: 48, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
-    special: { width: 48, height: 42 }
+    default:     { width: 48,  height: 42 }
+    doublewidth: { width: 96,  height: 42 }
+    narrow:      { width: 33,  height: 42 }
+    large:       { width: 66,  height: 42 }
+    altline:     { width: 72,  height: 42 }
+    wide:        { width: 108, height: 42 }
+    spaceline:   { width: 162, height: 42 }
+    special:     { width: 48,  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 show_eschars preferences    '   space        , . Return"
+        - "Shift_L   y x c v b n m ' BackSpace"
+        - "show_numbers show_eschars 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 show_eschars preferences    \"  space        , . Return"
+        - "Shift_L   Y X C V B N M \" 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"
+        - "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"
+        - "show_letters show_eschars preferences       Space    , .    Return"
     eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "à â ç é è ê î ô ù û ñ"
+        - "À Â Ç É È Ê Î Ô Ù Û Ñ"
+        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
+        - "show_letters show_eschars preferences       Space     °     Return"
 
 buttons:
     Shift_L:
@@ -61,7 +64,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
@@ -73,15 +76,8 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "äÄ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
+        label: "Ââ"
+    Space:
         outline: "spaceline"
         label: " "
         text: " "
@@ -91,3 +87,15 @@ buttons:
         keysym: "Return"
     "\"":
         keysym: "quotedbl"
+    °:
+        outline: "large"
+    ".":
+        outline: "narrow"
+    ",":
+        outline: "narrow"
+    "|":
+        outline: "doublewidth"
+    "}":
+        outline: "doublewidth"
+    ×:
+        outline: "doublewidth"

data/keyboards/cz+qwerty.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 52.67, height: 52 }
-    spaceline: { width: 106, height: 52 }
-    special: { width: 35.33, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 52.67, height: 52 }
+    spaceline: { width: 106,   height: 52 }
+    special:   { width: 35.33, height: 52 }
 
 views:
     base:
@@ -75,7 +75,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/cz+qwerty_wide.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 81, height: 42 }
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 81,  height: 42 }
     spaceline: { width: 162, height: 42 }
-    special: { width: 54, height: 42 }
+    special:   { width: 54,  height: 42 }
 
 views:
     base:
@@ -75,7 +75,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/cz.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 52.67, height: 52 }
-    spaceline: { width: 106, height: 52 }
-    special: { width: 35.33, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 52.67, height: 52 }
+    spaceline: { width: 106,   height: 52 }
+    special:   { width: 35.33, height: 52 }
 
 views:
     base:
@@ -75,7 +75,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/cz_wide.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 81, height: 42 }
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 81,  height: 42 }
     spaceline: { width: 162, height: 42 }
-    special: { width: 54, height: 42 }
+    special:   { width: 54,  height: 42 }
 
 views:
     base:
@@ -75,7 +75,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/de.yaml

@@ -1,11 +1,11 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
     spaceline: { width: 99.67, height: 52 }
-    special: { width: 35.33, height: 52 }
+    special:   { width: 35.33, height: 52 }
 
 views:
     base:
@@ -59,7 +59,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
@@ -71,7 +71,7 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "äÄ"
+        label: "Ää"
     space:
         outline: "spaceline"
         label: " "

data/keyboards/de_wide.yaml

@@ -1,11 +1,11 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default: { width: 48, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 108, height: 42 }
+    default:   { width: 48,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
     spaceline: { width: 216, height: 42 }
-    special: { width: 48, height: 42 }
+    special:   { width: 48,  height: 42 }
 
 views:
     base:
@@ -59,7 +59,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
@@ -71,7 +71,7 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "äÄ"
+        label: "Ää"
     space:
         outline: "spaceline"
         text: " "

data/keyboards/dk.yaml

@@ -1,9 +1,8 @@
 ---
 outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 48.39024, height: 52 }
-    wide: { width: 62, height: 52 }
-    outline7: { width: 88.97561, height: 52 }
+    default:   { width: 32,       height: 52 }
+    altline:   { width: 48.39024, height: 52 }
+    wide:      { width: 62,       height: 52 }
     spaceline: { width: 150.5853, height: 52 }
 
 views:

data/keyboards/email/us.yaml

@@ -1,10 +1,11 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62, height: 52 }
     spaceline: { width: 106.67, height: 52 }
-    special: { width: 44, height: 52 }
+    special:   { width: 44,     height: 52 }
+    large:     { width: 44,     height: 52 }
 
 views:
     base:
@@ -41,10 +42,10 @@ buttons:
         icon: "edit-clear-symbolic"
         action: erase
     at:
-        outline: "special"
+        outline: "large"
         text: "@"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
@@ -68,7 +69,7 @@ buttons:
         outline: "altline"
         label: "*/="
     period:
-        outline: "special"
+        outline: "large"
         text: "."
     space:
         outline: "spaceline"

data/keyboards/epo.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
     spaceline: { width: 99.67, height: 52 }
-    special: { width: 35.33, height: 52 }
+    special:   { width: 35.33, height: 52 }
 
 views:
     base:
@@ -58,7 +58,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/es+cat.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
     spaceline: { width: 99.67, height: 52 }
-    special: { width: 44, height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:
@@ -58,7 +58,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/es.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
     spaceline: { width: 99.67, height: 52 }
-    special: { width: 44, height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:
@@ -58,7 +58,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/fi.yaml

@@ -1,9 +1,8 @@
 ---
 outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 48.39024, height: 52 }
-    wide: { width: 62, height: 52 }
-    outline7: { width: 88.97561, height: 52 }
+    default:   { width: 32,       height: 52 }
+    altline:   { width: 48.39024, height: 52 }
+    wide:      { width: 62,       height: 52 }
     spaceline: { width: 150.5853, height: 52 }
 
 views:

data/keyboards/fr+bepo.yaml

@@ -0,0 +1,206 @@
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    small:     { width: 50,    height: 30 }
+    altline:   { width: 35.33, height: 52 }
+    wide:      { width: 50,    height: 52 }
+    spaceline: { width: 150,   height: 52 }
+    special:   { width: 35.33, height: 52 }
+
+views:
+    base:
+        - "b é p o w v d l j z"
+        - "a u i e c t s r n m"
+        - "Shift_L y x k q g h f period BackSpace"
+        - "show_numbers preferences         space    show_eschars Return"
+    upper:
+        - "B É P O W V D L J Z"
+        - "A U I E C T S R N M"
+        - "Shift_L   Y X K Q G H F -  BackSpace"
+        - "show_numbers preferences         space  colon   show_eschars Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars  Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    eschars:
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters preferences         space        show_eschars  Return"
+ 
+buttons:
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    period:
+        outline: "special"
+        text: "."
+    slash:
+        outline: "special"
+        text: "/"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "special"
+        label: ">_"
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"

data/keyboards/fr+bepo_wide.yaml

@@ -0,0 +1,89 @@
+---
+outlines:
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 100, height: 42 }
+    spaceline: { width: 205, height: 42 }
+    special:   { width: 54,  height: 42 }
+
+views:
+    base:
+        - "b é p o w v d l j z"
+        - "a u i e c t s r n m"
+        - "Shift_L y x k q g h f . BackSpace"
+        - "show_numbers preferences         space    show_eschars Return"
+    upper:
+        - "B É P O W V D L J Z"
+        - "A U I E C T S R N M"
+        - "Shift_L   Y X K Q G H F -  BackSpace"
+        - "show_numbers preferences         space  colon   show_eschars Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    eschars:
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"

data/keyboards/fr.yaml

@@ -63,7 +63,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/fr_wide.yaml

@@ -63,7 +63,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/ge.yaml

@@ -0,0 +1,78 @@
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
+
+views:
+    base:
+        - "ქ წ ე რ ტ ყ უ ი ო პ"
+        - "ა ს დ ფ გ ჰ ჯ კ ლ"
+        - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
+        - "show_numbers preferences         space        period Return"
+    upper:
+        - "ქ ჭ ე ღ თ ყ უ ი ო პ"
+        - "ა შ დ ფ გ ჰ ჟ კ ლ"
+        - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
+        - "show_numbers preferences         space        period Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "! @ # $ % ^ & * ( )"
+        - "show_symbols   - ' \" colon ; , ?   BackSpace"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "+ ⨯ ÷ = / _ € £ ¥ ₾"
+        - "~ ` | · √ π τ ° { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        period Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    period:
+        outline: "special"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"

data/keyboards/gr+polytonic.yaml

@@ -0,0 +1,326 @@
+# Greek polytonic layout by Antonis Tsolomitis
+# University of the Aegean, Department of Mathematics, atsol@aegean.gr
+# March 2022
+# 
+---
+outlines:
+    default:   { width: 40,    height: 60 }
+    altline:   { width: 52.67, height: 60 }
+    wide:      { width: 62,    height: 60 }
+    extrawide: { width: 66,    height: 60 }
+    spaceline: { width: 140,   height: 60 }
+    special:   { width: 44,    height: 60 }
+
+views:
+    base:
+        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "α σ δ φ γ η ξ κ λ show_accents"
+        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
+        - "show_numbers preferences space period comma Return"
+    upper:
+        - "colon EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
+        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
+        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
+        - "show_numbers preferences space exclam period_upper Return"
+    accents:
+        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
+        - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
+        - "show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni ᾿ BackSpace"
+        - "show_numbers preferences space Return"
+    oxia:
+        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
+        - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
+        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
+        - "show_numbers preferences space eis_l eis_r Return"
+    Oxia:
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
+        - "show_oxia ᾼ ῌ ῼ show_base"
+        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
+        - "show_numbers preferences space eis_l eis_r Return"
+    bariaorperispomeni:
+        - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
+        - "show_BariaOrPerispomeni ᾳ ᾲ ῃ ῂ ῳ ῲ ῠ show_base"
+        - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
+        - "show_numbers preferences space ῇ ῷ Return"
+    BariaOrPerispomeni:
+        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
+        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
+        - "show_numbers preferences space BackSpace Return"
+    psiliordasia:
+        - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
+        - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
+        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
+        - "show_numbers preferences space Return"
+    PsiliOrDasia:
+        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
+        - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
+        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
+        - "show_numbers preferences space Return"
+    psiliordasiaandoxia:
+        - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
+        - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
+        - "ᾅ ᾕ ᾥ BackSpace"
+        - "show_numbers preferences space Return"
+    PsiliOrDasiaAndOxia:
+        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
+        - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
+        - "ᾍ ᾝ ᾭ BackSpace"
+        - "show_numbers preferences space Return"
+    psiliordasiaandvaria:
+        - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
+        - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
+        - "ᾃ ᾓ ᾣ BackSpace"
+        - "show_numbers preferences space Return"
+    PsiliOrDasiaAndVaria:
+        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
+        - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
+        - "ᾋ ᾛ ᾫ BackSpace"
+        - "show_numbers preferences space Return"
+    psiliordasiaandperispomeni:
+        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
+        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
+        - "ᾇ ᾗ ᾧ BackSpace"
+        - "show_numbers preferences space Return"
+    PsiliOrDasiaAndPerispomeni:
+        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
+        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
+        - "ᾏ ᾟ ᾯ BackSpace"
+        - "show_numbers preferences space Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
+        - "show_letters preferences space period comma Return"
+    symbols:
+        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_letters preferences space period comma Return"
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
+    show_oxia:
+        action:
+            set_view: "oxia"
+        outline: "extrawide"
+        label: "´ ΅"
+    show_Oxia:
+        action:
+            set_view: "Oxia"
+        outline: "extrawide"
+        label: "´¨↑"
+    show_bariaorperispomeni:
+        action:
+            set_view: "bariaorperispomeni"
+        outline: "extrawide"
+        label: "` ῀"
+    show_BariaOrPerispomeni:
+        action:
+            set_view: "BariaOrPerispomeni"
+        outline: "extrawide"
+        label: "`῀↑"
+    show_psiliordasia:
+        action:
+            set_view: "psiliordasia"
+        outline: "extrawide"
+        label: "᾿ ῾"
+    show_PsiliOrDasia:
+        action:
+            set_view: "PsiliOrDasia"
+        outline: "extrawide"
+        label: "᾿῾↑"
+    show_psiliordasiaandoxia:
+        action:
+            set_view: "psiliordasiaandoxia"
+        outline: "extrawide"
+        label: "῎ ῞"
+    show_PsiliOrDasiaAndOxia:
+        action:
+            set_view: "PsiliOrDasiaAndOxia"
+        outline: "extrawide"
+        label: "῎῞↑"
+    show_psiliordasiaandvaria:
+        action:
+            set_view: "psiliordasiaandvaria"
+        outline: "extrawide"
+        label: "῍ ῝"
+    show_PsiliOrDasiaAndVaria:
+        action:
+            set_view: "PsiliOrDasiaAndVaria"
+        outline: "extrawide"
+        label: "῍῝↑"
+    show_psiliordasiaandperispomeni:
+        action:
+            set_view: "psiliordasiaandperispomeni"
+        outline: "extrawide"
+        label: "῏ ῟"
+    show_PsiliOrDasiaAndPerispomeni:
+        action:
+            set_view: "PsiliOrDasiaAndPerispomeni"
+        outline: "extrawide"
+        label: "῏῟↑"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ΑΒΓ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_accents:
+        action:
+            locking:
+                lock_view: "accents"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ᾦ"
+    show_base:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "αι"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    period:
+        outline: "special"
+        text: "."
+    period_upper:
+        outline: "special"
+        text: "·"
+    comma:
+        outline: "special"
+        text: ","
+    colon:
+        outline: "special"
+        text: ":"
+    semicolon:
+        outline: "special"
+        text: ";"
+    exclam:
+        outline: "special"
+        text: "!"
+    eis_l:
+        outline: "special"
+        text: "«"
+    eis_r:
+        outline: "special"
+        text: "»"
+    aring:
+        text: "å"
+    Aring:
+        text: "Å"
+    oslash:
+        text: "ø"
+    Oslash:
+        text: "Ø"
+    ae:
+        text: "æ"
+    AE:
+        text: "Æ"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        outline: "special"
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    backslash:
+        text: "\\"
+    slash:
+        text: "/"
+    quotedbl:
+        text: "\""
+    quoteright:
+        text: "'"
+    less:
+        text: "<"
+    greater:
+        text: ">"
+    question:
+        text: "?"
+    bracketleft:
+        text: "["
+    bracketright:
+        text: "]"
+

data/keyboards/gr.yaml

@@ -1,40 +1,41 @@
-# Greek layout created by Antonis Tsolomitis
+# Greek layout originally created by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # Sep 2019
+# Edited by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 48.39024, height: 52 }
-    wide: { width: 62, height: 52 }
-    outline7: { width: 88.97561, height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    default:   { width: 40,    height: 60 }
+    altline:   { width: 52.67, height: 60 }
+    wide:      { width: 62,    height: 60 }
+    spaceline: { width: 140,   height: 60 }
+    special:   { width: 44,    height: 60 }
 
 views:
     base:
-        - "; ς ε ρ τ υ θ ι ο π !"
+        - "semicolon ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accented"
-        - "Shift_L ζ χ ψ ω β ν μ , BackSpace"
-        - "show_numbers preferences space period Return"
+        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
+        - "show_numbers preferences space period comma Return"
     upper:
-        - ": EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
+        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ · BackSpace"
-        - "show_numbers preferences space « » Return"
+        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
+        - "show_numbers preferences space period_upper apostrophe Return"
     accented:
-        - "ά έ ή ί ό ύ ώ ϊ ϋ ΐ"
-        - "ΰ Ά Έ Ή Ί Ό Ύ Ώ Ϊ show_base"
-        - "Ϋ Ϗ ϐ ϑ ϕ ϖ ϗ – — BackSpace"
-        - "show_numbers preferences space quoteleft quoteright Return"
+        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
+        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
+        - "show_numbers preferences space eis_l eis_r Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
         - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period Return"
+        - "show_letters preferences space period comma Return"
     symbols:
         - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
         - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
         - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period Return"
+        - "show_letters preferences space period comma Return"
 buttons:
     Shift_L:
         action:
@@ -54,12 +55,12 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "wide"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "wide"
         label: "ΑΒΓ"
     show_symbols:
         action:
@@ -78,16 +79,40 @@ buttons:
             set_view: "base"
         outline: "altline"
         label: "αι"
-    period:
-        outline: "altline"
-        text: "."
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    period:
+        outline: "special"
+        text: "."
+    period_upper:
+        outline: "special"
+        text: "·"
+    comma:
+        outline: "special"
+        text: ","
+    colon:
+        outline: "special"
+        text: ":"
+    semicolon:
+        outline: "special"
+        text: ";"
+    apostrophe:
+        outline: "special"
+        text: "᾿"
+    exclam:
+        outline: "special"
+        text: "!"
+    eis_l:
+        outline: "special"
+        text: "«"
+    eis_r:
+        outline: "special"
+        text: "»"
     aring:
         text: "å"
     Aring:
@@ -162,8 +187,6 @@ buttons:
         text: "{"
     braceright:
         text: "}"
-    comma:
-        text: ","
     backslash:
         text: "\\"
     slash:
@@ -176,12 +199,6 @@ buttons:
         text: "<"
     greater:
         text: ">"
-    colon:
-        text: ":"
-    semicolon:
-        text: ";"
-    exclam:
-        text: "!"
     question:
         text: "?"
     bracketleft:

data/keyboards/gr_wide.yaml

@@ -0,0 +1,204 @@
+# Creaed by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
+---
+outlines:
+    default:   { width: 80,  height: 60 }
+    altline:   { width: 110, height: 60 }
+    wide:      { width: 120, height: 60 }
+    spaceline: { width: 250, height: 60 }
+    special:   { width: 75,  height: 60 }
+
+views:
+    base:
+        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "α σ δ φ γ η ξ κ λ show_accented"
+        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
+        - "show_numbers preferences space period comma Return"
+    upper:
+        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
+        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
+        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
+        - "show_numbers preferences space period_upper apostrophe Return"
+    accented:
+        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
+        - "Ϗ ϐ ϑ ϗ ΰ ϕ ϖ – — BackSpace"
+        - "show_numbers preferences space eis_l eis_r Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
+        - "show_letters preferences space period comma Return"
+    symbols:
+        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_letters preferences space period comma Return"
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ΑΒΓ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_accented:
+        action:
+            locking:
+                lock_view: "accented"
+                unlock_view: "base"
+        outline: "altline"
+        label: "άΐ"
+    show_base:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "αι"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    period:
+        outline: "special"
+        text: "."
+    period_upper:
+        outline: "special"
+        text: "·"
+    comma:
+        outline: "special"
+        text: ","
+    colon:
+        outline: "special"
+        text: ":"
+    semicolon:
+        outline: "special"
+        text: ";"
+    apostrophe:
+        outline: "special"
+        text: "᾿"
+    exclam:
+        outline: "special"
+        text: "!"
+    eis_l:
+        outline: "special"
+        text: "«"
+    eis_r:
+        outline: "special"
+        text: "»"
+    aring:
+        text: "å"
+    Aring:
+        text: "Å"
+    oslash:
+        text: "ø"
+    Oslash:
+        text: "Ø"
+    ae:
+        text: "æ"
+    AE:
+        text: "Æ"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    backslash:
+        text: "\\"
+    slash:
+        text: "/"
+    quotedbl:
+        text: "\""
+    quoteright:
+        text: "'"
+    less:
+        text: "<"
+    greater:
+        text: ">"
+    question:
+        text: "?"
+    bracketleft:
+        text: "["
+    bracketright:
+        text: "]"

data/keyboards/hu.yaml

@@ -0,0 +1,82 @@
+# Maintained by: soyer <soyer@irl.hu>
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special:   { width: 35.33, 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 show_eschars 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 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:
+        - "ö ü ó Ö Ü Ó"
+        - "í ő ú Í Ő Ú"
+        - "show_numbers é á ű É Á Ű BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "éá"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/hu_wide.yaml

@@ -0,0 +1,82 @@
+# Maintained by: soyer <soyer@irl.hu>
+---
+outlines:
+    default:   { width: 48,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special:   { width: 48,  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 show_eschars 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 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:
+        - "ö ü ó Ö Ü Ó"
+        - "í ő ú Í Ő Ú"
+        - "show_numbers é á ű É Á Ű BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "éá"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/il.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 40, height: 60 }
-    altline: { width: 56, height: 60 }
-    wide: { width: 62, height: 60 }
+    default:   { width: 40,  height: 60 }
+    altline:   { width: 56,  height: 60 }
+    wide:      { width: 62,  height: 60 }
     spaceline: { width: 142, height: 60 }
-    special: { width: 44, height: 60 }
+    special:   { width: 44,  height: 60 }
 
 views:
     base:

data/keyboards/ir.yaml

@@ -1,29 +1,29 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:
-        - "ض ص ق ف غ ع ه خ ح ج"
-        - "ش س ی ب ل ا ت ن م ک"
-        - "Shift_L   ظ ط ز ر ذ د و  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "ض ص ث ق ف غ ع ه خ ح ج"
+        - "ش س ی ب ل ا ت ن م ک گ"
+        - "Shift_L  ظ ط ز ر ذ د پ و  BackSpace"
+        - "show_numbers preferences         space     zwnj period Return"
     upper:
-        - "پ { } [ ] ّ   َ   ِ  ُ چ"
-        - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ"
-        - "Shift_L  ك ٓ ژ ء > < ؟  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
+        - "_ ئ ي إ أ آ ة » « : ؛"
+        - "Shift_L ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
+        - "show_numbers preferences         space        ! ، Return"
     numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰"
-        - "@ # ﷼ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ؛ ! ?  BackSpace"
+        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
+        - "… ٬ ٫ ﷼ ٪ ، * ) ( − ـ"
+        - "show_symbols + - × ÷ = ^ % / BackSpace"
         - "show_letters preferences         space        period Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "& ` | · • % π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        period Return"
@@ -48,17 +48,17 @@ buttons:
         action:
             set_view: "numbers"
         outline: "wide"
-        label: "123"
+        label: "۱۲۳"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "altline"
-        label: "123"
+        label: "۱۲۳"
     show_letters:
         action:
             set_view: "base"
         outline: "wide"
-        label: "ABC"
+        label: "ا‌ب‌پ"
     show_symbols:
         action:
             set_view: "symbols"
@@ -74,5 +74,8 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
     colon:
         text: ":"

data/keyboards/ir_wide.yaml

@@ -1,32 +1,32 @@
 ---
 outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 108, height: 42 }
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
     spaceline: { width: 216, height: 42 }
-    special: { width: 54, height: 42 }
+    special:   { width: 54,  height: 42 }
 
 views:
     base:
-        - "ض ص ق ف غ ع ه خ ح ج"
-        - "ش س ی ب ل ا ت ن م ک"
-        - "Shift_L   ظ ط ز ر ذ د و  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "ض ص ث ق ف غ ع ه خ ح ج چ \\"
+        - "ش س ی ب ل ا ت ن م ک گ"
+        - "Shift_L ظ ط ز ر ذ د پ و ، / BackSpace"
+        - "show_numbers preferences         space     zwnj ؟ ! period Return"
     upper:
-        - "پ { } [ ] ّ   َ   ِ  ُ چ"
-        - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ"
-        - "Shift_L  ك ٓ ژ ء > < ؟  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ # _"
+        - "ؤ ئ ي إ أ آ ة » « : ؛"
+        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  ؟ BackSpace"
+        - "show_numbers preferences         space        ، ؟ ! period Return"
     numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰"
-        - "@ # ﷼ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ؛ ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ | ="
+        - "… ٬ ٫ ﷼ ٪ ، * ) ( − _"
+        - "show_symbols + - × ÷ = ^ % / BackSpace"
+        - "show_letters preferences         space        ، ؟ ! period Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "& ` | · • % π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        ، ؟ ! period Return"
 
 buttons:
     Shift_L:
@@ -48,23 +48,23 @@ buttons:
         action:
             set_view: "numbers"
         outline: "wide"
-        label: "123"
+        label: "۱۲۳"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "altline"
-        label: "123"
+        label: "۱۲۳"
     show_letters:
         action:
             set_view: "base"
         outline: "wide"
-        label: "ABC"
+        label: "ا‌ب‌پ"
     show_symbols:
         action:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    ".":
+    period:
         outline: "special"
         text: "."
     space:
@@ -74,5 +74,8 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
     colon:
         text: ":"

data/keyboards/it+fur.yaml

@@ -2,11 +2,11 @@
 # 14 october 2020
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
     spaceline: { width: 99.67, height: 52 }
-    special: { width: 44, height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:
@@ -65,7 +65,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/it.yaml

@@ -2,11 +2,11 @@
 # 03 october 2019
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
     spaceline: { width: 99.67, height: 52 }
-    special: { width: 44, height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:
@@ -30,10 +30,10 @@ views:
         - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        ? . Return"
     eschars:
-        - "á é í ó ú Á É Í Ó Ú"
-        - "à è ì ò « » ù ! { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        « » Return"
+        - "è é È É ù ú Ù Ú ò ó"
+        - "à á À Á ì í Ì Í Ò Ó"
+        - "show_numbers   “ ” « » ≈ ≠ ‽  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
 
 buttons:
     Shift_L:
@@ -65,7 +65,7 @@ buttons:
         action:
             set_view: "base"
         outline: "altline"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/jp+kana.yaml

@@ -1,11 +1,11 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default: { width: 62, height: 52 }
+    default:      { width: 62, height: 52 }
     default-wide: { width: 62, height: 52 }
-    altline: { width: 62, height: 52 }
-    wide: { width: 62, height: 52 }
-    special: { width: 62, height: 52 }
+    altline:      { width: 62, height: 52 }
+    wide:         { width: 62, height: 52 }
+    special:      { width: 62, height: 52 }
 
 views:
     base: # hiragana

data/keyboards/jp+kana_wide.yaml

@@ -1,11 +1,11 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default: { width: 62, height: 42 }
+    default:      { width: 62, height: 42 }
     default-wide: { width: 62, height: 42 }
-    altline: { width: 62, height: 42 }
-    wide: { width: 62, height: 42 }
-    special: { width: 62, height: 42 }
+    altline:      { width: 62, height: 42 }
+    wide:         { width: 62, height: 42 }
+    special:      { width: 62, height: 42 }
 
 views:
     base: # hiragana

data/keyboards/no.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 48.39024, height: 52 }
-    wide: { width: 64, height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 32,       height: 52 }
+    altline:   { width: 48.39024, height: 52 }
+    wide:      { width: 64,       height: 52 }
+    spaceline: { width: 142,      height: 52 }
+    special:   { width: 44,       height: 52 }
 
 views:
     base:

data/keyboards/number/us.yaml

@@ -1,8 +1,8 @@
 ---
 outlines:
-    default: { width: 37.46341, height: 52 }
-    altline: { width: 48.39024, height: 52 }
-    outline7: { width: 88.97561, height: 52 }
+    default:   { width: 37.46341, height: 52 }
+    altline:   { width: 48.39024, height: 52 }
+    outline7:  { width: 88.97561, height: 52 }
     spaceline: { width: 120.5853, height: 52 }
 
 views:

data/keyboards/pl.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 59, height: 52 }
-    spaceline: { width: 140, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 59,    height: 52 }
+    spaceline: { width: 140,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:

data/keyboards/pl_wide.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 100, height: 42 }
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 100, height: 42 }
     spaceline: { width: 206, height: 42 }
-    special: { width: 54, height: 42 }
+    special:   { width: 54,  height: 42 }
 
 views:
     base:

data/keyboards/ro.yaml

@@ -0,0 +1,89 @@
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special:   { width: 44,    height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        . Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        , Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , Return"
+    eschars:
+        - "ă â î ș ț á é í ó ü"
+        - "Ă Â Î Ș Ț Á É Í Ó Ü"
+        - "show_numbers_from_symbols „ ” « » ― { } BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ăĂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"

data/keyboards/ro_wide.yaml

@@ -0,0 +1,89 @@
+---
+outlines:
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
+    spaceline: { width: 153, height: 42 }
+    special:   { width: 54,  height: 42 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        . Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        , Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , Return"
+    eschars:
+        - "ă â î ș ț á é í ó ü"
+        - "Ă Â Î Ș Ț Á É Í Ó Ü"
+        - "show_numbers_from_symbols „ ” « » ― { } BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ăĂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"

data/keyboards/ru.yaml

@@ -1,12 +1,12 @@
 ---
 outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 32, height: 52 }
-    wide: { width: 57, height: 52 }
-    narrow: { width: 26, height: 52 }
+    default:   { width: 32,  height: 52 }
+    altline:   { width: 32,  height: 52 }
+    wide:      { width: 57,  height: 52 }
+    narrow:    { width: 26,  height: 52 }
     spaceline: { width: 107, height: 52 }
-    fill: { width: 159, height: 52 }
-    special: { width: 42, height: 52 }
+    fill:      { width: 159, height: 52 }
+    special:   { width: 42,  height: 52 }
 
 views:
     base:

data/keyboards/se.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 48.39024, height: 52 }
-    wide: { width: 64,  height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 32,       height: 52 }
+    altline:   { width: 48.39024, height: 52 }
+    wide:      { width: 64,       height: 52 }
+    spaceline: { width: 142,      height: 52 }
+    special:   { width: 44,       height: 52 }
  
 
 views:

data/keyboards/se_wide.yaml

@@ -0,0 +1,164 @@
+---
+outlines:
+    default:   { width: 50,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special:   { width: 60,  height: 42 }
+ 
+
+views:
+    base:
+        - "q w e r t y u i o p å"
+        - "a s d f g h j k l ö ä"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    upper:
+        - "Q W E R T Y U I O P Å"
+        - "A S D F G H J K L Ö Ä"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    numbers:
+        - "§ 1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign EuroSign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "µ asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "½ ¤ copyright U00AE U00A3 U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: altline
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        outline: "wide"
+        action:
+            set_view: "numbers"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: altline
+        label: "123"
+    show_letters:
+        outline: "wide"
+        action:
+            set_view: "base"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: "special"
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    comma:
+        text: ","
+    backslash:
+        text: "\\"
+    slash:
+        text: "/"
+    quotedbl:
+        text: "\""
+    quoteright:
+        text: "'"
+    less:
+        text: "<"
+    greater:
+        text: ">"
+    colon:
+        text: ":"
+    semicolon:
+        text: ";"
+    exclam:
+        text: "!"
+    question:
+        text: "?"
+    bracketleft:
+        text: "["
+    bracketright:
+        text: "]"

data/keyboards/terminal/de.yaml

@@ -0,0 +1,255 @@
+---
+outlines:
+    default:    { width: 35.33,  height: 46 }
+    halfwidth:  { width: 17.665, height: 46 }
+    narrow:     { width: 26.335, height: 46 }
+    special:    { width: 35.33,  height: 46 }
+    altline:    { width: 52.67,  height: 46 }
+    large:      { width: 52.67,  height: 46 }
+    action:     { width: 59,     height: 46 }
+    wide:       { width: 59,     height: 46 }
+    spaceline:  { width: 100.96, height: 46 }
+    small:      { width: 50.471, height: 22 }
+
+views:
+    base:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t z u i o p"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Z U I O P"
+        - "SlashSmall A S D F G H J K L PipeSmall"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "\\ * # $ / & - + ( ) _"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    symbols:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    eschars:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+    actions:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "Ää"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+        label: "Entf"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+        label: "Einfg"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+        label: "Menü"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+        label: "Untbr"
+    Home:
+        outline: "small"
+        keysym: "Home"
+        label: "Pos1"
+    End:
+        outline: "small"
+        keysym: "End"
+        label: "Ende"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+        label: "Bild↑"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+        label: "Bild↓"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Strg"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "„":
+        outline: "narrow"
+        text: "„"
+    "“":
+        outline: "narrow"
+        text: "“"
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"

data/keyboards/terminal/de_wide.yaml

@@ -0,0 +1,259 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    halfwidth: { width: 27,   height: 37 }
+    narrow:    { width: 40.5, height: 37 }
+    special:   { width: 54,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 153,  height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t z u i o p"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Z U I O P"
+        - "SlashSmall A S D F G H J K L PipeSmall"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "\\ * # $ / & - + ( ) _"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    eschars:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "Ää"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+        label: "Entf"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+        label: "Einfg"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+        label: "Menü"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+        label: "Untbr"
+    Home:
+        outline: "small"
+        keysym: "Home"
+        label: "Pos1"
+    End:
+        outline: "small"
+        keysym: "End"
+        label: "Ende"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+        label: "Bild↑"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+        label: "Bild↓"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Strg"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "„":
+        outline: "narrow"
+        text: "„"
+    "“":
+        outline: "narrow"
+        text: "“"
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"

data/keyboards/terminal/es.yaml

@@ -0,0 +1,220 @@
+---
+outlines:
+    default:   { width: 35.33, height: 46 }
+    action:    { width: 59,    height: 46 }
+    altline:   { width: 52.67, height: 46 }
+    large:     { width: 52.67, height: 46 }
+    wide:      { width: 59,    height: 46 }
+    spaceline: { width: 92.29, height: 46 }
+    special:   { width: 44,    height: 46 }
+    small:     { width: 50.57, height: 22 }
+
+views:
+    base:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ñ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ñ"
+        - "Shift_L   Z X C V B N M  DelUp"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # € / & - _ + ( )"
+        - "show_symbols , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    symbols:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° @ { }"
+        - "show_numbers   \\ % < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    eschars:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers , ü ç ï Ü Ç ï BackSpace"
+        - "show_letters show_symbols preferences        space        show_actions Return"
+    actions:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            set_view: "eschars"
+        outline: "altline"
+        label: "áÁ"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    ".":
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    DelUp:
+        outline: "altline"
+        keysym: "Delete"
+        label: "Del"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"

data/keyboards/terminal/es_wide.yaml

@@ -0,0 +1,224 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 153,  height: 37 }
+    special:   { width: 54,   height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ñ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences    space    show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ñ"
+        - "Shift_L   Z X C V B N M  DelUp"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # $ / & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "show_numbers   \\ % < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    eschars:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers ´ ü ç ï Ü Ç Ï BackSpace"
+        - "show_letters show_symbols preferences        space        show_actions Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            set_view: "eschars"
+        outline: "altline"
+        label: "áÁ"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    ".":
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    DelUp:
+        outline: "altline"
+        keysym: "Delete"
+        label: "Del"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"

data/keyboards/terminal/fr+bepo.yaml

@@ -0,0 +1,223 @@
+---
+outlines:
+    action:    { width: 59,    height: 46 }
+    small:     { width: 50,    height: 22 }
+    default:   { width: 35.33, height: 46 }
+    altline:   { width: 35.33, height: 46 }
+    wide:      { width: 50,    height: 46 }
+    spaceline: { width: 110,   height: 46 }
+    special:   { width: 35.33,    height: 46 }
+
+views:
+    base:
+        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "b é p o w v d l j z"
+        - "a u i e c t s r n m"
+        - "Shift_L y x k q g h f period BackSpace"
+        - "show_numbers preferences slash  space  show_eschars show_actions Return"
+    upper:
+        - "Ctrl Alt Tabsmall PgUp PgDn Home End"
+        - "B É P O W V D L J Z"
+        - "A U I E C T S R N M"
+        - "Shift_L   Y X K Q G H F -  BackSpace"
+        - "show_numbers preferences  space  colon  show_eschars show_actions Return"
+    numbers:
+        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars show_actions Return"
+    symbols:
+        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars show_actions Return"
+    eschars:
+        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters preferences         space        show_eschars show_actions Return"
+    actions:
+        - "Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters Menu Break Left Down Right"
+
+ 
+buttons:
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    Tabsmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    period:
+        outline: "special"
+        text: "."
+    slash:
+        outline: "special"
+        text: "/"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "special"
+        label: ">_"
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "wide"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"

data/keyboards/terminal/fr+bepo_wide.yaml

@@ -0,0 +1,227 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    small:     { width: 67.4, height: 22 }
+    altline:   { width: 81,   height: 37 }
+    wide:      { width: 100,  height: 37 }
+    spaceline: { width: 110,  height: 37 }
+    special:   { width: 54,   height: 37 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "b é p o w v d l j z"
+        - "a u i e c t s r n m"
+        - "Shift_L y x k q g h f period BackSpace"
+        - "show_numbers preferences         space    slash show_eschars show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "B É P O W V D L J Z"
+        - "A U I E C T S R N M"
+        - "Shift_L   Y X K Q G H F -  BackSpace"
+        - "show_numbers preferences         space  colon   show_eschars show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars show_actions Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"    
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars show_actions Return"
+    eschars:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"        
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters preferences         space        show_eschars show_actions Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters Menu Break Left Down Right"
+
+ 
+buttons:
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    period:
+        outline: "special"
+        text: "."
+    slash:
+        outline: "special"
+        text: "/"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "special"
+        label: ">_"
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"

data/keyboards/terminal/fr.yaml

@@ -194,7 +194,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/terminal/fr_wide.yaml

@@ -1,12 +1,12 @@
 ---
 outlines:
+    default:   { width: 54,   height: 37 }
     action:    { width: 90,   height: 37 }
     small:     { width: 67.4, height: 22 }
-    default:   { width: 54,  height: 37 }
-    altline:   { width: 81,  height: 37 }
-    wide:      { width: 100, height: 37 }
-    spaceline: { width: 110, height: 37 }
-    special:   { width: 54,  height: 37 }
+    altline:   { width: 81,   height: 37 }
+    wide:      { width: 100,  height: 37 }
+    spaceline: { width: 110,  height: 37 }
+    special:   { width: 54,   height: 37 }
 
 views:
     base:
@@ -197,7 +197,7 @@ buttons:
         action:
             set_view: "base"
         outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"

data/keyboards/terminal/us+dvorak.yaml

@@ -0,0 +1,204 @@
+---
+outlines:
+    default:   { width: 35.33, height: 46 }
+    action:    { width: 59,    height: 46 }
+    altline:   { width: 52.67, height: 46 }
+    wide:      { width: 59,    height: 46 }
+    spaceline: { width: 140,   height: 46 }
+    special:   { width: 44,    height: 46 }
+    small:     { width: 50.47, height: 22 }
+
+views:
+    base:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "Shift_L   p y f g c r l  BackSpace"
+        - "a o e u i d h t n s"
+        - ", q j k x b m w v z"
+        - "show_numbers preferences      space        show_actions Return"
+    upper:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Shift_L   P Y F G C R L  BackSpace"
+        - "A O E U I D H T N S"
+        - ", Q J K X B M W V Z"
+        - "show_numbers preferences      space        show_actions Return"
+    numbers:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "* # $ / & - _ + ( )"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "show_letters preferences         space        period Return"
+    actions:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"

data/keyboards/terminal/us+dvorak_wide.yaml

@@ -0,0 +1,208 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 225,  height: 37 }
+    special:   { width: 54,   height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "Shift_L   p y f g c r l  BackSpace"
+        - "a o e u i d h t n s"
+        - ", q j k x b m w v z"
+        - "show_numbers preferences      space        show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Shift_L   P Y F G C R L  BackSpace"
+        - "A O E U I D H T N S"
+        - ", Q J K X B M W V Z"
+        - "show_numbers preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "* # $ / & - _ + ( )"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "show_letters preferences         space        period Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"

data/keyboards/terminal/us.yaml

@@ -1,44 +1,46 @@
 ---
 outlines:
-    default: { width: 35.33, height: 46 }
-    action:  { width: 59,    height: 46 }
-    altline: { width: 52.67, height: 46 }
-    wide: { width: 59, height: 46 }
-    spaceline: { width: 140, height: 46 }
-    special: { width: 44, height: 46 }
-    small: { width: 59, height: 22 }
+    default:   { width: 35.33,  height: 46 }
+    halfwidth: { width: 17.665, height: 46 }
+    special:   { width: 44,     height: 46 }
+    altline:   { width: 52.67,  height: 46 }
+    large:     { width: 52.67,  height: 46 }
+    action:    { width: 59,     height: 46 }
+    wide:      { width: 59,     height: 46 }
+    spaceline: { width: 144.96, height: 46 }
+    small:     { width: 50.57,  height: 22 }
 
 views:
     base:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "q w e r t y u i o p"
-        - "a s d f g h j k l"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
         - "Shift_L   z x c v b n m  BackSpace"
         - "show_numbers preferences      space        show_actions Return"
     upper:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
         - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
+        - "SlashSmall A S D F G H J K L PipeSmall"
         - "Shift_L   Z X C V B N M  BackSpace"
         - "show_numbers preferences      space        show_actions Return"
     numbers:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
+        - "\\ * # $ / & - + ( ) _"
         - "show_symbols   , \" ' colon ; ! ?  BackSpace"
         - "show_letters preferences         space        period Return"
     symbols:
-        - "Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
         - "show_letters preferences         space        period Return"
     actions:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
+        - "show_letters_actions Menu Break Left Down Right"
 
 buttons:
     Shift_L:
@@ -59,7 +61,7 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
         label: "123"
     show_numbers_from_symbols:
         action:
@@ -67,6 +69,11 @@ buttons:
         outline: "altline"
         label: "123"
     show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
         action:
             set_view: "base"
         outline: "wide"
@@ -82,7 +89,7 @@ buttons:
         outline: "altline"
         label: ">_"
     period:
-        outline: "altline"
+        outline: "large"
         text: "."
     space:
         outline: "spaceline"
@@ -135,6 +142,10 @@ buttons:
     Tab:
         outline: "action"
         keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
     Del:
         outline: "action"
         keysym: "Delete"
@@ -198,3 +209,19 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"

data/keyboards/terminal/us_wide.yaml

@@ -1,44 +1,46 @@
 ---
 outlines:
     default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 225,  height: 37 }
+    halfwidth: { width: 27,   height: 37 }
     special:   { width: 54,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 234,  height: 37 }
     small:     { width: 67.4, height: 22 }
 
 views:
     base:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "q w e r t y u i o p"
-        - "a s d f g h j k l"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
         - "Shift_L   z x c v b n m  BackSpace"
         - "show_numbers preferences      space        show_actions Return"
     upper:
         - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
         - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
+        - "SlashSmall A S D F G H J K L PipeSmall"
         - "Shift_L   Z X C V B N M  BackSpace"
         - "show_numbers preferences      space        show_actions Return"
     numbers:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
+        - "\\ * # $ / & - + ( ) _"
         - "show_symbols   , \" ' colon ; ! ?  BackSpace"
         - "show_letters preferences         space        period Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
         - "show_letters preferences         space        period Return"
     actions:
         - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
+        - "show_letters_actions Menu Break Left Down Right"
 
 buttons:
     Shift_L:
@@ -59,7 +61,7 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
         label: "123"
     show_numbers_from_symbols:
         action:
@@ -67,6 +69,11 @@ buttons:
         outline: "altline"
         label: "123"
     show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
         action:
             set_view: "base"
         outline: "wide"
@@ -82,7 +89,7 @@ buttons:
         outline: "altline"
         label: ">_"
     period:
-        outline: "altline"
+        outline: "large"
         text: "."
     space:
         outline: "spaceline"
@@ -205,4 +212,20 @@ buttons:
     Alt:
         modifier: "Alt"
         outline: "small"
-        label: "Alt"
+        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"

data/keyboards/th.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:

data/keyboards/th_wide.yaml

@@ -1,11 +1,11 @@
 ---
 outlines:
-    default: { width: 75, height: 56 }
-    altline: { width: 75, height: 56 }
-    wide: { width: 135, height: 56 }
-    spaceline: { width: 450, height: 56 }
+    default:         { width: 75,  height: 56 }
+    altline:         { width: 75,  height: 56 }
+    wide:            { width: 135, height: 56 }
+    spaceline:       { width: 450, height: 56 }
     spacelinesymbol: { width: 300, height: 56 }
-    special: { width: 90, height: 56 }
+    special:         { width: 90,  height: 56 }
 
 views:
     base:

data/keyboards/ua.yaml

@@ -1,12 +1,12 @@
 ---
 outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 32, height: 52 }
-    wide: { width: 57, height: 52 }
-    narrow: { width: 26, height: 52 }
+    default:   { width: 32,  height: 52 }
+    altline:   { width: 32,  height: 52 }
+    wide:      { width: 57,  height: 52 }
+    narrow:    { width: 26,  height: 52 }
     spaceline: { width: 107, height: 52 }
-    fill: { width: 159, height: 52 }
-    special: { width: 42, height: 52 }
+    fill:      { width: 159, height: 52 }
+    special:   { width: 42,  height: 52 }
 
 views:
     base:

data/keyboards/url/us.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
+    default:   { width: 35.33,  height: 52 }
+    altline:   { width: 52.67,  height: 52 }
+    wide:      { width: 62,     height: 52 }
     spaceline: { width: 106.67, height: 52 }
-    special: { width: 44, height: 52 }
+    special:   { width: 44,     height: 52 }
 
 views:
     base:

data/keyboards/us+colemak.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:

data/keyboards/us+colemak_wide.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 108, height: 42 }
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
     spaceline: { width: 216, height: 42 }
-    special: { width: 54, height: 42 }
+    special:   { width: 54,  height: 42 }
 
 views:
     base:

data/keyboards/us+dvorak.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:

data/keyboards/us+dvorak_wide.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 108, height: 42 }
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
     spaceline: { width: 216, height: 42 }
-    special: { width: 54, height: 42 }
+    special:   { width: 54,  height: 42 }
 
 views:
     base:

data/keyboards/us_wide.yaml

@@ -1,10 +1,10 @@
 ---
 outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 108, height: 42 }
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
     spaceline: { width: 216, height: 42 }
-    special: { width: 54, height: 42 }
+    special:   { width: 54,  height: 42 }
 
 views:
     base:

data/sm.puri.Squeekboard.desktop.in.in

@@ -3,7 +3,14 @@ Name=Squeekboard
 GenericName=On Screen Keyboard
 Comment=An on screen virtual keyboard
 Exec=@bindir@/squeekboard
+Icon=input-keyboard-symbolic
 Terminal=false
 Type=Application
 NoDisplay=true
 Categories=GTK;Utility;
+OnlyShowIn=Phosh;
+X-Phosh-UsesFeedback=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true

data/squeekboard.gresources.xml

@@ -8,5 +8,6 @@
    <file>icons/key-enter.svg</file>
    <file>icons/key-shift.svg</file>
    <file>icons/keyboard-mode-symbolic.svg</file>
+   <file>icons/zwnj.svg</file>
   </gresource>
 </gresources>

data/style-Adwaita:dark.css

@@ -1,34 +1,22 @@
+/* Adwaita-dark style keyboard */
 sq_view {
     background-color: rgba(0, 0, 0, 255);
     color: #ffffff;
-    font-family: cantarell, sans-serif;
-    font-size: 25px;
 }
 
 sq_view sq_button {
     color: #deddda;
     background: #464448;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #5e5c64;
-    border-radius: 3px;
-    margin: 4px 2px 4px 2px;
-}
-
-sq_view.wide sq_button {
-    margin: 1px 1px 1px 1px;
 }
 
 sq_button:active {
     background: #747077;
-    border-color: #96949d;
 }
 
 sq_button.altline,
 sq_button.special,
 sq_button.wide {
     background: #2b292f;
-    border-color: #3e3a44;
 }
 
 sq_button.latched {
@@ -41,22 +29,12 @@ sq_button.locked {
     color: #1c71d8;
 }
 
-sq_button.action {
-    font-size: 0.75em;
-}
-
-sq_button.small {
-    font-size: 0.5em;
-}
-
 #Return {
     background: #1c71d8;
-    border-color: #1a5fb4;
 }
 
 #Return:active {
     background: #1c71d8;
-    border-color: #3584e4;
 }
 
 @import url("resource:///sm/puri/squeekboard/common.css");

data/style.css

@@ -1,65 +1,47 @@
+/* Keyboard style */
 sq_view {
-    background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
-    color: @theme_text_color; /*#ffffff;*/
-    font-family: cantarell, sans-serif;
-    font-size: 25px;
+    background-color: mix(@theme_base_color, @theme_fg_color, 0.1);
+    box-shadow:inset 0 1px 0 0 mix(@borders, @theme_base_color, 0.8);
 }
 
-sq_view sq_button {
-    color: @theme_fg_color; /*#deddda;*/
-    background: mix(@theme_bg_color, @theme_base_color, -0.5); /* #464448; */
-    border-style: solid;
-    border-width: 1px;
-    border-color: @borders; /* #5e5c64;*/
-    border-radius: 3px;
-    margin: 4px 2px 4px 2px;
+sq_button {
+    color: @theme_fg_color;
+    background: alpha(@theme_fg_color, 0.07); 
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2); 
 }
 
-sq_view.wide sq_button {
-    margin: 1px 1px 1px 1px;
-}
-
-sq_button:active,
-sq_button.altline:active,
-sq_button.special:active,
-sq_button.wide:active {
-    background: mix(@theme_bg_color, @theme_selected_bg_color, 0.4);/* #747077; */
-    border-color: mix(@borders, @theme_selected_fg_color, 0.5);/* #96949d; */
+sq_button:active {
+    background: alpha(@theme_fg_color, 0.11);
 }
 
 sq_button.altline,
-sq_button.special,
-sq_button.wide {
-    background: mix(@theme_bg_color, @theme_base_color, 0.5); /*#2b292f;*/
-    border-color: @borders; /* #3e3a44; */
+sq_button.special {
+    background: alpha(@theme_fg_color, 0.15); 
+}
+
+sq_button.altline:active,
+sq_button.special:active {
+    background: alpha(@theme_fg_color, 0.2);
 }
 
 sq_button.latched {
-    background: @theme_fg_color; /*#ffffff;*/
-    color: @theme_bg_color; /*#2b292f;*/
+    background: alpha(@theme_fg_color, 0.2); 
+    color: alpha(@theme_fg_color, 0.8);
 }
 
 sq_button.locked {
-    background: @theme_fg_color; /*#ffffff;*/
-    color: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#2b292f;*/
-}
-
-sq_button.action {
-    font-size: 0.75em;
-}
-
-sq_button.small {
-    font-size: 0.5em;
+    background: alpha(@theme_fg_color, 0.5);
+    color: @theme_base_color;
 }
 
 #Return {
-    background: @theme_selected_bg_color; /* #1c71d8; */
-    border-color: @borders; /*#1a5fb4;*/
+    background: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
 }
 
 #Return:active {
-    background: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#1c71d8;*/
-    border-color: @borders; /*#3584e4;*/
+    background: mix(@theme_selected_bg_color, black, 0.2);
+    color: mix(@theme_selected_fg_color, black, 0.2);
 }
 
 @import url("resource:///sm/puri/squeekboard/common.css");

debian/cargo/config

@@ -9,4 +9,3 @@ replace-with = 'vendored-sources'
 
 [source.vendored-sources]
 directory = '/usr/share/cargo/registry'
-

debian/changelog

@@ -1,3 +1,327 @@
+squeekboard (1.24.0) experimental; urgency=medium
+
+  [ MoonlightWave-12 ]
+  * src/popover.c: Change 'ControlCenter' to 'Settings'
+  * Add new emoji-layout
+  * squeekboard.doap: update descriptions and links
+  * Change branch-name from 'master' to 'main'
+  * hacking.md: add more instructions
+
+  [ Guido Günther ]
+  * ci: Stop building byzantium debs
+  * Use newer dependencies everywhere
+  * ci: Drop lintian check
+  * ci: Use Debian trixie for the doc build
+  * ci: Cancel running jobs
+  * ci: Always use noninteractive debconf backend
+
+ -- MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>  Sun, 10 Mar 2024 14:44:36 +0100
+
+squeekboard (1.23.0) experimental; urgency=medium
+
+  [ Vasil Pupkin ]
+  * Add Belarusian translation
+
+  [ Pierre Michel Augustin ]
+  * Add Haitian Creole translation
+  * Update Haitian Creole translation
+  * Update Haitian Creole translation
+
+  [ Luciano ]
+  * add french canadian layout (QWERTY + accented letters)
+
+  [ Danial Behzadi ]
+  * Fix Persian layout
+
+  [ uzanto uz ]
+  * Add Spanish terminal-keyboard-layouts
+
+  [ MoonlightWave-12 ]
+  * Improve Spanish terminal-keyboard-layouts
+  * Update links in the documentation
+  * doc/tutorial.md: Remove outdated information about translations
+  * Improve layouts of us-terminal-keyboards
+  * us.yaml and us_wide.yaml: Change outline of 123- and ABC-keys to altline
+  * us.yaml and us_wide.yaml: Change the outline of the period-key
+  * Fix Swiss layouts
+  * Add German terminal-keyboard-layout
+  * data/keyboards/email/us.yaml: fix styling of @-key
+  * data/keyboards/de*.yaml: Change äÄ-label to Ää
+  * data/keyboards/*.yaml: Change "abc" to "ABC"
+  * Add wide emoji-layout
+  * Update dependencies
+
+ -- MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>  Fri, 08 Mar 2024 10:46:37 +0100
+
+squeekboard (1.22.0-1) experimental; urgency=medium
+
+  [ Asier Sarasua Garmendia ]
+  * Add Basque translation
+
+  [ Dorota Czaplejewicz ]
+  * state: Make size independent of scaling factor
+  * cleanup: Remove debug prints
+  * tests: Make panel manager modifications pure
+  * panel: Fix sizing on output reconfiguration
+  * Update deps
+
+  [ Undef ]
+  * layout: fix uppercase dvorak terminal mode
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 01 Apr 2023 13:46:23 +0000
+
+squeekboard (1.21.0-1) experimental; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * CI: target bookworm for "future" job
+  * keyboard: Remove unused field
+  * style: Use layout name as css class
+  * style: Give gr+polytonic a custom font
+  * docs: Add NEWS.md
+  * docs: Remove obsolete amber instructions
+  * docs: Update Cargo.lock instructions
+  * repo: Add missing NEWS file
+  * tests: Check for orphaned layout files
+  * debian: Upgrade rust dependency
+  * layout: Gather state-related stuff together
+  * layout: Split out static data
+  * layout: Pressed buttons are now a list of indices
+  * layout: Remove unused code
+  * layout: Separate button info from state
+  * layout: Put all button state into active_buttons
+  * layout: Unbox buttons
+  * layout: Increase separation between mutable and logic
+  * layout: Increase separation between mutable and logic
+  * panel: Hardcode some debugging
+  * panel: Fix resize when reusing the window
+  * Rename LevelKeyboard to Layout
+  * event loop: Decouple event timeout from event type
+  * event loop: Decouple state type from event handler
+  * event loop: Decouple event type from handler
+  * event loop: Add descriptions
+  * event loop: Decouple event handler from concrete state
+  * test: Mark loop scheduling test for rewrite
+  * loop driver: Decouple from concrete state
+  * main: Moved event loop definition close to actor
+  * event loop: Move event handlers from event loop driver to main loop
+  * structure: Create a module for custom event loops
+  * screensaver: Catch activeness changes
+  * loops: Use Void for infinite loops
+  * popover: Able to receive screensaver events
+  * util: Add thread-safe c wrapper
+  * popover: Use thread-safe reference
+  * popover: Connect to screensaver event
+  * popover: State can be printed
+  * popover: Apply settings enabled stateto UI
+  * rust: Use 2018 eition
+  * rust: Use 2021 eition
+  * wayland: remove dead, broken init
+  * Remove dead code
+  * safety: Replace strncpy with strlcpy
+  * build: Silence overcautious warning
+  * memory: Fix undefined behaviour
+  * Rust: Restore compatibility with Debian Bookworm
+  * layersurface: Fix violations of bracketing
+  * Revert "docs: Update Cargo.lock instructions"
+  * Update Cargo.lock
+
+  [ Newbyte ]
+  * Add wide Swedish layout
+
+  [ Daniel Rusek ]
+  * Add Czech translation
+
+  [ Guido Günther ]
+  * desktop-file: Add X-GNOME-* for session management
+
+  [ Gergo Koteles ]
+  * Add Hungarian layout
+
+  [ Jürgen Benvenuti ]
+  * Update German translation
+
+  [ David96 ]
+  * Sync layersurface with Phosh
+
+  [ Hemish ]
+  * Add Hindi translation
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Thu, 16 Feb 2023 15:35:32 +0000
+
+squeekboard (1.20.0-1) experimental; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * state: Don't animate when force-hidden
+  * build: Use Cargo.lock included with the repo by default
+  * build: Update Cargo.lock.newer
+
+  [ Darren R ]
+  * added US Dvorak Terminal
+
+  [ Efstathios Iosifidis ]
+  * Add Greek translation
+
+  [ Goran Vidović ]
+  * Add Croatian translation
+
+  [ Sebastian Krzyszkowiak ]
+  * data: Set an icon in the desktop file
+  * data: Indicate that Squeekboard provides haptic feedback
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 03 Sep 2022 14:21:57 +0000
+
+squeekboard (1.19.0-1) experimental; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * docs: Describe layouts
+  * glib: Fix import
+  * state: Record layout choice
+  * doc: Describe how to control debugging mode
+  * state: Include layout choice in visible outcome
+  * state: Store layout override
+  * state: Decide panel arrangement
+  * state: Use dummy layout command
+  * state: Use IM hint and purpose for layout selection
+  * main: Dry-load layout in response to the layout command
+  * state: Become the source of layout choice
+  * cargo: Halt overzealous upgrader
+  * ci: Use bookworm for online builds
+  * build: Generate files before compiling sources
+  * gtk: Persist panel state
+  * build: Update Cargo.lock
+
+  [ Luke Luo ]
+  * Add Chinese (China) translation
+
+  [ Éloi Rivard ]
+  * Add French translation
+
+  [ Laurent Laffont ]
+  * Add FR+Bépo layout
+
+  [ Bytez ]
+  * Fixed missing characters in eschars view in italian layout.
+  * Replaced foreign characters.
+
+  [ Aleksandr Melman ]
+  * Add Russian translation
+
+  [ skysphr ]
+  * Added Georgian layout
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 06 Jul 2022 06:10:40 +0000
+
+squeekboard (1.18.0-1) experimental; urgency=medium
+
+  [ Hugo Carvalho ]
+  * Add Portuguese translation
+
+  [ Мирослав Николић ]
+  * Add Serbian translation
+
+  [ William Wold ]
+  * Do not reset pending state on zwp_input_method_v2.done
+
+  [ Balázs Úr ]
+  * Add Hungarian translation
+
+  [ Emin Tufan Çetin ]
+  * Add Turkish translation
+
+  [ Piotr Drąg ]
+  * Add Polish translation
+
+  [ Pablo Correa Gómez ]
+  * Add Spanish translation
+
+  [ Vittorio Monti ]
+  * Add Italian translation
+
+  [ Dorota Czaplejewicz ]
+  * build: Replace missing crates.io dependency with Purism-hosted one
+  * ci: Allow failure on sid
+  * build: Update clap on newer Debian
+  * panel: Use scaling to set height
+  * layouts: Add Greek Polytonic
+  * debug: Add dbus interface to control debug prints
+  * output: Store physical size
+  * state: Derive panel size from physical click target size
+  * Clean up size types
+  * state: Add sizing unit test
+  * layouts: Register gr_wide
+  * CI: Build Rust code reference
+  * CI: Add gitlab pages deployment
+  * panel: Split away panel handling
+  * cargo: Add zbus to newer Debian
+  * docs: Update location
+  * docs: Link to reference
+  * docs: Make index more logical
+  * Update Cargo lock
+
+  [ Sotiris Papadopoulos ]
+  * Update gr.yaml to take advantage of more space per symbol. Creation of a wide variant...
+
+  [ Arnaud Ferraris ]
+  * state: fix "wide mode" detection in portrait orientation
+  * layout: allow stretching the layout by a small amount
+  * layout: fix build on i386
+
+  [ Sungjoon Moon ]
+  * Add Korean translation
+
+  [ Quentin PAGÈS ]
+  * Add Occitan translation
+
+  [ Zurab Kargareteli ]
+  * Add Georgian translation
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 25 Apr 2022 13:12:36 +0000
+
+squeekboard (1.17.0-1) experimental; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * docs: Detail the release process better
+  * cleanup: Remove unused header lines
+  * docstrings: Clarify the purpose of Receiver
+  * wayland: Move initialization to the Rust side
+  * ffi: Remove unnecessary pointers to InputMethod
+  * outputs: Clean up for more Rust usage
+  * outputs: Notify the state manager about changes
+  * outputs: Handle removal
+  * Save outputs state
+  * Store preferred output
+  * deps: Vendor assert_matches
+  * Carry output information on visible command all the way to C
+  * Don't reach for globals to choose output
+  * visibility: Forward panel height information to window creation
+  * outputs: Remove ui manager
+  * output: Use new source of panel height information
+  * panel: Apply a hard limit of 1/2 height
+  * cargo: Update lockfile
+
+  [ Cosmin Humeniuc ]
+  * Add Romanian layout
+
+  [ Sam Hewitt ]
+  * data: Update stylesheet with upstream design
+
+  [ Tor ]
+  * Make compatible with latest cargo deps
+
+  [ Luís Fernando Stürmer da Rosa ]
+  * Update Brazilian Portuguese translation
+
+  [ Fran Dieguez ]
+  * Add Galician translation
+
+  [ William Wold ]
+  * Check if dbus handler is null before using
+
+  [ Yosef Or Boczko ]
+  * Add Hebrew translation
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 25 Jan 2022 11:24:04 +0000
+
 squeekboard (1.16.0-1) experimental; urgency=medium
 
   [ Dorota Czaplejewicz ]

debian/control

@@ -8,14 +8,15 @@ Build-Depends:
  meson (>=0.51.0),
  ninja-build,
  pkg-config,
+ libbsd-dev,
  libglib2.0-dev,
  libgnome-desktop-3-dev,
  libgtk-3-dev,
  libfeedback-dev,
- librust-bitflags-1-dev (>= 1.0),
- librust-clap-2+default-dev (>= 2.32),
- librust-gio+v2-44-dev,
- librust-glib+v2-44-dev,
+ librust-bitflags-dev (>= 1.0),
+ librust-clap-dev (>= 2.32),
+ librust-gio+v2-58-dev,
+ librust-glib+v2-58-dev,
  librust-glib-sys-dev,
  librust-gtk+v3-22-dev (>= 0.5),
  librust-gtk-sys-dev,
@@ -23,6 +24,7 @@ Build-Depends:
  librust-serde-derive-1-dev (>= 1.0),
  librust-serde-yaml-0.8-dev (>= 0.8),
  librust-xkbcommon-0.4+wayland-dev (>= 0.4),
+ librust-zbus-dev (>= 1.9),
  libwayland-dev (>= 1.16),
  lsb-release,
  python3,
@@ -30,11 +32,13 @@ Build-Depends:
  rustc,
  wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
-Homepage: https://source.puri.sm/Librem5/squeekboard
+Homepage: https://gitlab.gnome.org/World/Phosh/squeekboard
 
 Package: squeekboard
 Architecture: linux-any
 Depends:
+# for Greek polytonic readability
+ fonts-gfs-didot-classic,
 # for the Adwaita-dark theme
  gnome-themes-extra-data,
  ${shlibs:Depends},

debian/copyright

@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: squeekboard
-Source: https://source.puri.sm/Librem5/squeekboard
+Source: https://gitlab.gnome.org/World/Phosh/squeekboard
 
 Files: *
 Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>

debian/rules

@@ -25,10 +25,10 @@ export RUSTFLAGS = --remap-path-prefix=$(CURDIR)=/remap-pwd $(xgot)
 
 
 distrel := $(shell lsb_release --codename --short)
-ifneq (,$(filter $(distrel),buster amber))
-	legacy = true
+ifneq (,$(filter $(distrel),bookworm))
+	newer = true
 else
-	legacy = false
+	newer = false
 endif
 
 %:
@@ -38,6 +38,6 @@ endif
 # causing Cargo to refuse to build with a crates.io copy
 override_dh_auto_configure:
 	[ ! -f Cargo.lock ] || rm Cargo.lock
-	dh_auto_configure -- -Dlegacy=$(legacy)
+	dh_auto_configure -- -Dnewer=$(newer) -Donline=false
 
 override_dh_autoreconf:

doc/hacking.md

@@ -38,7 +38,7 @@ You may notice that they are ordered roughly from "user-focused" to "maintainer-
 Sending patches
 ---------------
 
-By submitting a change to this project, you agree to license it under the [GPL license version 3](https://source.puri.sm/Librem5/squeekboard/blob/master/COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](https://source.puri.sm/Librem5/squeekboard/blob/master/dco.txt).
+By submitting a change to this project, you agree to license it under the [GPL license version 3](COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](dco.txt).
 
 Development environment
 -----------------------
@@ -56,7 +56,7 @@ sudo apt-get -y install build-essential
 sudo apt-get -y build-dep .
 ```
 
-For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](https://source.puri.sm/Librem5/squeekboard/blob/master/debian/control) file.
+For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](debian/control) file.
 
 Testing
 -------
@@ -90,6 +90,14 @@ Layouts can be selected using the GNOME Settings application.
 $ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'de')]"
 ```
 
+### Debugging mode
+
+Squeekboard prints some information on standard output by default. To get deep debugging information, it can also print all changes in (some of) its internal state. Those logs are most useful when reporting hard to catch issues, and can be enabled using the following command:
+
+```
+busctl set-property --user sm.puri.SqueekDebug /sm/puri/SqueekDebug sm.puri.SqueekDebug Enabled b true
+```
+
 ### Environment Variables
 
 Besides the environment variables supported by GTK and [GLib](https://docs.gtk.org/glib/running.html) applications
@@ -102,6 +110,17 @@ contain a comma separated list of:
 Coding
 ------
 
+### Reference docs
+
+Reference documentation can be generated using:
+
+```
+cd squeekboard_build/ 
+../squeekboard_source/cargo.sh doc --no-deps --document-private-items
+```
+
+as well as found [online](https://world.pages.gitlab.gnome.org/Phosh/squeekboard/doc/rs/).
+
 ### Project structure
 
 Rust modules should be split into 2 categories: libraries, and user interface. They differ in the way they do error handling.
@@ -205,6 +224,7 @@ While the file is not actually used, it's a good idea to save the config in case
 
 ```
 cd squeekboard-build
+.../squeekboard-source/cargo.sh update
 ninja test
 cp ./Cargo.lock .../squeekboard-source
 ```
@@ -225,42 +245,49 @@ Packaging is in the `debian/` directory, and creates builds that can be quickly
 
 ```
 cd squeekboard-source
-gbp dch --multimaint-merge  --ignore-branch
+EMAIL=my_address@example.com gbp dch --multimaint-merge  --ignore-branch --git-author --distribution=experimental --new-version=x.y.z
 ```
 
 Inspect `debian/changelog`, and make sure the first line contains the correct version number and suite. For example:
 
 ```
-squeekboard (1.13.0pureos0~amber0) amber-phone; urgency=medium
+squeekboard (1.22.0) experimental; urgency=medium
 ```
 
-Commit the updated `debian/changelog`. The commit message should contain the release version and a description of changes.
+Add the updated `debian/changelog` to the commit. The commit message should contain the release version and a description of changes.
 
-> Release 1.13.0 "Externality"
->
-> Changes:
->
-> - A system for latching and locking views
-> ...
+### 5. Update the NEWS file
 
-### 5. Create a signed tag for downstreams
+Summarize the changes since the last release in the NEWS file. Use the Markdown syntax, e.g.
+
+```
+1.22.0 "Superposition"
+-----------------------------
+
+Changes:
+- Fixed panel sizing when scaling
+...
+```
+
+### 6. Commit changes
+
+Generate a commit message from the NEWS file:
+
+```
+tools/make_message | git commit --file=- ...
+```
+
+If the commit message looks wrong, fix the NEWS file, and do `git commit --amend`.
+
+### 7. Create a signed tag for downstreams
 
 The tag should be the version number with "v" in front of it. The tag message should be "squeekboard" and the tag name. Push it to the upstream repository:
 
 ```
-git tag -s -u my_address@example.com v1.13.0 -m "squeekboard v1.13.0"
-git push v1.13.0
+git tag -s -u my_address@example.com v1.22.0 -m "squeekboard v1.22.0"
+git push origin v1.22.0
 ```
 
-### 5. Create a signed tag for packaging
+### 8. Rejoice
 
-Similar to the above, but format it for the PureOS downstream.
-
-```
-git tag -s -u my_address@example.com 'pureos/1.13.0pureos0_amber0' -m 'squeekboard 1.13.0pureos0_amber0'
-git push 'pureos/1.13.0pureos0_amber0'
-```
-
-### 6. Rejoice
-
-You released a new version of Squeekboard, and made it available on PureOS. Congratulations.
+You released a new version of Squeekboard. Congratulations!

doc/index.md

@@ -1,26 +1,19 @@
 Welcome to squeekboard's documentation!
 =======================================
 
-Contents
---------
-
-* [Tutorial](tutorial.md)
-* [Contributing](hacking.md)
-* [Switching views](views.md)
-
 Introduction
 ------------
 
-Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
+Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](README.md).
 
 Layouts
 -------
 
 Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](tutorial.md) explains the process in detail.
 
-Layouts are created using a text-based format, based on YAML.
+Layouts are created using a [text-based format, based on YAML](layouts.md).
 
-TODO: Provide a description of the format.
+### Views
 
 Squeekboard layouts are separated into *views* and use a *room metaphor* to [switch views](views.md).
 
@@ -28,3 +21,7 @@ Contributions
 -------------
 
 Anyone is free to modify *squeekboard*. See the [contributing document](hacking.md).
+
+### Code documentation
+
+To expose the structure of Squeekboard in detail, there's a [code reference](https://world.pages.gitlab.gnome.org/Phosh/squeekboard/doc/rs/).

doc/layouts.md

@@ -0,0 +1,121 @@
+Layouts
+=====
+
+Squeekboard is composed of multiple layouts, several for each language, multiplied by each hint.
+
+Layouts live in the "keyboards" directory.
+
+Hints
+-------
+
+The currently supported hints are: default, "email", "emoji", "number', "pin", "terminal", and "url".
+
+Each directory in "keyboards" is named after a hint, with the "keyboards" directory itself taking the role of default.
+
+Languages/scripts
+-----------------------
+
+Each hint directory contains multiple layout files. A single language will be composed of multiple files, with names starting with the same text. The language names are taken from iso639-3. An example is "gr".
+
+After the language name optionally comes a "+" and an indication of the variant. For example, "it+fur".
+
+Squeekboard will look for those based on the currently selected layout in Gnome Control Center.
+
+Then, there's an optional part "_wide", which Squeekboard will try to use if the current display is rather wide. Example: "us+colemak_wide" or "us_wide".
+
+Finally, the file name ends with ".yaml", e.g. "jp+kana_wide.yaml".
+
+Together with hint information, this gives a complete path to the layout like this: "keyboards/terminal/fr_wide.yaml" or "keyboards/cz+qwerty.yaml".
+
+Layout syntax
+------------------
+
+The layout file follows the YAML syntax, with specific meanings given to sections.
+
+### Outlines
+
+The "outlines" dictionary controls the widths and heights of buttons. 
+
+```
+outlines:
+    default: { width: 32, height: 52 }
+```
+The width and height numbers are not in pixels, but rather they are proportionally scaled to fit the panel size.
+
+There may be any number of outlines, but there are some special names:
+- "default" applies to every button unless explicitly changed. It should be used for buttons that emit text
+- "altline", "wide" have own color scheme, should be used for buttons which cause view changes
+- "special" has own color scheme, to be used for confirmations like enter.
+
+### Views
+
+The "views" dictionary contains the actual views and positions of buttons.
+
+```
+views:
+    base:
+        - "q w e r t y u i o p å"
+```
+
+Squeekboard's layouts consist of multiple views, of which only one is visible at a time. Different views may contain different or the same buttons, more or fewer buttons, but each layout is independent. They are *not* shift levels – there is no concept of "shift" in Squeekboard. View selection is also not dependent on modifiers.
+
+There is only one special view "base". Views and view switching are described in detail in the [views](views.md) document.
+
+Views in Squeekboard are based on rows. The first row comes near the top of the panel, the next one below, and so on.
+
+```
+- "Q W E R T Y U I O P Å"
+- "upper   z x c v b n m  BackSpace"
+```
+
+Each row is a single string, and button names are separated by spaces. In left-to-right languages, the panel will be laid out just like the view code. CAUTION: buttons are placed on the panel left-to-right, starting from the earliest position in the string. That may not display great in your text editor when you use right-to-left characters as button names.
+
+#### Button names in rows
+
+Unicode characters are supported in the row string, so it's easy to use the correct name for most of them. However, the layout code is still YAML, which excludes certain characters: the space " ", the backslash "\", the double quote `"`. Those must use a replacement name.
+
+Similarly, buttons that do not emit characters must have some names.
+
+### Buttons
+
+The buttons section describes what the button looks like and what it does.
+
+```
+    BackSpace:
+        outline: altline
+        icon: "edit-clear-symbolic"
+        action: erase
+```
+
+Each entry in the "buttons" dictionary describes some button already present in one of the "views" rows. In the above example, it's "BackSpace".
+
+The button description can have a number of components, each optional. For details, see 
+
+- "outline" selects which entry from the "outlines" section to use to draw this button,
+- "label" is what should be displayed on the button, if its name is unsuitable,
+- "icon" is the name of the svg icon to use instead of a label (icons are builtin, see the "data/icons" directory),
+- "text" is the text to submit when the button is clicked – if the name of the button is not suitable,
+- "keysym" is the emulated keyboard keysym to send instead of sending text. Its use is discouraged: Squeekboard will automatically send keysyms if it detects that the receiving application does not accept text.
+- "modifier" makes the button set an emulated keyboard modifier. The use of this is discouraged, and never needed for entering text.
+- "action" sets aside the button for special actions like view switching
+
+#### Action
+
+```
+        action:
+            set_view: "numbers"
+```
+
+The "action" property has multiple forms.
+
+- "erase" will erase the position behind the cursor,
+- "show_preferences" will open the language selection popup,
+- "set_view" simply switches to a view,
+- "lock_view" switches to a view for a moment.
+
+The two switching modes are better described in the [views](views.md) document.
+
+Sources
+----------
+
+The sources, where all this is documented and up to date are in "src/data/parsing.rs". The reference documentation for the `rs::data::parsing::Layout` structure is the main place to look at.

doc/tutorial.md

@@ -5,18 +5,16 @@ This guide is based on the original Kareema's [forum post](https://forums.puri.s
 
 It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.
 
-So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://source.puri.sm/Librem5/squeekboard/-/merge_requests/)
+So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/)
 
 ## Creating a new layout
 
-Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout.
+Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout, with the [layouts](layouts.md) documentation in hand.
 
 ### Get one of the existing keyboard layouts
 
-* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
-* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
-* Take a look and try to understand them :slight_smile:
-
+* You can get one of the keyboards from the squeekboard git repository : [https://gitlab.gnome.org/World/Phosh/squeekboard](https://gitlab.gnome.org/World/Phosh/squeekboard)
+* The keyboard layouts are located in the subdirectory [`data/keyboards/`](data/keyboards) in the `.yaml` files
 
 ### Creating the keyboard layout
 
@@ -54,7 +52,7 @@ Above all, your layout should be working, be tested, not break anything, and mak
 
 ### Fork your own copy of squeekboard
 
-* Best way would be to start with a fork of the squeekboard repository: Create a user account at https://source.puri.sm/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
+* Best way would be to start with a fork of the squeekboard repository: Create a user account at https://gitlab.gnome.org/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
 * Clone your fork locally with `git clone` and use the uri of your forked repo there
 
 ### Edit your keyboard and get it merged
@@ -64,8 +62,7 @@ Above all, your layout should be working, be tested, not break anything, and mak
 * Checkout your branch, edit your keyboard layout and commit your changes
 * Your layout **must** be correctly named, and in `data/keyboards/`.
 * Your layout **must** pass the `test_layout` tool with zero problems.
-* Your translation **must** be correctly named, and in `data/langs/`.
-* Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it).
+* Your layout **must** be added to automatic tests. **Remember to add the layout** to `src/resources.rs` and `tests/meson.build`.
 
 ### Get it merged
 
@@ -82,12 +79,12 @@ If you want your change to become part of official Squeekboard, or if you want t
 
 ### Compile squeekboard
 
-* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building)
+* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [README.md#building](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/main/README.md#building)
 
 ### Run squeekboard
 
-* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
-* Additionally take a look at the contribution document for [testing info](HACKING.md#testing)
+* Follow these instructions to run squeekboard: [README.md#running](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/main/README.md#running)
+* Additionally take a look at the contribution document for [testing info](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/main/doc/hacking.md#testing)
 * You can either test it locally on your Linux system or use the [QEMU Librem 5 image](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
 * To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems:
   `deb [arch=amd64] http://ci.puri.sm/ scratch librem5`