From 881dad5914039378ae155ad8b9f9c7b3b2b34109 Mon Sep 17 00:00:00 2001
From: MoonlightWave-12
 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>
Date: Sat, 16 Mar 2024 14:24:38 +0100
Subject: [PATCH] Improve German layout

It is rectangular now,
there are less layout-changes when switching views,
and some commonly used symbols are more easily available.

Before this change, the arrangement of the keys was different between
the normal layout and the wide layout.
The wide layout can now move to the "eschars"-view, like the normal layout.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/627>
---
 data/keyboards/de.yaml      |  7 ++---
 data/keyboards/de_wide.yaml | 56 ++++++++++++++++++++++++++-----------
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/data/keyboards/de.yaml b/data/keyboards/de.yaml
index a1581796..4d114dd1 100644
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@@ -1,21 +1,20 @@
-# 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 }
-    spaceline: { width: 99.67, height: 52 }
+    spaceline: { width: 89.3,  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"
+        - "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"
+        - "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:
diff --git a/data/keyboards/de_wide.yaml b/data/keyboards/de_wide.yaml
index 28bcf227..9adebb41 100644
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@@ -1,38 +1,40 @@
-# Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 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 }
+    halfwidth: { width: 24,   height: 42 }
+    thin:      { width: 30,   height: 42 }
+    narrow:    { width: 40.5, height: 42 }
+    altline:   { width: 81,   height: 42 }
+    wide:      { width: 108,  height: 42 }
+    spaceline: { width: 156,  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 preferences         space        , . Return"
+        - "Shift_L   y x c v b n m ß-thin BackSpace"
+        - "show_numbers show_eschars preferences         space        ,-narrow .-narrow Return"
     upper:
         - "Q W E R T Z U I O P Ü"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers preferences         space        ! ? Return"
+        - "Shift_L   Y X C V B N M --thin BackSpace"
+        - "show_numbers show_eschars preferences         space        !-narrow ?-narrow Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # % & - _ + ( ) ß"
+        - "@ # € % & - _ + ( )"
         - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters preferences         space        , . Return"
+        - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
     symbols:
-        - "~ ` ´  · © ® ÷ × ¶"
-        - "€ £ $ ¥ ^ ° * { } |"
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters preferences         space        , . Return"
+        - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
     eschars:
         - "ä è é ö ü Ä È É Ö Ü"
         - "à â ê î ô À Â È Î Ô"
         - "show_numbers  « » ç Ç æ œ ß  BackSpace"
-        - "show_letters preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
     Shift_L:
@@ -79,3 +81,25 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    „:
+        outline: "narrow"
+    “:
+        outline: "narrow"
+    ",-narrow":
+        outline: "narrow"
+        text: ","
+    .-narrow:
+        outline: "narrow"
+        text: "."
+    "!-narrow":
+        outline: "narrow"
+        text: "!"
+    ?-narrow:
+        outline: "narrow"
+        text: "?"
+    --thin:
+        outline: "thin"
+        text: "-"
+    ß-thin:
+        outline: "thin"
+        text: "ß"