From d7ee2f4c3ca83ad08c0e33f28dc4db882d5961c8 Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Fri, 15 Nov 2019 15:07:09 +0000
Subject: [PATCH] layouts: Correct most unneeded xkb symbols usage

---
 data/keyboards/fi.yaml | 19 +++++++++----------
 data/keyboards/no.yaml | 19 +++++++++----------
 data/keyboards/se.yaml | 29 ++++++++---------------------
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/data/keyboards/fi.yaml b/data/keyboards/fi.yaml
index 4c699625..e894902d 100644
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@@ -15,25 +15,25 @@ outlines:
 
 views:
     base:
-        - "q w e r t y u i o p aring"
-        - "a s d f g h j k l ouml auml"
+        - "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        period    Return"
+        - "show_numbers preferences         space        .    Return"
     upper:
-        - "Q W E R T Y U I O P Aring"
-        - "A S D F G H J K L Ouml Auml"
+        - "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        period    Return"
+        - "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    Return"
+        - "show_letters preferences         space        .    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        .    Return"
 
 buttons:
     Shift_L:
@@ -65,9 +65,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    ".":
         outline: altline
-        label: "."
     space:
         outline: spaceline
         label: " "
diff --git a/data/keyboards/no.yaml b/data/keyboards/no.yaml
index 0fa6ea4f..3326bc0c 100644
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@@ -15,25 +15,25 @@ outlines:
 
 views:
     base:
-        - "q w e r t y u i o p aring"
-        - "a s d f g h j k l oslash ae"
+        - "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        period    Return"
+        - "show_numbers preferences         space        .    Return"
     upper:
-        - "Q W E R T Y U I O P Aring"
-        - "A S D F G H J K L Oslash AE"
+        - "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        period    Return"
+        - "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    Return"
+        - "show_letters preferences         space        .    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        .    Return"
 
 buttons:
     Shift_L:
@@ -65,9 +65,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    ".":
         outline: altline
-        label: "."
     space:
         outline: spaceline
         label: " "
diff --git a/data/keyboards/se.yaml b/data/keyboards/se.yaml
index 7e8a7dd9..28a476bb 100644
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@@ -15,25 +15,25 @@ outlines:
 
 views:
     base:
-        - "q w e r t y u i o p aring"
+        - "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        period    Return"
+        - "show_numbers preferences         space        .    Return"
     upper:
-        - "Q W E R T Y U I O P Aring"
-        - "A S D F G H J K L Ouml Auml"
+        - "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        period    Return"
+        - "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    Return"
+        - "show_letters preferences         space        .    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        .    Return"
 
 buttons:
     Shift_L:
@@ -65,27 +65,14 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    ".":
         outline: altline
-        label: "."
     space:
         outline: spaceline
         label: " "
     Return:
         outline: "wide"
         icon: "key-enter"
-    aring:
-        label: "Ã¥"
-    Aring:
-        label: "Ã…"
-    ö:
-        label: "ö"
-    Ö:
-        label: "Ö"
-    ä:
-        label: "ä"
-    Ä:
-        label: "Ä"
     asterisk:
         label: "*"
     asciitilde:
-- 
GitLab