move the Avestan layout from the Persian file to the Ancient file

4 files changed, 69 insertions, 91 deletions

diff --git a/rules/base.extras.xml b/rules/base.extras.xml
index f177588..eeec87b 100644
--- a/rules/base.extras.xml
+++ b/rules/base.extras.xml
@@ -11,6 +11,7 @@
         <languageList>
           <iso639Id>got</iso639Id>
           <iso639Id>uga</iso639Id>
+          <iso639Id>ave</iso639Id>
         </languageList>
       </configItem>
       <variantList>
@@ -32,6 +33,15 @@
             </languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem popularity="exotic">
+            <name>ave</name>
+            <description>Avestan</description>
+            <languageList>
+              <iso639Id>ave</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -288,30 +298,6 @@
     </layout>
     <layout>
       <configItem popularity="exotic">
-        <name>ir</name>
-        <shortDescription>fa</shortDescription>
-        <description>Persian</description>
-        <countryList>
-          <iso3166Id>IR</iso3166Id>
-        </countryList>
-        <languageList>
-          <iso639Id>fas</iso639Id>
-        </languageList>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem popularity="exotic">
-            <name>ave</name>
-            <description>Avestan</description>
-            <languageList>
-              <iso639Id>ave</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem popularity="exotic">
         <name>lt</name>
         <shortDescription>lt</shortDescription>
         <description>Lithuanian</description>
diff --git a/rules/compat/variantsMapping.lst b/rules/compat/variantsMapping.lst
index e6a90a4..3d922f3 100644
--- a/rules/compat/variantsMapping.lst
+++ b/rules/compat/variantsMapping.lst
@@ -20,4 +20,5 @@ pk	urd		pk	urd-phonetic
 syr	basic		sy	syc
 syr	phonetic	sy	syc_phonetic
 tel	basic		in	tel
-ara	uga	ancient		uga
+ara	uga	ancient		uga	// Delete in 2028.
+ir	ave	ancient		ave	// Delete in 2028.
diff --git a/symbols/ancient b/symbols/ancient
index ea70827..a96058f 100644
--- a/symbols/ancient
+++ b/symbols/ancient
@@ -139,3 +139,60 @@ xkb_symbols "uga" {
     key <AB09> {[   U10387,   period         ]};  // 𐎇 .
     key <AB10> {[   U10391,   periodcentered ]};  // 𐎑 ·
 };
+
+
+// Layout for Avestan, by Ernst Tremel, coded by Simos Xenitellis.
+// Reference: https://blog.simos.info/avestan-keyboard-layout/.
+// Generated with https://github.com/simos/keyboardlayouteditor.
+partial alphanumeric_keys
+xkb_symbols "ave"
+{
+	name[Group1] = "Avestan";
+
+	key <AE01> {[ U10B78                 ]}; // 𐭸
+	key <AE02> {[ U10B79                 ]}; // 𐭹
+	key <AE03> {[ U10B7A                 ]}; // 𐭺
+	key <AE04> {[ U10B7B                 ]}; // 𐭻
+	key <AE05> {[ U10B7C                 ]}; // 𐭼
+	key <AE06> {[ U10B7D                 ]}; // 𐭽
+	key <AE07> {[ U10B7E                 ]}; // 𐭾
+	key <AE08> {[ U10B7F                 ]}; // 𐭿
+
+	key <AD01> {[ U10B22,         U10B23 ]}; // 𐬢 𐬣
+	key <AD02> {[ U10B33,         U10B34 ]}; // 𐬳 𐬴
+	key <AD03> {[ U10B08,         U10B09 ]}; // 𐬈 𐬉
+	key <AD04> {[ U10B2D,         U10B26 ]}; // 𐬭 𐬦
+	key <AD05> {[ U10B19,         U10B1A ]}; // 𐬙 𐬚
+	key <AD06> {[ U10B2B,         U10B2A ]}; // 𐬫 𐬪
+	key <AD07> {[ U10B0E,         U10B0F ]}; // 𐬎 𐬏
+	key <AD08> {[ U10B0C,         U10B0D ]}; // 𐬌 𐬍
+	key <AD09> {[ U10B0A,         U10B0B ]}; // 𐬊 𐬋
+	key <AD10> {[ U10B1E                 ]}; // 𐬞
+	key <AD11> {[ U10B06,         U10B07 ]}; // 𐬆 𐬇
+	key <AD12> {[ U10B02,         U10B03 ]}; // 𐬂 𐬃
+
+	key <AC01> {[ U10B00,         U10B01 ]}; // 𐬀 𐬁
+	key <AC02> {[ U10B2F,         U10B31 ]}; // 𐬯 𐬱
+	key <AC03> {[ U10B1B,         U10B1C ]}; // 𐬛 𐬜
+	key <AC04> {[ U10B1F,         U10B16 ]}; // 𐬟 𐬖
+	key <AC05> {[ U10B14,         U10B15 ]}; // 𐬔 𐬕
+	key <AC06> {[ U10B35,          UE100 ]}; // 𐬵 
+	key <AC07> {[ U10B18,         U10B24 ]}; // 𐬘 𐬤
+	key <AC08> {[ U10B10,          UE101 ]}; // 𐬐 
+	key <AC09> {[ U10B2E,          UE103 ]}; // 𐬮 
+	key <AC10> {[ U10B3B,         U10B3A ]}; // 𐬻 𐬺
+	key <AC11> {[ U10B1D                 ]}; // 𐬝
+	key <BKSL> {[ U10B04,         U10B05 ]}; // 𐬄 𐬅
+
+	key <LSGT> {[ U10B04,         U10B05 ]}; // 𐬄 𐬅
+	key <AB01> {[ U10B30,         U10B32 ]}; // 𐬰 𐬲
+	key <AB02> {[ U10B11,         U10B12 ]}; // 𐬑 𐬒
+	key <AB03> {[ U10B17,          UE102 ]}; // 𐬗 
+	key <AB04> {[ U10B2C,         U10B13 ]}; // 𐬬 𐬓
+	key <AB05> {[ U10B20,         U10B21 ]}; // 𐬠 𐬡
+	key <AB06> {[ U10B25,         U10B27 ]}; // 𐬥 𐬧
+	key <AB07> {[ U10B28,         U10B29 ]}; // 𐬨 𐬩
+	key <AB08> {[ U10B3C,         U10B39 ]}; // 𐬼 𐬹
+	key <AB09> {[ U10B3E,         U10B3D ]}; // 𐬾 𐬽
+	key <AB10> {[ U10B3F, periodcentered ]}; // 𐬿 ·
+};
diff --git a/symbols/ir b/symbols/ir
index 6aa7097..3591d2e 100644
--- a/symbols/ir
+++ b/symbols/ir
@@ -281,69 +281,3 @@ xkb_symbols "ku_ara" {
     include "nbsp(zwnj2nb3)"
     include "level3(ralt_switch)"
 };
-
-// EXTRAS:
-
-/////////////////////////////////////////////////////////////////////////////////
-//
-// Generated keyboard layout file with the Keyboard Layout Editor.
-// For more about the software, see http://code.google.com/p/keyboardlayouteditor
-//
-// Version 0.2, fixed AD09.
-//
-// Layout by Ernst Tremel, http://ubuntuforums.org/showpost.php?p=9365469&postcount=32
-// Creation of this file by Simos Xenitellis.
-
-partial alphanumeric_keys
-xkb_symbols "ave"
-{
-	name[Group1] = "Avestan";
-
-	key <AB01> { [ U10B30,         U10B32 ] }; // 𐬰 𐬲
-	key <AB02> { [ U10B11,         U10B12 ] }; // 𐬑 𐬒
-	key <AB03> { [ U10B17,          UE102 ] }; // 𐬗 
-	key <AB04> { [ U10B2C,         U10B13 ] }; // 𐬬 𐬓
-	key <AB05> { [ U10B20,         U10B21 ] }; // 𐬠 𐬡
-	key <AB06> { [ U10B25,         U10B27 ] }; // 𐬥 𐬧
-	key <AB07> { [ U10B28,         U10B29 ] }; // 𐬨 𐬩
-	key <AB08> { [ U10B3C,         U10B39 ] }; // 𐬼 𐬹
-	key <AB09> { [ U10B3E,         U10B3D ] }; // 𐬾 𐬽
-	key <AB10> { [ U10B3F, periodcentered ] }; // 𐬿 ·
-
-	key <AC01> { [ U10B00,         U10B01 ] }; // 𐬀 𐬁
-	key <AC02> { [ U10B2F,         U10B31 ] }; // 𐬯 𐬱
-	key <AC03> { [ U10B1B,         U10B1C ] }; // 𐬛 𐬜
-	key <AC04> { [ U10B1F,         U10B16 ] }; // 𐬟 𐬖
-	key <AC05> { [ U10B14,         U10B15 ] }; // 𐬔 𐬕
-	key <AC06> { [ U10B35,          UE100 ] }; // 𐬵 
-	key <AC07> { [ U10B18,         U10B24 ] }; // 𐬘 𐬤
-	key <AC08> { [ U10B10,          UE101 ] }; // 𐬐 
-	key <AC09> { [ U10B2E,          UE103 ] }; // 𐬮 
-	key <AC10> { [ U10B3B,         U10B3A ] }; // 𐬻 𐬺
-	key <AC11> { [ U10B1D                 ] }; // 𐬝
-
-	key <AD01> { [ U10B22,         U10B23 ] }; // 𐬢 𐬣
-	key <AD02> { [ U10B33,         U10B34 ] }; // 𐬳 𐬴
-	key <AD03> { [ U10B08,         U10B09 ] }; // 𐬈 𐬉
-	key <AD04> { [ U10B2D,         U10B26 ] }; // 𐬭 𐬦
-	key <AD05> { [ U10B19,         U10B1A ] }; // 𐬙 𐬚
-	key <AD06> { [ U10B2B,         U10B2A ] }; // 𐬫 𐬪
-	key <AD07> { [ U10B0E,         U10B0F ] }; // 𐬎 𐬏
-	key <AD08> { [ U10B0C,         U10B0D ] }; // 𐬌 𐬍
-	key <AD09> { [ U10B0A,         U10B0B ] }; // 𐬊 𐬋
-	key <AD10> { [ U10B1E                 ] }; // 𐬞
-	key <AD11> { [ U10B06,         U10B07 ] }; // 𐬆 𐬇
-	key <AD12> { [ U10B02,         U10B03 ] }; // 𐬂 𐬃
-
-	key <AE01> { [ U10B78                 ] }; // 𐭸
-	key <AE02> { [ U10B79                 ] }; // 𐭹
-	key <AE03> { [ U10B7A                 ] }; // 𐭺
-	key <AE04> { [ U10B7B                 ] }; // 𐭻
-	key <AE05> { [ U10B7C                 ] }; // 𐭼
-	key <AE06> { [ U10B7D                 ] }; // 𐭽
-	key <AE07> { [ U10B7E                 ] }; // 𐭾
-	key <AE08> { [ U10B7F                 ] }; // 𐭿
-
-	key <BKSL> { [ U10B04,         U10B05 ] }; // 𐬄 𐬅
-	key <LSGT> { [ U10B04,         U10B05 ] }; // 𐬄 𐬅
-};