moved braille to brai, according to ISO, b.fd.o#19695

4 files changed, 5 insertions, 64 deletions

diff --git a/ChangeLog b/ChangeLog
index f5900d42..37c46b15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
 	http://bugs.freedesktop.org/show_bug.cgi?id=19694
 	* geometry/dell, rules/base.m_g.part: added latitude geometry,
 	http://bugs.freedesktop.org/show_bug.cgi?id=19750
+	* rules/base.xml.in, symbols/Makefile.am, symbols/brai,
+	symbols/braille: moved Braille symbols to the proper location,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19695
 
 2009-01-27  Sergey Udaltsov
 
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 16ec3636..690874c3 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4093,7 +4093,7 @@
     </layout>
     <layout>
       <configItem>
-        <name>braille</name>
+        <name>brai</name>
         <_shortDescription>Brl</_shortDescription>
         <_description>Braille</_description>
       </configItem>
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index e65ff62d..981c8314 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -6,7 +6,7 @@ ad af al \
 am ara az \
 be bd \
 bg br ba \
-bt by braille \
+bt by brai \
 ca cd \
 ch cn cz \
 de dk \
diff --git a/symbols/braille b/symbols/braille
deleted file mode 100644
index 01d0bf2d..00000000
--- a/symbols/braille
+++ /dev/null
@@ -1,62 +0,0 @@
-// $XKeyboardConfig$
-
-// 10-dot patterns on the home row + v and n
-partial default alphanumeric_keys
-xkb_symbols "home_row" {
-    include "braille(keypad)"
-
-    name[Group1]="Braille";
-
-    key <AC04>	{ [ braille_dot_1 ] };
-    key <AC03>	{ [ braille_dot_2 ] };
-    key <AC02>	{ [ braille_dot_3 ] };
-    key <AC07>	{ [ braille_dot_4 ] };
-    key <AC08>	{ [ braille_dot_5 ] };
-    key <AC09>	{ [ braille_dot_6 ] };
-    key <AC01>	{ [ braille_dot_7 ] };
-    key <AC10>	{ [ braille_dot_8 ] };
-    key <AB04>	{ [ braille_dot_9 ] };
-    key <AB06>	{ [ braille_dot_10 ] };
-};
-
-// 6-dot patterns for the left hand
-partial alphanumeric_keys
-xkb_symbols "left_hand" {
-    include "braille(keypad)"
-
-    name[Group1]="Braille - Left hand";
-
-    key <AC03>	{ [ braille_dot_1 ] };
-    key <AC02>	{ [ braille_dot_2 ] };
-    key <AC01>	{ [ braille_dot_3 ] };
-    key <AC04>	{ [ braille_dot_4 ] };
-    key <AB05>	{ [ braille_dot_5 ] };
-    key <AB04>	{ [ braille_dot_6 ] };
-};
-
-// 6-dot patterns for the right hand
-partial alphanumeric_keys
-xkb_symbols "right_hand" {
-    include "braille(keypad)"
-
-    name[Group1]="Braille - Right hand";
-
-    key <AC07>	{ [ braille_dot_1 ] };
-    key <AB05>	{ [ braille_dot_2 ] };
-    key <AB06>	{ [ braille_dot_3 ] };
-    key <AC08>	{ [ braille_dot_4 ] };
-    key <AC09>	{ [ braille_dot_5 ] };
-    key <AC10>	{ [ braille_dot_6 ] };
-};
-
-// 6-dot patterns on the keypad
-partial hidden keypad_keys
-xkb_symbols "keypad" {
-    key <KP4>	{ [ braille_dot_1 ] };
-    key <KP1>	{ [ braille_dot_2 ] };
-    key <KP0>	{ [ braille_dot_3 ] };
-    key <KP5>	{ [ braille_dot_4 ] };
-    key <KP6>	{ [ braille_dot_5 ] };
-    key <KPAD>	{ [ braille_dot_6 ] };
-};
-