From 325f3b6bee87535053dfb5bb4443dfb2dc419666 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Tue, 13 Jan 2009 23:00:20 +0000 Subject: [PATCH] added misc:typo, b.fd.o#14022 --- ChangeLog | 8 ++++++ rules/base.l1o_s.part | 1 + rules/base.l2o_s.part | 1 + rules/base.l3o_s.part | 1 + rules/base.l4o_s.part | 1 + rules/base.lo_s.part | 1 + rules/base.xml.in | 6 +++++ symbols/Makefile.am | 2 +- symbols/typo | 57 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 symbols/typo diff --git a/ChangeLog b/ChangeLog index f1752e3..e31202c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-01-13 Sergey Udaltsov + + * symbols/typo, rules/base.l1o_s.part, rules/base.l2o_s.part, + rules/base.l3o_s.part, rules/base.l4o_s.part, rules/base.lo_s.part, + rules/base.xml.in, symbols/Makefile.am: added (inactive so far) + misc:typo option, first step to close + https://bugs.freedesktop.org/show_bug.cgi?id=14022 + 2009-01-12 Sergey Udaltsov * rules/Makefile.am, rules/merge.sh: fix the build (thanks to Oswald diff --git a/rules/base.l1o_s.part b/rules/base.l1o_s.part index 5544d53..592fab2 100644 --- a/rules/base.l1o_s.part +++ b/rules/base.l1o_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 + * misc:typo = +typo(base):1 diff --git a/rules/base.l2o_s.part b/rules/base.l2o_s.part index 3ffd6a8..aac680e 100644 --- a/rules/base.l2o_s.part +++ b/rules/base.l2o_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 + * misc:typo = +typo(base):2 diff --git a/rules/base.l3o_s.part b/rules/base.l3o_s.part index aa327eb..1010e2e 100644 --- a/rules/base.l3o_s.part +++ b/rules/base.l3o_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3 + * misc:typo = +typo(base):3 diff --git a/rules/base.l4o_s.part b/rules/base.l4o_s.part index 7968250..49650ad 100644 --- a/rules/base.l4o_s.part +++ b/rules/base.l4o_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4 + * misc:typo = +typo(base):4 diff --git a/rules/base.lo_s.part b/rules/base.lo_s.part index c491f07..dee7b6d 100644 --- a/rules/base.lo_s.part +++ b/rules/base.lo_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) + * misc:typo = +typo(base) diff --git a/rules/base.xml.in b/rules/base.xml.in index b284e37..19ae34a 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -4751,6 +4751,12 @@ <_description>Shift cancels CapsLock + diff --git a/symbols/Makefile.am b/symbols/Makefile.am index 371d1aa..e65ff62 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -30,7 +30,7 @@ tj tr \ ua us uz vn \ za \ altwin capslock compose ctrl eurosign group inet \ -keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl +keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo dir_data = $(dist_symbols_DATA) diff --git a/symbols/typo b/symbols/typo new file mode 100644 index 0000000..46d8440 --- /dev/null +++ b/symbols/typo @@ -0,0 +1,57 @@ +// $XKeyboardConfig$ + +// typographic keyboard +// Sergei Stolyarov +// + +// default layout +default partial +xkb_symbols "base" { +// 1st keyboard row + key { [NoSymbol, NoSymbol, NoSymbol, approxeq] }; + key { [NoSymbol, NoSymbol, onesuperior, NoSymbol] }; + key { [NoSymbol, NoSymbol, twosuperior, onehalf] }; + key { [NoSymbol, NoSymbol, threesuperior, onethird] }; + key { [NoSymbol, NoSymbol, dollar, onequarter] }; + key { [NoSymbol, NoSymbol, 0x01002030, NoSymbol] }; + key { [NoSymbol, NoSymbol, ampersand] }; + key { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] }; + key { [NoSymbol, NoSymbol, emdash, hyphen] }; + key { [NoSymbol, NoSymbol, notequal, plusminus] }; + +// 2nd keyboard row + key { [NoSymbol, NoSymbol, EuroSign] }; // "e" + key { [NoSymbol, NoSymbol, registered] }; // "r" + key { [NoSymbol, NoSymbol, trademark] }; // "t" + key { [NoSymbol, NoSymbol, yen, NoSymbol] }; // "y" + key { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p" + key { [ NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [ + key { [ NoSymbol, NoSymbol, bracketright, braceright ] }; // ] + +// 3rd keyboard row + key { [NoSymbol, NoSymbol, 0x1000301, NoSymbol] }; // "a" // + key { [NoSymbol, NoSymbol, section]}; // "s" + key { [NoSymbol, NoSymbol, degree, division] }; // "d" + key { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f" + key { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j" + key { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k" + key { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l" + key { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";" + key { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'" + +// 4th keyboard row + key { [NoSymbol, NoSymbol, multiply, 0x010022C5] }; // "x" + key { [NoSymbol, NoSymbol, copyright, cent] }; // "c" + key { [NoSymbol, NoSymbol, guillemotleft, less] }; // "," + key { [NoSymbol, NoSymbol, guillemotright, greater] }; // "." + key { [NoSymbol, NoSymbol, ellipsis] }; // "/" + +// the last keyboard row + key { [space, space, nobreakspace] }; + +// arrow keys + key { [Left, Left, 0x1002190, 0x10021D0] }; + key { [Up, Up, 0x1002191, 0x10021D1] }; + key { [Right, Right, 0x1002192, 0x10021D2] }; + key { [Down, Down, 0x1002193, 0x10021D3] }; +}; -- 2.32.0.93.g670b81a890