Moving ca(shs) into extras

There are only 1650 speakers
http://en.wikipedia.org/wiki/Shuswap_language

diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
index 9cb7977..19f8fad 100644 (file)
--- a/rules/base.extras.xml.in
+++ b/rules/base.extras.xml.in
@@ -27,6 +27,13 @@
             <_description>Kutenai</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>shs</name>
+            <_shortDescription>shs</_shortDescription>
+            <_description>Secwepemctsin</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 3024f95..5979d36 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2179,13 +2179,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>shs</name>
-            <_shortDescription>shs</_shortDescription>
-            <_description>Secwepemctsin</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>eng</name>
             <_shortDescription>en</_shortDescription>
             <_description>English (Canada)</_description>

diff --git a/symbols/ca b/symbols/ca
index 1c777ee..ab9cef1 100644 (file)
--- a/symbols/ca
+++ b/symbols/ca
@@ -451,31 +451,6 @@ xkb_symbols "multix" {
     include "level5(rctrl_switch)"
 };
 
-// Secwepemctsin keyboard for X11
-// written by Neskie Manuel <neskiem@gmail.com>
-
-partial alphanumeric_keys  
-xkb_symbols "shs" {
-
-    include "us"
-
-    name[Group1]= "Secwepemctsin";
-
-    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
-    //q, l, t, s, m, g, k, p, w, y, r
-    //XCompose key is used for the other accute and grave.
-
-    key <AB08> { [ comma, less, U0313    ]     };
-    key <AC01> { [ a, A, aacute, Aacute  ]     };
-    key <AD03> { [ e, E, eacute, Eacute  ]     };
-    key <AD07> { [ u, U, uacute, Uacute  ]     };
-    key <AD08> { [ i, I, iacute, Iacute  ]     };
-    key <AD09> { [ o, O, oacute, Oacute  ]     };
-
-    include "level3(ralt_switch)"
-    include "compose(rctrl)"
-};
-
 // OLPC Section
 xkb_symbols "olpc" {
 
@@ -527,3 +502,29 @@ xkb_symbols "kut" {
     //MODIFIER LETTER RIGHT HALF RING
     key <AC10> {       [ semicolon,    colon,U02BE,U02BE       ]       };
 };
+
+// Secwepemctsin keyboard for X11
+// written by Neskie Manuel <neskiem@gmail.com>
+
+partial alphanumeric_keys  
+xkb_symbols "shs" {
+
+    include "us"
+
+    name[Group1]= "Secwepemctsin";
+
+    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
+    //q, l, t, s, m, g, k, p, w, y, r
+    //XCompose key is used for the other accute and grave.
+
+    key <AB08> { [ comma, less, U0313    ]     };
+    key <AC01> { [ a, A, aacute, Aacute  ]     };
+    key <AD03> { [ e, E, eacute, Eacute  ]     };
+    key <AD07> { [ u, U, uacute, Uacute  ]     };
+    key <AD08> { [ i, I, iacute, Iacute  ]     };
+    key <AD09> { [ o, O, oacute, Oacute  ]     };
+
+    include "level3(ralt_switch)"
+    include "compose(rctrl)"
+};
+