diff options
121 files changed, 1006 insertions, 1016 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d999694..e6a0635e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -166,7 +166,7 @@ xkbcommon build: stage: build script: # Ensure there are no leftovers - - rm -rf xorgproto libxkbcommon + - rm -rf xorgproto libxkbcommon # Get latest xorgproto so we definitely have all keysyms - git clone --depth=1 https://gitlab.freedesktop.org/xorg/proto/xorgproto - export X11_HEADERS_PREFIX="$PWD/xorgproto/" @@ -44,7 +44,7 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of the Digital Equipment +Except as contained in this notice, the name of the Digital Equipment Corporation shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. @@ -104,19 +104,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/ChangeLog.old b/ChangeLog.old index 40e24271..f200f53a 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -222,7 +222,7 @@ 2009-05-12 Reşat SABIQ * configure.in (new locale), po/crh.po: - Added crh.po as well (as was done originally on January 30), + Added crh.po as well (as was done originally on January 30), based on Peter Hutterer's feedback regarding build process; http://bugs.freedesktop.org/show_bug.cgi?id=19730 @@ -517,7 +517,7 @@ * keycodes/macintosh, rules/base.m_k.part, rules/base.o_k.part: dropped the goodmap and badmap keycodes for apple - needed for a very old kernels only. http://bugs.freedesktop.org/show_bug.cgi?id=9095 - + 2008-12-17 Sergey Udaltsov * symbols/capslock, symbols/compose, symbols/ctrl: fix lock modifier @@ -1193,7 +1193,7 @@ * rules/base.o_s.part, rules/base.xml.in, rules/compat/layoutRename.lst, symbols/Makefile.am, symbols/cs, symbols/me, symbols/rs, symbols/ba, symbols/hr, symbols/si: splitting - Serbia and Montenegro + Serbia and Montenegro https://bugs.freedesktop.org/show_bug.cgi?id=12390 2007-10-02 Sergey Udaltsov @@ -1779,23 +1779,23 @@ closing https://bugs.freedesktop.org/show_bug.cgi?id=8465 2006-09-30 Sergey Udaltsov - + * rules/base.o_s.part, rules/base.xml.in, symbols/Makefile.am, symbols/nbsp: adding nbsp:* options, closing https://bugs.freedesktop.org/show_bug.cgi?id=8451 2006-09-29 Sergey Udaltsov - + * rules/base.xml.in: added keypad:* options, closing https://bugs.freedesktop.org/show_bug.cgi?id=8240 2006-09-28 Sergey Udaltsov - + * geometry/thinkpad: fix for geometry, closing https://bugs.freedesktop.org/show_bug.cgi?id=8419 2006-09-24 Sergey Udaltsov - + * symbols/am, rules/base.xml.in: added am(eastern), am(western), am(eastern-alt), closing https://bugs.freedesktop.org/show_bug.cgi?id=8404 @@ -1807,7 +1807,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=8240 2006-09-18 Sergey Udaltsov - + * keycodes/macintosh, rules/HDR, rules/Makefile.am, rules/base.m_k.part, rules/base.o_k.part, rules/base.xml.in: split "good" and "bad" apple keycodes, closing @@ -1830,7 +1830,7 @@ again, https://bugs.freedesktop.org/show_bug.cgi?id=8321 2006-09-17 Sergey Udaltsov - + symbols/keypad, symbols/pc, symbols/us, symbols/macintosh_vndr/*, rules/base.m_t.part, rules/base.ml1_s.part, rules/base.ml_s.part, rules/base.o_t.part, rules/base.xml.in, rules/merge.sh: reorganized @@ -1839,7 +1839,7 @@ * symbols/pc: modularized numpad stuff, https://bugs.freedesktop.org/show_bug.cgi?id=8312 - + 2006-09-10 Sergey Udaltsov rules/base.list.part, symbols/inet: added 2 models, thanks to @@ -1956,10 +1956,10 @@ * rules/base.xml.in: fixed mismatch between directory and symbols/inet file. https://bugs.freedesktop.org/show_bug.cgi?id=7398 - + * symbols/ro: fixed Romanian academic https://bugs.freedesktop.org/show_bug.cgi?id=7393 - + 2006-06-28 Sergey Udaltsov * keycodes/evdev: pc105 compatiliby, closing @@ -2020,7 +2020,7 @@ 2006-05-28 Sergey Udaltsov - * symbols/inet,rules/base.xml.in,rules/base.lists.part: + * symbols/inet,rules/base.xml.in,rules/base.lists.part: added Logitech Cordless Desktop LX-300 https://bugs.freedesktop.org/show_bug.cgi?id=5609 @@ -2051,7 +2051,7 @@ 2006-05-04 Sergey Udaltsov - * rules/base.xml.in,symbols/iq,symbols/in,symbols/sy: added Kurdish, + * rules/base.xml.in,symbols/iq,symbols/in,symbols/sy: added Kurdish, closed https://bugs.freedesktop.org/show_bug.cgi?id=6159 one more time @@ -2118,7 +2118,7 @@ 2006-03-27 Sergey Udaltsov * keycodes/macintosh,keymap/macintosh,rules/base.m_k.part: fixed - Macintosh F13-F15, closed + Macintosh F13-F15, closed https://bugs.freedesktop.org/show_bug.cgi?id=6399 2006-03-25 Sergey Udaltsov @@ -2128,8 +2128,8 @@ 2006-03-25 Sergey Udaltsov - * symbols/il,rules/compat/variantRename.lst: generalized 'basic', - removed si1452, closed + * symbols/il,rules/compat/variantRename.lst: generalized 'basic', + removed si1452, closed https://bugs.freedesktop.org/show_bug.cgi?id=6375 2006-03-23 Sergey Udaltsov @@ -2138,17 +2138,17 @@ RAlt problem, reported in ubuntu: https://launchpad.net/distros/ubuntu/+source/xkeyboard-config/+bug/35845 Now all types are specified for Group1, to make it consistent - + 2006-03-22 Sergey Udaltsov * rules/base.xml.in,symbols/tr: added Kurdish, closed https://bugs.freedesktop.org/show_bug.cgi?id=6159 - + 2006-03-22 Sergey Udaltsov * rules/base.xml.in: added missing Logitech models, fixed https://bugs.freedesktop.org/show_bug.cgi?id=6350 - + 2006-03-21 Sergey Udaltsov * symbols/kr: added Korean layout, closing @@ -2179,13 +2179,13 @@ * symbols/es, rules/base.xml.in: added es(cat), closing https://bugs.freedesktop.org/show_bug.cgi?id=6047 -2006-02-25 Alan Coopersmith +2006-02-25 Alan Coopersmith * symbols/sun_vndr/*, compat/japan, compat/mousekeys, geometry/sun: massive update from Sun, see https://bugs.freedesktop.org/show_bug.cgi?id=5725 - + 2006-02-24 M. Emal Alekozai <memala@gmx.net> * symbols/af, symbols/Makefile.am, rules/base.xml: @@ -2204,42 +2204,42 @@ * symbols/inet: Fixed inet(armada) https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=5893 - + 2006-02-21 svu * symbols/hr: Fixed hr(us) https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=3807 - + 2006-02-01 svu * rules/compat/layoutRename.lst: Added cz_qwerty compat rule https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177362 - + 2006-01-31 svu * symbols/us: Added single-handed dvoraks https://bugs.freedesktop.org/show_bug.cgi?id=5659 - + 2006-01-22 svu * types/level5: Fixed ScrollLock behaviour https://bugs.freedesktop.org/show_bug.cgi?id=5635 - + 2006-01-15 svu * symbols/bd: Corrected Bangladesh layout, closed https://bugs.freedesktop.org/show_bug.cgi?id=5480 - + 2006-01-14 svu * rules/base.ml_*.part: Japanese layouts are nec_vndr/jp, for consistency - + 2006-01-14 svu * symbols/macintosh_vnd/is: some cosmetic stuff and some info, closing https://bugs.freedesktop.org/show_bug.cgi?id=5597 - + 2006-01-14 svu * rules/base.lists.part: extended non-latin list, closing @@ -2294,7 +2294,7 @@ * symbols/hu: returned def_dot (instead of def_comma, really eliminated) - + 2005-12-10 svu * symbols/compat/layoutRename.lst: added en_US @@ -2350,7 +2350,7 @@ * symbols/by, rules/base.xml.in: added by(latin), closed https://bugs.freedesktop.org/show_bug.cgi?id=4576 - + 2005-10-04 svu * symbols/gr: added keypad(comma), closed @@ -2364,14 +2364,14 @@ 2005-10-02 svu - * rules/base.lists.part, rules/base.xml.in, + * rules/base.lists.part, rules/base.xml.in, symbols/inet: adding Genius Comfy, closing https://bugs.freedesktop.org/show_bug.cgi?id=2275 2005-10-02 svu - * rules/Makefile.am, rules/HDR, + * rules/Makefile.am, rules/HDR, rules/base.l1o_s.part, rules/base.l2o_s.part, rules/base.l3o_s.part, rules/base.l4o_s.part: adding "layout + option -> symbols" rules, @@ -2417,12 +2417,12 @@ * rules/Makefile.am, rules/merge.sh fixing merging in env where srcdir != objdir, closing https://bugs.freedesktop.org/show_bug.cgi?id=4547 - + 2005-09-22 svu * rules/base.xml.in, symbols/kz: change Cyr to Rus - + 2005-09-21 svu * rules/base.ml_s.part: @@ -2447,7 +2447,7 @@ 2005-09-14 svu - * symbols/inet, rules/base.xml.in rules/base.lists.part: + * symbols/inet, rules/base.xml.in rules/base.lists.part: Added Cherry CyBo@rd USB-Hub. Thanks to Paul Egan Fixed https://bugs.freedesktop.org/show_bug.cgi?id=4498 @@ -2479,7 +2479,7 @@ 2005-09-04 svu * rules/base.xml.in, symbols/lk: - No TSCII/INSCRIPT in Sri Lanka, + No TSCII/INSCRIPT in Sri Lanka, according to <hash@jayasolutions.cjb.net> 2005-08-25 svu @@ -2504,13 +2504,13 @@ 2005-08-24 svu - * rules/base.xml.in, symbols/mk, + * rules/base.xml.in, symbols/mk, rules/compat/layoutRename.lst: Move Macedonian to country-based 2005-08-23 svu - * rules/base.xml.in, symbols/ba, + * rules/base.xml.in, symbols/ba, symbols/si, symbols/cs, symbols/hr: Major Balkanian revolution by Danilo Segan. GREAT THANKS to him. @@ -2554,7 +2554,7 @@ 2005-08-04 svu * Makefile.am, configure.in, xkbrules.am: - Taking nice ideas from xkbdata. + Taking nice ideas from xkbdata. Thanks to Daniel Stone for his knowledge of autofoo 2005-08-04 svu @@ -2627,7 +2627,7 @@ 2005-07-25 svu * symbols/hr: - added belowdot, abovedot, in relation to + added belowdot, abovedot, in relation to https://bugs.freedesktop.org/show_bug.cgi?id=475 2005-07-24 svu @@ -2654,17 +2654,17 @@ 2005-07-20 svu - * symbols/ru, - symbols/us, - symbols/se, - symbols/ua, - rules/base.xml.in: + * symbols/ru, + symbols/us, + symbols/se, + symbols/ua, + rules/base.xml.in: sorting out Russian layout, fixing (without 3rd and 4th groups) https://bugs.freedesktop.org/show_bug.cgi?id=2582 2005-07-15 svu - * symbols/inet, rules/base.xml.in: + * symbols/inet, rules/base.xml.in: added Cherry CyMotion Linux, fixed https://bugs.freedesktop.org/show_bug.cgi?id=3789 @@ -2708,8 +2708,8 @@ 2005-02-03 svu - * symbols/srp, types/extra: replaced SERBIAN_ALPHABETIC with - FOUR_LEVEL_ALPHABETIC, as Danilo requested. Also, SERBIAN_CAPS + * symbols/srp, types/extra: replaced SERBIAN_ALPHABETIC with + FOUR_LEVEL_ALPHABETIC, as Danilo requested. Also, SERBIAN_CAPS renamed to SEPARATE_CAPS_AND_SHIFT_ALPHABETIC. 2005-01-21 svu @@ -2721,12 +2721,12 @@ 2005-01-21 svu - * symbols/gr: a bit more order in group name (needed for 'basic' but + * symbols/gr: a bit more order in group name (needed for 'basic' but not for 'bare' 2005-01-20 svu - * symbols/hr: added missing keymapping, + * symbols/hr: added missing keymapping, fixed https://bugs.freedesktop.org/show_bug.cgi?id=2325 2005-01-19 svu @@ -2741,7 +2741,7 @@ 2005-01-16 svu * symbols, rules/base.xml.in: HUGE commit - adjusting the group names - according to the descriptions. + according to the descriptions. Also, some layouts were missing the default variants - added one. Also, some default variants were listed in the variantLists - now they are removed. @@ -2753,7 +2753,7 @@ 2004-12-22 svu * symbols: massive patch for the group names (by Denis Barbier) - * rules/base.xml.in: first iteration, match the country names with + * rules/base.xml.in: first iteration, match the country names with the group names 2004-12-21 02:07 svu @@ -2775,10 +2775,10 @@ 2004-12-08 00:30 svu - * symbols/mkd, + * symbols/mkd, rules/base.xml.in, rules/compat/layoutRename.lst, - rules/compat/Makefile.am: Macedonian is now language-based, + rules/compat/Makefile.am: Macedonian is now language-based, not country-based. Compatibility rule added. 2004-12-04 01:40 svu @@ -2810,18 +2810,18 @@ 2004-10-29 00:55 svu - * rules/base.xml.in, rules/base.lists.part, symbols/inet: - Added Cherry CyMotion Master XPress, fixed + * rules/base.xml.in, rules/base.lists.part, symbols/inet: + Added Cherry CyMotion Master XPress, fixed http://freedesktop.org/bugzilla/show_bug.cgi?id=1715 2004-10-26 21:08 svu - * symbols/Makefile.am, symbols/kg, rules/base.xml.in: added + * symbols/Makefile.am, symbols/kg, rules/base.xml.in: added Kyrgyz, thanks to Yury Fedorov 2004-10-12 18:45 svu - * symbols/Makefile.am, symbols/sin, rules/base.xml.in: added + * symbols/Makefile.am, symbols/sin, rules/base.xml.in: added Sinhalese, thanks to Harshula Jayasuriya 2004-10-10 23:59 svu @@ -3888,4 +3888,3 @@ 2003-11-24 23:32 svu * README: first file in - @@ -98,9 +98,9 @@ 1.9 Bugfixes (27). Updated/new translations. Some new layouts and models. The evdev model is gone, use pc105 instead. Some fixes for the build process -1.8 Bugfixes (10). Updated/new translations. Some new layouts and models. -1.7 Bugfixes (30). Updated/new translations. Some new layouts and models. -1.6 Bugfixes (36). Updated/new translations. Some new layouts and models. +1.8 Bugfixes (10). Updated/new translations. Some new layouts and models. +1.7 Bugfixes (30). Updated/new translations. Some new layouts and models. +1.6 Bugfixes (36). Updated/new translations. Some new layouts and models. Added terminate:* group Dropped locale-specific models Improved compat rules @@ -122,7 +122,7 @@ The group names now are matching the descriptions - and the validating scripts are implemented. Some layouts, variants, models are added/fixed. - Some translations are updated (though the overall translation activity + Some translations are updated (though the overall translation activity is disappointinly low). 0.4 A lot of fixes and polishing (introduced own CVS keyword). Highlights: @@ -136,5 +136,5 @@ Added HOWTO.transition. Added Maori layout. Fixed bug 515. -0.1 First public release. +0.1 First public release. XKB configuration only. Restructured layouts tree. Only additive layouts are included. No compatibility rules. diff --git a/docs/HOWTO.testing b/docs/HOWTO.testing index 01aa0500..f6565173 100644 --- a/docs/HOWTO.testing +++ b/docs/HOWTO.testing @@ -1,5 +1,5 @@ A mini-HOWTO test the XKB config without modifying the system configuration. -(Only tested with XFree86 4.3+.) +(Only tested with XFree86 4.3+.) First see what your configuration is. Note the model and layout. $ setxkbmap -print diff --git a/geometry/amiga b/geometry/amiga index 9c5f65e5..5a39ac3d 100644 --- a/geometry/amiga +++ b/geometry/amiga @@ -55,8 +55,8 @@ default xkb_geometry "usa1" { row { top= 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", -15 } }; }; @@ -71,8 +71,8 @@ default xkb_geometry "usa1" { row { top= 58; keys { { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; }; @@ -186,8 +186,8 @@ xkb_geometry "de" { row { top= 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; @@ -203,7 +203,7 @@ xkb_geometry "de" { top= 58; keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; }; diff --git a/geometry/ataritt b/geometry/ataritt index 06a681de..9d27657b 100644 --- a/geometry/ataritt +++ b/geometry/ataritt @@ -49,24 +49,24 @@ default xkb_geometry "us" { row { top= 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", -13 }, <DELE> }; }; row { top= 39; keys { { <LCTL>, "CTRL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <BKSL>, 34 } }; }; row { top= 58; keys { { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; }; @@ -176,22 +176,22 @@ xkb_geometry "de" { row { top= 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", -13 }, <DELE> }; }; row { top= 39; keys { { <LCTL>, "CTRL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <BKSL>, 34 } }; }; row { top= 58; - keys { { <LFSH>, "LFSH" }, <LSGT>, + keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } diff --git a/geometry/chicony b/geometry/chicony index 75bce8d1..92eee005 100644 --- a/geometry/chicony +++ b/geometry/chicony @@ -48,7 +48,7 @@ default xkb_geometry "us" { top = 33; color = "black"; }; - + solid "Button1" { shape = "BTNS"; left = 10; @@ -164,23 +164,23 @@ default xkb_geometry "us" { row { top = 20; keys { <TAB>, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <AD13> }; }; row { top = 39; keys { { <CAPS>, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, shape="WIDEST" } }; }; row { top = 58; keys { { <LFSH>, shape="WIDEST" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, shape="RTSH" } }; diff --git a/geometry/dell b/geometry/dell index 501fdca1..a0c8833f 100644 --- a/geometry/dell +++ b/geometry/dell @@ -77,7 +77,7 @@ default xkb_geometry "dell101" { { <FK01>, 20 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -95,24 +95,24 @@ default xkb_geometry "dell101" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -248,7 +248,7 @@ xkb_geometry "dell65x" { { <FK01>, 20 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -266,24 +266,24 @@ xkb_geometry "dell65x" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -366,14 +366,14 @@ xkb_geometry "dellm65" { labelColor = "white"; shape "BACKGROUND" { cornerRadius = 3, { [ 308, 152 ] } }; - shape "BACKGROUND2" { cornerRadius = 2, { [ 7, 22 ], + shape "BACKGROUND2" { cornerRadius = 2, { [ 7, 22 ], [ 171, 22 ], [ 171, 10 ], [ 301, 10 ], [ 301, 148 ], [ 244, 148 ], [ 244, 132 ], - [ 7, 132] } }; + [ 7, 132] } }; solid "Background" { shape = "BACKGROUND"; top = 0; @@ -435,12 +435,12 @@ xkb_geometry "dellm65" { key.gap = 0; row { top = 0; - keys { { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, + keys { { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, { <INS>, 1 }, <HOME>, <PGUP> }; }; row { top = 12; - keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, + keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, { <FK05>, 1 }, <FK06>, <FK07>, <FK08>, { <FK09>, 1 }, <FK10>, <FK11>, <FK12>, { <DELE>, 1 }, <END>, <PGDN> }; @@ -459,7 +459,7 @@ xkb_geometry "dellm65" { shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } }; shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } }; shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } }; - + section "Alpha" { top = 36; @@ -478,27 +478,27 @@ xkb_geometry "dellm65" { row { top = 20; keys { { <TAB>, "TABK" }, - { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } }; }; row { top = 39; keys { { <CAPS>, "CAPS" }, - { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, 1, "RTRN" } }; }; row { top = 58; keys { { <LFSH>, "LFSH" }, - { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, 1, "RTSH" } }; }; row { top = 77; - keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, + keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } }; }; }; @@ -509,7 +509,7 @@ xkb_geometry "dellm65" { left = 243; width = 54; height = 36; - + key.color = "grey80"; key.shape = "SKEY"; row { @@ -518,7 +518,7 @@ xkb_geometry "dellm65" { keys { <UP> }; }; - + row { top = 17; left = 2; @@ -533,11 +533,11 @@ xkb_geometry "dellm65" { priority = 255; color = "blue"; shape = "STIK"; - top = 90; + top = 90; left = 135; }; }; - + xkb_geometry "latitude" { description="Dell Latitude"; width=304.2; height=219.1; @@ -605,7 +605,7 @@ xkb_geometry "latitude" { {<AD04>, "NORM", 1}, {<AD05>, "NORM", 1}, {<AD06>, "NORM", 1}, {<AD07>, "NORM", 1}, {<AD08>, "NORM", 1}, {<AD09>, "NORM", 1}, {<AD10>, "NORM", 1}, {<AD11>, "NORM", 1}, {<AD12>, "NORM", 1}, {<RTRN>, "RTRN", 1}};}; row {top=38; left=0; keys {{<CAPS>, "CAPS", 0}, {<AC01>, "NORM", 1}, {<AC02>, "NORM", 1}, {<AC03>, "NORM", 1}, - {<AC04>, "NORM", 1}, {<AC05>, "NORM", 1}, {<AC06>, "NORM", 1}, {<AC07>, "NORM", 1}, {<AC08>, "NORM", 1}, + {<AC04>, "NORM", 1}, {<AC05>, "NORM", 1}, {<AC06>, "NORM", 1}, {<AC07>, "NORM", 1}, {<AC08>, "NORM", 1}, {<AC09>, "NORM", 1}, {<AC10>, "NORM", 1}, {<AC11>, "NORM", 1}, {<AC12>, "NORM", 1}};}; // TODO There's a weird <> key here, check it out: row {top=57; left=0; keys {{<LFSH>, "LFSH", 0}, {<AB01>, "NORM", 1}, {<AB02>, "NORM", 1}, {<AB03>, "NORM", 1}, @@ -617,7 +617,7 @@ xkb_geometry "latitude" { shape "ARROW" {corner=1.5, {[17,15]}, {[2,0.5],[15,13]}}; section "Arrows" {key.color="grey"; priority=110; top=112; left=240; width=43; height=31; - row {top=0; left=18; keys {{<UP>, "ARROW", 0}};}; + row {top=0; left=18; keys {{<UP>, "ARROW", 0}};}; row {top=16; left=0; keys {{<LEFT>, "ARROW", 0}, {<DOWN>, "ARROW", 1}, {<RGHT>, "ARROW", 1}};}; }; // End of "Arrows" section @@ -627,7 +627,7 @@ xkb_geometry "latitude" { indicator.onColor="green"; indicator.offColor="grey"; indicator.top=7; - indicator.shape="LED"; + indicator.shape="LED"; indicator.priority=200; indicator "Num Lock" {left=72;}; indicator "Caps Lock" {left=80;}; @@ -638,7 +638,7 @@ xkb_geometry "latitude" { shape "ROUND" {corner=5, {[10,10]}}; shape "POWER" {corner=7, {[15,15]}}; section "Topbuttons" {key.color="grey"; priority=110; top=2; left=100; - row {top=2; left=0; keys {{<VLUP>, "ROUND", 0}, {<VLDN>, "ROUND", 3}, {<MUTE>, "ROUND", 3}};}; + row {top=2; left=0; keys {{<VLUP>, "ROUND", 0}, {<VLDN>, "ROUND", 3}, {<MUTE>, "ROUND", 3}};}; row {top=0; left=45; keys {{<POWR>, "POWER", 0}};}; }; // End of "TopButtons" section }; diff --git a/geometry/digital_vndr/lk b/geometry/digital_vndr/lk index cf7c5737..37fa8391 100644 --- a/geometry/digital_vndr/lk +++ b/geometry/digital_vndr/lk @@ -20,13 +20,13 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. // // HISTORY -// Log: lk,v +// Log: lk,v // Revision 1.2 1996/06/18 09:12:47 erik // use flags correctly, assorted cleanups and consortium fixes // @@ -37,23 +37,23 @@ // Revision 1.1.2.5 1995/08/11 19:35:47 William_Walker // Sync up with Erik's pool. // [1995/08/11 18:35:58 William_Walker] -// +// // Revision 1.1.2.4 1995/06/27 12:17:28 William_Walker // Rename <TLDE> to ISO9995 compliant <AE00>. // [1995/06/26 20:23:07 William_Walker] -// +// // Revision 1.1.2.3 1995/06/09 20:54:36 William_Walker // Add VT105 layout support and ISO group support // [1995/06/09 20:40:38 William_Walker] -// +// // Revision 1.1.2.2 1995/06/05 19:21:16 William_Walker // New file. I love keymaps. // [1995/06/05 18:05:43 William_Walker] -// +// // EndLog -// +// // @(#)RCSfile: lk,v Revision: 1.2 (DEC) Date: 1996/01/24 12:16:00 -// +// xkb_geometry "lk201" { width = 530; height = 170; @@ -126,16 +126,16 @@ xkb_geometry "lk201" { section "Alpha" { top = 60; row { top = 1; left = 15; - keys { <AE00>, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { <AE00>, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "MED" } }; }; row { top = 21; left = 15; keys { { <TAB>, "MED" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; @@ -143,13 +143,13 @@ xkb_geometry "lk201" { row { top = 41; keys { <LCTL>, { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top = 61; keys { { <LFSH>, "LONG" }, - <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "LONG" } }; @@ -258,16 +258,16 @@ xkb_geometry "lk401" { section "Alpha" { top = 60; row { top = 1; left = 15; - keys { <AE00>, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { <AE00>, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "MED" } }; }; row { top = 21; left = 15; keys { { <TAB>, "MED" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; @@ -275,13 +275,13 @@ xkb_geometry "lk401" { row { top = 41; keys { <LCTL>, { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top = 61; keys { { <LFSH>, "LONG" }, - <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "LONG" } }; @@ -395,16 +395,16 @@ xkb_geometry "lk450" { section "Alpha" { top = 60; row { top = 1; left = 15; - keys { <AE00>, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { <AE00>, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "MED" } }; }; row { top = 21; left = 15; keys { { <TAB>, "MED" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; @@ -412,13 +412,13 @@ xkb_geometry "lk450" { row { top = 41; keys { <LCTL>, { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top = 61; keys { { <LFSH>, "LONG" }, - <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "LONG" } }; @@ -531,29 +531,29 @@ xkb_geometry "lk401bj" section "Alpha" { top = 60; row { top = 1; left = 15; - keys { <AE00>, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { <AE00>, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "MED" } }; }; row { top = 21; left = 15; keys { { <TAB>, "MED" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top = 41; keys { <LCTL>, { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top = 61; keys { { <LFSH>, "LONG" }, - <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "LONG" } }; @@ -667,28 +667,28 @@ xkb_geometry "lk401jj" { section "Alpha" { top = 70; row { top = 1; left = 7; - keys { { <AE00>, "MED1" }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { { <AE00>, "MED1" }, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <AB00>, { <BKSP>, "MED1" } }; }; row { top = 21; left = 7; keys { { <TAB>, "LONG1" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top = 41; keys { { <LCTL>, "CTRL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top = 61; keys { <CAPS>, { <LFSH>, "LONG1" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>, { <RTSH>, "MED" } }; diff --git a/geometry/digital_vndr/pc b/geometry/digital_vndr/pc index aaceeba8..ee798b0b 100644 --- a/geometry/digital_vndr/pc +++ b/geometry/digital_vndr/pc @@ -20,13 +20,13 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. // // HISTORY -// Log: pc,v +// Log: pc,v // Revision 1.2 1996/06/18 09:12:50 erik // use flags correctly, assorted cleanups and consortium fixes // @@ -37,19 +37,19 @@ // Revision 1.1.2.4 1995/08/11 19:35:48 William_Walker // Sync up with Erik's pool. // [1995/08/11 18:36:03 William_Walker] -// +// // Revision 1.1.2.3 1995/06/27 12:17:29 William_Walker // Rename <TLDE> to ISO9995 compliant <AE00>. // [1995/06/26 20:23:10 William_Walker] -// +// // Revision 1.1.2.2 1995/06/05 19:21:19 William_Walker // New file. I love keymaps. // [1995/06/05 18:05:51 William_Walker] -// +// // EndLog -// +// // @(#)RCSfile: pc,v Revision: 1.2 (DEC) Date: 1996/02/02 14:40:25 -// +// partial xkb_geometry "common" { width = 480; height = 200; @@ -183,30 +183,30 @@ xkb_geometry "pc101" { section "Alpha" { top = 80; row { top = 1; - keys { <AE00>, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { <AE00>, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" } }; }; row { top = 21; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top = 41; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN" } }; }; row { top = 61; keys { { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; @@ -229,7 +229,7 @@ xkb_geometry "pc102" { shape.cornerRadius = 1; shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } }; shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } }; - shape "RTRN" { + shape "RTRN" { approx = { [0,0],[28,19] }, { [0,0], [27,0], [27,39], [5,39], [5,19], [0,19] }, { [3,2], [24,2], [24,36], [8,36], [8,16], [3,16] } @@ -248,29 +248,29 @@ xkb_geometry "pc102" { section "Alpha" { top = 80; row { top = 1; - keys { <AE00>, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { <AE00>, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" } }; }; row { top = 21; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top = 41; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12> }; }; row { top = 61; keys { { <LFSH>, "LFSH" }, - <BKSL>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <BKSL>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; @@ -308,37 +308,37 @@ xkb_geometry "pcxaj" { section "Alpha" { top = 80; row { top = 1; - keys { <AE00>, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { <AE00>, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" } }; }; row { top = 21; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top = 41; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12>, { <RTRN>, "RTRN" } }; }; row { top = 61; keys { { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>, { <RTSH>, "RTSH" } }; }; row { top = 81; key.shape = "MODK"; - keys { <LCTL>, <LALT>, - { <MUHE>, "NORM" }, + keys { <LCTL>, <LALT>, + { <MUHE>, "NORM" }, { <SPCE>, "SPCE" }, { <KANJ>, "NORM" }, { <HIRA>, "NORM" }, diff --git a/geometry/digital_vndr/unix b/geometry/digital_vndr/unix index f3f180ce..141e4ed8 100644 --- a/geometry/digital_vndr/unix +++ b/geometry/digital_vndr/unix @@ -20,13 +20,13 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. // // HISTORY -// Log: unix,v +// Log: unix,v // Revision 1.2 1996/06/18 09:12:53 erik // use flags correctly, assorted cleanups and consortium fixes // @@ -37,11 +37,11 @@ // Revision 1.1.2.2 1995/06/05 19:21:23 William_Walker // New file. I love keymaps. // [1995/06/05 18:05:56 William_Walker] -// +// // EndLog -// +// // @(#)RCSfile: unix,v Revision: 1.2 (DEC) Date: 1996/01/24 12:16: -// +// xkb_geometry "unix" { width = 340; @@ -68,7 +68,7 @@ xkb_geometry "unix" { section "Function" { top = 30; row { top = 1; - keys { <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, + keys { <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, { <FK06>, 20 }, <FK07>, <FK08>, <FK09>, <FK10>, { <LEFT>, 20 }, <DOWN>, <UP>, <RGHT> }; @@ -77,30 +77,30 @@ xkb_geometry "unix" { section "Alpha" { top = 50; row { top = 1; - keys { { <AE00>, "AE00" }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { { <AE00>, "AE00" }, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" } }; }; row { top = 21; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <BKSL>, <AB00> }; }; row { top = 41; left = -4; keys { { <LCTL>, "CTRL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, - <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN" } }; }; row { top = 61; left = -4; keys { { <LFSH>, "SHFT" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "SHFT" } }; @@ -116,7 +116,7 @@ xkb_geometry "unix" { key.shape = "MODK"; keys { { <LCMP>, "NORM" }, <LALT>, { <SPCE>, "SPCE" }, - <RALT>, <RCMP> + <RALT>, <RCMP> }; }; }; @@ -166,28 +166,28 @@ xkb_geometry "lk421jj" { section "Alpha" { top = 65; row { top = 1; left = 7; - keys { { <AE00>, "MED" }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, - <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + keys { { <AE00>, "MED" }, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, + <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <AB00>, { <BKSP>, "MED" } }; }; row { top = 21; left = 7; keys { { <TAB>, "LONG1" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, - <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, + <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top = 41; keys { { <LCTL>, "CTRL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top = 61; keys { <CAPS>, { <LFSH>, "LONG1" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>, { <RTSH>, "LONG1" } }; diff --git a/geometry/everex b/geometry/everex index c175b171..1e49110e 100644 --- a/geometry/everex +++ b/geometry/everex @@ -6,7 +6,7 @@ default xkb_geometry "STEPnote" { shape.cornerRadius= 1; - shape "NORM" { + shape "NORM" { { [17,17] }, { [ 2, 1], [ 15, 15 ] } }; @@ -46,7 +46,7 @@ default xkb_geometry "STEPnote" { { [ 88.8, 17 ] }, { [ 2, 1 ], [ 86.8, 15 ] } }; - shape "WELL" { + shape "WELL" { { [ 269, 105 ] } }; shape "LED" { @@ -90,7 +90,7 @@ default xkb_geometry "STEPnote" { top= 0.5; key.color= "grey30"; key.shape= "FKEY"; - keys { + keys { { <ESC>, "ESC" }, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>, @@ -99,42 +99,42 @@ default xkb_geometry "STEPnote" { }; row { top= 16.5; - keys { + keys { { <TLDE>, "NARR" }, <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, - { <BKSP>, shape="WIDE", color="grey30" }, + { <BKSP>, shape="WIDE", color="grey30" }, { <HOME>, shape="NARR", color="grey30" } }; }; row { top= 34; - keys { + keys { { <TAB>, shape="WIDE", color="grey30" }, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, - { <BKSL>, "NARR" }, + { <BKSL>, "NARR" }, { <PGUP>, shape="NARR", color="grey30" } }; }; row { top= 51.5; - keys { + keys { { <CAPS>, shape="CAPS", color="grey30" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, - { <RTRN>, shape="RTRN", color="grey30" }, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC11>, + { <RTRN>, shape="RTRN", color="grey30" }, { <PGDN>, shape="NARR", color="grey30" } }; }; row { top= 69; - keys { + keys { { <LFSH>, shape="LFSH", color="grey30" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, shape="RTSH", color="grey30" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + { <RTSH>, shape="RTSH", color="grey30" }, { <UP>, shape="NARR", color="grey30" }, { <END>, shape="NARR", color="grey30" } }; @@ -142,8 +142,8 @@ default xkb_geometry "STEPnote" { row { top= 86.5; key.color= "grey30"; - keys { - { <FUNC>, "WIDE" }, + keys { + { <FUNC>, "WIDE" }, <LCTL>, <LALT>, { <SPCE>, shape="SPCE", 18, color="grey20" }, <RALT>, <INS>, <DELE>, diff --git a/geometry/fujitsu b/geometry/fujitsu index 5f5ff58b..6550a3e0 100644 --- a/geometry/fujitsu +++ b/geometry/fujitsu @@ -25,7 +25,7 @@ // default xkb_geometry "138" { - // This is an approximate layout for a (US/ASCII) Fujitsu keyboard. + // This is an approximate layout for a (US/ASCII) Fujitsu keyboard. description= "Fujitsu English keyboard"; @@ -36,7 +36,7 @@ default xkb_geometry "138" { shape.cornerRadius= 1; shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } }; shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } }; - shape "RTRN" { + shape "RTRN" { approx = { [ 0, 0], [28,37] }, { [ 0, 0], [28, 0], [28,37], [ 5,37], [ 5,19], [ 0,19] }, @@ -66,8 +66,8 @@ default xkb_geometry "138" { top= 28; row { top= 1; - keys { - <BREA>, { <PRSC>, 6 }, + keys { + <BREA>, { <PRSC>, 6 }, { <FK13>, 30 }, <FK14>, <FK15>, <FK16>, { <FK17>, 6 }, <FK18>, <FK19>, <FK20>, { <FK21>, 6 }, <FK22>, <FK23>, <FK24>, @@ -94,10 +94,10 @@ default xkb_geometry "138" { }; row { top= 54; - keys { - <UNDO>, { <ESC>, 6 }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, - <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, + keys { + <UNDO>, { <ESC>, 6 }, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, + <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <TLDE>, <BKSP>, { <KPMU>, 68 }, <KPDV>, <KPAD>, <KPSU> @@ -112,20 +112,20 @@ default xkb_geometry "138" { }; row { top= 73; - keys { <COPY>, + keys { <COPY>, { <TAB>, 6, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }, { <KP7>, 68 }, <KP8>, <KP9>, <KPEQ> }; }; row { top= 92; - keys { <PAST>, + keys { <PAST>, { <LCTL>, 6, "LCTL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>, { <UP>, 49 }, { <KP4>, 25 }, <KP5>, <KP6>, <KPDC> @@ -139,10 +139,10 @@ default xkb_geometry "138" { }; row { top= 111; - keys { <CUT>, - { <LFSH>, 6 , "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + keys { <CUT>, + { <LFSH>, 6 , "LFSH" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>, { <RTSH>, "RTSH" }, { <DOWN>, 25 }, { <KP1>, 25 }, <KP2>, <KP3>, { <KPEN>, "KPEN" } @@ -151,16 +151,16 @@ default xkb_geometry "138" { row { top= 130; keys { <HELP>, { <CAPS>, 6 }, - <LALT>, <LMTA>, + <LALT>, <LMTA>, { <SPCE>, "SPCE" }, - <RMTA>, <RALT>, <COMP>, <LNFD>, + <RMTA>, <RALT>, <COMP>, <LNFD>, { <KP0>, 68, "KP0" }, <KP00> }; }; row { top= 149; left= 316; - keys { + keys { { <EXEC>, "EXEC" } }; }; @@ -169,7 +169,7 @@ default xkb_geometry "138" { xkb_geometry "140" { - // This is an approximate layout for a Fujitsu Japanese keyboard. + // This is an approximate layout for a Fujitsu Japanese keyboard. description= "Fujitsu Japanese keyboard"; @@ -180,7 +180,7 @@ xkb_geometry "140" { shape.cornerRadius= 1; shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } }; shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } }; - shape "RTRN" { + shape "RTRN" { approx = { [ 0, 0], [28,37] }, { [ 0, 0], [28, 0], [28,37], [ 5,37], [ 5,19], [ 0,19] }, @@ -211,8 +211,8 @@ xkb_geometry "140" { top= 28; row { top= 1; - keys { - <BREA>, { <PRSC>, 6 }, + keys { + <BREA>, { <PRSC>, 6 }, { <FK13>, 30 }, <FK14>, <FK15>, <FK16>, { <FK17>, 6 }, <FK18>, <FK19>, <FK20>, { <FK21>, 6 }, <FK22>, <FK23>, <FK24>, @@ -239,10 +239,10 @@ xkb_geometry "140" { }; row { top= 54; - keys { - <UNDO>, { <ESC>, 6 }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, - <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, + keys { + <UNDO>, { <ESC>, 6 }, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, + <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <BKSL>, <BKSP>, { <KPMU>, 68 }, <KPDV>, <KPAD>, <KPSU> @@ -257,20 +257,20 @@ xkb_geometry "140" { }; row { top= 73; - keys { <COPY>, + keys { <COPY>, { <TAB>, 6, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }, { <KP7>, 68 }, <KP8>, <KP9>, <KPEQ> }; }; row { top= 92; - keys { <PAST>, + keys { <PAST>, { <LCTL>, 6, "LCTL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <TLDE>, { <UP>, 49 }, { <KP4>, 25 }, <KP5>, <KP6>, <KPDC> @@ -284,11 +284,11 @@ xkb_geometry "140" { }; row { top= 111; - keys { <CUT>, - { <LFSH>, 6 , "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - <AB11>, { <RTSH>, "RTSH" }, + keys { <CUT>, + { <LFSH>, 6 , "LFSH" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB11>, { <RTSH>, "RTSH" }, { <DOWN>, 25 }, { <KP1>, 25 }, <KP2>, <KP3>, { <KPEN>, "KPEN" } }; @@ -305,8 +305,8 @@ xkb_geometry "140" { row { top= 149; left= 134; - keys { - { <UNK7>, "HNKN" }, { <UNK8>, "HNKN" }, + keys { + { <UNK7>, "HNKN" }, { <UNK8>, "HNKN" }, { <EXEC>, 132, "EXEC" } }; }; diff --git a/geometry/hhk b/geometry/hhk index 793f7c07..a325f1ea 100644 --- a/geometry/hhk +++ b/geometry/hhk @@ -197,7 +197,7 @@ partial hidden xkb_geometry "basic" { description = "Happy Hacking"; width = 290; height = 106; - + shape.cornerRadius = 1; shape "NORM" { { [18, 18] }, { [2, 1], [14, 14] } }; shape "BKSP" { { [28, 18] }, { [2, 1], [24, 14] } }; @@ -223,10 +223,10 @@ partial hidden xkb_geometry "basic" { row { top = 1; keys { - <ESC>, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, - <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, - <AE11>, <AE12>, + <ESC>, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, + <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, + <AE11>, <AE12>, <BKSL>, <TLDE> }; }; @@ -246,7 +246,7 @@ partial hidden xkb_geometry "basic" { { <LCTL>, "CTRL" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, + <AC11>, { <RTRN>, "RTRN" } }; }; diff --git a/geometry/hp b/geometry/hp index caab94fc..43e0e8f8 100644 --- a/geometry/hp +++ b/geometry/hp @@ -56,7 +56,7 @@ default xkb_geometry "pc101" { { <FK01>, 18 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -74,24 +74,24 @@ default xkb_geometry "pc101" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -191,10 +191,10 @@ xkb_geometry "hil" { top= 1; keys { { <BRK>, "FKT1" }, { <STOP>, "FKT1" } , { <FK01>, "FKT2", 10 }, { <FK02>, "FKT2" }, - { <FK03>, "FKT2" }, { <FK04>, "FKT2" }, + { <FK03>, "FKT2" }, { <FK04>, "FKT2" }, { <MENU>, "FKT1" }, { <SYST>, "FKT1" }, - { <FK05>, "FKT2" }, { <FK06>, "FKT2" }, - { <FK07>, "FKT2" }, { <FK08>, "FKT2" }, + { <FK05>, "FKT2" }, { <FK06>, "FKT2" }, + { <FK07>, "FKT2" }, { <FK08>, "FKT2" }, { <CLRL>, "FKT1", 10 }, { <CLR>, "FKT1" }, { <FK09>, "FKT1", 19 }, { <FK10>, "FKT1" }, { <FK11>, "FKT1" }, { <FK12>, "FKT1" } @@ -215,8 +215,8 @@ xkb_geometry "hil" { row { top= 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" }, <INSC>, <DELC> }; @@ -224,8 +224,8 @@ xkb_geometry "hil" { row { top= 39; keys { <CAPS>, <LCTL>, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN" }, <HOME>, <PGUP> }; @@ -233,8 +233,8 @@ xkb_geometry "hil" { row { top= 58; keys { <ESC>, { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" }, <SELE>, <UP>, <PGDN> }; @@ -295,7 +295,7 @@ xkb_geometry "omnibook" { shape "MODK" { cornerRadius = 1, { [28, 16] }, { [2, 0], [26, 14] } }; shape "SPCE" { cornerRadius = 1, { [90, 16] }, { [2, 0], [88, 14] } }; shape "ARRS" { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 11] } }; - + shape "LED" { cornerRadius = 1, { [2, 4] } }; shape "KEYS" { cornerRadius = 1, @@ -429,23 +429,23 @@ xkb_geometry "omnibook_intl" { row { top = 18; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top = 35; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12> }; }; row { top = 52; keys { { <LFSH>, "LFSH" }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; @@ -625,23 +625,23 @@ xkb_geometry "dv5" { row { top = 19.5; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top = 39; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN" } }; }; row { top = 58.5; keys { { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; diff --git a/geometry/keytronic b/geometry/keytronic index fb17dd8b..a24c3301 100644 --- a/geometry/keytronic +++ b/geometry/keytronic @@ -43,9 +43,9 @@ default xkb_geometry "FlexPro" { shape "BKSL" { { [ 23,18] }, { [2,1], [21,17] } }; shape "RTRN" { approx = { [16, 0], [38,37] }, - { [16, 0], [38, 0], [38,37], + { [16, 0], [38, 0], [38,37], [ 0,37], [ 0,19], [16,19] }, - { [18, 1], [36, 1], [36,36], + { [18, 1], [36, 1], [36,36], [ 2,36], [ 2,20], [18,20] } }; shape "CAPS" { { [36,18] }, { [2,1], [34,17] } }; shape "SHFT" { { [46,18] }, { [2,1], [44,17] } }; @@ -107,8 +107,8 @@ default xkb_geometry "FlexPro" { left= 53; row { top= 1; - keys { - { <ESC>, color="grey20" }, { <BKSL>, "BKSL", color="grey20" }, + keys { + { <ESC>, color="grey20" }, { <BKSL>, "BKSL", color="grey20" }, <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, @@ -117,42 +117,42 @@ default xkb_geometry "FlexPro" { }; row { top= 20; - keys { + keys { { <TLDE>, color="grey20" }, { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", -14, color="grey20" } }; }; row { top= 39; - keys { + keys { { <LCTL>, color="grey20" }, { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11> }; }; row { top= 58; - keys { - { <LFSH>, color="grey20" }, - { <LFSH>, "SHFT", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + keys { + { <LFSH>, color="grey20" }, + { <LFSH>, "SHFT", color="grey20" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "SHFT", color="grey20" } }; }; row { top= 77; key.color= "grey20"; - keys { - <LALT>, - { <LCTL>, shape="LCTL" }, + keys { + <LALT>, + { <LCTL>, shape="LCTL" }, { <LALT>, shape="LALT" }, { <SPCE>, shape="LSPC", 4, color="white" }, { <SPCE>, shape="RSPC",color="white" }, - { <RALT>, shape="RALT", 4 }, + { <RALT>, shape="RALT", 4 }, { <RCTL>, shape="RCTL" } }; }; @@ -206,11 +206,11 @@ default xkb_geometry "FlexPro" { text "CapsLockLabel" { left= 465; text="Caps\nLock"; }; text "ScrollLockLabel" { left= 487; text="Scroll\nLock"; }; - logo "FlexProLogoImage" { + logo "FlexProLogoImage" { top= 12; left= 45; - name= "KeyTronic"; - shape= "LOGO"; + name= "KeyTronic"; + shape= "LOGO"; }; text "KeyTronicLogoText" { top= 15; diff --git a/geometry/kinesis b/geometry/kinesis index d73b1e14..4cb0987a 100644 --- a/geometry/kinesis +++ b/geometry/kinesis @@ -1,7 +1,7 @@ default xkb_geometry "model100" { // This is an approximate layout for a Kinesis Ergonomic keyboard - // Generated completely by eye. I didn't actually *measure* a real + // Generated completely by eye. I didn't actually *measure* a real // keyboard. description= "Kinesis Ergonomic"; @@ -31,7 +31,7 @@ default xkb_geometry "model100" { row { left= 1; top= 1; - keys { + keys { <ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>, <FK07>, <FK08> }; @@ -47,7 +47,7 @@ default xkb_geometry "model100" { left= 1; top= 0.2; keys { - <FK09>, <FK10>, <FK11>, <FK12>, <PRSC>, + <FK09>, <FK10>, <FK11>, <FK12>, <PRSC>, <SCLK>, <PAUS>, <FK16>, <FK17> }; }; @@ -57,11 +57,11 @@ default xkb_geometry "model100" { row.top= 1; key.gap= 0.5; - logo "KinesisLogoImage" { + logo "KinesisLogoImage" { top= 25; left= 240; - name= "Kinesis"; - shape= "LOGO"; + name= "Kinesis"; + shape= "LOGO"; }; indicator.shape= "LED"; diff --git a/geometry/macintosh b/geometry/macintosh index 172646a2..0cbe0d9b 100644 --- a/geometry/macintosh +++ b/geometry/macintosh @@ -22,8 +22,8 @@ default xkb_geometry "macintosh" { shape "TLDE" { { [ 23,18] }, { [2,1], [ 21,17] } }; shape "BKSP" { { [ 33,18] }, { [2,1], [ 31,17] } }; shape "TAB" { { [ 33,18] }, { [2,1], [ 31,17] } }; - shape "RTRN" { - { [0,0],[23,0],[23,37],[4,37],[4,18],[0,18] }, + shape "RTRN" { + { [0,0],[23,0],[23,37],[4,37],[4,18],[0,18] }, { [2,1],[21,1],[21,36],[6,36],[6,17],[2,17] } }; shape "CAPS" { { [ 37,18] }, { [2,1], [ 35,17] } }; shape "LCTL" { { [ 28,18] }, { [2,1], [ 26,17] } }; @@ -38,7 +38,7 @@ default xkb_geometry "macintosh" { shape "KP0" { { [ 37,18] }, { [2,1], [ 35,17] } }; shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } }; // Macintosh keyboards have a special sysctl key at the top right - shape "AAPL" { + shape "AAPL" { { [ 0,0], [ 18,0], [ 18,18], [ 0,18] }, { [ 1,1], [ 17,1], [ 17,17], [ 1,17] }, { [ 8,5], [ 8,12], [ 2,9] } }; @@ -74,7 +74,7 @@ default xkb_geometry "macintosh" { top = 48; row { top= 1; - keys { <ESC>, + keys { <ESC>, { <FK01>, 20 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, @@ -120,7 +120,7 @@ default xkb_geometry "macintosh" { top= 77; keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" }, { <LWIN>, "LMTA" }, - { <SPCE>, "SPCE" }, + { <SPCE>, "SPCE" }, { <RWIN>, "RMTA" }, { <RALT>, "RALT" }, { <RCTL>, "RCTL" } }; @@ -199,7 +199,7 @@ xkb_geometry "applepro" { shape "RTSH" { { [ 47, 18] }, { [2, 1], [ 45, 15] } }; shape "RTRN" { - { [0,0],[27,0],[27,37],[4,37],[4,18],[0,18] }, + { [0,0],[27,0],[27,37],[4,37],[4,18],[0,18] }, { [2,1],[25,1],[25,34],[6,34],[6,15],[2,15] } }; shape "CAPS" { { [ 32, 18] }, { [2, 1], [ 26, 15] } }; @@ -210,7 +210,7 @@ xkb_geometry "applepro" { shape "LMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } }; shape "RMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } }; shape "SPCE" { { [121, 20] }, { [3, 1], [118, 17] } }; - shape "BOTM" { { [ 18, 20] }, { [2, 1], [ 16, 17] } }; + shape "BOTM" { { [ 18, 20] }, { [2, 1], [ 16, 17] } }; shape "KP0" { { [ 37, 20] }, { [2, 1], [ 35, 17] } }; shape "KPEN" { { [ 18, 39] }, { [2, 1], [ 16, 36] } }; @@ -225,7 +225,7 @@ xkb_geometry "applepro" { top = 26; row { top= 1; - keys { <ESC>, + keys { <ESC>, { <FK01>, 14 }, <FK02>, <FK03>, <FK04>, { <FK05>, 14 }, <FK06>, <FK07>, <FK08>, { <FK09>, 14 }, <FK10>, <FK11>, <FK12>, @@ -270,7 +270,7 @@ xkb_geometry "applepro" { top= 77; keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" }, { <LWIN>, "LMTA" }, - { <SPCE>, "SPCE" }, + { <SPCE>, "SPCE" }, { <RWIN>, "RMTA" }, { <RALT>, "RALT" }, { <RCTL>, "RCTL" } }; @@ -390,35 +390,35 @@ xkb_geometry "macbook78" { row { top= 20; keys { { <TAB>, "TABK"}, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top= 39; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC11>, { <RTRN>, "RTRN" } }; }; row { top= 58; keys { { <LFSH>, "LFSH"}, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; }; row { top= 77; - keys { {<FN>, "DEGR"}, - <LCTL>, <LALT>, + keys { {<FN>, "DEGR"}, + <LCTL>, <LALT>, {<LMTA>, "APPL"}, - {<SPCE>, "SPCE" }, + {<SPCE>, "SPCE" }, {<RMTA>, "APPL"}, <KPEN> }; @@ -461,8 +461,8 @@ xkb_geometry "macbook79" { shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } }; shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } }; shape "RTRN" { { [ 0,0], [17,0], [17,37], [5,37], [5, 18], [0,18], [0,0] }, - cornerRadius=1, - { [ 2,2], [15,2], [15,35], [7,35], [7, 16], [2,16] } + cornerRadius=1, + { [ 2,2], [15,2], [15,35], [7,35], [7, 16], [2,16] } }; shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } }; shape "LFSH" { { [ 21,18] }, cornerRadius=1, { [0,2], [ 19,16] } }; @@ -511,33 +511,33 @@ xkb_geometry "macbook79" { row { top= 20; keys { { <TAB>, "TABK"}, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top= 39; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top= 58; keys { { <LFSH>, "LFSH"}, - <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; }; row { top= 77; - keys { {<FN>, "DEGR"}, - <LCTL>, <LALT>, + keys { {<FN>, "DEGR"}, + <LCTL>, <LALT>, {<LWIN>, "APPL"}, - {<SPCE>, "SPCE" }, + {<SPCE>, "SPCE" }, {<RALT>, "APPL"}, <KPEN> }; @@ -652,7 +652,7 @@ xkb_geometry "applealu_ansi" { corner= 1, { [ 15.5, 18 ] } }; - shape "LED" { + shape "LED" { corner= 0.5, { [ 1.5, 1.5 ] } }; @@ -734,7 +734,7 @@ xkb_geometry "applealu_ansi" { top= 55.5; left= 0; keys { - { <LFSH>, "LFSH", 0 }, + { <LFSH>, "LFSH", 0 }, { <AB01>, "NORM", 3.5 }, { <AB02>, "NORM", 3.5 }, { <AB03>, "NORM", 3.5 }, { <AB04>, "NORM", 3.5 }, { <AB05>, "NORM", 3.5 }, { <AB06>, "NORM", 3.5 }, @@ -942,7 +942,7 @@ xkb_geometry "applealu_iso" { corner= 1, { [ 15.5, 18 ] } }; - shape "LED" { + shape "LED" { corner= 0.5, { [ 1.5, 1.5 ] } }; @@ -1239,7 +1239,7 @@ xkb_geometry "applealu_jis" { corner= 1, { [ 15.5, 36.5 ] } }; - shape "LED" { + shape "LED" { corner= 0.5, { [ 1.5, 1.5 ] } }; @@ -1321,7 +1321,7 @@ xkb_geometry "applealu_jis" { top= 55.5; left= 0; keys { - { <LFSH>, "LFSH", 0 }, + { <LFSH>, "LFSH", 0 }, { <AB01>, "NORM", 3.5 }, { <AB02>, "NORM", 3.5 }, { <AB03>, "NORM", 3.5 }, { <AB04>, "NORM", 3.5 }, { <AB05>, "NORM", 3.5 }, { <AB06>, "NORM", 3.5 }, diff --git a/geometry/microsoft b/geometry/microsoft index 4fd277cb..6cfd9819 100644 --- a/geometry/microsoft +++ b/geometry/microsoft @@ -7,26 +7,26 @@ default xkb_geometry "natural" { shape.cornerRadius= 1; shape "LDEF" { { [ 18,18] }, { [2,1], [15,15] } }; - shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; - shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; + shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; + shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; shape "LFSH" { { [ 41,18] }, { [2,1], [38,15] } }; shape "KEY6" { { [ 22,18] }, { [2,1], [15,15] } }; shape "KEYT" { { [ 33,18] }, { [2,1], [15,15] } }; shape "KEYG" { { [ 29,18] }, { [2,1], [15,15] } }; - shape "LCTL" { + shape "LCTL" { approx= { [ 32, 22 ] }, { [ 0, 0], [ 32, 0 ], [ 32, 23 ], [ 0, 22 ] }, - { [ 2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } + { [ 2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } }; - shape "LWIN" { + shape "LWIN" { approx= { [ 32, 23 ] }, { [ 0, 0], [ 32, 0 ], [ 32, 24 ], [ 0, 23 ] }, - { [ 2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } + { [ 2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } }; - shape "LALT" { + shape "LALT" { approx= { [ 32, 24 ] }, { [ 0, 0], [ 32, 0 ], [ 32, 25 ], [ 0, 24 ] }, - { [ 2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } + { [ 2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } }; shape "RDEF" { { [ 18,18] }, { [3,1], [15,15] } }; shape "KEY7" { { [ 28, 18 ] }, { [ 14, 1], [26, 15] } }; @@ -36,32 +36,32 @@ default xkb_geometry "natural" { shape "BKSL" { { [ 24, 18 ] }, { [ 3, 1], [22, 15] } }; shape "RTRN" { { [ 37, 18 ] }, { [ 3, 1], [35, 15] } }; shape "RTSH" { { [ 43, 18 ] }, { [ 3, 1], [41, 15] } }; - shape "RALT" { + shape "RALT" { approx= { [ 27, 24 ] }, { [ 0, 0], [ 27, 0 ], [ 27, 24 ], [ 0, 25 ] }, - { [ 3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } + { [ 3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } }; - shape "RWIN" { + shape "RWIN" { approx= { [ 27, 23 ] }, { [ 0, 0], [ 27, 0 ], [ 27, 23 ], [ 0, 24 ] }, - { [ 3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } + { [ 3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } }; - shape "MENU" { + shape "MENU" { approx= { [ 27, 21 ] }, { [ 0, 0], [ 27, 0 ], [ 27, 21 ], [ 0, 23 ] }, - { [ 3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } + { [ 3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } }; - shape "RCTL" { + shape "RCTL" { approx= { [ 27, 19 ] }, { [ 0, 0], [ 27, 0 ], [ 27, 19 ], [ 0, 21 ] }, - { [ 3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } + { [ 3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } }; shape "KPAD" { { [ 18, 37 ] }, { [ 3, 1 ], [ 16, 34 ] } }; shape "KP0" { { [ 37, 18 ] }, { [ 3, 1 ], [ 35, 15 ] } }; shape "SPCE" { - { [ 4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], + { [ 4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], [134,26], [99,30], [67,33], [33,30], [ 0,26] }, - { [ 6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], + { [ 6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], [131,23], [99,28], [67,32], [33,28], [ 3,23] } }; @@ -113,7 +113,7 @@ default xkb_geometry "natural" { }; row { top= 58; - keys { { <LFSH>, "LFSH" }, + keys { { <LFSH>, "LFSH" }, <AB01>, <AB02>, <AB03>, <AB04>, <AB05> }; }; @@ -143,13 +143,13 @@ default xkb_geometry "natural" { row { top= 1; keys { { <AE07>, "KEY7" }, - <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" } }; }; row { top= 20; - keys { + keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; @@ -171,7 +171,7 @@ default xkb_geometry "natural" { row { top= 77; left= 40; - keys { { <RALT>, "RALT" }, { <RWIN>, "RWIN" }, + keys { { <RALT>, "RALT" }, { <RWIN>, "RWIN" }, { <MENU>, "MENU" }, { <RCTL>, "RCTL" } }; }; @@ -210,7 +210,7 @@ default xkb_geometry "natural" { }; }; // End of "Editing" section - shape "LED" { + shape "LED" { cornerRadius= 0, { [ 3, 1 ] } }; @@ -221,7 +221,7 @@ default xkb_geometry "natural" { indicator "Num Lock" { top= 90; }; indicator "Caps Lock" { top= 107; }; indicator "Scroll Lock" { top= 127; }; - + section "Keypad" { top= 47; left= 456; @@ -252,7 +252,7 @@ default xkb_geometry "natural" { }; // Approximate layout for a Microsoft Natural(R) Keyboard Elite -// +// // Modified by Pavel Kurashov <pavell@mail.ru> Mon Oct 8 22:08:20 NOVST 2007 // // * Function, editing and navigation keys are reduced in height @@ -271,26 +271,26 @@ xkb_geometry "elite" { shape.cornerRadius= 1; shape "LDEF" { { [ 18,18] }, { [2,1], [15,15] } }; shape "FKEY" { { [ 18,13] }, { [2,1], [15,10] } }; - shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; - shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; + shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; + shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; shape "LFSH" { { [ 41,18] }, { [2,1], [38,15] } }; shape "KEY6" { { [ 22,18] }, { [2,1], [15,15] } }; shape "KEYT" { { [ 33,18] }, { [2,1], [15,15] } }; shape "KEYG" { { [ 29,18] }, { [2,1], [15,15] } }; - shape "LCTL" { + shape "LCTL" { approx= { [ 32, 22 ] }, { [ 0, 0], [ 32, 0 ], [ 32, 23 ], [ 0, 22 ] }, - { [ 2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } + { [ 2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } }; - shape "LWIN" { + shape "LWIN" { approx= { [ 32, 23 ] }, { [ 0, 0], [ 32, 0 ], [ 32, 24 ], [ 0, 23 ] }, - { [ 2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } + { [ 2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } }; - shape "LALT" { + shape "LALT" { approx= { [ 32, 24 ] }, { [ 0, 0], [ 32, 0 ], [ 32, 25 ], [ 0, 24 ] }, - { [ 2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } + { [ 2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } }; shape "RDEF" { { [ 18,18 ] }, { [ 2, 1], [15, 15] } }; shape "KEY7" { { [ 28, 18 ] }, { [ 14, 1], [26, 15] } }; @@ -300,32 +300,32 @@ xkb_geometry "elite" { shape "BKSL" { { [ 24, 18 ] }, { [ 2, 1], [22, 15] } }; shape "RTRN" { { [ 37, 18 ] }, { [ 2, 1], [35, 15] } }; shape "RTSH" { { [ 43, 18 ] }, { [ 2, 1], [41, 15] } }; - shape "RALT" { + shape "RALT" { approx= { [ 27, 24 ] }, { [ 0, 0], [ 27, 0 ], [ 27, 24 ], [ 0, 25 ] }, - { [ 3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } + { [ 3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } }; - shape "RWIN" { + shape "RWIN" { approx= { [ 27, 23 ] }, { [ 0, 0], [ 27, 0 ], [ 27, 23 ], [ 0, 24 ] }, - { [ 3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } + { [ 3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } }; - shape "MENU" { + shape "MENU" { approx= { [ 27, 21 ] }, { [ 0, 0], [ 27, 0 ], [ 27, 21 ], [ 0, 23 ] }, - { [ 3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } + { [ 3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } }; - shape "RCTL" { + shape "RCTL" { approx= { [ 27, 19 ] }, { [ 0, 0], [ 27, 0 ], [ 27, 19 ], [ 0, 21 ] }, - { [ 3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } + { [ 3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } }; shape "KPAD" { { [ 18, 37 ] }, { [ 3, 1 ], [ 16, 34 ] } }; shape "KP0" { { [ 37, 18 ] }, { [ 3, 1 ], [ 35, 15 ] } }; shape "SPCE" { - { [ 4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], + { [ 4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], [134,26], [99,30], [67,33], [33,30], [ 0,26] }, - { [ 6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], + { [ 6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], [131,23], [99,28], [67,32], [33,28], [ 3,23] } }; @@ -378,7 +378,7 @@ xkb_geometry "elite" { }; row { top= 58; - keys { { <LFSH>, "LFSH" }, + keys { { <LFSH>, "LFSH" }, <AB01>, <AB02>, <AB03>, <AB04>, <AB05> }; }; @@ -409,13 +409,13 @@ xkb_geometry "elite" { row { top= 1; keys { { <AE07>, "KEY7" }, - <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, + <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" } }; }; row { top= 20; - keys { + keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; @@ -437,7 +437,7 @@ xkb_geometry "elite" { row { top= 77; left= 40; - keys { { <RALT>, "RALT" }, { <RWIN>, "RWIN" }, + keys { { <RALT>, "RALT" }, { <RWIN>, "RWIN" }, { <MENU>, "MENU" }, { <RCTL>, "RCTL" } }; }; @@ -460,17 +460,17 @@ xkb_geometry "elite" { }; row { top= 22; - left=20; + left=20; keys { <HOME>, <PGUP> }; }; row { top= 36; - left=20; + left=20; keys { <END>, <PGDN> }; }; row { top= 50; - left=20; + left=20; keys { <DELE>, <INS> }; }; row { @@ -480,17 +480,17 @@ xkb_geometry "elite" { }; row { top= 89; - left=20; + left=20; keys { <LEFT>, <RGHT> }; }; row { top= 103; - left=29; + left=29; keys { <DOWN> }; }; }; // End of "Editing" section - shape "LED" { + shape "LED" { cornerRadius= 1, { [ 7, 2 ] } }; @@ -501,7 +501,7 @@ xkb_geometry "elite" { indicator "Num Lock" { top= 90; }; indicator "Caps Lock" { top= 107; }; indicator "Scroll Lock" { top= 127; }; - + section "Keypad" { top= 44; left= 412; diff --git a/geometry/nec b/geometry/nec index f4af6660..ed3b7e04 100644 --- a/geometry/nec +++ b/geometry/nec @@ -53,8 +53,8 @@ default xkb_geometry "pc98" { top= 1; key.shape="FUNC"; keys { { <BRK>, "NORM" }, { <PRSC>, "NORM", 5 }, - { <FK01>, 6 }, <FK02>, <FK03>, <FK04>, <FK05>, - { <FK06>, 6 }, <FK07>, <FK08>, <FK09>, <FK10>, + { <FK01>, 6 }, <FK02>, <FK03>, <FK04>, <FK05>, + { <FK06>, 6 }, <FK07>, <FK08>, <FK09>, <FK10>, { <FK11>, 6 }, <FK12>, <FK13>, <FK14>, <FK15> }; }; @@ -64,7 +64,7 @@ default xkb_geometry "pc98" { top= 54; row { top= 1; - keys { { <ESC>, shape="BKSP"}, + keys { { <ESC>, shape="BKSP"}, <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <BKSL>, @@ -74,23 +74,23 @@ default xkb_geometry "pc98" { row { top= 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", 6 } }; }; row { top= 39; keys { <LCTL>, <CAPS>, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12> }; }; row { top= 58; keys { { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>, { <RTSH>, "RTSH" } }; @@ -99,7 +99,7 @@ default xkb_geometry "pc98" { top= 77; keys { { <ALGR>, 35 } , <LALT>, { <NFER>, "FUNC" }, { <SPCE>, "SPCE" }, { <XFER>, "FUNC" } - + }; }; }; // End of "Alpha" section diff --git a/geometry/northgate b/geometry/northgate index 364bf549..1a1dd43b 100644 --- a/geometry/northgate +++ b/geometry/northgate @@ -74,8 +74,8 @@ default xkb_geometry "omnikey101" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", -14, color="grey20" } }; @@ -83,16 +83,16 @@ default xkb_geometry "omnikey101" { row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" }, <BKSL> }; }; diff --git a/geometry/pc b/geometry/pc index f3cba6d1..1bb925de 100644 --- a/geometry/pc +++ b/geometry/pc @@ -78,7 +78,7 @@ default xkb_geometry "pc101" { { <FK01>, 20 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -96,24 +96,24 @@ default xkb_geometry "pc101" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -238,7 +238,7 @@ xkb_geometry "pc102" { { <FK01>, 10 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -249,31 +249,31 @@ xkb_geometry "pc102" { top= 1; keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, - <AE10>, <AE11>, <AE12>, + <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP", color="grey20" } }; }; row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -397,7 +397,7 @@ xkb_geometry "pc104" { { <FK01>, 20 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -415,24 +415,24 @@ xkb_geometry "pc104" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -560,7 +560,7 @@ xkb_geometry "pc105" { { <FK01>, 20 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -578,24 +578,24 @@ xkb_geometry "pc105" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" } + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <BKSL> + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC11>, <BKSL> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -801,23 +801,23 @@ xkb_geometry "pc86" { row { top = 20; keys { { <TAB>, shape="NARR", color="grey30" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <AD13>, shape="NARR" } }; }; row { top = 39; keys { { <CAPS>, color="grey30" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, shape="WIDEST", color="grey30" } }; }; row { top = 58; keys { { <LFSH>, shape="WIDEST", color="grey30" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, shape="WIDER", color="grey30" } }; @@ -894,7 +894,7 @@ xkb_geometry "pc104alt" { { <FK01>, 20 }, <FK02>, <FK03>, <FK04>, { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -912,8 +912,8 @@ xkb_geometry "pc104alt" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, // <AD11>, <AD12>, { <RTRN>, -13, "RTRN", color="grey20" } <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" } }; @@ -921,16 +921,16 @@ xkb_geometry "pc104alt" { row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; diff --git a/geometry/sgi_vndr/O2 b/geometry/sgi_vndr/O2 index 8bd17797..f19bfd0a 100644 --- a/geometry/sgi_vndr/O2 +++ b/geometry/sgi_vndr/O2 @@ -6,19 +6,19 @@ // fee is hereby granted, provided that the above copyright // notice appear in all copies and that both that copyright // notice and this permission notice appear in supporting -// documentation, and that the name of Silicon Graphics not be -// used in advertising or publicity pertaining to distribution +// documentation, and that the name of Silicon Graphics not be +// used in advertising or publicity pertaining to distribution // of the software without specific prior written permission. -// Silicon Graphics makes no representation about the suitability +// Silicon Graphics makes no representation about the suitability // of this software for any purpose. It is provided "as is" // without any express or implied warranty. -// -// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +// +// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY // AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH // THE USE OR PERFORMANCE OF THIS SOFTWARE. // @@ -34,8 +34,8 @@ default xkb_geometry "pc101" { width= 448; height= 162; - shape "EDGE" { - cornerRadius= 2, + shape "EDGE" { + cornerRadius= 2, { [ 15, 0 ], [ 433, 0 ], [ 433, 10 ], [ 448, 10 ], [ 448, 162 ], [ 0, 162 ], [ 0, 10 ], [ 15, 10 ] } }; @@ -89,25 +89,25 @@ default xkb_geometry "pc101" { row { top= 20; keys { { <TAB>, "TABK", color= "grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } - }; + }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 58; - keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + keys { { <LFSH>, "LFSH", color="grey20" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -175,12 +175,12 @@ default xkb_geometry "pc101" { text "NumLockLabel" { left= 376.5; text="1"; }; text "CapsLockLabel" { left= 401.5; text="A"; }; text "ScrollLockLabel" { left= 426.5; text="S"; }; - - logo "SGILogoImage" { + + logo "SGILogoImage" { top= 26.5; left= 396; - name= "SGI"; - shape= "LOGO"; + name= "SGI"; + shape= "LOGO"; }; text.font= "helvetica"; text.weight= "bold"; @@ -296,8 +296,8 @@ xkb_geometry "pc102" { row { top= 20; keys { { <TAB>, "TABK", color= "grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", color= "grey20" } }; @@ -305,16 +305,16 @@ xkb_geometry "pc102" { row { top= 39; keys { { <CAPS>, "CAPS", color= "grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color= "grey20" }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color= "grey20" } }; }; @@ -379,11 +379,11 @@ xkb_geometry "pc102" { text "CapsLockLabel" { left= 405; text="Caps\nLock"; }; text "ScrollLockLabel" { left= 430; text="Scroll\nLock"; }; - logo "SGILogoImage" { + logo "SGILogoImage" { top= 17; left= 22; - name= "SGI"; - shape= "LOGO"; + name= "SGI"; + shape= "LOGO"; }; text "SGILogoText" { top= 21; @@ -455,11 +455,11 @@ xkb_geometry "jp106" { shape= "EDGE"; }; - logo "SGILogoImage" { + logo "SGILogoImage" { top= 5; left= 6; - name= "SGI"; - shape= "LOGO"; + name= "SGI"; + shape= "LOGO"; }; text "SGILogoText" { @@ -506,10 +506,10 @@ xkb_geometry "jp106" { top= 1; keys { { <ESC>, color="grey20" }, { <FK01>, 18 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, + { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, { <FK07>, color="grey20"}, {<FK08>,color="grey20"}, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -518,8 +518,8 @@ xkb_geometry "jp106" { top= 61; row { top= 1; - keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, - <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, + keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, + <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <AE13>, { <BKSP>, "BKSP", color="grey20" } }; @@ -527,24 +527,24 @@ xkb_geometry "jp106" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>, { <RTSH>, "RTSH", color="grey20" } }; }; diff --git a/geometry/sgi_vndr/indigo b/geometry/sgi_vndr/indigo index 2c174666..60b02f65 100644 --- a/geometry/sgi_vndr/indigo +++ b/geometry/sgi_vndr/indigo @@ -6,19 +6,19 @@ // fee is hereby granted, provided that the above copyright // notice appear in all copies and that both that copyright // notice and this permission notice appear in supporting -// documentation, and that the name of Silicon Graphics not be -// used in advertising or publicity pertaining to distribution +// documentation, and that the name of Silicon Graphics not be +// used in advertising or publicity pertaining to distribution // of the software without specific prior written permission. -// Silicon Graphics makes no representation about the suitability +// Silicon Graphics makes no representation about the suitability // of this software for any purpose. It is provided "as is" // without any express or implied warranty. -// -// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +// +// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY // AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH // THE USE OR PERFORMANCE OF THIS SOFTWARE. // @@ -85,25 +85,25 @@ default xkb_geometry "pc101" { row { top= 20; keys { { <TAB>, "TABK", color= "grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } - }; + }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 58; - keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + keys { { <LFSH>, "LFSH", color="grey20" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -165,12 +165,12 @@ default xkb_geometry "pc101" { text "NumLockLabel" { left= 382.5; text="Num\nLock"; }; text "CapsLockLabel" { left= 407; text="Caps\nLock"; }; text "ScrollLockLabel" { left= 432; text="Scroll\nLock"; }; - - logo "SGILogoImage" { + + logo "SGILogoImage" { top= 17; left= 22; - name= "SGI"; - shape= "LOGO"; + name= "SGI"; + shape= "LOGO"; }; text "SGILogoText" { top= 21; @@ -279,8 +279,8 @@ xkb_geometry "pc102" { row { top= 20; keys { { <TAB>, "TABK", color= "grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", color= "grey20" } }; @@ -288,16 +288,16 @@ xkb_geometry "pc102" { row { top= 39; keys { { <CAPS>, "CAPS", color= "grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color= "grey20" }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color= "grey20" } }; }; @@ -362,11 +362,11 @@ xkb_geometry "pc102" { text "CapsLockLabel" { left= 405; text="Caps\nLock"; }; text "ScrollLockLabel" { left= 430; text="Scroll\nLock"; }; - logo "SGILogoImage" { + logo "SGILogoImage" { top= 17; left= 22; - name= "SGI"; - shape= "LOGO"; + name= "SGI"; + shape= "LOGO"; }; text "SGILogoText" { top= 21; diff --git a/geometry/sgi_vndr/indy b/geometry/sgi_vndr/indy index 9b7a40de..e726a8bb 100644 --- a/geometry/sgi_vndr/indy +++ b/geometry/sgi_vndr/indy @@ -6,19 +6,19 @@ // fee is hereby granted, provided that the above copyright // notice appear in all copies and that both that copyright // notice and this permission notice appear in supporting -// documentation, and that the name of Silicon Graphics not be -// used in advertising or publicity pertaining to distribution +// documentation, and that the name of Silicon Graphics not be +// used in advertising or publicity pertaining to distribution // of the software without specific prior written permission. -// Silicon Graphics makes no representation about the suitability +// Silicon Graphics makes no representation about the suitability // of this software for any purpose. It is provided "as is" // without any express or implied warranty. -// -// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +// +// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY // AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH // THE USE OR PERFORMANCE OF THIS SOFTWARE. // @@ -85,25 +85,25 @@ default xkb_geometry "pc101" { row { top= 20; keys { { <TAB>, "TABK", color= "grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } - }; + }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color="grey20" } }; }; row { top= 58; - keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + keys { { <LFSH>, "LFSH", color="grey20" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -165,12 +165,12 @@ default xkb_geometry "pc101" { text "NumLockLabel" { left= 382.5; text="Num\nLock"; }; text "CapsLockLabel" { left= 407; text="Caps\nLock"; }; text "ScrollLockLabel" { left= 432; text="Scroll\nLock"; }; - - logo "SGILogoImage" { + + logo "SGILogoImage" { top= 17; left= 22; - name= "SGI"; - shape= "LOGO"; + name= "SGI"; + shape= "LOGO"; }; text "SGILogoText" { top= 21; @@ -280,8 +280,8 @@ xkb_geometry "pc102" { row { top= 20; keys { { <TAB>, "TABK", color= "grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN", color= "grey20" } }; @@ -289,16 +289,16 @@ xkb_geometry "pc102" { row { top= 39; keys { { <CAPS>, "CAPS", color= "grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color= "grey20" }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color= "grey20" } }; }; @@ -363,11 +363,11 @@ xkb_geometry "pc102" { text "CapsLockLabel" { left= 405; text="Caps\nLock"; }; text "ScrollLockLabel" { left= 430; text="Scroll\nLock"; }; - logo "SGILogoImage" { + logo "SGILogoImage" { top= 17; left= 22; - name= "SGI"; - shape= "LOGO"; + name= "SGI"; + shape= "LOGO"; }; text "SGILogoText" { top= 21; @@ -439,11 +439,11 @@ xkb_geometry "jp106" { shape= "EDGE"; }; - logo "SGILogoImage" { + logo "SGILogoImage" { top= 5; left= 6; - name= "SGI"; - shape= "LOGO"; + name= "SGI"; + shape= "LOGO"; }; text "SGILogoText" { @@ -490,10 +490,10 @@ xkb_geometry "jp106" { top= 1; keys { { <ESC>, color="grey20" }, { <FK01>, 18 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, + { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, { <FK07>, color="grey20"}, {<FK08>,color="grey20"}, { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 8 }, <SCLK>, <PAUS> + { <PRSC>, 8 }, <SCLK>, <PAUS> }; }; }; // End of "Function" section @@ -502,8 +502,8 @@ xkb_geometry "jp106" { top= 61; row { top= 1; - keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, - <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, + keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, + <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <AE13>, { <BKSP>, "BKSP", color="grey20" } }; @@ -511,24 +511,24 @@ xkb_geometry "jp106" { row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" } }; }; row { top= 39; keys { { <CAPS>, "CAPS", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12> }; }; row { top= 58; keys { { <LFSH>, "LFSH", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>, { <RTSH>, "RTSH", color="grey20" } }; }; diff --git a/geometry/sony b/geometry/sony index 70714941..25beb122 100644 --- a/geometry/sony +++ b/geometry/sony @@ -62,8 +62,8 @@ default xkb_geometry "nwp5461" { top= 1; left= 37; key.shape="FKEY"; - keys { <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, - { <FK06>, 5 }, <FK07>, <FK08>, <FK09>, <FK10>, + keys { <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, + { <FK06>, 5 }, <FK07>, <FK08>, <FK09>, <FK10>, { <FK11>, 5 }, <FK12> }; }; @@ -73,34 +73,34 @@ default xkb_geometry "nwp5461" { top= 80; row { top= 1; - keys { { <ESC>, color="grey20" } , + keys { { <ESC>, color="grey20" } , <AE01>, <AE02>, <AE03>, <AE04>, - <AE05>, <AE06>, <AE07>, <AE08>, - <AE09>, <AE10>, <AE11>, <AE12>, + <AE05>, <AE06>, <AE07>, <AE08>, + <AE09>, <AE10>, <AE11>, <AE12>, <BKSL>, { <BKSP>, "BKSP", color="grey20" } }; }; row { top= 20; keys { { <TAB>, "TABK", color="grey20" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, { <DELE>, color="grey20" }, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD11>, <AD12>, { <DELE>, color="grey20" }, { <RTRN>, "RTRN", -14, color="grey20" } }; }; row { top= 39; keys { { <LCTL>, "MODK", color="grey20" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <TLDE> }; }; row { top= 58; keys { { <LFSH>, "SHFT", color="grey20" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>, { <RTSH>, "SHFT", color="grey20" } }; @@ -113,7 +113,7 @@ default xkb_geometry "nwp5461" { { <STOP>, "STOP", color="white" }, { <SPCE>, "SPCE", color="white" }, { <CUT>, "CUT", color="white" }, - { <UNK0>, "UNK" }, { <UNK1>, "UNK" }, + { <UNK0>, "UNK" }, { <UNK1>, "UNK" }, { <EXEC>, "EXEC" } }; }; diff --git a/geometry/sun b/geometry/sun index fc6d5a63..2d1658d5 100644 --- a/geometry/sun +++ b/geometry/sun @@ -92,8 +92,8 @@ xkb_geometry "t6" { row { top= 20; keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; @@ -101,17 +101,17 @@ xkb_geometry "t6" { row { top= 39; keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN" } }; }; row { top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -207,10 +207,10 @@ xkb_geometry "t6tuv" { shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } }; shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; + shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "RTRN" { + shape "RTRN" { approx = { [ 0, 0], [28,37] }, { [ 0, 0], [28, 0], [28,37], [ 5,37], [ 5,18], [ 0,18] }, @@ -268,25 +268,25 @@ xkb_geometry "t6tuv" { row { top= 20; keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top= 39; keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; @@ -387,7 +387,7 @@ xkb_geometry "t6jp" { shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } }; shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "RTRN" { + shape "RTRN" { approx = { [ 0, 0], [28,37] }, { [ 0, 0], [28, 0], [28,37], [ 5,37], [ 5,18], [ 0,18] }, @@ -442,24 +442,24 @@ xkb_geometry "t6jp" { row { top= 20; keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top= 39; keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL> }; }; row { top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>, { <RTSH>, "RTSH", color="grey20" } }; @@ -611,8 +611,8 @@ xkb_geometry "t6unix" { row { top= 20; keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSP>, "BKSP", color="grey20" } }; @@ -620,17 +620,17 @@ xkb_geometry "t6unix" { row { top= 39; keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN" } }; }; row { top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH", color="grey20" } }; }; diff --git a/geometry/thinkpad b/geometry/thinkpad index 48e8cdcc..ab16d93d 100644 --- a/geometry/thinkpad +++ b/geometry/thinkpad @@ -151,7 +151,7 @@ xkb_geometry "common" { keys { <LEFT>, <DOWN>, <RGHT> }; }; }; // End of "Navigation" section - + shape "STIK" { cornerRadius = 4, { [7, 7] } }; solid "STIK" { @@ -189,23 +189,23 @@ xkb_geometry "us" { row { top = 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top = 39; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN" } }; }; row { top = 58; keys { { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; @@ -241,23 +241,23 @@ xkb_geometry "intl" { row { top = 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" } }; }; row { top = 39; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12> }; }; row { top = 58; keys { { <LFSH>, "LFSH" }, <AB00>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; @@ -420,7 +420,7 @@ xkb_geometry "60" { keys { <LEFT>, <DOWN>, <RGHT> }; }; }; // End of "Navigation" section - + shape "STIK" { cornerRadius = 3.5, { [7, 7] } }; solid "STIK" { @@ -445,23 +445,23 @@ xkb_geometry "60" { row { top = 20; keys { { <TAB>, "TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" } }; }; row { top = 39; keys { { <CAPS>, "CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTRN>, "RTRN", color = "blue" } }; }; row { top = 58; keys { { <LFSH>, "LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, { <RTSH>, "RTSH" } }; diff --git a/geometry/winbook b/geometry/winbook index 842eefbf..db4561c1 100644 --- a/geometry/winbook +++ b/geometry/winbook @@ -6,7 +6,7 @@ default xkb_geometry "XP5" { shape.cornerRadius= 1; - shape "NORM" { + shape "NORM" { { [17,17] }, { [ 2, 1], [ 15, 15 ] } }; @@ -55,28 +55,28 @@ default xkb_geometry "XP5" { section "Whole" { top= 10; row { - top= 11; + top= 11; key.shape= "FKEY"; - keys { - <ESC>, - <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>, + keys { + <ESC>, + <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>, <PAUS>, <HOME>, <END>, <PGUP> }; }; row { top= 22; - keys { + keys { { <AEO1>, "ONE" }, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, - { <BKSP>, shape="WIDE" }, + { <BKSP>, shape="WIDE" }, <PGDN> }; }; row { top= 40; - keys { + keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, { <BKSL>, "WIDR" } @@ -85,26 +85,26 @@ default xkb_geometry "XP5" { row { top= 58; keys { { <CAPS>, shape="WIDE" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC11>, { <RTRN>, shape="RTRN" } }; }; row { top= 76; - keys { + keys { { <LFSH>, shape="WIDR" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - <RTSH>, <UP>, <NMLK> + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + <RTSH>, <UP>, <NMLK> }; }; row { top= 94; - keys { - { <LCTL>, "WIDE" }, <FUNC>, { <LALT>, "WIDE" }, - <TLDE>, { <SPCE>, shape="SPCE" }, <INS>, <DELE>, + keys { + { <LCTL>, "WIDE" }, <FUNC>, { <LALT>, "WIDE" }, + <TLDE>, { <SPCE>, shape="SPCE" }, <INS>, <DELE>, <LEFT>, <DOWN>, <RGHT> }; }; diff --git a/keycodes/digital_vndr/lk b/keycodes/digital_vndr/lk index 30b49d31..a5d96428 100644 --- a/keycodes/digital_vndr/lk +++ b/keycodes/digital_vndr/lk @@ -20,7 +20,7 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. @@ -37,19 +37,19 @@ // Revision 1.1.2.4 1995/08/05 15:25:55 William_Walker // Upgrade to XKB protocol 0.62 // [1995/08/05 14:39:58 William_Walker] -// +// // Revision 1.1.2.3 1995/06/27 12:17:31 William_Walker // Rename <TLDE> to ISO9995 compliant <AE00>. // [1995/06/26 20:24:04 William_Walker] -// +// // Revision 1.1.2.2 1995/06/05 19:21:28 William_Walker // New file. I love keymaps. // [1995/06/05 18:07:29 William_Walker] -// +// // EndLog -// -// @(#)RCSfile: lk Revision: /main/3 (DEC) Date: 1996/01/24 12:13:31 -// +// +// @(#)RCSfile: lk Revision: /main/3 (DEC) Date: 1996/01/24 12:13:31 +// xkb_keycodes "lk_common" { // "Function" keys <FK01> = 86; diff --git a/keycodes/digital_vndr/pc b/keycodes/digital_vndr/pc index 33ef848d..d55cdab6 100644 --- a/keycodes/digital_vndr/pc +++ b/keycodes/digital_vndr/pc @@ -20,7 +20,7 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. @@ -37,23 +37,23 @@ // Revision 1.1.6.2 1995/08/07 17:40:37 William_Walker // Upgrade XKB to protocol 0.62 (dual submit from decx11) // [1995/08/06 14:06:28 William_Walker] -// +// // Revision 1.1.2.4 1995/08/05 15:25:56 William_Walker // Upgrade to XKB protocol 0.62 // [1995/08/05 14:40:02 William_Walker] -// +// // Revision 1.1.2.3 1995/06/27 12:17:32 William_Walker // Rename <TLDE> to ISO9995 compliant <AE00>. // [1995/06/26 20:24:07 William_Walker] -// +// // Revision 1.1.2.2 1995/06/05 19:21:31 William_Walker // New file. I love keymaps. // [1995/06/05 18:07:34 William_Walker] -// +// // EndLog -// -// @(#)RCSfile: pc Revision: /main/3 (DEC) Date: 1996/01/24 12:13:36 -// +// +// @(#)RCSfile: pc Revision: /main/3 (DEC) Date: 1996/01/24 12:13:36 +// xkb_keycodes "pc_common" { // "Function" keys <FK01> = 9; diff --git a/keycodes/macintosh b/keycodes/macintosh index c8c91466..12d0e866 100644 --- a/keycodes/macintosh +++ b/keycodes/macintosh @@ -33,7 +33,7 @@ default xkb_keycodes "macintosh" { <FK14> = 183; <FK15> = 184; <KPEQ> = 157; - + }; xkb_keycodes "old" { diff --git a/keycodes/xfree86 b/keycodes/xfree86 index b4194dd3..e4d817b1 100644 --- a/keycodes/xfree86 +++ b/keycodes/xfree86 @@ -331,7 +331,7 @@ xkb_keycodes "basic" { <K74> = 219; // <I5B> <K75> = 220; // <I5C> <K76> = 221; // <I5D> - + // Solaris compatibility alias <LMTA> = <LWIN>; @@ -21,9 +21,9 @@ # compose-tast og det virker! # # delete key = slettetast -# digraph = digraf (En digraf er to bogstaver, der repræsenterer én lyd. -# En digraf er ikke det samme som en ligatur.) Eksempler: "hj" og "hv" -# i "hjælp", "hvis" og "hvordan", eller "ph" i engelsk "phone". Kilde +# digraph = digraf (En digraf er to bogstaver, der repræsenterer én lyd. +# En digraf er ikke det samme som en ligatur.) Eksempler: "hj" og "hv" +# i "hjælp", "hvis" og "hvordan", eller "ph" i engelsk "phone". Kilde # dansk wikipedia # Dvorak -> Dvorak personnavn (så med stort) # keypad = numerisk tastatur @@ -1943,7 +1943,7 @@ msgstr "Hausa (Ghana)" msgid "avn" msgstr "avn" -# The Avatime are an Akan people who live in Volta region of Ghana. History has it +# The Avatime are an Akan people who live in Volta region of Ghana. History has it # that they are Ahanta people who migrated to the Volta region. #: ../rules/base.xml.in.h:513 msgid "Avatime" @@ -2800,8 +2800,8 @@ msgstr "Serbisk (kyrillisk med anførelsestegnene »«)" msgid "Serbian (Latin with guillemets)" msgstr "Serbisk (latin med anførelsestegnene »«)" -# Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken -# in north-western Serbia and eastern Croatia +# Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken +# in north-western Serbia and eastern Croatia #: ../rules/base.xml.in.h:742 msgid "Pannonian Rusyn" msgstr "Pannonisk rusyn" @@ -2872,9 +2872,9 @@ msgstr "Spansk (Dvorak)" msgid "ast" msgstr "ast" -# Asturian (Asturian: Asturianu or Bable) is a Romance -# language of the West Iberian group, Astur-Leonese -# Subgroup, spoken in the Spanish province of Asturias +# Asturian (Asturian: Asturianu or Bable) is a Romance +# language of the West Iberian group, Astur-Leonese +# Subgroup, spoken in the Spanish province of Asturias # by the Asturian people. #: ../rules/base.xml.in.h:761 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)" @@ -3166,8 +3166,8 @@ msgstr "Ukrainsk (standard RSTU)" msgid "Russian (Ukraine, standard RSTU)" msgstr "Russisk (Ukraine, standard RSTU)" -# Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken -# in north-western Serbia and eastern Croatia +# Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken +# in north-western Serbia and eastern Croatia #: ../rules/base.xml.in.h:841 msgid "Ukrainian (homophonic)" msgstr "Ukrainsk (homofonisk)" @@ -4183,11 +4183,11 @@ msgid "Non-breaking space at the 4th level, thin non-breaking space at the 6th l msgstr "Ubrydeligt mellemrum på fjerde niveau, tyndt ubrydeligt mellemrum på sjette niveau (via Ctrl+Skift)" # The zero-width non-joiner (ZWNJ) is a non-printing character used in the computerized -# typesetting of some cursive scripts, or other scripts which make use of ligatures, -# such as Devanagari. When placed between two characters that would otherwise be -# connected, a ZWNJ causes them to be printed in their final and initial forms, -# respectively. This is also an effect of a space character, but a ZWNJ is used when it -# is desirable to keep the words closer together. The ZWNJ is represented in Unicode +# typesetting of some cursive scripts, or other scripts which make use of ligatures, +# such as Devanagari. When placed between two characters that would otherwise be +# connected, a ZWNJ causes them to be printed in their final and initial forms, +# respectively. This is also an effect of a space character, but a ZWNJ is used when it +# is desirable to keep the words closer together. The ZWNJ is represented in Unicode # is U+200C, and can be represented in HTML as ‌, ‌ or ‌. Kilde eng. # wikipedia 12. maj 2010 #: ../rules/base.xml.in.h:1107 diff --git a/rules/0001-lists.part b/rules/0001-lists.part index f8191ed5..e32165fc 100644 --- a/rules/0001-lists.part +++ b/rules/0001-lists.part @@ -52,4 +52,3 @@ sun_type7 sun_type7_suncompat suncompat ! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat - diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part index f4f512ad..c047f3ec 100644 --- a/rules/0042-o_s.part +++ b/rules/0042-o_s.part @@ -194,4 +194,3 @@ grp:ralt_rshift_toggle = +group(ralt_rshift_toggle) grp:alt_shift_toggle = +group(alt_shift_toggle) grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir) - diff --git a/rules/0043-o_c.part b/rules/0043-o_c.part index 198c7524..4042e4c9 100644 --- a/rules/0043-o_c.part +++ b/rules/0043-o_c.part @@ -6,4 +6,3 @@ japan:kana_lock = +japan(kana_lock) caps:shiftlock = +ledcaps(shift_lock) grab:break_actions = +xfree86(grab_break) - diff --git a/rules/base.extras.xml b/rules/base.extras.xml index e153e5f2..dea4465c 100644 --- a/rules/base.extras.xml +++ b/rules/base.extras.xml @@ -857,7 +857,7 @@ <iso639Id>neg</iso639Id> </languageList> </configItem> - </variant> + </variant> <variant> <configItem popularity="exotic"> <name>winkeys-p</name> diff --git a/rules/compat/meson.build b/rules/compat/meson.build index 8510a3e5..ac842c69 100644 --- a/rules/compat/meson.build +++ b/rules/compat/meson.build @@ -1,4 +1,4 @@ -# generated files +# generated files rules_compat_generated = [] layout_mappings = files('layoutsMapping.lst') diff --git a/rules/xfree98 b/rules/xfree98 index 022811a0..856ae9ca 100644 --- a/rules/xfree98 +++ b/rules/xfree98 @@ -27,4 +27,3 @@ ctrl:grouptoggle_capscontrol = +ctrl(swapcaps)+group(lctrl_toggle) ctrl:ac_ctrl = +ctrl(ac_ctrl) ctrl:aa_ctrl = +ctrl(aa_ctrl) - diff --git a/rules/xkb.dtd b/rules/xkb.dtd index fce9b195..ab710e9b 100644 --- a/rules/xkb.dtd +++ b/rules/xkb.dtd @@ -7,7 +7,7 @@ <!ELEMENT xkbConfigRegistry (modelList,layoutList,optionList)> -<!ATTLIST xkbConfigRegistry +<!ATTLIST xkbConfigRegistry version CDATA "1.1"> <!ELEMENT modelList (model*)> diff --git a/rules/xml2lst.pl b/rules/xml2lst.pl index 82289aa4..23ca0e0e 100755 --- a/rules/xml2lst.pl +++ b/rules/xml2lst.pl @@ -64,7 +64,7 @@ sub with_attribute { if (defined $value && $value ne '') { $value =~ s/"//g; foreach $node (@{$nodelist}) { - $attrvalue = node_attribute($node, $attr); + $attrvalue = node_attribute($node, $attr); if (defined $attrvalue && $attrvalue eq $value) { return $node; } diff --git a/scripts/publish.sh b/scripts/publish.sh index 6d918e01..44fde088 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -10,4 +10,3 @@ acc=${2:-svu} scp "$file" ${acc}@www.x.org:/home/svu/public_html echo "Check on http://www.x.org/~${acc}" - diff --git a/symbols/apl b/symbols/apl index a270b024..9a32163f 100644 --- a/symbols/apl +++ b/symbols/apl @@ -16,16 +16,16 @@ // This file doesn't deal with all the combining stuff -- I'm not an APL programmer, // and am not quite sure what's needed here. However, it may be possible to get this -// working with dead keys and the like. Patches gratefully accepted. +// working with dead keys and the like. Patches gratefully accepted. // [Geoff Streeter: What has been done to is to support all of the APL overstrikes in the compose table] // Some of the shift-key assignments may differ from the APL tradition. If -// that's not considered acceptable, it should be possible to remap the +// that's not considered acceptable, it should be possible to remap the // shift keys. I have striven, however, to ensure that the use of shift keys -// in these maps is at least self-consistent. +// in these maps is at least self-consistent. -// I'm assuming that this will be used with another keyboard layout (ie. for -// your language), with a special shift key to use these maps. +// I'm assuming that this will be used with another keyboard layout (ie. for +// your language), with a special shift key to use these maps. // 2018-07-02 added some codes to the Unicode Private Use page. // 2017-02-27 changed ¤ to ⌺, added ⊆ @@ -244,7 +244,7 @@ xkb_symbols "apl2" { key <AB10> { [ slash, backslash, U233F ] }; // /: ⌿ -- AFS Slash Bar key <AC10> { [ bracketleft, parenleft, U234E ] }; // ;: ⍎ -- [See B key in SAX layout] - key <AC11> { [ bracketright, parenright, U2355 ] }; // ': ⍕ -- [See N key in SAX layout] + key <AC11> { [ bracketright, parenright, U2355 ] }; // ': ⍕ -- [See N key in SAX layout] key <AD11> { [ NoSymbol, U2192, U235E ] }; // [: (←) → ⍞ -- Rightwards Arrow / AFS Quote Quad key <AD12> { [ U2337, U2378, U2359 ] }; // ]: ⌷ ⍸ ⍙ -- AFS Squish Quad / AFS Iota Underbar / AFS Delta Underbar @@ -264,7 +264,7 @@ xkb_symbols "apl2" { key <BKSL> { [ U2261, U2377, U2364 ] }; // \: ≡ ⍷ ⍤ -- Identical To / AFS Epsilon Underbar / AFS Jot Diaeresis - key <TLDE> { [ NoSymbol, U233B, U2342 ] }; // `: ⌻ ⍂ -- + key <TLDE> { [ NoSymbol, U233B, U2342 ] }; // `: ⌻ ⍂ -- include "level3(ralt_switch)" }; @@ -299,7 +299,7 @@ xkb_symbols "aplplusII" { // AFS is short for APL Functional Symbol key <AC10> { [ bracketleft, parenleft, U234E ] }; // ;: ⍎ -- [See B key in SAX layout] - key <AC11> { [ bracketright, parenright, U2355 ] }; // ': ⍕ -- [See N key in SAX layout] + key <AC11> { [ bracketright, parenright, U2355 ] }; // ': ⍕ -- [See N key in SAX layout] key <AD11> { [ U2190, NoSymbol, U235E ] }; // [: ← ⍞ -- Leftwards Arrow / AFS Quote Quad key <AD12> { [ U2192, NoSymbol, U236C ] }; // ]: → ⍬ -- Rightwards Arrow / AFS Zilde key <AE01> { [ NoSymbol, NoSymbol, U2261 ] }; // 1: ≡ -- Identical To @@ -361,7 +361,7 @@ xkb_symbols "aplx" { }; // APL language support for the Dyalog keyboard. -// Dyalog Ltd sell this keyboard with APL engravings. The current model is +// Dyalog Ltd sell this keyboard with APL engravings. The current model is // engraved on a Cherry G80. Base languages for US, UK and DK are availible. // Geoff Streeter, Dyalog Ltd. 2007-09-03 @@ -383,7 +383,7 @@ xkb_symbols "aplx" { // add omega underbar 2019-03-22 // change all "partial hidden" to "hidden partial" - seems to be a compiler change -// The intention is that this keyboard layout overlays a base keyboard that provides +// The intention is that this keyboard layout overlays a base keyboard that provides // the alphabet and similar. If this keyboard is placed as the 2nd layout then it can // be reached with a latching shift to increase group by one. @@ -538,7 +538,7 @@ xkb_symbols "dyalog_codes" { // . // F│F15 │F31 │F47 │F63 │ │F207│F223│F239│F255│ // └────┴────┴────┴────┴....┴────┴────┴────┴────┘ -// +// // whilst these locations are defined. Dyalog's "aplkeys/xterm" file copes with // normal function keys from the base keyboard rather than this overlay @@ -51,7 +51,7 @@ xkb_symbols "azerty" key <AB09> { [ colon, slash, U0323 ] }; // COLON, SLASH, COMBINING DOT BELOW key <AB10> { [ exclam, U00A7 ] }; // EXCLAMATION MARK, SECTION SIGN key <AC01> { [ q, Q, U2014, U2013 ] }; // SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH - key <AC02> { [ s, S, U201C, U201D ] }; // SMALL LETTER S, CAPITAL LETTER S, LEFT DOUBLE QUOTES, RIGHT DOUBLE QUOTES + key <AC02> { [ s, S, U201C, U201D ] }; // SMALL LETTER S, CAPITAL LETTER S, LEFT DOUBLE QUOTES, RIGHT DOUBLE QUOTES key <AC03> { [ d, D, U0257, U018A ] }; // SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK key <AC04> { [ f, F, U00E6, U00C6 ] }; // SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE key <AC05> { [ g, G, U02BC, UA78B ] }; // SMALL LETTER G, CAPITAL LETTER G, CURVED GLOTTAL, CAPITAL LETTER GLOTTAL (SALTILLO) @@ -332,7 +332,7 @@ xkb_symbols "mmuock" { key <AD09> { [ o, O, Greek_phi, Greek_PHI ] }; key <AD10> { [ p, P, Greek_pi, Greek_PI ] }; key <AD11> { [ oslash, Oslash, bracketleft, braceleft ] }; - key <AD12> { [Greek_sigma, Greek_SIGMA, bracketright, braceright ] }; + key <AD12> { [Greek_sigma, Greek_SIGMA, bracketright, braceright ] }; key <AC01> { [ a, A, U0303 ] }; // tone 0 key <AC02> { [ s, S, U0304 ] }; // tone 1 @@ -301,7 +301,7 @@ xkb_symbols "ro_nodeadkeys" { }; // German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten) -// Have acute and grave as dead keys, tilde and circumflex alive as they are needed +// Have acute and grave as dead keys, tilde and circumflex alive as they are needed // in many programming languages. // to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de // source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php @@ -628,7 +628,7 @@ xkb_symbols "dsb_qwertz" partial alphanumeric_keys xkb_symbols "qwerty" { - // This layout should work exactly as a de with the exception + // This layout should work exactly as a de with the exception // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). // 2008 by Matej Košík <kosik@fiit.stuba.sk> diff --git a/symbols/digital_vndr/lk b/symbols/digital_vndr/lk index 24308658..8cfd483e 100644 --- a/symbols/digital_vndr/lk +++ b/symbols/digital_vndr/lk @@ -20,13 +20,13 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. // // HISTORY -// Log: lk,v +// Log: lk,v // Revision 1.2 1996/06/18 09:10:09 erik // use flags correctly, assorted cleanups and consortium fixes // @@ -37,11 +37,11 @@ // Revision 1.1.2.2 1994/10/31 15:22:00 William_Walker // New experimental version. // [1994/10/31 14:48:37 William_Walker] -// +// // EndLog -// +// // @(#)RCSfile: lk,v Revision: 1.2 (DEC) Date: 1996/01/24 12:14:58 -// +// // Symbols common to all the LK-style keyboards. // default xkb_symbols "common" { diff --git a/symbols/digital_vndr/pc b/symbols/digital_vndr/pc index f50d4cde..d64daabf 100644 --- a/symbols/digital_vndr/pc +++ b/symbols/digital_vndr/pc @@ -20,7 +20,7 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. @@ -37,31 +37,31 @@ // Revision 1.1.6.3 1995/10/25 21:01:09 William_Walker // Make sure we use DIN 2137 and VT510 Spec for Group Semantics // [1995/10/23 15:49:03 William_Walker] -// +// // Revision 1.1.6.2 1995/08/07 17:40:40 William_Walker // Upgrade XKB to protocol 0.62 (dual submit from decx11) // [1995/08/06 14:06:32 William_Walker] -// +// // Revision 1.1.2.7 1995/08/05 15:25:57 William_Walker // Sync up with Erik's pool. // [1995/08/03 20:17:15 William_Walker] -// +// // Revision 1.1.2.6 1995/06/27 12:18:25 William_Walker // Add LK201 and LK450 support as well as TW and DP variants. // [1995/06/26 20:29:52 William_Walker] -// +// // Revision 1.1.2.5 1995/06/08 17:10:28 William_Walker // Make RALT default to Mode_switch // [1995/06/08 17:08:50 William_Walker] -// +// // Revision 1.1.2.4 1995/06/05 19:24:14 William_Walker // New file. I love keymaps. // [1995/06/05 18:17:03 William_Walker] -// +// // EndLog -// -// @(#)RCSfile: pc Revision: /main/4 (DEC) Date: 1996/01/24 12:15:02 -// +// +// @(#)RCSfile: pc Revision: /main/4 (DEC) Date: 1996/01/24 12:15:02 +// // ************************************************************** // * * diff --git a/symbols/digital_vndr/us b/symbols/digital_vndr/us index e737e4e3..41de6199 100644 --- a/symbols/digital_vndr/us +++ b/symbols/digital_vndr/us @@ -20,7 +20,7 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. @@ -37,27 +37,27 @@ // Revision 1.1.6.2 1995/10/25 21:01:25 William_Walker // Add pc104-key support // [1995/10/23 15:46:27 William_Walker] -// +// // Revision 1.1.2.7 1995/06/27 12:18:40 William_Walker // Add LK201 and LK450 support as well as TW and DP variants. // [1995/06/26 20:30:33 William_Walker] -// +// // Revision 1.1.2.6 1995/06/09 20:55:20 William_Walker // Add VT105 layout support and ISO group support // [1995/06/09 20:43:05 William_Walker] -// +// // Revision 1.1.2.5 1995/06/08 21:05:49 William_Walker // Use ISO_Next_Group instead of grouplock // [1995/06/08 21:03:56 William_Walker] -// +// // Revision 1.1.2.4 1995/06/05 19:25:00 William_Walker // New file. I love keymaps. // [1995/06/05 18:17:54 William_Walker] -// +// // EndLog -// -// @(#)RCSfile: us Revision: /main/4 (DEC) Date: 1996/01/24 12:15:05 -// +// +// @(#)RCSfile: us Revision: /main/4 (DEC) Date: 1996/01/24 12:15:05 +// // ************************************************************** // * * @@ -130,7 +130,7 @@ xkb_symbols "us" { xkb_symbols "vt105-tw" { include "digital_vndr/us(us)" include "digital_vndr/vt(vt105)" - override key <AE03> { + override key <AE03> { symbols[Group1]= [ 3, numbersign ], symbols[Group2]= [ sterling ] }; @@ -152,7 +152,7 @@ xkb_symbols "vt108-tw" { include "digital_vndr/us(us)" include "digital_vndr/vt(vt108)" replace key <LCMP> { [ Multi_key ] }; - override key <AE03> { + override key <AE03> { symbols[Group1]= [ 3, numbersign ], symbols[Group2]= [ sterling ] }; diff --git a/symbols/digital_vndr/vt b/symbols/digital_vndr/vt index 13f7941c..580ae25a 100644 --- a/symbols/digital_vndr/vt +++ b/symbols/digital_vndr/vt @@ -20,7 +20,7 @@ //OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR //THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -//Except as contained in this notice, the name of the Digital Equipment +//Except as contained in this notice, the name of the Digital Equipment //Corporation shall not be used in advertising or otherwise to promote //the sale, use or other dealings in this Software without prior written //authorization from Digital Equipment Corporation. @@ -37,23 +37,23 @@ // Revision 1.1.2.5 1995/07/11 21:20:50 William_Walker // Make RALT act as RALT // [1995/07/11 21:18:28 William_Walker] -// +// // Revision 1.1.2.4 1995/06/27 12:18:41 William_Walker // Add LK201 and LK450 support as well as TW and DP variants. // [1995/06/26 20:30:37 William_Walker] -// +// // Revision 1.1.2.3 1995/06/09 20:55:21 William_Walker // Add VT105 layout support and ISO group support // [1995/06/09 20:43:09 William_Walker] -// +// // Revision 1.1.2.2 1995/06/05 19:25:04 William_Walker // New file. I love keymaps. // [1995/06/05 18:17:58 William_Walker] -// +// // EndLog -// -// @(#)RCSfile: vt Revision: /main/3 (DEC) Date: 1996/01/24 12:15:08 -// +// +// @(#)RCSfile: vt Revision: /main/3 (DEC) Date: 1996/01/24 12:15:08 +// xkb_symbols "vt105" { // Modifier mappings @@ -519,12 +519,12 @@ xkb_symbols "bepo_latin9" { key <SPCE> { [ space, nobreakspace, underscore, nobreakspace ] }; // ␣ (espace insécable) _ (espace insécable) }; -// Version 1.1rc2 of the Bépo keyboard layout, +// Version 1.1rc2 of the Bépo keyboard layout, // normalized by the AFNOR NF Z71‐300 norm. -// +// // Layout: https://bepo.fr/wiki/Version_1.1rc2 // Normalization: https://normalisation.afnor.org/actualites/faq-clavier-francais/ -// +// // ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────╔═════════╗ // │ # ¶│ 1 „│ 2 “│ 3 ”│ 4 ⩽│ 5 ⩾║ 6 │ 7 ¬│ 8 ¼│ 9 ½│ 0 ¾│ ° ′│ ` ″║ ║ // │ $ –│ " —│ « <│ » >│ ( [│ ) ]║ @ ^│ + ±│ - −│ / ÷│ * ×│ = ≠│ % ‰║ <-- ║ diff --git a/symbols/fujitsu_vndr/jp b/symbols/fujitsu_vndr/jp index bcccd531..bb6dc0de 100644 --- a/symbols/fujitsu_vndr/jp +++ b/symbols/fujitsu_vndr/jp @@ -75,10 +75,10 @@ xkb_symbols "basic" { augment key <AB09> { [], [ kana_RU, kana_fullstop ] }; augment key <AB10> { [], [ kana_ME, kana_conjunctive ] }; key <AB11> { [ underscore ], [ kana_RO ] }; - key <UNK0> { [ Select ] }; - key <UNK1> { [ Massyo ] }; - key <UNK2> { [ Touroku ] }; - key <UNK3> { [ Zenkaku_Hankaku ] }; + key <UNK0> { [ Select ] }; + key <UNK1> { [ Massyo ] }; + key <UNK2> { [ Touroku ] }; + key <UNK3> { [ Zenkaku_Hankaku ] }; key <UNK4> { [ Eisu_Shift ] }; key <UNK5> { [ Mode_switch ] }; key <UNK6> { [ Cancel ] }; diff --git a/symbols/fujitsu_vndr/us b/symbols/fujitsu_vndr/us index f62b5c83..83169fe1 100644 --- a/symbols/fujitsu_vndr/us +++ b/symbols/fujitsu_vndr/us @@ -92,15 +92,15 @@ xkb_symbols "basic" { // End "Editing" section // Begin "Cursor" section - key <UNK0> { [ ] }; - key <UNK1> { [ ] }; - key <UNK2> { [ ] }; - key <PGUP> { [ Prior ] }; + key <UNK0> { [ ] }; + key <UNK1> { [ ] }; + key <UNK2> { [ ] }; + key <PGUP> { [ Prior ] }; key <HOME> { [ Home ] }; - key <PGDN> { [ Next ] }; - key <UNK3> { [ ] }; - key <DEL> { [ Delete ] }; - key <INS> { [ Insert ] }; + key <PGDN> { [ Next ] }; + key <UNK3> { [ ] }; + key <DEL> { [ Delete ] }; + key <INS> { [ Insert ] }; key <LEFT> { [ Left ] }; key <RGHT> { [ Right ] }; key <UP> { [ Up ] }; @@ -127,7 +127,7 @@ xkb_symbols "basic" { key <KP1> { [ KP_1 ] }; key <KP2> { [ KP_2 ] }; key <KP3> { [ KP_3 ] }; - key <KPEN> { [ KP_Enter ] }; + key <KPEN> { [ KP_Enter ] }; key <KP0> { [ KP_0 ] }; key <KP00> { [ KP_0 ] }; @@ -181,9 +181,9 @@ xkb_symbols "mac" { partial alphanumeric_keys -xkb_symbols "mac_intl" { +xkb_symbols "mac_intl" { - include "latin" + include "latin" name[Group1]="English (UK, Macintosh, intl.)"; diff --git a/symbols/hp_vndr/us b/symbols/hp_vndr/us index 8bbe2e60..9fb085e8 100644 --- a/symbols/hp_vndr/us +++ b/symbols/hp_vndr/us @@ -80,7 +80,7 @@ xkb_symbols "hil" { key <KP7> { [ KP_7 ] }; key <KP8> { [ KP_8 ] }; key <KP9> { [ KP_9 ] }; - key <KPEN> { [ KP_Enter ]}; + key <KPEN> { [ KP_Enter ]}; key <KP4> { [ KP_4 ] }; key <KP5> { [ KP_5 ] }; @@ -90,7 +90,7 @@ xkb_symbols "hil" { key <KP1> { [ KP_1 ] }; key <KP2> { [ KP_2 ] }; key <KP3> { [ KP_3 ] }; - key <KPTB> { [ KP_Tab ]}; + key <KPTB> { [ KP_Tab ]}; key <KP0> { [ KP_0 ] }; key <KPDL> { [ KP_Decimal ] }; @@ -346,13 +346,13 @@ xkb_symbols "def_qwerty" { key <AB01> { [ z, Z, greater ] }; }; -// def_dot: -// The Hungarian standard is the comma on the keypad not decimal dot, -// but programmers hate it -hidden partial keypad_keys -xkb_symbols "def_dot" { - key <KPDL> { [ KP_Delete, KP_Decimal ] }; -}; +// def_dot: +// The Hungarian standard is the comma on the keypad not decimal dot, +// but programmers hate it +hidden partial keypad_keys +xkb_symbols "def_dot" { + key <KPDL> { [ KP_Delete, KP_Decimal ] }; +}; // def_dead: @@ -474,76 +474,76 @@ include "level3(ralt_switch)" }; // The base Old Hungarian keys -// In the remarks you can read characters displayed only Unicode point +// In the remarks you can read characters displayed only Unicode point hidden partial alphanumeric_keys -xkb_symbols "oldhun_base" { +xkb_symbols "oldhun_base" { key.type[Group1]="FOUR_LEVEL_ALPHABETIC"; key <AD01> {[ U10CCE, U10C8E, backslash ]}; -//Old-Hungarian gy, Gy - key <AD02> {[ U10CF0, U10CB0 ]}; +//Old-Hungarian gy, Gy + key <AD02> {[ U10CF0, U10CB0 ]}; //Old Hungarian zs, Zs key <AD03> {[ U10CC9, U10C89, U10CCA, U10C8A ]}; //Old Hungarian e, E, close e, close E key <AD04> {[ U10CE2, U10CA2, U10CE3, U10CA3 ]}; -//Old Hungarian r, R, short r, short R +//Old Hungarian r, R, short r, short R key <AD05> {[ U10CE6, U10CA6, U10CF1, U10CB1 ]}; -//Old Hungarian t, T, ent-sharped sign,Ent-sharped sign +//Old Hungarian t, T, ent-sharped sign,Ent-sharped sign key <AD06> {[ U10CEF, U10CAF ]}; -//Old Hungarian z, Z +//Old Hungarian z, Z key <AD07> {[ U10CEA, U10CAA, U10CF2, U10CB2 ]}; -//Old Hungarian u, U, Old Hungarian us, Us +//Old Hungarian u, U, Old Hungarian us, Us key <AD08> {[ U10CD0, U10C90, U10CD1, U10C91 ]}; -//Old Hungarian i, I, ii, II +//Old Hungarian i, I, ii, II key <AD09> {[ U10CDB, U10C9B ]}; -//Old Hungarian o, O +//Old Hungarian o, O key <AD10> {[ U10CE0, U10CA0 ]}; -//Old Hungarian p, P +//Old Hungarian p, P key <AD11> {[ U10CDF, U10C9F ]}; //Old Hungarian oee, Oee key <AD12> {[ U10CEB, U10CAB, U10CD5, U10C95 ]}; -//Old Hungarian uu,Uu,unk,Unk +//Old Hungarian uu,Uu,unk,Unk key <AC01> {[ U10CC0, U10C80, U10CC3, U10C83 ]}; -//Old Hungarian a,A,amb,Amb +//Old Hungarian a,A,amb,Amb key <AC02> {[ U10CE4, U10CA4, U10CE1, U10CA1 ]}; -//Old Hungarian s,S,emp,Emp +//Old Hungarian s,S,emp,Emp key <AC03> {[ U10CC7, U10C87, U10CE7, U10CA7 ]}; //Old Hungarian d,D, ent/ant/int, Ent/Ant/Int key <AC04> {[ U10CCC, U10C8C, bracketleft ]}; -//Old Hungarian f,F +//Old Hungarian f,F key <AC05> {[ U10CCD, U10C8D, bracketright ]}; -//Old Hungarian g, G +//Old Hungarian g, G key <AC06> {[ U10CCF, U10C8F, U10CE9, U10CA9 ]}; -//Old Hungarian h, H,ech, Ech +//Old Hungarian h, H,ech, Ech key <AC07> {[ U10CD2, U10C92, backslash ]}; -//Old Hungarian j, J +//Old Hungarian j, J key <AC08> {[ U10CD3, U10C93, U10CD4, U10C94 ]}; -//Old Hungarian open k, open K, close k, close K +//Old Hungarian open k, open K, close k, close K key <AC09> {[ U10CD6, U10C96 ]}; -//Old Hungarian l, L +//Old Hungarian l, L key <AC10> {[ U10CCB, U10C8B ]}; -//Old Hungarian ee, EE +//Old Hungarian ee, EE key <AC11> {[ U10CC1, U10C81, U10CC8, U10C88 ]}; -//Old Hungarian aa, AA, and And +//Old Hungarian aa, AA, and And key <BKSL> {[ U10CEC, U10CAC ]}; -//Old Hungarian ue, Ue +//Old Hungarian ue, Ue key <AB01> {[ U10CD7, U10C97, greater ]}; -//Old Hungarian ly, Ly +//Old Hungarian ly, Ly key <AB02> {[ U10CE5, U10CA5, numbersign ]}; -//Old Hungarian sz, Sz +//Old Hungarian sz, Sz key <AB03> {[ U10CC4, U10C84, U10CC5, U10C85 ]}; -//Old Hungarian c,C, enc, Enc +//Old Hungarian c,C, enc, Enc key <AB04> {[ U10CEE, U10CAE, at ]}; -//Old Hungarian v,V +//Old Hungarian v,V key <AB05> {[ U10CC2, U10C82, braceleft ]}; -//Old Hungarian b, B +//Old Hungarian b, B key <AB06> {[ U10CD9, U10C99, braceright ]}; -//Old Hungarian n, N +//Old Hungarian n, N key <AB07> {[ U10CD8, U10C98, less ]}; -//Old Hungarian m, M +//Old Hungarian m, M key <AB08> {[ U2E41, U2E2E, U204F ]}; -//reversed question mark,reversed semicolon, reversed comma - key <AB09> {[ period, colon, greater ]}; - key <AB10> {[ minus, underscore, asterisk ]}; +//reversed question mark,reversed semicolon, reversed comma + key <AB09> {[ period, colon, greater ]}; + key <AB10> {[ minus, underscore, asterisk ]}; key <LSGT> {[ U10CD1, U10C91, less ]}; //Old Hungarian ii,II }; @@ -568,9 +568,9 @@ key.type[Group1]="FOUR_LEVEL_ALPHABETIC"; key <AE06> {[ U10CFF, slash, backslash, 6 ]}; //Old Hungarian thousand key <AE07> {[ U10CC6, U10C86, equal, 7 ]}; -//Old Hungarian cs, Cs +//Old Hungarian cs, Cs key <AE08> {[ U10CDA, U10C9A, parenleft, 8 ]}; -//Old Hungarian ny, Ny +//Old Hungarian ny, Ny key <AE09> {[ U10CE8, U10CA8, parenright, 9 ]}; //Old Hungarian ty, Ty key <AE10> {[ U10CDE, U10C9E, U10CDD, U10C9D ]}; @@ -578,7 +578,7 @@ key.type[Group1]="FOUR_LEVEL_ALPHABETIC"; key <AE11> {[ U10CED, U10CAD, section ]}; //Old Hungarian ue , Ue key <AE12> {[ U10CDC, U10C9C, copyright, U1F12F ]}; -//Old Hungarian oo, OO, copyleft +//Old Hungarian oo, OO, copyleft }; //Special section for "Old Hungarian (for ligatures)" layout @@ -596,23 +596,23 @@ key.type[Group1]="FOUR_LEVEL_ALPHABETIC"; key <AE03> {[ U10CFC, plus, minus, 3 ]}; //Old Hungarian ten key <AE04> {[ U10CFD, exclam, U203C, 4 ]}; -//Old Hungarian fifty,double exclam +//Old Hungarian fifty,double exclam key <AE05> {[ U10CFE, percent, U2026, 5 ]}; //Old Hungarian hundred, triple dot key <AE06> {[ U10CFF, slash, backslash, 6 ]}; //Old Hungarian thousand key <AE07> {[ U10CC6, U10C86, equal, 7 ]}; -//Old Hungarian cs, Cs +//Old Hungarian cs, Cs key <AE08> {[ U10CDA, U10C9A, parenleft, 8 ]}; -//Old Hungarian ny, Ny +//Old Hungarian ny, Ny key <AE09> {[ U10CE8, U10CA8, parenright, 9 ]}; //Old Hungarian ty, Ty key <AE10> {[ U10CDE, U10C9E, U10CDD, U10C9D ]}; -//Old Hungarian Rudimenta oe, Oe, Nikolsburg oe, Oe +//Old Hungarian Rudimenta oe, Oe, Nikolsburg oe, Oe key <AE11> {[ U10CED, U10CAD, section ]}; -//Old Hungarian ue , Ue +//Old Hungarian ue , Ue key <AE12> {[ U10CDC, U10C9C, copyright, U1F12F ]}; -//Old Hungarian oo, OO, copyleft +//Old Hungarian oo, OO, copyleft }; //Numpad for Old Hungarian layouts @@ -670,4 +670,4 @@ xkb_symbols "us" { key <AC01> {[ a, A, aacute, Aacute ]}; // a A á Á include "level3(ralt_switch)" -};
\ No newline at end of file +}; @@ -220,4 +220,3 @@ xkb_symbols "pegon-phonetic" { include "level3(ralt_switch)" }; - @@ -269,7 +269,7 @@ xkb_symbols "biblical" { // EXTRAS // Biblical hebrew (SIL) US Standard layout version 1.5 -// This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin +// This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin // by their more recent Unicodev6 counterparts // this map contains all the characters found in Biblical annotation, masoretic and Dead Sea Scroll related work. // The layout corresponds phonetically to a US standard layout or similar (Qwerty). @@ -320,7 +320,7 @@ xkb_symbols "biblicalSIL" { key <AC10> { [ U05B0, U05F4, semicolon, U05C3 ] }; //sva gers. p semicolon sof pasuq key <AC11> { [ U2019, U201D, U0323, U05C4 ] };//QuoteRight double R Quote punctum punctum Above - key <AB01> { [ hebrew_zain ] }; //Zayin - - + key <AB01> { [ hebrew_zain ] }; //Zayin - - key <AB02> { [ hebrew_chet ] }; //chet - - key <AB03> { [ hebrew_zade, U05E5 ] }; // tzade, final tzade - key <AB04> { [ hebrew_tet ] }; //tet - - @@ -333,5 +333,5 @@ xkb_symbols "biblicalSIL" { key <SPCE> { [ space, space, thinspace, nobreakspace ] };//space space thin space, nbsp - include "level3(ralt_switch)" + include "level3(ralt_switch)" }; @@ -138,7 +138,7 @@ xkb_symbols "mac" { include "level3(ralt_switch)" }; -// Used by Georgian people in Italy, +// Used by Georgian people in Italy, // contributed by Vladimer Sichinava partial alphanumeric_keys xkb_symbols "geo" { @@ -272,9 +272,9 @@ key.type[group1] = "ALPHABETIC"; key <AE05> { [ U01F5, U01F4 ] }; // gG with acute key <AE08> { [ uacute, Uacute ] }; key <AE09> { [ yacute, Yacute ] }; - key <AE10> { [ oacute, Oacute ] }; - key <AE11> { [ sacute, Sacute ] }; - key <AE12> { [ cacute, Cacute ] }; + key <AE10> { [ oacute, Oacute ] }; + key <AE11> { [ sacute, Sacute ] }; + key <AE12> { [ cacute, Cacute ] }; key <AD01> { [ q, Q ] }; key <AD02> { [ w, W ] }; @@ -331,14 +331,14 @@ xkb_symbols "tifinagh-alt-phonetic" { partial alphanumeric_keys xkb_symbols "rif" { - // Tarifit keyboard (QWERTY varient) + // Tarifit keyboard (QWERTY varient) // By Ilyahoo Proshel <ip@ipshel.com> 2021 // Only "ʷ ɛ ṭ ḍ γ ḥ ẓ ṣ" are supported by Rif Community. include "us" - name[Group1]= "Tarifit"; - + name[Group1]= "Tarifit"; + key <AD02> {[ w, W, U02B7 ]}; // ʷ key <AD03> {[ e, E, U025B, U0190 ]}; // e E ɛ Ɛ key <AD05> {[ t, T, U1E6D, U1E6C ]}; // t T ṭ Ṭ @@ -351,4 +351,3 @@ xkb_symbols "rif" { include "level3(ralt_switch)" }; - diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple index f74a71fd..d3f2d1b9 100644 --- a/symbols/macintosh_vndr/apple +++ b/symbols/macintosh_vndr/apple @@ -5,7 +5,7 @@ default partial modifier_keys xkb_symbols "extended" { - key <KPEQ> { [ KP_Equal ] }; + key <KPEQ> { [ KP_Equal ] }; // The key in the PC's Insert position is sometimes engraved Help (at least // in Switzerland and Great Britain), with Insert sometimes above. But in the @@ -41,7 +41,7 @@ xkb_symbols "laptop" { // the fn-keypad, so use the Enter key (right of <SPC>) for Mode_switch, // and use fn+Enter (Apple's code for Menu) for KP_Enter. replace key <KPEN> { [ ISO_Level3_Shift ] }; - modifier_map Mod5 { ISO_Level3_Shift }; + modifier_map Mod5 { ISO_Level3_Shift }; // Linux kernel bug with Menu on macs means this does not work yet // replace key <MENU> { [ KP_Enter ] }; // should be keycode 117 }; diff --git a/symbols/macintosh_vndr/ch b/symbols/macintosh_vndr/ch index aaf6f0ba..b127123a 100644 --- a/symbols/macintosh_vndr/ch +++ b/symbols/macintosh_vndr/ch @@ -6,7 +6,7 @@ default partial alphanumeric_keys xkb_symbols "extended" { - + name[Group1]= "Switzerland - German, Mac"; key <AE01> { [ 1, plus, plusminus, infinity ] }; @@ -25,7 +25,7 @@ xkb_symbols "extended" { key <AD02> { [ w, W, Greek_SIGMA, Aacute ] }; key <AD03> { [ e, E, EuroSign, Ediaeresis ] }; key <AD04> { [ r, R, registered, Egrave ] }; - key <AD05> { [ t, T, dagger, Icircumflex ] }; + key <AD05> { [ t, T, dagger, Icircumflex ] }; key <AD06> { [ z, Z, Greek_OMEGA, Iacute ] }; key <AD07> { [ u, U, degree, Ugrave ] }; key <AD08> { [ i, I, exclamdown, idotless ] }; @@ -34,7 +34,7 @@ xkb_symbols "extended" { key <AD11> { [ udiaeresis, egrave, section, ydiaeresis ] }; key <AD12> { [ dead_diaeresis, exclam, grave, apostrophe ] }; key <AC01> { [ a, A, aring, Aring ] }; - key <AC02> { [ s, S, ssharp, U1E9E ] }; + key <AC02> { [ s, S, ssharp, U1E9E ] }; // ligature fl key <AC03> { [ d, D, Greek_sigma, NoSymbol ] }; // partialderivative is not available here att @@ -50,7 +50,7 @@ xkb_symbols "extended" { key <AB02> { [ x, X, similarequal, trademark ] }; key <AB03> { [ c, C, copyright, NoSymbol ] }; key <AB04> { [ v, V, radical, diamond ] }; - key <AB05> { [ b, B, integral, NoSymbol ] }; + key <AB05> { [ b, B, integral, NoSymbol ] }; key <AB06> { [ n, N, dead_tilde, enopencircbullet ] }; // to be fixed att key <AB07> { [ m, M, mu, dead_abovering ] }; @@ -68,12 +68,12 @@ xkb_symbols "extended" { include "level3(ralt_switch)" }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "de" { include "macintosh_vndr/ch(extended)" }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "fr" { include "macintosh_vndr/ch(extended)" diff --git a/symbols/macintosh_vndr/de b/symbols/macintosh_vndr/de index 4e6e2b34..34c6af13 100644 --- a/symbols/macintosh_vndr/de +++ b/symbols/macintosh_vndr/de @@ -1,6 +1,6 @@ // olh@suse.de very close to MacOS map -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple US/ASCII @@ -32,7 +32,7 @@ xkb_symbols "basic" { key <AD08> { [ i, I, slash, Ucircumflex ] }; key <AD09> { [ o, O, oslash, Oslash ] }; key <AD11> { [ udiaeresis, Udiaeresis, periodcentered, degree ] }; - key <AD12> { [ plus, asterisk, asciitilde ] }; + key <AD12> { [ plus, asterisk, asciitilde ] }; key <AC01> { [ a, A, aring, Aring ] }; key <AC04> { [ f, F ] }; key <AC05> { [ g, G, copyright ] }; @@ -56,7 +56,7 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "Sundeadkeys" { // modify the default German layout to use Sun dead keys include "macintosh_vndr/de(basic)" @@ -72,12 +72,12 @@ xkb_symbols "Sundeadkeys" { key <BKSL> {[ numbersign, acute, dead_grave ]}; }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "sundeadkeys" { include "macintosh_vndr/de(Sundeadkeys)" }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "nodeadkeys" { // modify the default German layout to not have any dead keys include "macintosh_vndr/de(basic)" diff --git a/symbols/macintosh_vndr/dk b/symbols/macintosh_vndr/dk index 20a0236a..cdff44fb 100644 --- a/symbols/macintosh_vndr/dk +++ b/symbols/macintosh_vndr/dk @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US @@ -44,7 +44,7 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "macintosh_vndr/dk(basic)" name[Group1]= "Denmark - Mac, no dead keys"; diff --git a/symbols/macintosh_vndr/fi b/symbols/macintosh_vndr/fi index 23e3e0c3..fee2601e 100644 --- a/symbols/macintosh_vndr/fi +++ b/symbols/macintosh_vndr/fi @@ -1,10 +1,10 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "macintosh_vndr/se(basic)" // for consistent naming name[Group1]= "Finland - Mac"; }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "macintosh_vndr/se(basic)" // for consistent naming name[Group1]= "Finland - Mac, no dead keys"; diff --git a/symbols/macintosh_vndr/fr b/symbols/macintosh_vndr/fr index db21dd65..c2e38875 100644 --- a/symbols/macintosh_vndr/fr +++ b/symbols/macintosh_vndr/fr @@ -3,8 +3,8 @@ // adapted to the new input layer : // Martin Costabel <costabel@wanadoo.fr> 3-jan-2001 ////////////////////////////////////////////////////////////////// -// Petites Modification le juillet 2005 par Bin Zhang <bb.zhang@free.fr> : -// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE +// Petites Modification le juillet 2005 par Bin Zhang <bb.zhang@free.fr> : +// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE // 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign" // ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. ) // 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L @@ -93,7 +93,7 @@ xkb_symbols "extended" { xkb_symbols "nodeadkeys" { include "macintosh_vndr/fr(extended)" name[Group1]= "France - Mac, no dead keys"; - + key <AE01> { [ ampersand, 1, VoidSymbol, acute ] }; // MISSING: Apple key <AD11> { [asciicircum,diaeresis,ocircumflex, Ocircumflex ] }; key <BKSL> { [ grave, sterling, at, numbersign ] }; diff --git a/symbols/macintosh_vndr/gb b/symbols/macintosh_vndr/gb index 87e0b168..5ba10500 100644 --- a/symbols/macintosh_vndr/gb +++ b/symbols/macintosh_vndr/gb @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US @@ -12,6 +12,6 @@ xkb_symbols "basic" { key <AE03> { [ 3, sterling, numbersign ] }; key <TLDE> { [ section, plusminus ] }; key <LSGT> { [ grave, asciitilde ] }; - + include "level3(ralt_switch)" }; diff --git a/symbols/macintosh_vndr/is b/symbols/macintosh_vndr/is index 6bef10d8..a30c8a66 100644 --- a/symbols/macintosh_vndr/is +++ b/symbols/macintosh_vndr/is @@ -73,7 +73,7 @@ xkb_symbols "basic" { key <AE11> { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; key <AE12> { [ minus, underscore, endash, emdash ] }; - + //-- Row 4 (D) --// key <AD01> { [ q, Q, paragraph, VoidSymbol ] }; key <AD02> { [ w, W, U2211, VoidSymbol ] }; @@ -87,8 +87,8 @@ xkb_symbols "basic" { key <AD10> { [ p, P, Greek_pi, Greek_PI ] }; key <AD11> { [ eth, ETH, U201e, U201c ] }; key <AD12> { [ apostrophe, question, questiondown, U00B7 ] }; - - + + //-- Row 3 (C) --// key <AC01> { [ a, A, aring, Aring ] }; key <AC02> { [ s, S, ssharp, abovedot ] }; @@ -102,8 +102,8 @@ xkb_symbols "basic" { key <AC10> { [ ae, AE, oe, OE ] }; key <AC11> { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; key <BKSL> { [ plus, asterisk, U2022, plusminus ] }; - - + + //-- Row 2 (B) --// key <LSGT> { [ less, greater, section, UF8FF ] }; key <AB01> { [ z, Z, U3A9, VoidSymbol ] }; diff --git a/symbols/macintosh_vndr/latam b/symbols/macintosh_vndr/latam index 31172f78..70d70b1f 100644 --- a/symbols/macintosh_vndr/latam +++ b/symbols/macintosh_vndr/latam @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple mac_US diff --git a/symbols/macintosh_vndr/nl b/symbols/macintosh_vndr/nl index d9884cb9..e2f01910 100644 --- a/symbols/macintosh_vndr/nl +++ b/symbols/macintosh_vndr/nl @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin" diff --git a/symbols/macintosh_vndr/no b/symbols/macintosh_vndr/no index 9c703cbe..66fe682f 100644 --- a/symbols/macintosh_vndr/no +++ b/symbols/macintosh_vndr/no @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US @@ -35,7 +35,7 @@ xkb_symbols "basic" { }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "nodeadkeys" { // Modifies the basic Norwegian layout to no dead keys diff --git a/symbols/macintosh_vndr/pt b/symbols/macintosh_vndr/pt index 6233d0c4..76147abf 100644 --- a/symbols/macintosh_vndr/pt +++ b/symbols/macintosh_vndr/pt @@ -1,6 +1,6 @@ // mac version from Ricardo Cabral <bfe00991@mail.telepac.pt> -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US @@ -34,22 +34,22 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "Sundeadkeys" { include "macintosh_vndr/pt(basic)" // for consistent naming name[Group1]= "Portugal - Mac, Sun dead keys"; - + key <AE12> {[ plus, asterisk, dead_diaeresis, dead_diaeresis ]}; key <AC11> {[ dead_tilde, dead_circumflex ]}; key <AD12> {[ dead_acute, dead_grave ]}; }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "sundeadkeys" { include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "macintosh_vndr/pt(basic)" // for consistent naming name[Group1]= "Portugal - Mac, no dead keys"; diff --git a/symbols/macintosh_vndr/se b/symbols/macintosh_vndr/se index 25ef81c4..e47d1d11 100644 --- a/symbols/macintosh_vndr/se +++ b/symbols/macintosh_vndr/se @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US @@ -37,7 +37,7 @@ xkb_symbols "basic" { }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "macintosh_vndr/se(basic)" // for consistent naming name[Group1]= "Sweden - Mac, no dead keys"; @@ -356,4 +356,3 @@ xkb_symbols "zgt" { include "level3(ralt_switch)" }; - diff --git a/symbols/nec_vndr/jp b/symbols/nec_vndr/jp index 2931f3ad..28b51bee 100644 --- a/symbols/nec_vndr/jp +++ b/symbols/nec_vndr/jp @@ -150,7 +150,7 @@ default xkb_symbols "pc98" { key <KP0> { [ KP_0 ] }; key <KPSP> { [ KP_Separator ] }; key <KPDC> { [ KP_Decimal ] }; -// key <KPEN> { [ KP_Enter ] }; +// key <KPEN> { [ KP_Enter ] }; // End "Keypad" section modifier_map Shift { Shift_L }; diff --git a/symbols/nokia_vndr/rx-44 b/symbols/nokia_vndr/rx-44 index d7f287a4..f646cdc5 100644 --- a/symbols/nokia_vndr/rx-44 +++ b/symbols/nokia_vndr/rx-44 @@ -1,7 +1,7 @@ partial alphanumeric_keys xkb_symbols "us" { name[Group1] = "U.S. English"; - + include "nokia_vndr/rx-44(base)" key <AC01> { [ a, A, exclam, exclam ] }; diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 index 8c7b14ce..610435f5 100644 --- a/symbols/nokia_vndr/rx-51 +++ b/symbols/nokia_vndr/rx-51 @@ -4,7 +4,7 @@ xkb_symbols "common" { include "nokia_vndr/rx-51(modifiers)" key <BKSP> { [ BackSpace, Delete, BackSpace, Delete ] }; - + // This section should not be included by any other section. // It's referenced only once by rule file to allow multiple layout configurations. @@ -1075,7 +1075,7 @@ xkb_symbols "lv" { key <AD08> { symbols[Group2] = [ imacron, Imacron, 8, 8 ] }; key <AD09> { symbols[Group2] = [ omacron, Omacron, 9, 9 ] }; key <AD10> { symbols[Group2] = [ p, P, 0, 0 ] }; - key <AB08> { symbols[Group1] = [ ISO_Group_Latch, semicolon, equal, equal], + key <AB08> { symbols[Group1] = [ ISO_Group_Latch, semicolon, equal, equal], symbols[Group2] = [ comma, semicolon, equal, equal ] }; // 2. row @@ -85,7 +85,7 @@ xkb_symbols "basic" { // C row; Home row, left side key <AC01> { [ U0061, U0041, U00E6, U00C6 ] }; // a A æ Æ key <AC02> { [ U0073, U0053, U00A7, VoidSymbol ] }; // s S § - key <AC03> { [ U0064, U0044, VoidSymbol, VoidSymbol ] }; // d D + key <AC03> { [ U0064, U0044, VoidSymbol, VoidSymbol ] }; // d D key <AC04> { [ U0066, U0046, VoidSymbol, U00AA ] }; // f F ª key <AC05> { [ U0067, U0047, VoidSymbol, VoidSymbol ] }; // g G // C row; Home row, right side @@ -139,9 +139,9 @@ xkb_symbols "qwertz" { // Polish Dvorak keymaps // by Rafal Rzepecki <divide@users.sf.net> -// The base keymap "pl" places Polish quotes on quotemark key and -// moves the dead symbols from there to "1/!" key. If you are used to common -// dead keys placement, you could use "pl_altquotes"; in this layout +// The base keymap "pl" places Polish quotes on quotemark key and +// moves the dead symbols from there to "1/!" key. If you are used to common +// dead keys placement, you could use "pl_altquotes"; in this layout // dead keys remain in the old place, whereas Polish quotes are placed on the // "1/!" key. If you do not use Polish quotes at all, you can use "pl_basic" map. @@ -430,7 +430,7 @@ xkb_symbols "ru_phonetic_dvorak" { // EXTRAS: // A Polish keymap with a comprehensive set of quotes, dashes, and dead accents -// +// // See http://marcinwolinski.pl/keyboard/ for a description. // // ┌────┐ @@ -279,7 +279,7 @@ xkb_symbols "phonetic_YAZHERTY" { include "ru(phonetic_winkeys)" name[Group1]= "Russian (phonetic, YAZHERTY)"; key <LatW> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key <LatV> { [ Cyrillic_ve, Cyrillic_VE ] }; + key <LatV> { [ Cyrillic_ve, Cyrillic_VE ] }; }; @@ -1006,7 +1006,7 @@ xkb_symbols "prxn" { key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, Cyrillic_je, Cyrillic_JE, U04CF, U04C0, U030A, U0325 ] }; // й Й ј Ј ӏ Ӏ, Combining Ring Above and Below key <AD02> { [ Cyrillic_tse, Cyrillic_TSE, U04B5, U04B4, Cyrillic_u_straight, Cyrillic_U_straight, U051B, U051A ] }; // ц Ц ҵ Ҵ ү Ү ԛ Ԛ key <AD03> { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU, Cyrillic_u_straight_bar,Cyrillic_U_straight_bar, Byelorussian_shortu, Byelorussian_SHORTU ] }; // у У ў Ў ұ Ұ ў Ў - key <AD04> { [ Cyrillic_ka, Cyrillic_KA, Cyrillic_ka_descender, Cyrillic_KA_descender, U049F, U049E, U046F, U046E ] }; // к К Қ қ ҟ Ҟ ѯ Ѯ + key <AD04> { [ Cyrillic_ka, Cyrillic_KA, Cyrillic_ka_descender, Cyrillic_KA_descender, U049F, U049E, U046F, U046E ] }; // к К Қ қ ҟ Ҟ ѯ Ѯ key <AD05> { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO, U0463, U0462, UA653, UA652 ] }; // е Е ё Ё ѣ Ѣ ꙓ Ꙓ key <AD06> { [ Cyrillic_en, Cyrillic_EN, Cyrillic_nje, Cyrillic_NJE, Cyrillic_en_descender, Cyrillic_EN_descender, U04C8, U04C7 ] }; // н Н њ Њ ң Ң ӈ Ӈ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE, Ukrainian_ghe_with_upturn,Ukrainian_GHE_WITH_UPTURN, Cyrillic_ghe_bar, Cyrillic_GHE_bar, U04F7, U04F6 ] }; // г Г Ґ ґ ғ Ғ ӷ Ӷ @@ -1078,7 +1078,7 @@ xkb_symbols "unipunct" { include "us(basic)" name[Group1]= "Russian (with US punctuation)"; - + // Единственный символ, который отсутствует на US раскладке - № key <AE03> { [ 3, numbersign, 3, numerosign ] }; diff --git a/symbols/sharp_vndr/sl-c3x00 b/symbols/sharp_vndr/sl-c3x00 index 3d4e3393..8867b9e4 100644 --- a/symbols/sharp_vndr/sl-c3x00 +++ b/symbols/sharp_vndr/sl-c3x00 @@ -28,7 +28,7 @@ xkb_symbols "basic" { key <AD08> { [ i, I, braceright ] }; key <AD09> { [ o, O ] }; key <AD10> { [ p, P ] }; - + key <TAB> { [ Tab, ISO_Left_Tab, Caps_Lock ] }; key <AC01> { [ a, A ] }; @@ -51,7 +51,7 @@ xkb_symbols "basic" { key <AB07> { [ m, M ] }; key <RTSH> { [ Shift_R ] }; key <RTRN> { [ Return ] }; - + key <RALT> { [ ISO_Level3_Shift ] }; key <LCTL> { [ Control_L ] }; @@ -59,7 +59,7 @@ xkb_symbols "basic" { key <SPCE> { [ space ] }; key <AB08> { [ comma, slash, less ] }; key <AB09> { [ period, question, greater ] }; - + key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/symbols/sharp_vndr/ws003sh b/symbols/sharp_vndr/ws003sh index 8b4b96e6..a052bb5a 100644 --- a/symbols/sharp_vndr/ws003sh +++ b/symbols/sharp_vndr/ws003sh @@ -27,7 +27,7 @@ xkb_symbols "basic" { key <AD08> { [ i, I, bracketright ] }; key <AD09> { [ o, O, underscore ] }; key <AD10> { [ p, P, at ] }; - + key <TAB> { [ Tab, Tab, Escape ] }; key <AC01> { [ a, A ] }; @@ -58,7 +58,7 @@ xkb_symbols "basic" { key <LCTL> { [ Control_L ] }; key <SPCE> { [ space ] }; - + key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/symbols/sharp_vndr/ws007sh b/symbols/sharp_vndr/ws007sh index 6bbfdd47..1db41b20 100644 --- a/symbols/sharp_vndr/ws007sh +++ b/symbols/sharp_vndr/ws007sh @@ -27,7 +27,7 @@ xkb_symbols "basic" { key <AD08> { [ i, I, bracketright ] }; key <AD09> { [ o, O, underscore ] }; key <AD10> { [ p, P, at ] }; - + key <TAB> { [ Tab, Tab, Escape ] }; key <AC01> { [ a, A ] }; @@ -58,7 +58,7 @@ xkb_symbols "basic" { key <LCTL> { [ Control_L ] }; key <SPCE> { [ space ] }; - + key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/symbols/sharp_vndr/ws011sh b/symbols/sharp_vndr/ws011sh index 44b13b83..30630b62 100644 --- a/symbols/sharp_vndr/ws011sh +++ b/symbols/sharp_vndr/ws011sh @@ -20,7 +20,7 @@ xkb_symbols "basic" { key <AD09> { [ o, O, underscore ] }; key <AD10> { [ p, P, at ] }; key <BKSP> { [ BackSpace, BackSpace, Delete ] }; - + key <TAB> { [ Tab, Tab, Escape ] }; key <AC01> { [ a, A, bracketleft ] }; key <AC02> { [ s, S, apostrophe ] }; @@ -52,7 +52,7 @@ xkb_symbols "basic" { key <LCTL> { [ Control_L ] }; key <SPCE> { [ space ] }; - + key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/symbols/sharp_vndr/ws020sh b/symbols/sharp_vndr/ws020sh index 294fb601..d6cd1a17 100644 --- a/symbols/sharp_vndr/ws020sh +++ b/symbols/sharp_vndr/ws020sh @@ -20,7 +20,7 @@ xkb_symbols "basic" { key <AD09> { [ o, O, 3 ] }; key <AD10> { [ p, P, at ] }; key <BKSP> { [ BackSpace, BackSpace, Delete ] }; - + key <TAB> { [ Tab, Tab, Escape ] }; key <AC01> { [ a, A, bracketleft ] }; key <AC02> { [ s, S, apostrophe ] }; @@ -52,7 +52,7 @@ xkb_symbols "basic" { key <LCTL> { [ Control_L ] }; key <SPCE> { [ space ] }; - + key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/symbols/sony_vndr/us b/symbols/sony_vndr/us index 69102bfb..03af8edb 100644 --- a/symbols/sony_vndr/us +++ b/symbols/sony_vndr/us @@ -77,7 +77,7 @@ xkb_symbols "nwp5461" { key <KP1> { [ KP_1 ] }; key <KP2> { [ KP_2 ] }; key <KP3> { [ KP_3 ] }; - key <KPEN> { [ KP_Enter ] }; + key <KPEN> { [ KP_Enter ] }; key <KP0> { [ KP_0 ] }; key <KPDC> { [ KP_Decimal ] }; diff --git a/symbols/sun_vndr/ara b/symbols/sun_vndr/ara index 53ad9177..54a242d5 100644 --- a/symbols/sun_vndr/ara +++ b/symbols/sun_vndr/ara @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -47,7 +47,7 @@ xkb_symbols "sun_type6" { key <AE10> { [ 0x1000660, parenleft, 0, parenleft ] }; key <AE11> { [ minus, underscore, minus, underscore ] }; key <AE12> { [ equal, plus, equal, plus ] }; - + key <AD01> { [ Arabic_dad, Arabic_fatha, q, Q ] }; key <AD02> { [ Arabic_sad, Arabic_fathatan, w, W ] }; key <AD03> { [ Arabic_theh, Arabic_damma, e, E ] }; diff --git a/symbols/sun_vndr/be b/symbols/sun_vndr/be index cfda74ad..36b34f82 100644 --- a/symbols/sun_vndr/be +++ b/symbols/sun_vndr/be @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/br b/symbols/sun_vndr/br index 643593dc..13ac705d 100644 --- a/symbols/sun_vndr/br +++ b/symbols/sun_vndr/br @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -31,7 +31,7 @@ default partial alphanumeric_keys xkb_symbols "sun_type6" { name[Group1]= "Portuguese (Brazil, Sun Type 6/7)"; - + include "sun_vndr/us(sun_type6)" key <TLDE> { [ apostrophe, quotedbl, notsign ] }; diff --git a/symbols/sun_vndr/ca b/symbols/sun_vndr/ca index 044d6ffa..695f8b52 100644 --- a/symbols/sun_vndr/ca +++ b/symbols/sun_vndr/ca @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -47,7 +47,7 @@ xkb_symbols "sun_type6" { key <AE10> { [ 0, parenright, bracketright ]}; key <AE11> { [ minus, underscore, onehalf ]}; key <AE12> { [ equal, plus, notsign ]}; - + key <AD03> { [ e, E, EuroSign ]}; key <AD09> { [ o, O, section ]}; key <AD10> { [ p, P, paragraph ]}; @@ -65,7 +65,7 @@ xkb_symbols "sun_type6" { key <AB08> { [ comma, apostrophe, less ]}; key <AB09> { [ period, quotedbl, greater ]}; key <AB10> { [ eacute, Eacute, grave ]}; - + include "level3(ralt_switch)" }; diff --git a/symbols/sun_vndr/ch b/symbols/sun_vndr/ch index b736f6d5..ab8a35d2 100644 --- a/symbols/sun_vndr/ch +++ b/symbols/sun_vndr/ch @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -67,7 +67,7 @@ xkb_symbols "sun_type6_de" { }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "sun_type6_fr" { name[Group1]= "French (Switzerland, Sun Type 6/7)"; @@ -102,7 +102,7 @@ xkb_symbols "sun_type6_fr" { key <AB08> { [ comma, semicolon ] }; key <AB09> { [ period, colon ] }; key <AB10> { [ minus, underscore ] }; - + include "level3(ralt_switch)" }; diff --git a/symbols/sun_vndr/cz b/symbols/sun_vndr/cz index 0048342e..91c5d469 100644 --- a/symbols/sun_vndr/cz +++ b/symbols/sun_vndr/cz @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -61,7 +61,7 @@ xkb_symbols "sun_type6" { key <AC04> { [ f, F, bracketleft ] }; key <AC05> { [ g, G, bracketright ] }; key <AC08> { [ k, K, lstroke ] }; - key <AC09> { [ l, L, Lstroke ] }; + key <AC09> { [ l, L, Lstroke ] }; key <AC10> { [ uring, quotedbl, dollar ] }; key <AC11> { [ section, exclam, ssharp, currency ] }; key <BKSL> { [ dead_diaeresis, apostrophe, backslash, bar ] }; diff --git a/symbols/sun_vndr/de b/symbols/sun_vndr/de index 97417fd4..5ed3734e 100644 --- a/symbols/sun_vndr/de +++ b/symbols/sun_vndr/de @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -35,7 +35,7 @@ xkb_symbols "sun_type6" { include "sun_vndr/us(sun_type6)" key <TLDE> { [ asciicircum, degree ] }; - key <AE02> { [ 2, quotedbl, twosuperior ] }; + key <AE02> { [ 2, quotedbl, twosuperior ] }; key <AE03> { [ 3, section, threesuperior ] }; key <AE04> { [ 4, dollar ] }; key <AE06> { [ 6, ampersand, section ] }; diff --git a/symbols/sun_vndr/dk b/symbols/sun_vndr/dk index 941341e2..5db1d042 100644 --- a/symbols/sun_vndr/dk +++ b/symbols/sun_vndr/dk @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -45,8 +45,8 @@ xkb_symbols "sun_type6" { key <AE09> { [ 9, parenright, bracketright ] }; key <AE10> { [ 0, equal, braceright ] }; key <AE11> { [ plus, question ] }; - key <AE12> { [ dead_acute, dead_grave, bar ] }; - key <AD03> { [ e, E, EuroSign ] }; + key <AE12> { [ dead_acute, dead_grave, bar ] }; + key <AD03> { [ e, E, EuroSign ] }; key <AD11> { [ aring, Aring ] }; key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; key <BKSL> { [ apostrophe, asterisk, grave ] }; diff --git a/symbols/sun_vndr/ee b/symbols/sun_vndr/ee index 7206da9b..6e996c6b 100644 --- a/symbols/sun_vndr/ee +++ b/symbols/sun_vndr/ee @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/es b/symbols/sun_vndr/es index f3011315..d1be776d 100644 --- a/symbols/sun_vndr/es +++ b/symbols/sun_vndr/es @@ -44,7 +44,7 @@ xkb_symbols "sun_type6" { key <AE06> { [ 6, ampersand, notsign ] }; key <AE07> { [ 7, slash ] }; key <AE08> { [ 8, parenleft ] }; - key <AE09> { [ 9, parenright ] }; + key <AE09> { [ 9, parenright ] }; key <AE10> { [ 0, equal ] }; key <AE11> { [ apostrophe, question, grave ] }; key <AE12> { [ exclamdown, questiondown ] }; @@ -57,7 +57,7 @@ xkb_symbols "sun_type6" { key <AB08> { [ comma, semicolon ] }; key <AB09> { [ period, colon ] }; key <AB10> { [ minus, underscore ] }; - + include "level3(ralt_switch)" }; diff --git a/symbols/sun_vndr/fr b/symbols/sun_vndr/fr index 9a78f145..0dba5955 100644 --- a/symbols/sun_vndr/fr +++ b/symbols/sun_vndr/fr @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/gb b/symbols/sun_vndr/gb index d06ba0fe..c95b0084 100644 --- a/symbols/sun_vndr/gb +++ b/symbols/sun_vndr/gb @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/gr b/symbols/sun_vndr/gr index 218e9505..1b8b5233 100644 --- a/symbols/sun_vndr/gr +++ b/symbols/sun_vndr/gr @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/it b/symbols/sun_vndr/it index c85fd16a..8894a405 100644 --- a/symbols/sun_vndr/it +++ b/symbols/sun_vndr/it @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -40,16 +40,16 @@ xkb_symbols "sun_type6" { key <AE03> { [ 3, sterling ] }; key <AE06> { [ 6, ampersand ] }; key <AE07> { [ 7, slash ] }; - key <AE08> { [ 8, parenleft, braceleft ] }; - key <AE09> { [ 9, parenright, braceright ] }; + key <AE08> { [ 8, parenleft, braceleft ] }; + key <AE09> { [ 9, parenright, braceright ] }; key <AE10> { [ 0, equal ] }; - key <AE11> { [ apostrophe, question, grave ] }; + key <AE11> { [ apostrophe, question, grave ] }; key <AE12> { [ igrave, asciicircum ] }; key <AD03> { [ e, E, EuroSign ] }; key <AD11> { [ egrave, eacute, bracketleft, dead_abovering ] }; - key <AD12> { [ plus, asterisk, bracketright ] }; + key <AD12> { [ plus, asterisk, bracketright ] }; key <BKSL> { [ ugrave, section, asciitilde ] }; - key <AC10> { [ ograve, ccedilla, at ] }; + key <AC10> { [ ograve, ccedilla, at ] }; key <AC11> { [ agrave, degree, numbersign ] }; key <AB08> { [ comma, semicolon ] }; key <AB09> { [ period, colon ] }; diff --git a/symbols/sun_vndr/jp b/symbols/sun_vndr/jp index 82cd70ad..eb764a6d 100644 --- a/symbols/sun_vndr/jp +++ b/symbols/sun_vndr/jp @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/kr b/symbols/sun_vndr/kr index 58a1a03e..4af26f43 100644 --- a/symbols/sun_vndr/kr +++ b/symbols/sun_vndr/kr @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -80,4 +80,3 @@ partial function_keys xkb_symbols "rctrl_hanja" { include "kr(rctrl_hanja)" }; - diff --git a/symbols/sun_vndr/lt b/symbols/sun_vndr/lt index dc0fdbe5..1aff0b17 100644 --- a/symbols/sun_vndr/lt +++ b/symbols/sun_vndr/lt @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/lv b/symbols/sun_vndr/lv index aa128433..f0ae7a14 100644 --- a/symbols/sun_vndr/lv +++ b/symbols/sun_vndr/lv @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/nl b/symbols/sun_vndr/nl index 737ed068..47cfb20d 100644 --- a/symbols/sun_vndr/nl +++ b/symbols/sun_vndr/nl @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/no b/symbols/sun_vndr/no index b1375d9f..fccb21de 100644 --- a/symbols/sun_vndr/no +++ b/symbols/sun_vndr/no @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -51,7 +51,7 @@ xkb_symbols "sun_type6" { key <AD03> { [ e, E, EuroSign ] }; key <AD11> { [ aring, Aring ] }; key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; - key <AC10> { [ oslash, Oslash ] }; + key <AC10> { [ oslash, Oslash ] }; key <AC11> { [ ae, AE ] }; key <AB08> { [ comma, semicolon ] }; key <AB09> { [ period, colon ] }; diff --git a/symbols/sun_vndr/pl b/symbols/sun_vndr/pl index 8b8949e2..43155cef 100644 --- a/symbols/sun_vndr/pl +++ b/symbols/sun_vndr/pl @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -48,7 +48,7 @@ xkb_symbols "sun_type6" { key <AE11> { [ minus, underscore ] }; key <AE12> { [ equal, plus ] }; - key <AD03> { [ e, E, eogonek, Eogonek ] }; + key <AD03> { [ e, E, eogonek, Eogonek ] }; key <AD07> { [ u, U, EuroSign ] }; key <AD09> { [ o, O, oacute, Oacute ] }; key <AD11> { [ bracketleft, braceleft ] }; diff --git a/symbols/sun_vndr/pt b/symbols/sun_vndr/pt index 222a0b64..c467b077 100644 --- a/symbols/sun_vndr/pt +++ b/symbols/sun_vndr/pt @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -48,7 +48,7 @@ xkb_symbols "sun_type6" { key <AE11> { [ apostrophe, question, grave ] }; key <AE12> { [ guillemotleft, guillemotright ] }; key <AD03> { [ e, E, EuroSign ] }; - key <AD11> { [ plus, asterisk, dead_diaeresis ] }; + key <AD11> { [ plus, asterisk, dead_diaeresis ] }; key <AD12> { [ dead_acute, dead_grave ] }; key <BKSL> { [ dead_tilde, dead_circumflex ] }; key <AC10> { [ ccedilla, Ccedilla ] }; diff --git a/symbols/sun_vndr/ro b/symbols/sun_vndr/ro index 292f86e7..2db3f4ee 100644 --- a/symbols/sun_vndr/ro +++ b/symbols/sun_vndr/ro @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/ru b/symbols/sun_vndr/ru index aae97bdf..2aef65bf 100644 --- a/symbols/sun_vndr/ru +++ b/symbols/sun_vndr/ru @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/se b/symbols/sun_vndr/se index 99202966..6cdc08ab 100644 --- a/symbols/sun_vndr/se +++ b/symbols/sun_vndr/se @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/sk b/symbols/sun_vndr/sk index 2687fe4f..b47fa4be 100644 --- a/symbols/sun_vndr/sk +++ b/symbols/sun_vndr/sk @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/tr b/symbols/sun_vndr/tr index 9e604572..191307f5 100644 --- a/symbols/sun_vndr/tr +++ b/symbols/sun_vndr/tr @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -54,7 +54,7 @@ xkb_symbols "sun_type6" { key <AD12> { [udiaeresis, Udiaeresis, asciitilde ] }; key <AC10> { [ scedilla, Scedilla, acute ] }; - key <AC11> { [ i, Iabovedot ] }; + key <AC11> { [ i, Iabovedot ] }; key <BKSL> { [ comma, semicolon, grave ] }; key <LSGT> { [ less, greater, bar ] }; diff --git a/symbols/sun_vndr/tw b/symbols/sun_vndr/tw index 2296ad16..39b532c1 100644 --- a/symbols/sun_vndr/tw +++ b/symbols/sun_vndr/tw @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/ua b/symbols/sun_vndr/ua index 00701a77..e40eb9e8 100644 --- a/symbols/sun_vndr/ua +++ b/symbols/sun_vndr/ua @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us index adc876b1..c6fa178e 100644 --- a/symbols/sun_vndr/us +++ b/symbols/sun_vndr/us @@ -10,7 +10,7 @@ // copyright notice(s) and this permission notice appear in all copies of // the Software and that both the above copyright notice(s) and this // permission notice appear in supporting documentation. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -20,7 +20,7 @@ // FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// +// // Except as contained in this notice, the name of a copyright holder // shall not be used in advertising or otherwise to promote the sale, use // or other dealings in this Software without prior written authorization @@ -190,7 +190,7 @@ xkb_symbols "alt-intl" { key <AC10> { [ semicolon, colon, dead_ogonek, dead_diaeresis ] }; key <AC11> { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] }; - + key <AB02> { [ x, X, periodcentered, dead_stroke ] }; key <AB08> { [ comma, less, dead_cedilla, dead_caron ] }; key <AB09> { [ period, greater, dead_abovedot, dead_circumflex ] }; @@ -2209,7 +2209,7 @@ xkb_symbols "3l-cros" { }; }; -// A 3l variant for emacs users, which maps control to caps lock and (re)maps +// A 3l variant for emacs users, which maps control to caps lock and (re)maps // tab back to tab. partial modifier_keys xkb_symbols "3l-emacs" { diff --git a/tests/reg2ll.xsl b/tests/reg2ll.xsl index 3a074943..aa2703e1 100644 --- a/tests/reg2ll.xsl +++ b/tests/reg2ll.xsl @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > <xsl:output method="text" @@ -26,7 +26,7 @@ <xsl:template match="layout"><xsl:text> </xsl:text><xsl:value-of select="./configItem/name"/>:"<xsl:value-of select="./configItem/description"/>"<xsl:apply-templates match="./variantList/variant"/></xsl:template> - + <xsl:template match="variant"><xsl:text> </xsl:text><xsl:value-of select="../../configItem/name"/>(<xsl:value-of select="./configItem/name"/>):"<xsl:value-of select="./configItem/description"/>"</xsl:template> diff --git a/tests/test_regressions.py b/tests/test_regressions.py index 9988a03a..cd305f8b 100644 --- a/tests/test_regressions.py +++ b/tests/test_regressions.py @@ -40,7 +40,7 @@ KEYCODE_PATTERN = re.compile( [A-Z] # Start with an upper case letter [A-Z0-9]{1,3} # Followed by up to 3 characters # Latin aliases - | Lat[A-Z] + | Lat[A-Z] # Special cases | VOL- | VOL\+ |