OLPC fixlets

5 files changed, 19 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 4fa3bbcc..577eee7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-28  Sergey Udaltsov
+
+	* symbols/ara, symbols/us, symbols/es, symbols/us: OLPC fixlets
+
 2007-10-23  Sergey Udaltsov
 
 	* symbols/ru, rules/base.xml.in: added ru(kom),
diff --git a/symbols/ara b/symbols/ara
index b9ebc6c5..cca9971d 100644
--- a/symbols/ara
+++ b/symbols/ara
@@ -245,21 +245,21 @@ xkb_symbols "olpc" {
     key <AE02> {  [       0x1000662,              at  ] };
     key <AE03> {  [       0x1000663,      numbersign  ] };
     key <AE04> {  [       0x1000664,          dollar  ] };
-    key <AE05> {  [       0x1000665,         percent  ] };
+    key <AE05> {  [       0x1000665,  Arabic_percent  ] };
     key <AE06> {  [       0x1000666,        sterling  ] };
     key <AE07> {  [       0x1000667,        EuroSign  ] };
     key <AE08> {  [       0x1000668,        asterisk  ] };
-    key <AE09> {  [       0x1000669,       parenleft  ] };
-    key <AE10> {  [       0x1000660,      parenright  ] };
+    key <AE09> {  [       0x1000669,      parenright  ] };
+    key <AE10> {  [       0x1000660,       parenleft  ] };
 
     key <AD05> {  [      Arabic_feh,   Arabic_shadda  ] };
 
     key <AD08> {  [      Arabic_heh,        division  ] };
-    key <AD11> {  [     Arabic_jeem                   ] };
-    key <AD12> {  [      Arabic_dal                   ] };
+    key <AD11> {  [     Arabic_jeem,      braceright  ] };
+    key <AD12> {  [      Arabic_dal,       braceleft  ] };
 
-    key <AC01> {  [    Arabic_sheen,            less  ] };
-    key <AC02> {  [     Arabic_seen,         greater  ] };
+    key <AC01> {  [    Arabic_sheen,         greater  ] };
+    key <AC02> {  [     Arabic_seen,            less  ] };
     key <AC05> {  [      Arabic_lam,       ampersand  ] };
     key <AC10> {  [      Arabic_kaf                   ] };
     key <AC11> {  [      Arabic_tah                   ] };
@@ -268,7 +268,8 @@ xkb_symbols "olpc" {
 
 
     // REH isolated form?
-    key <AB04> {  [       Arabic_ra,  Arabic_kasratan ] };
+    key <AB03> {  [ Arabic_hamzaonwaw,   Arabic_kasra ] };
+    key <AB04> {  [       Arabic_ra,  Arabic_kasratan ] };    
     key <AB05> {  [     Arabic_thal,      asciicircum ] };
     // Language key
     key <I219> {  [  ISO_Next_Group,   ISO_Prev_Group ] };
diff --git a/symbols/br b/symbols/br
index 2cd9807f..75ec0825 100644
--- a/symbols/br
+++ b/symbols/br
@@ -95,7 +95,7 @@ xkb_symbols "olpc" {
     key <AE12>  { [       equal,           plus,       section                 ] };
 
     key <AD03> { [            e,              E,      EuroSign                 ] };
-    key <AD11> { [   dead_acute,      dead_grave                                ] };
+    key <AD11> { [   dead_acute,      dead_grave,        acute,          grave ] };
     key <AD12> { [  bracketleft,       braceleft,     0x10000AA                 ] };
 
     key <AC10> { [     ccedilla,       Ccedilla                                ] };
diff --git a/symbols/es b/symbols/es
index 5c9b52ed..e4328bc9 100644
--- a/symbols/es
+++ b/symbols/es
@@ -157,8 +157,8 @@ xkb_symbols "olpc" {
 
     key <TLDE> { [          bar,         degree                         ] };
     key <AE02> { [            2,       quotedbl,              at ] };
-    key <AE03> { [            3,     dead_grave,      numbersign ] };
-    key <AE05> { [            5,       percent, dead_circumflex ] };
+    key <AE03> { [            3,     dead_grave,      numbersign,   grave           ] };
+    key <AE05> { [            5,        percent,     asciicircum,   dead_circumflex ] };
     key <AE06> { [            6,      ampersand,         notsign ] };
     key <AE07> { [            7,          slash,       backslash ] };
     key <AE08> { [            8,      parenleft                         ] };
@@ -168,7 +168,7 @@ xkb_symbols "olpc" {
     key <AE12> { [   exclamdown,   questiondown                  ] };
 
     key <AD03> { [            e,              E,        EuroSign ] };
-    key <AD11> { [   dead_acute, dead_diaeresis                         ] };
+    key <AD11> { [   dead_acute, dead_diaeresis,           acute,   dead_abovering  ] };
     key <AD12> { [  bracketleft,      braceleft                  ] };
 
     key <AC10> { [       ntilde,        Ntilde                  ] };
diff --git a/symbols/us b/symbols/us
index 86f34904..d153ce20 100644
--- a/symbols/us
+++ b/symbols/us
@@ -867,8 +867,8 @@ xkb_symbols "olpc" {
    key <AB03>  { [         c,          C,    ccedilla,         Ccedilla ] };
    key <AB06>  { [         n,          N,      ntilde,           Ntilde ] };
    key <AB07>  { [         m,          M,          mu,               mu ] };
-   key <AB08>  { [     comma,      less, guillemontleft, guillemontleft ] };
-   key <AB09>  { [    period, greater, guillemontright, guillemontright ] };
+   key <AB08>  { [     comma,     less,  guillemotleft,   guillemotleft ] };
+   key <AB09>  { [    period,  greater, guillemotright,  guillemotright ] };
    key <AB10>  { [     slash,   question, questiondown,    questiondown ] };
 
    key <I219>  { [  multiply,   division, ISO_Next_Group, ISO_Prev_Group ] };