summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvu <svu>2007-09-26 11:43:47 +0000
committersvu <svu>2007-09-26 11:43:47 +0000
commita8551efb70a0423c7e3a3d32716d44a04dcbb2c6 (patch)
tree12664fa36813bb2e11829cf754092fcb9c58deb6
parentbc46aed1ffd30ccadee8a974361d0b9f93bcaf6e (diff)
massive patch from OLPC
-rw-r--r--ChangeLog9
-rw-r--r--rules/base.lists.part3
-rw-r--r--rules/base.m_k.part1
-rw-r--r--rules/base.ml_c.part1
-rw-r--r--rules/base.ml_s.part2
-rw-r--r--rules/base.xml.in13
-rwxr-xr-xrules/merge.sh3
-rw-r--r--symbols/Makefile.am2
-rw-r--r--symbols/ara56
-rw-r--r--symbols/br35
-rw-r--r--symbols/es35
-rw-r--r--symbols/group21
-rw-r--r--symbols/inet2
-rw-r--r--symbols/level35
-rw-r--r--symbols/ng61
-rw-r--r--symbols/olpc21
-rw-r--r--symbols/pk99
-rw-r--r--symbols/ru19
-rw-r--r--symbols/th61
-rw-r--r--symbols/tr9
-rw-r--r--symbols/us66
21 files changed, 510 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 5566ae8..a6f16b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-26 Sergey Udaltsov
+
+ * rules/base.lists.part, rules/base.m_k.part, rules/base.ml_c.part,
+ rules/base.ml_s.part, rules/base.xml.in, rules/merge.sh,
+ symbols/Makefile.am, symbols/ara, symbols/br, symbols/es,
+ symbols/group, symbols/inet, symbols/level3, symbols/ng, symbols/olpc,
+ symbols/pk, symbols/ru, symbols/th, symbols/tr, symbols/us: massive
+ patch from OLPC project
+
2007-09-25 Sergey Udaltsov
* NEWS, configure.in: preparing release 1.1
diff --git a/rules/base.lists.part b/rules/base.lists.part
index b11ce7d..0a72d31 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -14,6 +14,9 @@
// PC geometries - they have special geometry but symbols are mostly pc105
! $pcgeometries = abnt2 latitude jp106 kr106
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = ara br es ru th tr us
+
! $macbooks = macbook78 macbook79
! $maclaptop = ibook powerbook macbook78 macbook79
! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index b401e89..16b9446 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -6,6 +6,7 @@
abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106)
evdev = evdev
+ olpc = evdev
macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)
$macbooks = macintosh+macintosh(badmap)
diff --git a/rules/base.ml_c.part b/rules/base.ml_c.part
index 6f3c1e1..ec8f022 100644
--- a/rules/base.ml_c.part
+++ b/rules/base.ml_c.part
@@ -1,3 +1,4 @@
pc98 nec_vndr/jp = pc98(basic)
* jp = complete+japan
+ olpc * = olpc
* * = complete
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 1fab2dc..f6e0132 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -16,6 +16,8 @@
macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
$macs en_US = pc+macintosh_vndr/us(extended)
$macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
+ olpc $olpclayouts = olpc+%l%(m)
+ olpc * = olpc+%l
thinkpad br = pc+br(thinkpad)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index e77f127..b405f8a 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -935,6 +935,13 @@
<vendor>Intel</vendor>
</configItem>
</model>
+ <model>
+ <configItem>
+ <name>olpc</name>
+ <_description>OLPC</_description>
+ <vendor>OLPC</vendor>
+ </configItem>
+ </model>
</modelList>
<layoutList>
<layout>
@@ -1010,6 +1017,12 @@
<_description>International (AltGr dead keys)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>olpc2</name>
+ <_description>OLPC with mode toggle on multiply/divide key</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/rules/merge.sh b/rules/merge.sh
index c332ea5..8dfde55 100755
--- a/rules/merge.sh
+++ b/rules/merge.sh
@@ -7,7 +7,8 @@ if [ -z "$HDR" ]; then
HDR="HDR"
fi
-> $DEST
+basename=`basename $0`
+echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
for i in $*; do
if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 2280038..089ec5f 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -20,7 +20,7 @@ latam latin lk \
lt lv ma mao \
mk mm mn \
mt mv ng nl \
-no np pc pk \
+no np olpc pc pk \
pl pt ro \
ru se si \
sk sy th \
diff --git a/symbols/ara b/symbols/ara
index 9acf3ec..b9ebc6c 100644
--- a/symbols/ara
+++ b/symbols/ara
@@ -217,3 +217,59 @@ xkb_symbols "buckwalter" {
// End alphanumeric section
};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+ include "ara(basic)"
+
+ // As part of the olpc design some changes were made to the Arabic
+ // keyboard design. Major changes are:
+ //
+ // * Removed the lam-alef single character. Poeple type as they
+ // pronounce, and lam-alef is just a visual formatting of the
+ // sequence and is not often used on the keyboard. It is
+ // similar to the Allah single character, which is also not on
+ // the keyboard.
+ // * Moved the following keys:
+ // o Thal from TLDE to AB05: Due to space limitation on the
+ // keybaord, but also accessibility
+ // o Shadda from TLDE to AD05
+ // * Placed currency letters on number keys and moved the ^ and &
+ // characters to lower keys (This change is worth revisiting
+ // before end of test period)
+
+ key <TLDE> { [ grave, asciitilde ] };
+
+ key <AE01> { [ 0x1000661, exclam ] };
+ key <AE02> { [ 0x1000662, at ] };
+ key <AE03> { [ 0x1000663, numbersign ] };
+ key <AE04> { [ 0x1000664, dollar ] };
+ key <AE05> { [ 0x1000665, percent ] };
+ key <AE06> { [ 0x1000666, sterling ] };
+ key <AE07> { [ 0x1000667, EuroSign ] };
+ key <AE08> { [ 0x1000668, asterisk ] };
+ key <AE09> { [ 0x1000669, parenleft ] };
+ key <AE10> { [ 0x1000660, parenright ] };
+
+ key <AD05> { [ Arabic_feh, Arabic_shadda ] };
+
+ key <AD08> { [ Arabic_heh, division ] };
+ key <AD11> { [ Arabic_jeem ] };
+ key <AD12> { [ Arabic_dal ] };
+
+ key <AC01> { [ Arabic_sheen, less ] };
+ key <AC02> { [ Arabic_seen, greater ] };
+ key <AC05> { [ Arabic_lam, ampersand ] };
+ key <AC10> { [ Arabic_kaf ] };
+ key <AC11> { [ Arabic_tah ] };
+
+ key <BKSL> { [ backslash, bar ] };
+
+
+ // REH isolated form?
+ 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 c61d163..dc07edc 100644
--- a/symbols/br
+++ b/symbols/br
@@ -75,3 +75,38 @@ xkb_symbols "thinkpad" {
key <RCTL> { [ slash, question, degree, questiondown ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+ include "us(basic)"
+ name[Group1]="Brazil";
+
+ key <TLDE> { [ apostrophe, quotedbl ] };
+
+ key <AE01> { [ 1, exclam, onesuperior ] };
+ key <AE02> { [ 2, at, twosuperior ] };
+ key <AE03> { [ 3, numbersign, threesuperior ] };
+ key <AE04> { [ 4, dollar, sterling ] };
+ key <AE05> { [ 5, percent, cent ] };
+ key <AE06> { [ 6, dead_diaeresis, notsign ] };
+ key <AE12> { [ equal, plus, section ] };
+
+ key <AD03> { [ e, E, EuroSign ] };
+ key <AD11> { [ dead_acute, dead_grave ] };
+ key <AD12> { [ bracketleft, braceleft, 0x10000AA ] };
+
+ key <AC10> { [ ccedilla, Ccedilla ] };
+ key <AC11> { [ dead_tilde, dead_circumflex ] };
+ key <BKSL> { [ bracketright, braceright, 0x10000BA ] };
+
+ key <AB01> { [ z, Z, bar ] };
+ key <AB03> { [ c, C, 0x10020A2 ] };
+ key <AB09> { [ period, greater, backslash ] };
+ key <AB10> { [ semicolon, colon ] };
+
+ key <I219> { [ slash, question, degree, ISO_Next_Group ] };
+
+ include "level3(ralt_switch)"
+};
+
diff --git a/symbols/es b/symbols/es
index daa02e8..5c9b52e 100644
--- a/symbols/es
+++ b/symbols/es
@@ -148,3 +148,38 @@ xkb_symbols "mac" {
name[Group1]= "Spain - Macintosh";
};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+ include "us(basic)"
+ name[Group1]="Spain";
+
+ key <TLDE> { [ bar, degree ] };
+ key <AE02> { [ 2, quotedbl, at ] };
+ key <AE03> { [ 3, dead_grave, numbersign ] };
+ key <AE05> { [ 5, percent, dead_circumflex ] };
+ key <AE06> { [ 6, ampersand, notsign ] };
+ key <AE07> { [ 7, slash, backslash ] };
+ key <AE08> { [ 8, parenleft ] };
+ key <AE09> { [ 9, parenright ] };
+ key <AE10> { [ 0, equal ] };
+ key <AE11> { [ apostrophe, question ] };
+ key <AE12> { [ exclamdown, questiondown ] };
+
+ key <AD03> { [ e, E, EuroSign ] };
+ key <AD11> { [ dead_acute, dead_diaeresis ] };
+ key <AD12> { [ bracketleft, braceleft ] };
+
+ key <AC10> { [ ntilde, Ntilde ] };
+ key <AC11> { [ plus, asterisk, dead_tilde ] };
+ key <BKSL> { [ bracketright, braceright ] };
+
+ key <AB08> { [ comma, semicolon ] };
+ key <AB09> { [ period, colon ] };
+ key <AB10> { [ minus, underscore ] };
+
+ key <I219> { [ less, greater, ISO_Next_Group ] };
+
+ include "level3(ralt_switch)"
+};
diff --git a/symbols/group b/symbols/group
index 03d2250..4efa318 100644
--- a/symbols/group
+++ b/symbols/group
@@ -230,29 +230,32 @@ xkb_symbols "rwin_toggle" {
// Both Ctrls pressed together toggle group
partial modifier_keys
xkb_symbols "ctrls_toggle" {
- virtual_modifiers Control;
+ virtual_modifiers LControl, RControl;
key <LCTL> {
- type[Group1]="PC_CONTROL_LEVEL2",
- symbols[Group1]= [ NoSymbol, ISO_Prev_Group ]
+ type[Group1]="PC_RCONTROL_LEVEL2",
+ symbols[Group1]= [ NoSymbol, ISO_Prev_Group ],
+ virtualMods= LControl
};
key <RCTL> {
- type[Group1]="PC_CONTROL_LEVEL2",
- symbols[Group1]= [ NoSymbol, ISO_Next_Group ]
+ type[Group1]="PC_LCONTROL_LEVEL2",
+ symbols[Group1]= [ NoSymbol, ISO_Next_Group ],
+ virtualMods= RControl
};
};
// Both Alts pressed together toggle group
partial modifier_keys
xkb_symbols "alts_toggle" {
+ virtual_modifiers LAlt, RAlt;
key <LALT> {
- type[Group1]="PC_ALT_LEVEL2",
+ type[Group1]="PC_RALT_LEVEL2",
symbols[Group1]= [ NoSymbol, ISO_Prev_Group ],
- virtualMods= Alt
+ virtualMods= LAlt
};
key <RALT> {
- type[Group1]="PC_ALT_LEVEL2",
+ type[Group1]="PC_LALT_LEVEL2",
symbols[Group1]= [ NoSymbol, ISO_Next_Group ],
- virtualMods= Alt
+ virtualMods= RAlt
};
};
diff --git a/symbols/inet b/symbols/inet
index 4f55cfb..e54cf75 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -18,7 +18,7 @@
// setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type'
// All keyboards listed here should be also mentioned in
-// xc/programs/xkbcomp/rules/xfree86, xfree86.lst and xfree86.xml.
+// rules/base, base.lst and base.xml.
// Very common set of media keys
partial hidden alphanumeric_keys
diff --git a/symbols/level3 b/symbols/level3
index 644c8ef..d4e1129 100644
--- a/symbols/level3
+++ b/symbols/level3
@@ -50,8 +50,9 @@ partial hidden modifier_keys
xkb_symbols "ralt_switch_for_alts_toggle" {
virtual_modifiers LAlt, AlGr;
key <LALT> {
- type[Group1]="PC_ALT_LEVEL2",
- symbols[Group1] = [ Alt_L, ISO_Prev_Group, ISO_Prev_Group ]
+ type[Group1]="PC_RALT_LEVEL2",
+ symbols[Group1] = [ Alt_L, ISO_Prev_Group, ISO_Prev_Group ],
+ virtualMods= LAlt
};
key <RALT> {
type[Group1]="PC_ALT_LEVEL2",
diff --git a/symbols/ng b/symbols/ng
index 230e2f9..b45a53f 100644
--- a/symbols/ng
+++ b/symbols/ng
@@ -54,3 +54,64 @@ xkb_symbols "hausa" {
key <AB10> { [ scedilla, Scedilla, slash, question ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+ include "ng(basic)"
+
+ // OLPC West Africa keyboard layout
+ // See: http://wiki.laptop.org/go/Image:Nigeria-B3.png
+
+ key <TLDE> { [ grave, asciitilde, exclamdown, exclamdown ] };
+ key <AE01> { [ 1, exclam, sterling, sterling ] };
+ key <AE02> { [ 2, at, EuroSign, EuroSign ] };
+ key <AE03> { [ 3, numbersign, dollar, dollar ] };
+ key <AE04> { [ 4, 0x10020A6, 0x1000301, 0x1000301 ] }; // Naira, combining acute
+ key <AE05> { [ 5, percent, 0x1000300, 0x1000300 ] }; // combining grave
+ 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 <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
+ key <AE12> { [ equal, plus, 0x1000303, 0x1000303 ] }; // combining tilde above
+
+ key <AD02> { [ w, W, 0x1000, 0x1000 ] }; // E with dot below
+ key <AD03> { [ e, E, 0x10001DD, 0x100018E ] }; // reversed E
+ key <AD04> { [ r, R, 0x10001B4, 0x10001B3 ] }; // Y with hook
+ key <AD05> { [ t, T, 0x1000327, 0x1000327 ] }; // combining cedilla
+ key <AD06> { [ y, Y, 0x1000325, 0x1000325 ] }; // combining ring below
+ 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 <AD11> { [ bracketleft, braceleft, 0x1000331, 0x1000331 ] }; // combining macron below
+ key <AD12> { [bracketright, braceright, 0x1000330, 0x1000330 ] }; // combining tilde below
+
+ key <AC01> { [ a, A, Greek_iota, Greek_IOTA ] };
+ key <AC02> { [ s, S, 0x1001E63, 0x1001E62 ] }; // S with dot below
+ key <AC03> { [ d, D, 0x1000257, 0x100018A ] }; // D with hook
+ key <AC04> { [ f, F, 0x1001E0D, 0x1001E0C ] }; // D with dot below
+ key <AC05> { [ g, G, 0x1000272, 0x100019D ] }; // N with left hook
+ key <AC06> { [ u, U, 0x1001EE5, 0x1001EE4 ] }; // U with dot below
+ key <AC07> { [ j, J, 0x1001ECB, 0x1001ECA ] }; // I with dot below
+ key <AC08> { [ k, K, 0x1000199, 0x1000198 ] }; // K with hook
+ key <AC09> { [ l, L, 0x10001E37, 0x1001E36 ] }; // L with dot below
+ key <AC10> { [ semicolon, colon, masculine, ordfeminine ] };
+ key <AC11> { [ apostrophe, quotedbl, currency, currency ] };
+ key <BKSL> { [ backslash, bar, section, section ] };
+
+ key <AB03> { [ c, C, 0x1000254, 0x1000186 ] }; // open O
+ key <AB04> { [ v, V, 0x100028B, 0x10001B2 ] }; // V with hook
+ key <AB05> { [ b, B, 0x1000253, 0x1000181 ] }; // B with hook
+ key <AB06> { [ n, N, eng, ENG ] };
+ key <AB07> { [ m, M, 0x1001E45, 0x1001E44 ] }; // N with dot above
+ key <AB08> { [ comma, less, guillemontleft, guillemontleft ] };
+ key <AB09> { [ period, greater, guillemontright, guillemontright ] };
+ key <AB10> { [ slash, question, questiondown, questiondown ] };
+
+ key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+
+ include "level3(ralt_switch)"
+};
diff --git a/symbols/olpc b/symbols/olpc
new file mode 100644
index 0000000..a15cbc3
--- /dev/null
+++ b/symbols/olpc
@@ -0,0 +1,21 @@
+// $XKeyboardConfig$
+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Additional symbol definitions for the OLPC keyboards
+//
+
+alphanumeric_keys modifier_keys
+xkb_symbols "olpc" {
+ include "pc(pc105)"
+
+ modifier_map Mod1 { KP_Home }; // KP_Home is the "square" game key
+ modifier_map Mod3 { KP_End }; // KP_End is the "tick" game key
+ modifier_map Mod4 { KP_Prior }; // KP_Prior is the "O" game key
+ modifier_map Mod5 { KP_Next }; // KP_Next is the "X" game key
+
+ key <I220> { [ XF86Search ] }; // search key
+ key <I221> { [ XF86Meeting ] }; // fn+search key
+ key <I236> { [ XF86Start ] }; // gear key (fn+space)
+};
+
diff --git a/symbols/pk b/symbols/pk
index f51226c..7c9d4a9 100644
--- a/symbols/pk
+++ b/symbols/pk
@@ -83,3 +83,102 @@ xkb_symbols "urd" {
modifier_map Shift {Shift_L, Shift_R };
modifier_map Lock {Caps_Lock };
};
+
+partial default alphanumeric_keys
+xkb_symbols "ara" {
+ name[Group1]= "Arabic";
+
+// NOTES:
+//
+// there is also combined shadda diacritis in AltGr position of simple
+// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan
+// should a third state be added to Group2 ?
+//
+// How is this different from ara(basic)? --bernie
+
+ key <TLDE> { [ 0x100064d , 0x100064b ] };
+ key <AE01> { [ 0x10006F1 , 0x1000021 ] };
+ key <AE02> { [ 0x10006F2 , 0x1000003 ] };
+ key <AE03> { [ 0x10006F3 , 0x100002f ] };
+ key <AE04> { [ 0x10006F4 , 0x1000626 ] };
+ key <AE05> { [ 0x10006F5 , 0x1000003 ] };
+ key <AE06> { [ 0x10006F6 , 0x10006d6 ] };
+ key <AE07> { [ 0x10006F7 , 0x1000654 ] };
+ key <AE08> { [ 0x10006F8 , 0x100064c ] };
+ key <AE09> { [ 0x10006F9 , 0x1000029 ] };
+ key <AE10> { [ 0x10006F0 , 0x1000028 ] };
+ key <AE11> { [ 0x1000623 , 0x1000651 ] };
+ key <AE12> { [ 0x1000624 , 0x1000622 ] };
+ key <AD01> { [ 0x1000642 , 0x1000652 ] };
+ key <AD02> { [ 0x1000648 , 0x10000a3 ] };
+ key <AD03> { [ 0x1000639 , 0x10000a5 ] };
+ key <AD04> { [ 0x1000631 , 0x1000691 ] };
+ key <AD05> { [ 0x100062a , 0x1000679 ] };
+ key <AD06> { [ 0x10006d2 , 0x1000601 ] };
+ key <AD07> { [ 0x1000621 , 0x100060c ] };
+ key <AD08> { [ 0x10006cc , 0x1000670 ] };
+ key <AD09> { [ 0x10006c1 , 0x10006c3 ] };
+ key <AD10> { [ 0x100067e , 0x100064f ] };
+ key <AD11> { [ 0x100005d , 0x1000670 ] };
+ key <AD12> { [ 0x100005b , 0x1000670 ] };
+
+ key <AC01> { [ 0x1000627 , 0x1000653 ] };
+ key <AC02> { [ 0x1000633 , 0x1000635 ] };
+ key <AC03> { [ 0x100062f , 0x1000688 ] };
+ key <AC04> { [ 0x1000641 , 0x1000003 ] };
+ key <AC05> { [ 0x10006af , 0x100063a ] };
+ key <AC06> { [ 0x10006be , 0x100062d ] };
+ key <AC07> { [ 0x100062c , 0x1000636 ] };
+ key <AC08> { [ 0x10006a9 , 0x100062e ] };
+ key <AC09> { [ 0x1000644 , 0x1000613 ] };
+ key <AC10> { [ 0x100061b , 0x100003a ] };
+ key <AC11> { [ 0x1000670 , 0x1000022 ] };
+ key <BKSL> { [ 0x100060e , 0x1000614 ] };
+
+ key <LSGT> { [ bar , brokenbar ] };
+ key <AB01> { [ 0x1000632 , 0x1000630 ] };
+ key <AB02> { [ 0x1000634 , 0x1000698 ] };
+ key <AB03> { [ 0x1000686 , 0x100062b ] };
+ key <AB04> { [ 0x1000637 , 0x1000638 ] };
+ key <AB05> { [ 0x1000628 , 0x1000612 ] };
+ key <AB06> { [ 0x1000646 , 0x10006ba ] };
+ key <AB07> { [ 0x1000645 , 0x1000003 ] };
+ key <AB08> { [ 0x100060c , 0x1000650 ] };
+ key <AB09> { [ 0x10006d4 , 0x100064e ] };
+ key <AB10> { [ 0x1000003 , 0x100061f ] };
+
+ // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+// based on a keyboard map from an 'xkb/symbols/ur' file
+// Contact: Nadir Durrani
+// E-mail : aquadurrani@hotmail.com
+
+ include "pk(ara)"
+
+ key <AE02> { [ 0x10006F2 , 0x1000600 ] };
+ key <AE05> { [ 0x10006F5 , 0x100060F ] };
+ key <AE06> { [ 0x10006F6 , 0x1000610 ] };
+
+ key <AD01> { [ 0x1000642 , 0x10006E1 ] };
+ key <AD02> { [ 0x1000648 , 0x100FDFA ] };
+ key <AD03> { [ 0x1000639 , 0x1000611 ] };
+ // [] swapped due to keyboard misprint
+ key <AD11> { [ 0x100005B , 0x1000603 ] };
+ key <AD12> { [ 0x100005D , 0x100060E ] };
+
+ key <AC04> { [ 0x1000641 , 0x1000656 ] };
+ key <AC09> { [ 0x1000644 , 0x1000612 ] };
+ key <AC11> { [ 0x1000027 , 0x1000022 ] };
+ key <BKSL> { [ 0x1000602 , 0x1000614 ] };
+
+ key <AB05> { [ 0x1000628 , 0x1000613 ] };
+ key <AB07> { [ 0x1000645 , 0x1000658 ] };
+ key <AB10> { [ 0x1000615 , 0x100061F ] };
+
+ //language key
+ key <I219> { [ISO_Next_Group , ISO_Prev_Group ] };
+};
diff --git a/symbols/ru b/symbols/ru
index 9cca730..319fc06 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -69,6 +69,25 @@ xkb_symbols "basic" {
};
partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+ include "ru(basic)"
+
+ key <TLDE> { [ U+0451, U+0401, grave ] }; // Ñ‘, Ð
+ key <AE03> { [ 3, numbersign, U+2116 ] }; // â„–
+ key <AE04> { [ 4, dollar, semicolon ] };
+ key <AE05> { [ 5, percent ] };
+ key <AE06> { [ 6, asciicircum, colon ] };
+ key <AE07> { [ 7, ampersand ] };
+ key <AE08> { [ 8, asterisk ] };
+ key <AE09> { [ 9, parenleft, acute ] };
+ key <AC12> { [ backslash, bar, slash ] };
+ key <AB10> { [ period, comma ] };
+ key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+ key <BKSL> { [ backslash, slash ] };
+};
+
+partial alphanumeric_keys
xkb_symbols "winkeys" {
include "ru(basic)"
name[Group1]= "Russia - Winkeys";
diff --git a/symbols/th b/symbols/th
index 42383df..952ed43 100644
--- a/symbols/th
+++ b/symbols/th
@@ -186,3 +186,64 @@ xkb_symbols "tis" {
key <BKSL> { [ Thai_khokhon, Thai_khokhuat ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+ name[Group1]= "Thailand";
+ // The OLPC thai layout
+ // walter@laptop.org
+
+ key <TLDE> { [ 0x1000E4F, 0x1000E5B ] };
+ key <AE01> { [ 0x1000E3F, 0x1000E45 ] };
+ key <AE02> { [ slash, 0x1000E51 ] };
+ key <AE03> { [ minus, 0x1000E52 ] };
+ key <AE04> { [ 0x1000E20, 0x1000E53 ] };
+ key <AE05> { [ 0x1000E16, 0x1000E54 ] };
+ key <AE06> { [ 0x1000E38, 0x1000E39 ] };
+ key <AE07> { [ 0x1000E36, 0x1000E4E ] };
+ key <AE08> { [ 0x1000E04, 0x1000E55 ] };
+ key <AE09> { [ 0x1000E15, 0x1000E56 ] };
+ key <AE10> { [ 0x1000E08, 0x1000E57 ] };
+ key <AE11> { [ 0x1000E02, 0x1000E58 ] };
+ key <AE12> { [ 0x1000E0A, 0x1000E59 ] };
+
+ key <AD01> { [ 0x1000E46, 0x1000E50 ] };
+ key <AD02> { [ 0x1000E44, quotedbl ] };
+ key <AD03> { [ 0x1000E33, 0x1000E0E ] };
+ key <AD04> { [ 0x1000E1E, 0x1000E11 ] };
+ key <AD05> { [ 0x1000E30, 0x1000E18 ] };
+ key <AD06> { [ 0x1000E31, 0x1000E4D ] };
+ key <AD07> { [ 0x1000E35, 0x1000E4A ] };
+ key <AD08> { [ 0x1000E23, 0x1000E13 ] };
+ key <AD09> { [ 0x1000E19, 0x1000E2F ] };
+ key <AD10> { [ 0x1000E22, 0x1000E0D ] };
+ key <AD11> { [ 0x1000E1A, 0x1000E10 ] };
+ key <AD12> { [ 0x1000E25, comma ] };
+
+ key <AC01> { [ 0x1000E1F, 0x1000E24 ] };
+ key <AC02> { [ 0x1000E2B, 0x1000E06 ] };
+ key <AC03> { [ 0x1000E01, 0x1000E0F ] };
+ key <AC04> { [ 0x1000E14, 0x1000E42 ] };
+ key <AC05> { [ 0x1000E40, 0x1000E0C ] };
+ key <AC06> { [ 0x1000E49, 0x1000E47 ] };
+ key <AC07> { [ 0x1000E48, 0x1000E4B ] };
+ key <AC08> { [ 0x1000E32, 0x1000E29 ] };
+ key <AC09> { [ 0x1000E2A, 0x1000E28 ] };
+ key <AC10> { [ 0x1000E27, 0x1000E0B ] };
+ key <AC11> { [ 0x1000E07, period ] };
+ key <BKSL> { [ 0x1000E05, 0x1000E03 ] };
+
+ key <AB01> { [ 0x1000E1C, parenleft ] };
+ key <AB02> { [ 0x1000E1B, parenright ] };
+ key <AB03> { [ 0x1000E41, 0x1000E09 ] };
+ key <AB04> { [ 0x1000E2D, 0x1000E2E ] };
+ key <AB05> { [ 0x1000E34, 0x1000E3A ] };
+ key <AB06> { [ 0x1000E37, 0x1000E4C ] };
+ key <AB07> { [ 0x1000E17, question ] };
+ key <AB08> { [ 0x1000E21, 0x1000E12 ] };
+ key <AB09> { [ 0x1000E43, 0x1000E2C ] };
+ key <AB10> { [ 0x1000E1D, 0x1000E26 ] };
+
+ key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+};
diff --git a/symbols/tr b/symbols/tr
index 694ca22..b5273a5 100644
--- a/symbols/tr
+++ b/symbols/tr
@@ -226,3 +226,12 @@ xkb_symbols "ku_alt" {
key <AD08> { [ i, I, icircumflex, Icircumflex ] };
key <AD09> { [ o, O, odiaeresis, Odiaeresis ] };
};
+
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+ name[Group1]= "Turkish";
+ include "tr(f)"
+
+ key <I219> { [ less, greater, bar, brokenbar ] };
+};
diff --git a/symbols/us b/symbols/us
index 05bf6cf..b281dee 100644
--- a/symbols/us
+++ b/symbols/us
@@ -769,3 +769,69 @@ xkb_symbols "classmate-altgr-intl" {
include "level3(switch)"
};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+ include "us(basic)"
+ name[Group1]= "USA";
+
+ // OLPC international US English keyboard layout.
+ // It's a little different from the usual international layout.
+ // See: http://wiki.laptop.org/go/Image:Keyboard_english.png
+
+ key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
+ key <AE01> { [ 1, exclam, exclamdown, exclamdown ] };
+ key <AE02> { [ 2, at, notsign, notsign ] };
+ key <AE03> { [ 3, numbersign, 0x1000301, 0x1000301 ] }; // combining acute
+ key <AE04> { [ 4, dollar, 0x1000300, 0x1000300 ] }; // combining grave
+ 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 <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
+ key <AE12> { [ equal, plus, 0x1000303, 0x1000303 ] }; // combining tilde above
+
+ key <AD01> { [ q, Q, Greek_omega, Greek_OMEGA ] };
+ key <AD02> { [ w, W, oslash, Oslash ] };
+ key <AD03> { [ e, E, oe, OE ] };
+ key <AD04> { [ r, R, 0x1000327, 0x1000327 ] }; // combining cedilla
+ key <AD05> { [ t, T, 0x100032E, 0x100032E ] }; // combining breve below
+ key <AD06> { [ y, Y, 0x1000325, 0x1000325 ] }; // combining ring below
+ 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 <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 <AC03> { [ d, D, eth, ETH ] };
+ key <AC04> { [ f, F, thorn, THORN ] };
+ key <AC06> { [ h, H, sterling, sterling ] };
+ key <AC07> { [ j, J, EuroSign, EuroSign ] };
+ key <AC10> { [ semicolon, colon, masculine, ordfeminine ] };
+ key <AC11> { [ apostrophe, quotedbl, currency, currency ] };
+ key <BKSL> { [ backslash, bar, section, section ] };
+
+ 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 <AB10> { [ slash, question, questiondown, questiondown ] };
+
+ key <I219> { [ multiply, division, ISO_Next_Group, ISO_Prev_Group ] };
+
+ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc2" {
+ include "us(olpc)"
+ name[Group1]= "USA with Group Switch";
+ key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+};