fixing broken layouts, thanks to my testing scripts

7 files changed, 23 insertions, 25 deletions

diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 872558d9..04583105 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -21,7 +21,7 @@ mt nl no \
 ogam ori \
 pc pl pt \
 ro ru se \
-sk sk smi \
+si sk smi \
 srp syr tam \
 tel th tj \
 tr ua us \
diff --git a/symbols/ara b/symbols/ara
index d5d97dd5..35a73bfa 100644
--- a/symbols/ara
+++ b/symbols/ara
@@ -71,12 +71,12 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "qwerty" {
-    include "ar(basic)"
+    include "ara(basic)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "azerty" {
-    include "ar(basic)"
+    include "ara(basic)"
 
 	// the north african arabic keyboard differs from the middle east one
 	// by the numeric row; it follows French keyboard style
@@ -103,7 +103,7 @@ xkb_symbols "azerty" {
 
 partial alphanumeric_keys
 xkb_symbols "digits" {
-    include "ar(basic)"
+    include "ara(basic)"
 
 	// use arabic script digits
 
@@ -121,12 +121,12 @@ xkb_symbols "digits" {
 
 partial alphanumeric_keys
 xkb_symbols "qwerty_digits" {
-    include "ar(digits)"
+    include "ara(digits)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "azerty_digits" {
-    include "ar(azerty)"
+    include "ara(azerty)"
 	
     key <AE01> {  [       ampersand,       0x1000661      ]       };
     key <AE02> {  [          eacute,       0x1000662      ]       };
diff --git a/symbols/gr b/symbols/gr
index b0227a79..c690c694 100644
--- a/symbols/gr
+++ b/symbols/gr
@@ -11,7 +11,7 @@
 default partial alphanumeric_keys alternate_group
 xkb_symbols "basic" {
 
-    include "el(bare)"
+    include "gr(bare)"
 
     key <TLDE> {	[     grave,	asciitilde	]	};
     key <AE01> {	[	  1,	exclam 		]	};
@@ -81,7 +81,7 @@ xkb_symbols "bare" {
 partial alphanumeric_keys alternate_group
 xkb_symbols "extended" {
 
-    include "el(basic)"
+    include "gr(basic)"
 
     key.type = "THREE_LEVEL";
 
@@ -99,7 +99,7 @@ xkb_symbols "extended" {
 partial alphanumeric_keys alternate_group
 xkb_symbols "polytonic" {
 
-    include "el(extended)"
+    include "gr(extended)"
 
     key.type = "THREE_LEVEL";
 
@@ -114,7 +114,7 @@ xkb_symbols "polytonic" {
 partial alphanumeric_keys alternate_group
 xkb_symbols "nodeadkeys" {
 
-    include "el(basic)"
+    include "gr(basic)"
 
     key <AC10> { [	semicolon,		colon		] };
 
diff --git a/symbols/latam b/symbols/latam
index 8318df00..e188124c 100644
--- a/symbols/latam
+++ b/symbols/latam
@@ -32,7 +32,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "Sundeadkeys" {
-    include "la(basic)"
+    include "latam(basic)"
 
     key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
     key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
@@ -40,14 +40,14 @@ xkb_symbols "Sundeadkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
-    include "la(Sundeadkeys)"
+    include "latam(Sundeadkeys)"
 
 };
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "la(basic)"
+    include "latam(basic)"
 
     key <AE12>	{ [questiondown, exclamdown,    cedilla,       ogonek ]	};
     key <AD11>	{ [     grave, asciicircum, bracketleft,       degree ]	};
diff --git a/symbols/lv b/symbols/lv
index 311fc71a..0ad0b6e3 100644
--- a/symbols/lv
+++ b/symbols/lv
@@ -5,10 +5,8 @@
 // is a dirty hack). It is now not dependent on locale settings
 // and GTK_IM_MODULES in Gnome. The map is also providing some of
 // ISO9995-3 alternate characters. Note that this version works
-// correctly under Gnome 2.6. This is to be put into symbols/pc/
-// directory if you want to put it directly into symbols/
-// directory, or somewhere else, please correct the references
-// below.
+// correctly under Gnome 2.6. This is to be put into symbols/
+// directory, or somewhere else.
 //
 // Permission to use, copy, modify, distribute, and sell this software and its
 // documentation for any purpose is hereby granted without fee, provided that
@@ -93,7 +91,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys modifier_keys
 xkb_symbols "apostrophe" {
 
-    include "pc/lv(basic)"
+    include "lv(basic)"
 
 	key <AC11>	{[ISO_Level3_Latch, quotedbl, apostrophe, quotedbl]};
         key <SPCE>      {[space, space, apostrophe]};
@@ -104,7 +102,7 @@ xkb_symbols "apostrophe" {
 partial alphanumeric_keys modifier_keys
 xkb_symbols "tilde" {
 
-    include "pc/lv(basic)"
+    include "lv(basic)"
 
 	key <TLDE>	{[ISO_Level3_Latch, asciitilde, grave, acute]}; 
         key <SPCE>      {[space, space, asciitilde]};
@@ -115,7 +113,7 @@ xkb_symbols "tilde" {
 partial alphanumeric_keys modifier_keys
 xkb_symbols "fkey" {
 
-    include "pc/lv(basic)"
+    include "lv(basic)"
 
         key <AC04>      {[ISO_Level3_Latch, ISO_Level3_Latch, f, F]};
         key <SPCE>      {[space, space, f, F]};
diff --git a/symbols/mal b/symbols/mal
index 51c2b3f2..79c4c3eb 100644
--- a/symbols/mal
+++ b/symbols/mal
@@ -76,7 +76,7 @@ xkb_symbols "mlplusnum" {
 
    // Modifies the basic layout to include malayalam numbers
 
-   include "ml(basic)"
+   include "mal(basic)"
 
       key <AE01> { [ 0x01000d67 ,      exclam ] };
       key <AE02> { [ 0x01000d68 ,          at ] };
diff --git a/symbols/ogam b/symbols/ogam
index 4eeec2c0..3901521e 100644
--- a/symbols/ogam
+++ b/symbols/ogam
@@ -80,7 +80,7 @@ partial alphanumeric_keys
 xkb_symbols "laptop" {
     // For laptops which don't have the RWIN key but are otherwise
     // the same as 105-key layouts.
-    include "ogham(basic)"
+    include "ogam(basic)"
     key <MENU>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
 };
 
@@ -187,20 +187,20 @@ xkb_symbols "is434" {
 partial alphanumeric_keys
 xkb_symbols "IS434" {
     // just has uppercase in the name
-    include "ogham(is434)"
+    include "ogam(is434)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "is434laptop" {
     // For laptops which don't have the RWIN key but are otherwise
     // the same as 105-key layouts.
-    include "ogham(is434)"
+    include "ogam(is434)"
     key <MENU>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
 };
 
 partial alphanumeric_keys
 xkb_symbols "IS434laptop" {
     // just has uppercase in the name
-    include "ogham(is434)"
+    include "ogam(is434)"
     key <MENU>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
 };