small olpc fix

diff --git a/ChangeLog b/ChangeLog
index 1a4f665..7b6474f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-30  Sergey Udaltsov
+
+       * symbols/us: small olpc fix
+
 2007-11-21  Sergey Udaltsov
 
        * symbols/np, rules/base.lists.part: added np(olpc)

diff --git a/symbols/us b/symbols/us
index d153ce2..8ccbe99 100644 (file)
--- a/symbols/us
+++ b/symbols/us
@@ -835,7 +835,7 @@ xkb_symbols "olpc" {
    key <AE05> { [         5,    percent,     0x1000306,  0x1000306 ] }; // combining breve above
    key <AE06> { [         6,asciicircum,     0x100030A,  0x100030A ] }; // combining ring above
    key <AE07> { [         7,  ampersand,     0x1000302,  0x1000302 ] }; // combining circumflex above
-   key <AE08> { [         8,   asterisk,     0x1000324,  0x1000324 ] }; // combining caron above
+   key <AE08> { [         8,   asterisk,     0x100030C,  0x100030C ] }; // combining caron above
    key <AE09> { [         9,  parenleft,     0x1000307,  0x1000307 ] }; // combining dot above
    key <AE10> { [         0, parenright,     0x1000308,  0x1000308 ] }; // combining diaeresis above
    key <AE11> { [     minus, underscore,     0x1000304,  0x1000304 ] }; // combining macron above
@@ -850,12 +850,12 @@ xkb_symbols "olpc" {
    key <AD07> { [         u,          U,    0x100032D,   0x100032D ] }; // combining circumflex below
    key <AD08> { [         i,          I,    0x100032C,   0x100032C ] }; // combining caron below
    key <AD09> { [         o,          O,    0x1000323,   0x1000323 ] }; // combining dot below
-   key <AD10> { [         p,          P,    0x1000304,   0x1000304 ] }; // combining diaeresis below
+   key <AD10> { [         p,          P,    0x1000324,   0x1000324 ] }; // combining diaeresis below
    key <AD11> { [ bracketleft,  braceleft,  0x1000331,   0x1000331 ] }; // combining macron below
    key <AD12> { [bracketright, braceright,  0x1000330,   0x1000330 ] }; // combining tilde below
 
    key <AC01>  { [         a,          A,          ae,               AE ] };
-   key <AC02>  { [         s,          S,      ssharp,           ssharp ] };
+   key <AC02>  { [         s,          S,      ssharp,        0x1001E9C ] }; // uppercase S sharp
    key <AC03>  { [         d,          D,         eth,              ETH ] };
    key <AC04>  { [         f,          F,       thorn,            THORN ] };
    key <AC06>  { [         h,          H,    sterling,         sterling ] };