move the Ugaritic layout from the Arab file to the Ancient file

4 files changed, 74 insertions, 67 deletions

diff --git a/rules/base.extras.xml b/rules/base.extras.xml
index f7cc977..f177588 100644
--- a/rules/base.extras.xml
+++ b/rules/base.extras.xml
@@ -10,6 +10,7 @@
         <description>Ancient</description>
         <languageList>
           <iso639Id>got</iso639Id>
+          <iso639Id>uga</iso639Id>
         </languageList>
       </configItem>
       <variantList>
@@ -22,6 +23,15 @@
             </languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem popularity="exotic">
+            <name>uga</name>
+            <description>Ugaritic</description>
+            <languageList>
+              <iso639Id>uga</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -988,12 +998,6 @@
             <description>Arabic (Eastern Arabic numerals, extensions in the 4th level)</description>
           </configItem>
         </variant>
-        <variant>
-          <configItem popularity="exotic">
-            <name>uga</name>
-            <description>Ugaritic instead of Arabic</description>
-          </configItem>
-        </variant>
 	<variant>
           <configItem popularity="exotic">
             <name>ergoarabic</name>
diff --git a/rules/compat/variantsMapping.lst b/rules/compat/variantsMapping.lst
index 31b6ebc..e6a90a4 100644
--- a/rules/compat/variantsMapping.lst
+++ b/rules/compat/variantsMapping.lst
@@ -20,3 +20,4 @@ pk	urd		pk	urd-phonetic
 syr	basic		sy	syc
 syr	phonetic	sy	syc_phonetic
 tel	basic		in	tel
+ara	uga	ancient		uga
diff --git a/symbols/ancient b/symbols/ancient
index 24da10e..ea70827 100644
--- a/symbols/ancient
+++ b/symbols/ancient
@@ -76,3 +76,66 @@ xkb_symbols "got" {
     key <AB09>	{[      period,  greater	]};
     key <AB10>	{[       slash,  question	]};
 };
+
+
+// In this layout the Ugaritic characters get the places of
+// the Arabic characters with the matching sound values.
+partial alphanumeric_keys
+xkb_symbols "uga" {
+
+    name[Group1]= "Ugaritic";
+
+    key.type[Group1]="TWO_LEVEL";
+
+    key <TLDE> {[   U1038F,   none           ]};  // 𐎏
+    key <AE01> {[        1,   exclam         ]};  // 1 !
+    key <AE02> {[        2,   at             ]};  // 2 @
+    key <AE03> {[        3,   numbersign     ]};  // 3 #
+    key <AE04> {[        4,   dollar         ]};  // 4 $
+    key <AE05> {[        5,   percent        ]};  // 5 %
+    key <AE06> {[        6,   asciicircum    ]};  // 6 ^
+    key <AE07> {[        7,   ampersand      ]};  // 7 &
+    key <AE08> {[        8,   asterisk       ]};  // 8 *
+    key <AE09> {[        9,   parenleft      ]};  // 9 (
+    key <AE10> {[        0,   parenright     ]};  // 0 )
+    key <AE11> {[    minus,   underscore     ]};  // - _
+    key <AE12> {[    equal,   plus           ]};  // = +
+
+    key <AD01> {[   U1039D,   none           ]};  // 𐎝
+    key <AD02> {[   U10395,   none           ]};  // 𐎕
+    key <AD03> {[   U10398,   none           ]};  // 𐎘
+    key <AD04> {[   U10396,   none           ]};  // 𐎖
+    key <AD05> {[   U10394,   none           ]};  // 𐎔
+    key <AD06> {[   U10399,   none           ]};  // 𐎙
+    key <AD07> {[   U10393,   grave          ]};  // 𐎓 `
+    key <AD08> {[   U10385,   division       ]};  // 𐎅 ÷
+    key <AD09> {[   U10383,   multiply       ]};  // 𐎃 ×
+    key <AD10> {[   U10388,   semicolon      ]};  // 𐎈 ;
+    key <AD11> {[   U10382,   greater        ]};  // 𐎂 >
+    key <AD12> {[   U10384,   less           ]};  // 𐎄 <
+
+    key <AC01> {[   U1038C,   U27E8          ]};  // 𐎌 ⟨
+    key <AC02> {[   U10392,   U27E9          ]};  // 𐎒 ⟩
+    key <AC03> {[   U1038A,   bracketleft    ]};  // 𐎊 [
+    key <AC04> {[   U10381,   bracketright   ]};  // 𐎁 ]
+    key <AC05> {[   U1038D,   none           ]};  // 𐎍
+    key <AC06> {[   U10380,   none           ]};  // 𐎀
+    key <AC07> {[   U1039A,   none           ]};  // 𐎚
+    key <AC08> {[   U10390,   none           ]};  // 𐎐
+    key <AC09> {[   U1038E,   slash          ]};  // 𐎎 /
+    key <AC10> {[   U1038B,   colon          ]};  // 𐎋:
+    key <AC11> {[   U10389,   quotedbl       ]};  // 𐎉  "
+    key <BKSL> {[backslash,   bar            ]};  // \ |
+
+    key <LSGT> {[      bar,   endash         ]};  // | –
+    key <AB01> {[   U1039B,   guillemotleft  ]};  // 𐎛 «
+    key <AB02> {[     none,   guillemotright ]};  //   »
+    key <AB03> {[   U1039C,   braceleft      ]};  // 𐎜 {
+    key <AB04> {[   U10397,   braceright     ]};  // 𐎗 }
+    key <AB05> {[   U1039F,   U2039          ]};  // 𐎟 ‹
+    key <AB06> {[ question,   U203A          ]};  // ? ›
+    key <AB07> {[   U002BC,   apostrophe     ]};  // ʼ '
+    key <AB08> {[   U10386,   comma          ]};  // 𐎆 ,
+    key <AB09> {[   U10387,   period         ]};  // 𐎇 .
+    key <AB10> {[   U10391,   periodcentered ]};  // 𐎑 ·
+};
diff --git a/symbols/ara b/symbols/ara
index 1eb6f15..3749cc6 100644
--- a/symbols/ara
+++ b/symbols/ara
@@ -437,67 +437,6 @@ xkb_symbols "basic_ext_digits" {
     include "ara(digits_KP)"
 };
 
-// In this layout the Ugaritic characters get the places of the Arabic characters with the matching sound values.
-partial alphanumeric_keys
-xkb_symbols "uga" {
-
-    name[Group1]= "Ugaritic instead of Arabic";
-
-    key.type[Group1]="TWO_LEVEL";
-
-    key <TLDE> {[   U1038F,   none           ]};  // 𐎏
-    key <AE01> {[        1,   exclam         ]};  // 1 !
-    key <AE02> {[        2,   at             ]};  // 2 @
-    key <AE03> {[        3,   numbersign     ]};  // 3 #
-    key <AE04> {[        4,   dollar         ]};  // 4 $
-    key <AE05> {[        5,   percent        ]};  // 5 %
-    key <AE06> {[        6,   asciicircum    ]};  // 6 ^
-    key <AE07> {[        7,   ampersand      ]};  // 7 &
-    key <AE08> {[        8,   asterisk       ]};  // 8 *
-    key <AE09> {[        9,   parenleft      ]};  // 9 (
-    key <AE10> {[        0,   parenright     ]};  // 0 )
-    key <AE11> {[    minus,   underscore     ]};  // - _
-    key <AE12> {[    equal,   plus           ]};  // = +
-
-    key <AD01> {[   U1039D,   none           ]};  // 𐎝
-    key <AD02> {[   U10395,   none           ]};  // 𐎕
-    key <AD03> {[   U10398,   none           ]};  // 𐎘
-    key <AD04> {[   U10396,   none           ]};  // 𐎖
-    key <AD05> {[   U10394,   none           ]};  // 𐎔
-    key <AD06> {[   U10399,   none           ]};  // 𐎙
-    key <AD07> {[   U10393,   grave          ]};  // 𐎓 `
-    key <AD08> {[   U10385,   division       ]};  // 𐎅 ÷
-    key <AD09> {[   U10383,   multiply       ]};  // 𐎃 ×
-    key <AD10> {[   U10388,   semicolon      ]};  // 𐎈 ;
-    key <AD11> {[   U10382,   greater        ]};  // 𐎂 >
-    key <AD12> {[   U10384,   less           ]};  // 𐎄 <
-
-    key <AC01> {[   U1038C,   U27E8          ]};  // 𐎌 ⟨
-    key <AC02> {[   U10392,   U27E9          ]};  // 𐎒 ⟩
-    key <AC03> {[   U1038A,   bracketleft    ]};  // 𐎊 [
-    key <AC04> {[   U10381,   bracketright   ]};  // 𐎁 ]
-    key <AC05> {[   U1038D,   none           ]};  // 𐎍
-    key <AC06> {[   U10380,   none           ]};  // 𐎀
-    key <AC07> {[   U1039A,   none           ]};  // 𐎚
-    key <AC08> {[   U10390,   none           ]};  // 𐎐
-    key <AC09> {[   U1038E,   slash          ]};  // 𐎎 /
-    key <AC10> {[   U1038B,   colon          ]};  // 𐎋:
-    key <AC11> {[   U10389,   quotedbl       ]};  // 𐎉  "
-    key <BKSL> {[backslash,   bar            ]};  // \ |
-
-    key <LSGT> {[      bar,   endash         ]};  // | –
-    key <AB01> {[   U1039B,   guillemotleft  ]};  // 𐎛 «
-    key <AB02> {[     none,   guillemotright ]};  //   »
-    key <AB03> {[   U1039C,   braceleft      ]};  // 𐎜 {
-    key <AB04> {[   U10397,   braceright     ]};  // 𐎗 }
-    key <AB05> {[   U1039F,   U2039          ]};  // 𐎟 ‹
-    key <AB06> {[ question,   U203A          ]};  // ? ›
-    key <AB07> {[   U002BC,   apostrophe     ]};  // ʼ '
-    key <AB08> {[   U10386,   comma          ]};  // 𐎆 ,
-    key <AB09> {[   U10387,   period         ]};  // 𐎇 .
-    key <AB10> {[   U10391,   periodcentered ]};  // 𐎑 ·
-};
-
 // An Ergonomic implementation of the basic Arabic keyboard (PC). Brings all letters to the middle 30 keys.
 xkb_symbols "ergoarabic" {
     include "ara(basic)"