diff --git a/rules/base.xml.in b/rules/base.xml.in
index 313f488..2b5e8e7 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1375,7 +1375,13 @@
workman
- <_description>English (US, Workman)
+ <_description>English (Workman)
+
+
+
+
+ workman-intl
+ <_description>English (Workman international with dead keys)
diff --git a/symbols/us b/symbols/us
index 06cd3ce..4b4c701 100644
--- a/symbols/us
+++ b/symbols/us
@@ -729,7 +729,7 @@ xkb_symbols "mac" {
};
// Colemak symbols for xkb on X.Org Server 7.x
-// 2006-01-01 Shai Coleman, http://colemak.com/ . Public domain.
+// 2006-01-01 Shai Coleman, http://colemak.com/
partial alphanumeric_keys
xkb_symbols "colemak" {
@@ -1190,69 +1190,92 @@ xkb_symbols "htcdream" {
};
// Workman Keyboard Layout symbols for xkb on X.Org Server 7.x
-// 09-06-2010 OJ Bucao.
-partial default alphanumeric_keys
+// 09-06-2010 OJ Bucao. http://www.workmanlayout.com
+
+partial alphanumeric_keys
xkb_symbols "workman" {
- include "us(basic)"
+ name[Group1]= "English (Workman)";
- name[Group1]= "English (US, Workman)";
+ include "us(basic)"
// Alphanumeric section
- key { [ grave, asciitilde, dead_tilde, asciitilde ] };
- key { [ 1, exclam, exclamdown, onesuperior ] };
- key { [ 2, at, masculine, twosuperior ] };
- key { [ 3, numbersign, ordfeminine, threesuperior ] };
- key { [ 4, dollar, cent, sterling ] };
- key { [ 5, percent, EuroSign, yen ] };
- key { [ 6, asciicircum, hstroke, Hstroke ] };
- key { [ 7, ampersand, eth, ETH ] };
- key { [ 8, asterisk, thorn, THORN ] };
- key { [ 9, parenleft, leftsinglequotemark, leftdoublequotemark ] };
- key { [ 0, parenright, rightsinglequotemark, rightdoublequotemark ] };
- key { [ minus, underscore, endash, emdash ] };
- key { [ equal, plus, multiply, division ] };
+ key { [ q, Q ] };
+ key { [ d, D ] };
+ key { [ r, R ] };
+ key { [ w, W ] };
+ key { [ b, B ] };
+ key { [ j, J ] };
+ key { [ f, F ] };
+ key { [ u, U ] };
+ key { [ p, P ] };
+ key { [ semicolon, colon ] };
+
+ key { [ a, A ] };
+ key { [ s, S ] };
+ key { [ h, H ] };
+ key { [ t, T ] };
+ key { [ g, G ] };
+ key { [ y, Y ] };
+ key { [ n, N ] };
+ key { [ e, E ] };
+ key { [ o, O ] };
+ key { [ i, I ] };
+
+ key { [ z, Z ] };
+ key { [ x, X ] };
+ key { [ m, M ] };
+ key { [ c, C ] };
+ key { [ v, V ] };
+ key { [ k, K ] };
+ key { [ l, L ] };
+ // End alphanumeric section
- key { [ q, Q, adiaeresis, Adiaeresis ] };
- key { [ d, D, aring, Aring ] };
- key { [ r, R, atilde, Atilde ] };
- key { [ w, W, oslash, Ooblique ] };
- key { [ b, B, dead_ogonek, asciitilde ] };
- key { [ j, J, dstroke, Dstroke ] };
- key { [ f, F, lstroke, Lstroke ] };
- key { [ u, U, uacute, Uacute ] };
- key { [ p, P, udiaeresis, Udiaeresis ] };
- key { [ semicolon, colon, odiaeresis, Odiaeresis ] };
- key { [ bracketleft, braceleft, guillemotleft, 0x1002039 ] };
- key { [ bracketright, braceright, guillemotright, 0x100203a ] };
- key { [ backslash, bar, asciitilde, asciitilde ] };
+ key { [ BackSpace, Escape, BackSpace, BackSpace ] };
- key { [ a, A, aacute, Aacute ] };
- key { [ s, S, dead_grave, asciitilde ] };
- key { [ h, H, ssharp, asciitilde ] };
- key { [ t, T, dead_acute, dead_doubleacute ] };
- key { [ g, G, dead_diaeresis, asciitilde ] };
- key { [ y, Y, dead_caron, asciitilde ] };
- key { [ n, N, ntilde, Ntilde ] };
- key { [ e, E, eacute, Eacute ] };
- key { [ o, O, iacute, Iacute ] };
- key { [ i, I, oacute, Oacute ] };
- key { [ apostrophe, quotedbl, otilde, Otilde ] };
+ include "level3(ralt_switch)"
+};
- key { [ z, Z, ae, AE ] };
- key { [ x, X, dead_circumflex, asciitilde ] };
- key { [ m, M, ccedilla, Ccedilla ] };
- key { [ c, C, oe, OE ] };
- key { [ v, V, dead_breve, asciitilde ] };
- key { [ k, K, dead_abovering, asciitilde ] };
- key { [ l, L, dead_macron, asciitilde ] };
- key { [ comma, less, dead_cedilla, asciitilde ] };
- key { [ period, greater, dead_abovedot, asciitilde ] };
- key { [ slash, question, questiondown, asciitilde ] };
+partial alphanumeric_keys
+xkb_symbols "workman-intl" {
- key { [ BackSpace, Escape, BackSpace, BackSpace ] };
- key { [ minus, underscore, endash, emdash ] };
- key { [ space, space, space, nobreakspace ] };
+ name[Group1]= "English (Workman, international with dead keys)";
+
+ include "us(intl)"
+
+ // Alphanumeric section
+ key { [ q, Q, adiaeresis, Adiaeresis ] };
+ key { [ d, D, eth, ETH ] };
+ key { [ r, R, registered, registered ] };
+ key { [ w, W, aring, Aring ] };
+ key { [ b, B, b, B ] };
+ key { [ j, J, j, J ] };
+ key { [ f, F, f, F ] };
+ key { [ u, U, uacute, Uacute ] };
+ key { [ p, P, odiaeresis, Odiaeresis ] };
+ key { [ semicolon, colon, paragraph, degree ] };
+
+ key { [ a, A, aacute, Aacute ] };
+ key { [ s, S, ssharp, section ] };
+ key { [ h, H, h, H ] };
+ key { [ t, T, thorn, THORN ] };
+ key { [ g, G, g, G ] };
+ key { [ y, Y, udiaeresis, Udiaeresis ] };
+ key { [ n, N, ntilde, Ntilde ] };
+ key { [ e, E, eacute, Eacute ] };
+ key { [ o, O, oacute, Oacute ] };
+ key { [ i, I, iacute, Iacute ] };
+
+ key { [ z, Z, ae, AE ] };
+ key { [ x, X, x, X ] };
+ key { [ m, M, mu, mu ] };
+ key { [ c, C, copyright, cent ] };
+ key { [ v, V, v, V ] };
+ key { [ k, K, oe, OE ] };
+ key { [ l, L, oslash, Ooblique ] };
+ // End alphanumeric section
+
+ key { [ BackSpace, Escape, BackSpace, BackSpace ] };
include "level3(ralt_switch)"
};