polishing the compat stuff

6 files changed, 281 insertions, 56 deletions

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 23e45926..bdc5ae8f 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2185,26 +2185,6 @@
     </layout>
     <layout>
       <configItem>
-        <name>smi</name>
-        <_description>Northern Saami</_description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>sefi</name>
-            <_description>Finish and Swedish</_description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
         <name>pk</name>
         <_shortDescription>Pak</_shortDescription>
         <_description>Pakistan</_description>
diff --git a/rules/compat/layoutRename.lst b/rules/compat/layoutRename.lst
index 7b7440bc..12554030 100644
--- a/rules/compat/layoutRename.lst
+++ b/rules/compat/layoutRename.lst
@@ -1,17 +1,23 @@
 ar	ara
+ben	in(ben)
 bs	ba
-dev	deva
-dzdwi	dzo
+dev	in(deva)
+dvorak	us(dvorak)
+dzdwi	bt
 el	gr
-gur	guru
-iu	iku
-la	latam
-lo	lao
+guj	in(guj)
+gur	in(guru)
+iu	ca(ike)
+lo	la
+kan	in(kan)
 mi	mao
-ml	mal
-ogham	ogam
-sr	srp
-sapmi	smi
-tml	tam
-yu	sr
 mk	mkd
+ml	in(mal)
+ogham	ie(ogam)
+ori	ie(ori)
+sapmi	no(smi)
+sr	srp
+syr	sy(syc)
+tel	in(tel)
+tml	in(tam)
+yu	srp
diff --git a/rules/compat/variantRename.lst b/rules/compat/variantRename.lst
index 207a1308..aade6d57 100644
--- a/rules/compat/variantRename.lst
+++ b/rules/compat/variantRename.lst
@@ -1,37 +1,36 @@
+ben	basic		in	ben
+ben	probhat		in	ben_probhat	
+dev	basic		in	deva
 dvorak	$dvoraklayouts	%l	dvorak
 dvorak	basic		us	dvorak
 dvorak	pl_basic	pl	dvorak
 dvorak	pl		pl	dvorak_quotes
 dvorak	pl_altquotes	pl	dvorak_altquotes
-yu	basic		srp	latin
-yu	unicode		srp	latinunicode
-yu	yz		srp	latinyz
-yu	unicodeyz	srp	latinunicodeyz
-ben	basic		in	ben
-ben	probhat		in	ben_probhat	
-deva	basic		in	deva
+dzdwi	basic		bt	basic
 guj	basic		in	guj
-guru	basic		in	guru
+gur	basic		in	guru
+iu	basic		ca	ike
+lo	basic		la	basic
 kan	basic		in	kan
 mal	basic		in	mal
 mal	mlplusnum	in	mal_plusnum
+ogham	basic		ie	ogam
+ogham	laptop		ie	ogam_laptop
+ogham	is434		ie	ogam_is434
+ogham	is434laptop	ie	ogam_is434laptop
 ori	basic		in	ori
+sapmi	basic		no	smi
+sapmi	nodeadkeys	no	smi_nodeadkeys
+sapmi	sefi		fi	smi
+sin	phonetic-static	lk	sin_phonetic	
+syr	basic		sy	syc
+syr	phonetic	sy	syc_phonetic
 tam	INSCRIPT	in	tam
-tel	basic		in	tel
 tam	UNI		lk	tam_unicode
 tam	TAB		lk	tam_TAB
 tam	TSCII		lk	tam_TSCII
-urd	basic		pk	urd	
-sin	phonetic-static	lk	sin_phonetic	
-ogam	basic		ie	ogam
-ogam	laptop		ie	ogam_laptop
-ogam	is434		ie	ogam_is434
-ogam	is434laptop	ie	ogam_is434laptop
-iku	basic		ca	ike
-lao	basic		la	basic
-syr	basic		sy	syc
-syr	phonetic	sy	syc_phonetic
-dzo	basic		bt	basic
-smi	basic		no	smi
-smi	nodeadkeys	no	smi_nodeadkeys
-smi	sefi		fi	smi
+tel	basic		in	tel
+yu	basic		srp	latin
+yu	unicode		srp	latinunicode
+yu	yz		srp	latinyz
+yu	unicodeyz	srp	latinunicodeyz
diff --git a/symbols/bd b/symbols/bd
index 35c5004e..0e97e735 100644
--- a/symbols/bd
+++ b/symbols/bd
@@ -2,7 +2,7 @@
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
-    include "in(ben_inscript)"
+    include "in(ben)"
     name[Group1]= "Bangladesh";
 // TODO(svu): change iNSCRIPT to Jatiaya
 // according to http://ekushey.org/projects/shadhinota/national.html
diff --git a/symbols/bt b/symbols/bt
new file mode 100644
index 00000000..086b1a45
--- /dev/null
+++ b/symbols/bt
@@ -0,0 +1,88 @@
+// $XKeyboardConfig$
+//
+// Dzongkha / Tibetan layout for Bhutanese keyboard
+//
+/////////////////////////////////////////////////////////////////
+//
+//   Based on the official layout for Dzongkha
+//   approved by the Department of Information Technology &
+//   Dzongkha Development Authority of the Government of Bhutan
+//
+//   Copyright (C) 2004, Gregory Mokhin <mokhin@bog.msu.ru>
+//   Layout map provided by Chris Fynn
+///////////////////////////////////////////////////////////////// 
+//   Version 0.97.     Last modified: 09 Jan 2004
+/////////////////////////////////////////////////////////////////
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+      name[Group1]= "Bhutan";
+
+      key <TLDE> { [      U0F09, U0F0A, U0F6C, U0F6B ]	};
+      
+// numbers e.a.
+      key <AE01> { [      U0F21, U0F04, 1, exclam ]	};
+      key <AE02> { [      U0F22, U0F05, 2, at     ]	};
+      key <AE03> { [      U0F23, U0F06, 3, numbersign ]	};
+      key <AE04> { [      U0F24, U0F24, 4, dollar  ]	};
+      key <AE05> { [      U0F25, U0F25, 5, percent ]	};
+      key <AE06> { [      U0F26, U0F08, 6, U0F01 ]	};
+      key <AE07> { [      U0F27, U0F38, 7, ampersand ]	};
+      key <AE08> { [      U0F28, U0F34, 8, asterisk ]	};
+      key <AE09> { [      U0F29, U0F3C, 9, parenleft ]	};
+      key <AE10> { [      U0F20, U0F3D, 0, parenright ]	};
+      key <AE11> { [      U0F14, U0F7F, minus, underscore ]	};
+      key <AE12> { [      U0F0D, U0F11, equal, plus ]	};
+
+// consonants ( ka kha ga nga )
+      key <AD01> { [      U0F40, U0F90, U0F88  ]	};
+      key <AD02> { [      U0F41, U0F91, U0F89  ]	};
+      key <AD03> { [      U0F42, U0F92 ]	};
+      key <AD04> { [      U0F44, U0F94, U0F83, U0F82  ]	};
+
+// vowels ( i u e o )
+      key <AD05> { [      U0F72, U0F80, U0F1A  ]	};
+      key <AD06> { [      U0F74, U0F84, U0F1B  ]	};
+      key <AD07> { [      U0F7A, U0F7B, U0F1C  ]	};
+      key <AD08> { [      U0F7C, U0F7D, U0F1D, U0F17  ]	};
+
+// consonants ( ca cha ja nya )
+      key <AD09> { [      U0F45, U0F95, U0F1E, U0F18   ]	};
+      key <AD10> { [      U0F46, U0F96, U0F1F, U0F19   ]	};
+      key <AD11> { [      U0F47, U0F97, bracketleft, U0F3E ]	};
+      key <AD12> { [      U0F49, U0F99, bracketright, U0F3F  ]	};
+
+// consonants ( ta tha da na pa pha ba ma tsa tsha dza wa )
+      key <AC01> { [      U0F4F, U0F9F, U0F4A, U0F9A ]	};
+      key <AC02> { [      U0F50, U0FA0, U0F4B, U0F9B ]	};
+      key <AC03> { [      U0F51, U0FA1, U0F4C, U0F9C ]	};
+      key <AC04> { [      U0F53, U0FA3, U0F4E, U0F9E ]	};
+      key <AC05> { [      U0F54, U0FA4, U2039, U00AB ]	};
+      key <AC06> { [      U0F55, U0FA5, U203A, U00BB ]	};
+      key <AC07> { [      U0F56, U0FA6, U0F37, U0F35 ]	};
+      key <AC08> { [      U0F58, U0FA8, U0F7E ]	};
+      key <AC09> { [      U0F59, U0FA9, U0F39 ]	};
+      key <AC10> { [      U0F5A, U0FAA, colon, semicolon ]	};
+      key <AC11> { [      U0F5B, U0FAB, apostrophe, quotedbl ]	};
+      
+// TODO: BKSL and LSGT are from gb layout, are there any variants?
+      key <BKSL> { [      U0F5D, U0FAD, backslash, U0FBA ]	};
+      key <LSGT> { [      U0F0D, U0F11, U0F10, U0F0F ]	};
+
+// consonants ( zha za 'a ya ra la sha sa ha a )
+      key <AB01> { [      U0F5E, U0FAE, U0F13, U0F36 ]	};
+      key <AB02> { [      U0F5F, U0FAF, U0FBE, U0FBF ]	};
+      key <AB03> { [      U0F60, U0F71, U0F03, U0FB0 ]	};
+      key <AB04> { [      U0F61, U0FB1, U0F12, U0FBB ]	};
+      key <AB05> { [      U0F62, U0FB2, U0F6A, U0FBC ]	};
+      key <AB06> { [      U0F63, U0FB3, U0F8A, U0F88 ]	};
+      key <AB07> { [      U0F64, U0FB4, U0F65, U0FB5 ]	};
+      key <AB08> { [      U0F66, U0FB6, comma, less ]	};
+      key <AB09> { [      U0F67, U0FB7, period, greater ]	};
+      key <AB10> { [      U0F68, U0FB8, slash, question ]	};
+
+// space
+      key <SPCE> { [ U0F0B, space, U0F0C, U00A0 ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/symbols/sy b/symbols/sy
new file mode 100644
index 00000000..6cb7f80a
--- /dev/null
+++ b/symbols/sy
@@ -0,0 +1,152 @@
+// $XKeyboardConfig$
+
+//
+// $XFree86: xc/programs/xkbcomp/symbols/syr,v 1.1 2002/11/22 03:06:50 dawes Exp $
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "ara(basic)"
+    name[Group1]= "Syria";
+};
+
+partial alphanumeric_keys
+xkb_symbols "syc" {
+    name[Group1]= "Syria - Syriac";
+
+    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
+    key <AE01> {  [  	1,		exclam,		0x1000701		]     };
+    key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };
+    key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };
+    key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };
+    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };
+    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };
+    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };
+    key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };
+    key <AE09> {  [  	9,		parenright,	0x100070C		]     };
+    key <AE10> {  [  	0,		parenleft,	0x100070D		]     };
+    key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };
+    key <AE12> {  [  	equal,		plus,		0x1002510		]     };
+						
+    key <AD01> {  [  	0x1000714,	0x1000730,	Arabic_fatha		]     };
+    key <AD02> {  [  	0x1000728,	0x1000733,	Arabic_fathatan		]     };
+    key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };
+    key <AD04> {  [  	0x1000729,	0x100073A,	Arabic_dammatan		]     };
+    key <AD05> {  [  	0x1000726,	0x100073D,	Arabic_madda_above	]     };
+    key <AD06> {  [  	0x100071C,	0x1000740,	Arabic_hamza_above	]     };
+    key <AD07> {  [  	0x1000725,	0x1000741,	0x1000747		]     };
+    key <AD08> {  [  	0x1000717,	0x1000308,	0x1000743		]     };
+    key <AD09> {  [  	0x100071E,      0x1000304,	0x1000745		]     };
+    key <AD10> {  [  	0x100071A,      0x1000307,	0x100032D		]     };
+    key <AD11> {  [ 	0x1000713,      0x1000303				]     };
+    key <AD12> {  [  	0x1000715,	0x100074A				]     };
+    key <BKSL> {  [  	0x1000706,	colon					]     };
+
+    key <AC01> {  [  	0x100072B,	0x1000731,	Arabic_kasra		]     };
+    key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };
+    key <AC03> {  [	0x100071D,	0x1000737				]     };
+    key <AC04> {  [  	0x1000712,	0x100073B,	Arabic_hamza		]     };
+    key <AC05> {  [  	0x1000720,	0x100073E,	Arabic_hamza_below	]     };
+    key <AC06> {  [  	0x1000710,      0x1000711, 	Arabic_superscript_alef	]     };
+    key <AC07> {  [  	0x100072C,	Arabic_tatweel,	0x1000748		]     };
+    key <AC08> {  [  	0x1000722,	0x1000324, 	0x1000744		]     };
+    key <AC09> {  [	0x1000721,	0x1000331,	0x1000746		]     };
+    key <AC10> {  [  	0x100071F,      0x1000323				]     };
+    key <AC11> {  [  	0x100071B,	0x1000330				]     };
+
+    key <SPCE> {  [  	space,		0x100200c				]     };
+    key <AB01> {  [  	bracketright,	0x1000732,	Arabic_sukun		]     };
+    key <AB02> {  [  	bracketleft,	0x1000735				]     };
+    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };
+    key <AB04> {  [  	0x100072A,	0x100073C, 	0x100200C		]     };
+    key <AB05> {  [  	0x1000727,      0x100073F,      0x100200E		]     };
+    key <AB06> {  [  	0x1000700,	0x1000739,	0x100200F		]     };
+    key <AB07> {  [  	0x100002E,	0x1000742				]     };
+    key <AB08> {  [  	0x1000718,	Arabic_comma				]     };
+    key <AB09> {  [  	0x1000719,	Arabic_semicolon			]     };
+    key <AB10> {  [  	0x1000707,	Arabic_question_mark			]     };
+
+    // End Alphanumeric Section
+
+    
+    // Begin Modifier Mappings
+    
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod2   { Mode_switch };
+
+};
+//
+// $XFree86: xc/programs/xkbcomp/symbols/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $
+//
+
+partial alphanumeric_keys
+xkb_symbols "syc_phonetic" {
+    name[Group1]= "Syria - Syriac phonetic";
+
+    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
+    key <AE01> {  [  	1,		exclam,		0x1000701		]     };
+    key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };
+    key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };
+    key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };
+    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };
+    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };
+    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };
+    key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };
+    key <AE09> {  [  	9,		parenright,	0x100070C		]     };
+    key <AE10> {  [  	0,		parenleft,	0x100070D		]     };
+    key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };
+    key <AE12> {  [  	equal,		plus,		0x1002510		]     };
+						
+    key <AD01> {  [  	0x1000729,	0x1000730,	Arabic_fatha		]     };
+    key <AD02> {  [  	0x1000718,	0x1000733,	Arabic_fathatan		]     };
+    key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };
+    key <AD04> {  [  	0x100072A,	0x100073A,	Arabic_dammatan		]     };
+    key <AD05> {  [  	0x100072C,	0x100073D,	Arabic_madda_above	]     };
+    key <AD06> {  [  	0x100071D,	0x1000740,	Arabic_hamza_above	]     };
+    key <AD07> {  [  	0x100071C,	0x1000741,	0x1000747		]     };
+    key <AD08> {  [  	0x1000725,	0x1000308,	0x1000743		]     };
+    key <AD09> {  [  	0x1000727,      0x1000304,	0x1000745		]     };
+    key <AD10> {  [  	0x1000726,      0x1000307,	0x100032D		]     };
+    key <AD11> {  [ 	bracketright,   0x1000303				]     };
+    key <AD12> {  [  	bracketleft,	0x100074A				]     };
+    key <BKSL> {  [  	0x1000706,	colon					]     };
+
+    key <AC01> {  [  	0x1000710,	0x1000731,	Arabic_kasra		]     };
+    key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };
+    key <AC03> {  [	0x1000715,	0x1000737				]     };
+    key <AC04> {  [  	0x1000714,	0x100073B,	Arabic_hamza		]     };
+    key <AC05> {  [  	0x1000713,	0x100073E,	Arabic_hamza_below	]     };
+    key <AC06> {  [  	0x1000717,      0x1000711, 	Arabic_superscript_alef	]     };
+    key <AC07> {  [  	0x100071B,	Arabic_tatweel,	0x1000748		]     };
+    key <AC08> {  [  	0x100071F,	0x1000324, 	0x1000744		]     };
+    key <AC09> {  [	0x1000720,	0x1000331,	0x1000746		]     };
+    key <AC10> {  [  	0x100071A,      0x1000323				]     };
+    key <AC11> {  [  	0x100071E,	0x1000330				]     };
+
+    key <SPCE> {  [  	space,		0x100200c				]     };
+    key <AB01> {  [  	0x1000719,	0x1000732,	Arabic_sukun		]     };
+    key <AB02> {  [  	0x1000728,	0x1000735				]     };
+    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };
+    key <AB04> {  [  	0x100072B,	0x100073C, 	0x100200C		]     };
+    key <AB05> {  [  	0x1000712,      0x100073F,      0x100200E		]     };
+    key <AB06> {  [  	0x1000722,	0x1000739,	0x100200F		]     };
+    key <AB07> {  [  	0x1000721,	0x1000742				]     };
+    key <AB08> {  [  	0x1000700,	Arabic_comma				]     };
+    key <AB09> {  [  	0x100002E,	Arabic_semicolon			]     };
+    key <AB10> {  [  	0x1000707,	Arabic_question_mark			]     };
+
+    // End Alphanumeric Section
+
+    
+    // Begin Modifier Mappings
+    
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod2   { Mode_switch };
+
+};