From b91f418b83d8b2db2596d7b0dd57cdf11a8605d1 Mon Sep 17 00:00:00 2001 From: svu Date: Mon, 18 Sep 2006 11:45:12 +0000 Subject: [PATCH] no more old pc symbols, b.fd.o#8321 --- ChangeLog | 189 +++++++++++++++++----------------------- geometry/pc | 2 +- rules/base.ml1_s.part | 5 +- rules/base.ml_s.part | 18 ++-- rules/compat/ml1_s.sh | 6 +- rules/compat/ml1v1_s.sh | 3 +- rules/compat/ml1v_s.sh | 3 +- rules/compat/ml_s.sh | 6 +- rules/compat/mlv_s.sh | 3 +- symbols/pc | 23 +---- 10 files changed, 99 insertions(+), 159 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3eb8b40..56eab8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,379 +1,350 @@ +2006-09-18 Sergey Udaltsov + + * geometry/pc, rules/base.ml1_s.part, rules/base.ml_s.part, + rules/compat/ml1_s.sh, rules/compat/ml1v1_s.sh, + rules/compat/ml1v_s.sh, rules/compat/ml_s.sh, rules/compat/mlv_s.sh, + symbols/pc: getting rid of pc101/102/104 legacy. Breaking XkbSymbols + again, https://bugs.freedesktop.org/show_bug.cgi?id=8321 + 2006-09-17 Sergey Udaltsov - * symbols/keypad, symbols/pc, symbols/us, symbols/macintosh_vndr/*, + 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 Mac stuff, thanks to Denis, https://bugs.freedesktop.org/show_bug.cgi?id=8280 -2006-09-17 Sergey Udaltsov - - symbols/pc: modularized numpad stuff, + * symbols/pc: modularized numpad stuff, https://bugs.freedesktop.org/show_bug.cgi?id=8312 2006-09-06 Sergey Udaltsov - rules/altwin: mapping LALT to Mod4 modifier, + * rules/altwin: mapping LALT to Mod4 modifier, https://bugs.freedesktop.org/show_bug.cgi?id=8068 2006-09-05 Sergey Udaltsov - rules/base.lists.part: adding missing kbds, reordering a bit + * rules/base.lists.part: adding missing kbds, reordering a bit https://bugs.freedesktop.org/show_bug.cgi?id=7816 -2006-09-05 Sergey Udaltsov - - geometry/ibm_vnd, configure.in, rules/base.m_g.part: getting rid of + * geometry/ibm_vnd, configure.in, rules/base.m_g.part: getting rid of ibm_vndr geometry, fixing rules, https://bugs.freedesktop.org/show_bug.cgi?id=7990 -2006-09-05 Sergey Udaltsov - - symbols/gb: s/ralt_switch/ralt_switch_multikey + * symbols/gb: s/ralt_switch/ralt_switch_multikey https://bugs.freedesktop.org/show_bug.cgi?id=7674 -2006-09-05 Sergey Udaltsov - - rules/base.mlv_s.part: fixing mac rule for nodeadkeys, + * rules/base.mlv_s.part: fixing mac rule for nodeadkeys, https://bugs.freedesktop.org/show_bug.cgi?id=8123 -2006-09-05 Sergey Udaltsov - - rules/base.ml_s.part: s/old_macintosh/macintosh_old/g, + * rules/base.ml_s.part: s/old_macintosh/macintosh_old/g, https://bugs.freedesktop.org/show_bug.cgi?id=8128 2006-09-04 Sergey Udaltsov - rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part, + * rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part, rules/base.m_s.part, rules/base.ml1_s.part, rules/base.ml_s.part, rules/base.mlv_s.part: fixing lists, https://bugs.freedesktop.org/show_bug.cgi?id=7817 -2006-09-04 Sergey Udaltsov - - symbols/cd, symbols/gr, symbols/il, symbols/jp, symbols/la, + * symbols/cd, symbols/gr, symbols/il, symbols/jp, symbols/la, symbols/lk, symbols/ru, symbols/ca: fixing types, on per-group basis, https://bugs.freedesktop.org/show_bug.cgi?id=8121 -2006-09-04 Sergey Udaltsov - - symbols/level3: adding level3:ralt_switch_multikey, + * symbols/level3: adding level3:ralt_switch_multikey, https://bugs.freedesktop.org/show_bug.cgi?id=7674 2006-09-03 Sergey Udaltsov - symbols/vn: getting rid of digits (1 and 2 shift levels), + * symbols/vn: getting rid of digits (1 and 2 shift levels), https://bugs.freedesktop.org/show_bug.cgi?id=7807 -2006-09-03 Sergey Udaltsov - - rules/base.xml.in: s/guillemot/guillemet/, closing + * rules/base.xml.in: s/guillemot/guillemet/, closing https://bugs.freedesktop.org/show_bug.cgi?id=8116 2006-09-02 Sergey Udaltsov - symbols/lt, rules/base.xml.in: added lt(ibm) + * symbols/lt, rules/base.xml.in: added lt(ibm) https://bugs.freedesktop.org/show_bug.cgi?id=3841 -2006-09-02 Sergey Udaltsov - - symbols/hr: reverted Croatian + * symbols/hr: reverted Croatian https://bugs.freedesktop.org/show_bug.cgi?id=8019 2006-09-01 Sergey Udaltsov - symbols/ru, rules/base.xml.in: added Ossetian, closing + * symbols/ru, rules/base.xml.in: added Ossetian, closing https://bugs.freedesktop.org/show_bug.cgi?id=8092 -2006-09-01 Sergey Udaltsov - - symbols/ir, symbols/iq, rules/base.xml.in: added Kurdish Arabic-Latin + * symbols/ir, symbols/iq, rules/base.xml.in: added Kurdish Arabic-Latin 2006-08-31 Sergey Udaltsov - geometry/macintosh, keycodes/macintosh, keycodes/xfree86, + * geometry/macintosh, keycodes/macintosh, keycodes/xfree86, rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part, rules/base.m_s.part, rules/base.ml_s.part, rules/base.xml.in, symbols/inet: Added Macbook stuff, partially closing https://bugs.freedesktop.org/show_bug.cgi?id=8068 -2006-08-31 Sergey Udaltsov - - symbols/group, rules/base.o_s.part: added group:alt_caps_toggle + * symbols/group, rules/base.o_s.part: added group:alt_caps_toggle https://bugs.freedesktop.org/show_bug.cgi?id=8047 2006-08-02 Sergey Udaltsov - symbols/inet, keycodes/evdev: updated evdev + * symbols/inet, keycodes/evdev: updated evdev https://bugs.freedesktop.org/show_bug.cgi?id=7631 2006-07-30 Sergey Udaltsov - symbols/pl: added pl(csb) + * symbols/pl: added pl(csb) https://bugs.freedesktop.org/show_bug.cgi?id=7693 2006-07-29 Sergey Udaltsov - symbols/bt: fixed Bhutan + * symbols/bt: fixed Bhutan https://bugs.freedesktop.org/show_bug.cgi?id=7556 -2006-07-29 Sergey Udaltsov - - symbols/us: added dvorak-classic, closing + * symbols/us: added dvorak-classic, closing https://bugs.freedesktop.org/show_bug.cgi?id=7503 -2006-07-29 Sergey Udaltsov - - symbols/inet: added acer_c300, closing + * symbols/inet: added acer_c300, closing https://bugs.freedesktop.org/show_bug.cgi?id=6361 2006-07-29 Sergey Udaltsov - symbols/lk: updated Sinhala, thanks to Harshula + * symbols/lk: updated Sinhala, thanks to Harshula 2006-07-10 Sergey Udaltsov - symbols/de: added Mac variants, closing + * symbols/de: added Mac variants, closing https://bugs.freedesktop.org/show_bug.cgi?id=6671 2006-07-04 Sergey Udaltsov - symbols/ch: fixed KPDL in ch(de_mac), patch from + * symbols/ch: fixed KPDL in ch(de_mac), patch from https://bugs.freedesktop.org/show_bug.cgi?id=6960 2006-07-02 Sergey Udaltsov - rules/base.xml.in: fixed mismatch between directory and symbols/inet + * rules/base.xml.in: fixed mismatch between directory and symbols/inet file. https://bugs.freedesktop.org/show_bug.cgi?id=7398 -2006-07-02 Sergey Udaltsov - - symbols/ro: fixed Romanian academic + * symbols/ro: fixed Romanian academic https://bugs.freedesktop.org/show_bug.cgi?id=7393 2006-06-28 Sergey Udaltsov - keycodes/evdev: pc105 compatiliby, closing + * keycodes/evdev: pc105 compatiliby, closing https://bugs.freedesktop.org/show_bug.cgi?id=7347 2006-06-25 Sergey Udaltsov - rules/base.xml.in, geometry/pc, symbols/inet: added Dell Lattitude, + * rules/base.xml.in, geometry/pc, symbols/inet: added Dell Lattitude, https://bugs.freedesktop.org/show_bug.cgi?id=6894 -2006-06-25 Sergey Udaltsov - - symbols/inet, rules/base.xml.in: added 2 new layouts, closing + * symbols/inet, rules/base.xml.in: added 2 new layouts, closing https://bugs.freedesktop.org/show_bug.cgi?id=7325 -2006-06-25 Sergey Udaltsov - - symbols/np: added Nepali, closing + * symbols/np: added Nepali, closing https://bugs.freedesktop.org/show_bug.cgi?id=6373 2006-06-25 Sergey Udaltsov - geometry/pc, rules/base.lists.part, rules/base.m_g.part, + * geometry/pc, rules/base.lists.part, rules/base.m_g.part, rules/base.xml.in, symbols/kr: updated Korean layouts/geometry https://bugs.freedesktop.org/show_bug.cgi?id=7316 2006-06-22 Sergey Udaltsov - symbols/inet: fixing double RaiseVolume, closing + * symbols/inet: fixing double RaiseVolume, closing https://bugs.freedesktop.org/show_bug.cgi?id=7095 2006-06-14 Sergey Udaltsov - symbols/mt, rules/base.xml.in: fixed the US variant group name - -2006-06-14 Sergey Udaltsov - - symbols/gh: fixed 'D' key, closing + * symbols/mt, rules/base.xml.in: fixed the US variant group name + * symbols/gh: fixed 'D' key, closing https://bugs.freedesktop.org/show_bug.cgi?id=7216 2006-06-13 Sergey Udaltsov - symbols/level5, compat/level5: replacing F21-F23 with explicit + * symbols/level5, compat/level5: replacing F21-F23 with explicit hexadecimal values of XK_ISO_Level5_*. So for next months people could have Canadian layout fixed and, at the same time, do not have to upgrade xorg. Closing https://bugs.freedesktop.org/show_bug.cgi?id=4411 -2006-06-13 Sergey Udaltsov - - symbols/ch, symbols/inet, symbols/base.xml.in: added mac stuff from + * symbols/ch, symbols/inet, symbols/base.xml.in: added mac stuff from https://bugs.freedesktop.org/show_bug.cgi?id=6960 2006-06-13 Sergey Udaltsov - symbols/mt: fixed mt(us), closing + * symbols/mt: fixed mt(us), closing https://bugs.freedesktop.org/show_bug.cgi?id=1411 2006-06-10 Sergey Udaltsov - symbols/level5, compat5/level5: better working Canadian + * symbols/level5, compat5/level5: better working Canadian layout, but not complete yet 2006-06-01 Sergey Udaltsov - symbols/am: fixed comma in Armenian, closing + * symbols/am: fixed comma in Armenian, closing https://bugs.freedesktop.org/show_bug.cgi?id=7080 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 2006-05-28 Sergey Udaltsov - rules/base.ml_c: fixed compat for jp layout, closing + * rules/base.ml_c: fixed compat for jp layout, closing https://bugs.freedesktop.org/show_bug.cgi?id=4002 2006-05-17 Sergey Udaltsov - symbols/inet: fixed power_g5, partially closing + * symbols/inet: fixed power_g5, partially closing https://bugs.freedesktop.org/show_bug.cgi?id=6960 2006-05-13 Sergey Udaltsov - symbols/fi: added fi(kotoistus) + * symbols/fi: added fi(kotoistus) https://bugs.freedesktop.org/show_bug.cgi?id=6901 2006-05-05 Sergey Udaltsov - symbols/de: added de(neo) + * symbols/de: added de(neo) https://bugs.freedesktop.org/show_bug.cgi?id=6837 2006-05-04 Sergey Udaltsov - symbols/inet: fixed cymotionlinux, closing + * symbols/inet: fixed cymotionlinux, closing https://bugs.freedesktop.org/show_bug.cgi?id=6828 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 2006-04-20 Sergey Udaltsov - keycodes/evdev: added LSGT, closing + * keycodes/evdev: added LSGT, closing https://bugs.freedesktop.org/show_bug.cgi?id=6674 2006-04-19 Sergey Udaltsov - symbols/macintosh_vndr/(be,de,ch): use keypad(comma) + * symbols/macintosh_vndr/(be,de,ch): use keypad(comma) 2006-04-19 Sergey Udaltsov - rules/*, keymap/sgi_vndr/*: shift_toggle -> shifts_toggle, + * rules/*, keymap/sgi_vndr/*: shift_toggle -> shifts_toggle, fixing https://bugs.freedesktop.org/show_bug.cgi?id=5078 2006-04-08 Sergey Udaltsov - keycodes/xfree86,symbols/br: fixed abnt2 keymap and layout + * keycodes/xfree86,symbols/br: fixed abnt2 keymap and layout https://bugs.freedesktop.org/show_bug.cgi?id=4910 2006-04-08 Sergey Udaltsov - geometry/macintosh: fixed mac geometry + * geometry/macintosh: fixed mac geometry https://bugs.freedesktop.org/show_bug.cgi?id=4714 2006-04-05 Sergey Udaltsov - rules/base.xml.in, changed PC-98xx Series to Japan, + * rules/base.xml.in, changed PC-98xx Series to Japan, https://bugs.freedesktop.org/show_bug.cgi?id=5591 2006-04-04 Sergey Udaltsov - symbols/compose,rules/base.xml.in,rules/base.o_s.part: added + * symbols/compose,rules/base.xml.in,rules/base.o_s.part: added compose(lwin) https://bugs.freedesktop.org/show_bug.cgi?id=2396 2006-04-04 Sergey Udaltsov - symbols/inet,rules/base.xml.in: added Logitech diNovo + * symbols/inet,rules/base.xml.in: added Logitech diNovo https://bugs.freedesktop.org/show_bug.cgi?id=1681 2006-04-04 Sergey Udaltsov - symbols/inet: fixed Logitech Access Keyboard + * symbols/inet: fixed Logitech Access Keyboard https://bugs.freedesktop.org/show_bug.cgi?id=1018 2006-04-04 Sergey Udaltsov - symbols/pt: added LSGT + * symbols/pt: added LSGT https://bugs.freedesktop.org/show_bug.cgi?id=970 2006-04-02 Sergey Udaltsov - symbols/be, rules/base.xml.in: added 'be(wang)' + * symbols/be, rules/base.xml.in: added 'be(wang)' https://bugs.freedesktop.org/show_bug.cgi?id=6474 2006-03-28 Sergey Udaltsov - symbols/cd, symbols/Makefile.am: added 'cd' + * symbols/cd, symbols/Makefile.am: added 'cd' https://bugs.freedesktop.org/show_bug.cgi?id=5500 2006-03-27 Sergey Udaltsov - keycodes/macintosh,keymap/macintosh,rules/base.m_k.part: fixed + * keycodes/macintosh,keymap/macintosh,rules/base.m_k.part: fixed Macintosh F13-F15, closed https://bugs.freedesktop.org/show_bug.cgi?id=6399 2006-03-25 Sergey Udaltsov - symbols/inet: fixed cymotion, + * symbols/inet: fixed cymotion, https://bugs.freedesktop.org/show_bug.cgi?id=3541 2006-03-25 Sergey Udaltsov - symbols/il,rules/compat/variantRename.lst: generalized 'basic', + * 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 - symbols/group: another attempt to fix unfamous + * symbols/group: another attempt to fix unfamous 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 + * 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 + * 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 + * symbols/kr: added Korean layout, closing https://bugs.freedesktop.org/show_bug.cgi?id=6323 2006-03-21 Sergey Udaltsov - types/pc,symbols/level3: another attempt to fix unfamous + * types/pc,symbols/level3: another attempt to fix unfamous RAlt problem, reported in ubuntu: https://launchpad.net/distros/ubuntu/+source/xkeyboard-config/+bug/35845 2006-03-17 Sergey Udaltsov - symbols/inet, rules/base*: added Acer Ferrari 4K + * symbols/inet, rules/base*: added Acer Ferrari 4K https://bugs.freedesktop.org/show_bug.cgi?id=5259 2006-03-16 Sergey Udaltsov - symbols/ee: improved ee(dvorak), closing + * symbols/ee: improved ee(dvorak), closing https://bugs.freedesktop.org/show_bug.cgi?id=4568 2006-03-05 Sergey Udaltsov - configure.in, NEWS, Changelog:Preparing release 0.8 + * configure.in, NEWS, Changelog:Preparing release 0.8 2006-02-26 Sergey Udaltsov diff --git a/geometry/pc b/geometry/pc index 943d22a..c083d63 100644 --- a/geometry/pc +++ b/geometry/pc @@ -1319,7 +1319,7 @@ xkb_geometry "kr106" { }; // End of "kr106" geometry -// Based on the pc(basic) layout. The keypad, sysreq/ScrLk/Break, and multimedia +// Based on the pc(pc105) layout. The keypad, sysreq/ScrLk/Break, and multimedia // keys are not shown because they are shared with other keys via the key. // This should not be a problem if the normal symbols are used, as the keys will // show through normally, they just won't show from xkbprint. For the record, diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part index bef256b..ff1c35c 100644 --- a/rules/base.ml1_s.part +++ b/rules/base.ml1_s.part @@ -5,6 +5,5 @@ macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) - $macs $macvendorlayouts = pc(pc105)+macintosh_vndr/%l[1]%(v[1]) - $pcmodels * = pc(%m)+%l[1]%(v[1]) - * * = pc(pc105)+%l[1]%(v[1]) + $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) + * * = pc+%l[1]%(v[1]) diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part index ad2111c..d9555af 100644 --- a/rules/base.ml_s.part +++ b/rules/base.ml_s.part @@ -7,19 +7,15 @@ sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2 sun5 * = latin+sun_vndr/us(sun5)+%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) - abnt2 br = pc(pc104)+br + abnt2 br = pc+br macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old en_US = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v) macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2 macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v) - $macbooks * = pc(pc105)+%l%(v) - $macs en_US = pc(pc105)+macintosh_vndr/us(extended) - $macs $macvendorlayouts = pc(pc105)+macintosh_vndr/%l%(v) - $pcmodels intl = us(%mcompose) - * intl = us(pc104compose) - * jp = pc(pc102)+jp(latin)+jp:2 - $pcmodels $nonlatin = pc(%m)+us+%l%(v):2 - $pcmodels * = pc(%m)+%l%(v) - * $nonlatin = pc(pc105)+us+%l%(v):2 - * * = pc(pc105)+%l%(v) + $macbooks * = pc+%l%(v) + $macs en_US = pc+macintosh_vndr/us(extended) + $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) + * jp = pc+jp(latin)+jp:2 + * $nonlatin = pc+us+%l%(v):2 + * * = pc+%l%(v) diff --git a/rules/compat/ml1_s.sh b/rules/compat/ml1_s.sh index 19c383f..a0c0a2e 100755 --- a/rules/compat/ml1_s.sh +++ b/rules/compat/ml1_s.sh @@ -5,11 +5,9 @@ OUTFILE=base.ml1_s.part > $OUTFILE awk '{ - printf " $pcmodels %s = pc(%%m)+%s%%(v[1])\n", $1, $2; - printf " * %s = pc(pc105)+%s%%(v[1])\n", $1, $2; + printf " * %s = pc+%s%%(v[1])\n", $1, $2; }' < layoutRename.lst >> $OUTFILE awk '{ - printf " $pcmodels %s(%s) = pc(%%m)+%s(%s)\n", $1, $2, $3, $4; - printf " * %s(%s) = pc(pc105)+%s(%s)\n", $1, $2, $3, $4; + printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4; }' < variantRename.lst >> $OUTFILE diff --git a/rules/compat/ml1v1_s.sh b/rules/compat/ml1v1_s.sh index 49a4bd0..9037e16 100755 --- a/rules/compat/ml1v1_s.sh +++ b/rules/compat/ml1v1_s.sh @@ -5,6 +5,5 @@ OUTFILE=base.ml1v1_s.part > $OUTFILE awk '{ - printf " $pcmodels %s %s = pc(%%m)+%s(%s)\n", $1, $2, $3, $4; - printf " * %s %s = pc(pc105)+%s(%s)\n", $1, $2, $3, $4; + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; }' < variantRename.lst >> $OUTFILE diff --git a/rules/compat/ml1v_s.sh b/rules/compat/ml1v_s.sh index 71c2c8d..2b9496e 100755 --- a/rules/compat/ml1v_s.sh +++ b/rules/compat/ml1v_s.sh @@ -5,6 +5,5 @@ OUTFILE=base.ml1v_s.part > $OUTFILE awk '{ - printf " $pcmodels %s %s = pc(%%m)+%s(%s)\n", $1, $2, $3, $4; - printf " * %s %s = pc(pc105)+%s(%s)\n", $1, $2, $3, $4; + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; }' < variantRename.lst >> $OUTFILE diff --git a/rules/compat/ml_s.sh b/rules/compat/ml_s.sh index 473e73b..6f6ccc4 100755 --- a/rules/compat/ml_s.sh +++ b/rules/compat/ml_s.sh @@ -5,11 +5,9 @@ OUTFILE=base.ml_s.part > $OUTFILE awk '{ - printf " $pcmodels %s = pc(%%m)+%s\n", $1, $2; - printf " * %s = pc(pc105)+%s\n", $1, $2; + printf " * %s = pc+%s\n", $1, $2; }' < layoutRename.lst >> $OUTFILE awk '{ - printf " $pcmodels %s(%s) = pc(%%m)+%s(%s)\n", $1, $2, $3, $4; - printf " * %s(%s) = pc(pc105)+%s(%s)\n", $1, $2, $3, $4; + printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4; }' < variantRename.lst >> $OUTFILE diff --git a/rules/compat/mlv_s.sh b/rules/compat/mlv_s.sh index 48bd098..5a3a9a1 100755 --- a/rules/compat/mlv_s.sh +++ b/rules/compat/mlv_s.sh @@ -5,6 +5,5 @@ OUTFILE=base.mlv_s.part > $OUTFILE awk '{ - printf " $pcmodels %s %s = pc(%%m)+%s(%s)\n", $1, $2, $3, $4; - printf " * %s %s = pc(pc105)+%s(%s)\n", $1, $2, $3, $4; + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; }' < variantRename.lst >> $OUTFILE diff --git a/symbols/pc b/symbols/pc index ac42cfa..9156ad8 100644 --- a/symbols/pc +++ b/symbols/pc @@ -3,8 +3,8 @@ // // $XFree86: xc/programs/xkbcomp/symbols/pc,v 1.9 2003/06/09 19:59:46 dawes Exp $ -partial hidden alphanumeric_keys modifier_keys -xkb_symbols "basic" { +default partial alphanumeric_keys modifier_keys +xkb_symbols "pc105" { key { [ Escape ] }; @@ -67,25 +67,6 @@ xkb_symbols "basic" { modifier_map Mod4 { }; }; -// definition for all PC-AT type keyboard, all extra keys are -// defined in pc(basic). -xkb_symbols "pc101" { - include "pc(basic)" -}; - -xkb_symbols "pc102" { - include "pc(basic)" -}; - -default -xkb_symbols "pc104" { - include "pc(basic)" -}; - -xkb_symbols "pc105" { - include "pc(pc104)" -}; - partial hidden alphanumeric_keys xkb_symbols "function" { key { -- 2.32.0.93.g670b81a890