osk-layouts: Fixed Persian OSK

Remove duplicate and unnecessary keys, and add missing ones
(e.g. ZWNJ).

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3409>

data/gnome-shell-icons.gresource.xml

@@ -46,6 +46,7 @@
     <file preprocess="xml-stripblanks">scalable/status/keyboard-hide-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-layout-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-shift-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/keyboard-zwnj-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/message-indicator-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/no-notifications-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/screen-privacy-disabled-symbolic.svg</file>

data/icons/scalable/status/keyboard-zwnj-symbolic.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/osk-layouts/ir.json

@@ -22,16 +22,12 @@
           },
           {
             "strings": [
-              "ق",
+              "ق"
-              "ڨ"
             ]
           },
           {
             "strings": [
-              "ف",
+              "ف"
-              "ڤ",
-              "ڢ",
-              "ڥ"
             ]
           },
           {
@@ -47,7 +43,7 @@
           {
             "strings": [
               "ه",
-              "ه‍"
+              "ة"
             ]
           },
           {
@@ -62,21 +58,25 @@
           },
           {
             "strings": [
-              "ج",
+              "ج"
+            ]
+          },
+          {
+            "strings": [
               "چ"
             ]
           },
           {
             "action": "delete",
             "iconName": "edit-clear-symbolic",
-            "width": 1.5
+            "width": 1
           }
         ],
         [
           {
+            "leftOffset": 0.5,
             "strings": [
-              "ش",
+              "ش"
-              "ڜ"
             ]
           },
           {
@@ -86,24 +86,18 @@
           },
           {
             "strings": [
-              "ي",
+              "ی",
-              "ئ",
+              "ئ"
-              "ى"
             ]
           },
           {
             "strings": [
-              "ب",
+              "ب"
-              "پ"
             ]
           },
           {
             "strings": [
-              "ل",
+              "ل"
-              "لا",
-              "لأ",
-              "لإ",
-              "لآ"
             ]
           },
           {
@@ -133,14 +127,13 @@
           },
           {
             "strings": [
-              "ك",
+              "ک",
-              "گ",
+              "ك"
-              "ک"
             ]
           },
           {
             "strings": [
-              "ط"
+              "گ"
             ]
           },
           {
@@ -151,19 +144,24 @@
         ],
         [
           {
-            "leftOffset": 1,
+            "leftOffset": 1.5,
             "strings": [
-              "ذ"
+              "ظ"
             ]
           },
           {
             "strings": [
-              "ء"
+              "ط"
             ]
           },
           {
             "strings": [
-              "ؤ"
+              "ژ"
+            ]
+          },
+          {
+            "strings": [
+              "ز"
             ]
           },
           {
@@ -173,13 +171,12 @@
           },
           {
             "strings": [
-              "ى",
+              "ذ"
-              "ئ"
             ]
           },
           {
             "strings": [
-              "ة"
+              "د"
             ]
           },
           {
@@ -189,25 +186,14 @@
           },
           {
             "strings": [
-              "ز",
+              "پ"
-              "ژ"
-            ]
-          },
-          {
-            "strings": [
-              "ظ"
-            ]
-          },
-          {
-            "strings": [
-              "د"
             ]
           }
         ],
         [
           {
             "action": "levelSwitch",
-            "label": "?123",
+            "label": "۱۲۳؟",
             "level": "opt",
             "width": 1.5
           },
@@ -220,7 +206,7 @@
             "strings": [
               " "
             ],
-            "width": 6
+            "width": 5.5
           },
           {
             "strings": [
@@ -243,6 +229,10 @@
               "("
             ]
           },
+          {
+            "iconName": "keyboard-zwnj-symbolic",
+            "keyval": "0x100200c"
+          },
           {
             "action": "emoji",
             "iconName": "face-smile-symbolic"
@@ -475,7 +465,7 @@
         [
           {
             "action": "levelSwitch",
-            "label": "ABC",
+            "label": "الف‌ب‌پ",
             "level": "default",
             "width": 1.5
           },
@@ -672,7 +662,7 @@
         [
           {
             "action": "levelSwitch",
-            "label": "?123",
+            "label": "۱۲۳؟",
             "level": "opt",
             "width": 1.5
           },
@@ -713,7 +703,7 @@
           },
           {
             "action": "levelSwitch",
-            "label": "?123",
+            "label": "۱۲۳؟",
             "level": "opt",
             "width": 3
           }
@@ -721,7 +711,7 @@
         [
           {
             "action": "levelSwitch",
-            "label": "ABC",
+            "label": "الف‌ب‌پ",
             "level": "default",
             "width": 1.5
           },