From 5e4a6765459f98c7b976cee1d6f412f68e3ee3c9 Mon Sep 17 00:00:00 2001 From: DreymaR Date: Tue, 2 Feb 2021 12:31:23 +0100 Subject: [PATCH] Renamed to _orig and _xmod * Some users felt that the unchanged xkb-data files were better named 'orig' than 'bak'. * Since I'm a maniac, that made me change the 'mod' dir to 'xmod' too. * Note that you may create a patch with the orig and xmod dirs, if you wish. --- README.md | 8 +++-- install-dreymar-xmod.sh | 32 +++++++++--------- .../xkb-data_unchanged.zip | Bin .../xkb-data_version.txt | 0 .../xkb/geometry/pc | 0 .../xkb/keycodes/aliases | 0 .../xkb/keycodes/evdev | 0 .../xkb/keycodes/xfree86 | 0 .../xkb/rules/evdev | 0 .../xkb/rules/evdev.lst | 0 .../xkb/rules/evdev.xml | 0 .../xkb/symbols/al | 0 .../xkb/symbols/at | 0 .../xkb/symbols/ba | 0 .../xkb/symbols/be | 0 .../xkb/symbols/bg | 0 .../xkb/symbols/br | 0 .../xkb/symbols/ca | 0 .../xkb/symbols/cz | 0 .../xkb/symbols/de | 0 .../xkb/symbols/dk | 0 .../xkb/symbols/epo | 0 .../xkb/symbols/es | 0 .../xkb/symbols/fi | 0 .../xkb/symbols/fr | 0 .../xkb/symbols/gb | 0 .../xkb/symbols/gr | 0 .../xkb/symbols/group | 0 .../xkb/symbols/hr | 0 .../xkb/symbols/hu | 0 .../xkb/symbols/il | 0 .../xkb/symbols/is | 0 .../xkb/symbols/it | 0 .../xkb/symbols/latam | 0 .../xkb/symbols/level5 | 0 .../xkb/symbols/nl | 0 .../xkb/symbols/no | 0 .../xkb/symbols/pl | 0 .../xkb/symbols/pt | 0 .../xkb/symbols/ro | 0 .../xkb/symbols/rs | 0 .../xkb/symbols/ru | 0 .../xkb/symbols/se | 0 .../xkb/symbols/si | 0 .../xkb/symbols/sk | 0 .../xkb/symbols/tr | 0 .../xkb/symbols/us | 0 .../xkb/types/level5 | 0 .../xkb-data_version.txt | 0 .../xkb/geometry/pc | 0 .../xkb/keycodes/aliases | 0 .../xkb/keycodes/evdev | 0 .../xkb/keycodes/xfree86 | 0 .../xkb/rules/evdev | 0 .../xkb/rules/evdev.lst | 0 .../xkb/rules/evdev.xml | 0 .../xkb/symbols/al | 0 .../xkb/symbols/at | 0 .../xkb/symbols/ba | 0 .../xkb/symbols/be | 0 .../xkb/symbols/bg | 0 .../xkb/symbols/br | 0 .../xkb/symbols/ca | 0 .../xkb/symbols/colemak | 0 .../xkb/symbols/colemak_eD_epo | 0 .../xkb/symbols/colemak_eD_template | 0 .../xkb/symbols/cz | 0 .../xkb/symbols/de | 0 .../xkb/symbols/dk | 0 .../xkb/symbols/epo | 0 .../xkb/symbols/es | 0 .../xkb/symbols/extend | 0 .../xkb/symbols/fi | 0 .../xkb/symbols/fr | 0 .../xkb/symbols/gb | 0 .../xkb/symbols/gr | 0 .../xkb/symbols/group | 0 .../xkb/symbols/hr | 0 .../xkb/symbols/hu | 0 .../xkb/symbols/il | 0 .../xkb/symbols/is | 0 .../xkb/symbols/it | 0 .../xkb/symbols/latam | 0 .../xkb/symbols/level5 | 0 .../xkb/symbols/nl | 0 .../xkb/symbols/no | 0 .../xkb/symbols/pl | 0 .../xkb/symbols/pt | 0 .../xkb/symbols/ro | 0 .../xkb/symbols/rs | 0 .../xkb/symbols/ru | 0 .../xkb/symbols/se | 0 .../xkb/symbols/si | 0 .../xkb/symbols/sk | 0 .../xkb/symbols/tr | 0 .../xkb/symbols/us | 0 .../xkb/types/level5 | 0 97 files changed, 22 insertions(+), 18 deletions(-) rename {xkb-data_bak => xkb-data_orig}/xkb-data_unchanged.zip (100%) rename {xkb-data_bak => xkb-data_orig}/xkb-data_version.txt (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/geometry/pc (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/keycodes/aliases (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/keycodes/evdev (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/keycodes/xfree86 (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/rules/evdev (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/rules/evdev.lst (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/rules/evdev.xml (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/al (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/at (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/ba (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/be (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/bg (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/br (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/ca (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/cz (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/de (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/dk (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/epo (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/es (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/fi (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/fr (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/gb (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/gr (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/group (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/hr (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/hu (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/il (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/is (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/it (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/latam (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/level5 (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/nl (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/no (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/pl (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/pt (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/ro (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/rs (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/ru (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/se (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/si (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/sk (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/tr (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/symbols/us (100%) rename {xkb-data_bak => xkb-data_orig}/xkb/types/level5 (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb-data_version.txt (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/geometry/pc (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/keycodes/aliases (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/keycodes/evdev (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/keycodes/xfree86 (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/rules/evdev (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/rules/evdev.lst (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/rules/evdev.xml (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/al (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/at (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/ba (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/be (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/bg (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/br (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/ca (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/colemak (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/colemak_eD_epo (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/colemak_eD_template (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/cz (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/de (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/dk (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/epo (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/es (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/extend (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/fi (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/fr (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/gb (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/gr (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/group (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/hr (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/hu (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/il (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/is (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/it (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/latam (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/level5 (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/nl (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/no (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/pl (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/pt (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/ro (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/rs (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/ru (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/se (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/si (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/sk (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/tr (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/symbols/us (100%) rename {xkb-data_mod => xkb-data_xmod}/xkb/types/level5 (100%) diff --git a/README.md b/README.md index aacb164..740ac22 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ TODO: - Does this mean that LevelFive should've been discarded but isn't? Is it an XKB bug? * From Daniele at the Cmk Discord: Try out localectl? - E.g., 'localectl set-x11-keymap us pc105aw-sl cmk_ed_dh lv5:caps_switch_lock,misc:extend' should work to make changes persistent? -* The Curl(DH) model implementation have to go as it may mess w/ QWERTY. Instead, I should use two Extend variants. +* The Curl(DH) model implementation has to go as it may mess w/ QWERTY. Instead, I should use two Extend variants. - It also seems very hard for some newcomers to understand. So yes, I should have the Angle mod only and not CurlAngle models. - Also, matrix users want the V-D swap without an Angle mod! Another nail in the coffin for the Curl models. - Actually, should I make a NoModel CurlAngle layout for the model impaired? Vanilla, Curl(DH) and Curl(DH)Angle then. @@ -62,10 +62,12 @@ TODO: * Find out how to change the rules component properly to allow compiling and eventually merging to the main repo? * Migrate from `~/.bashrc` to `~/.xprofile`? The latter is more appropriate, but which setups source it and which ones don't? * Could use an key code alias defined in keycodes/evdev (alias = ), instead of the code? -* Test this method for using a local dir: +* Test this method for using a local dir, by Bjørnar "zkf" Hansen: - Copy the `xkb-data_mod/xkb` dir to, say, `/usr/local/bigbag/xkb` and `setenv MYXKB ` (setenv not necessary, just for here) - `setxkbmap -print | xkbcomp -I -I$MYXKB -I/usr/share/X11/xkb - $DISPLAY` - See https://github.com/DreymaR/BigBagKbdTrixXKB/issues/14 + - More useful info in this comment: https://github.com/DreymaR/BigBagKbdTrixXKB/issues/14#issuecomment-767590722 + - "-I/usr/local/share/X11/xkb can be written more succinctly as -I. if you first cd into this directory." * For an EsAlt variant as in EPKL: ``` key { [ 4, dollar, dead_currency, EuroSign ] }; // 4 @@ -89,6 +91,8 @@ DONE: * Changed the default layout for the setxkb.sh script to US (UniSym): In my experience, most users that struggle with the setup want US English. * To get back to your old layout/model, use `setxkb 4n/5n [loc]`. You may also specify `mod loc [var]`; omit `var` for the default (basic) variant. * Separated out the F# key block in the extend file: People complain that their TTY shortcuts aren't working because of it. Ext+AltGr+F# works though. +* Relieve the sudo requirement. And add an option to change the X11 dir since Nix uses another place. Pulled from fufexan@github. + - https://github.com/DreymaR/BigBagKbdTrixXKB/issues/15#issuecomment-769431139 [XKB-conf]: https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ (XKeyboard Config page) diff --git a/install-dreymar-xmod.sh b/install-dreymar-xmod.sh index 88fb5c0..c452c14 100644 --- a/install-dreymar-xmod.sh +++ b/install-dreymar-xmod.sh @@ -52,22 +52,22 @@ X11DIR='/usr/share/X11'; [ -d "${X11DIR}" ] || X11DIR='/usr/lib/X11' XVERSION='' ModDATE='' -DModDir=`dirname $0` # (-d) Path to the script (and mod?) root directory -ToolDir="${DModDir}/dreymar-xtools" # The location of tool scripts (like setxkb.sh) -DMod='xkb-data_mod' # (--) The main name of the directory with modded xkb-data files -DModTag="${DMod}${XVERSION:+'_v'}${XVERSION}${ModDATE:+'_'}${ModDATE}" # (-t) Mod dir "prefix" -DBakFix='dbak-' # (--) Backup dir prefix -DModFix='d' # (--) Modded dir prefix -InstDir="${X11DIR}" # (-i) Path to install subfolder(s) in -#~ InstDir="${HOME}/drey-xmod" # (-i) Path to install subfolder(s) in -WriteSys='no' # (-o) Overwrite the original xkb dir with the modded one -Restore='0' # (-r) Reverse: Restore from backup # instead of installing -DoBackup='ifnone' # (-n/b) Default backup behavior is "if no backups are found" -SubDirs='all' # (-m) Directory/-ies inside X11 to modify (e.g., 'xkb locale', 'all') -InstGTK='no' # (-g) Whether to install the GTK 2.0/3.0 config (if not present) -NoSudo='no' # (-s) Do not use sudo. Helpful for local dir installation. -SetXMap='no' # (-x) Whether to run the setxkb script after installing -SetXStr='5caw us us' # (--) Shortcut string for setxkb - 'kbd loc sym' (model layout eD-variant) +DModDir=`dirname $0` # (-d) Path to the script (and mod?) root directory +ToolDir="${DModDir}/dreymar-xtools" # The loc. of tool scripts (like setxkb.sh) +DMod='xkb-data_xmod' # (--) The main name of the directory with modded xkb-data files +DModTag="${DMod}${XVERSION:+'_v'}${XVERSION}${ModDATE:+'_'}${ModDATE}" # (-t) Mod dir "prefix" +DBakFix='dbak-' # (--) Backup dir prefix +DModFix='d' # (--) Modded dir prefix +InstDir="${X11DIR}" # (-i) Path to install subfolder(s) in +#~ InstDir="${HOME}/drey-xmod" # (-i) Path to install subfolder(s) in +WriteSys='no' # (-o) Overwrite the original xkb dir with the modded one +Restore='0' # (-r) Reverse: Restore from backup # instead of installing +DoBackup='ifnone' # (-n/b) Default backup behavior is "if no backups are found" +SubDirs='all' # (-m) Directory/-ies inside X11 to modify (e.g., 'xkb locale', 'all') +InstGTK='no' # (-g) Whether to install the GTK 2.0/3.0 config (if not present) +NoSudo='no' # (-s) Do not use sudo. Helpful for local dir installation. +SetXMap='no' # (-x) Whether to run the setxkb script after installing +SetXStr='5caw us us' # (--) Shortcut string for setxkb - 'kbd loc sym' (model layout eD-variant) ## NOTE: '# (-a)' means that the value can be set by option argument '-a ' HelpStr="\e[1mUsage: bash ${MyNAME} [optional args] [ [ ]]\e[0m\n"\ diff --git a/xkb-data_bak/xkb-data_unchanged.zip b/xkb-data_orig/xkb-data_unchanged.zip similarity index 100% rename from xkb-data_bak/xkb-data_unchanged.zip rename to xkb-data_orig/xkb-data_unchanged.zip diff --git a/xkb-data_bak/xkb-data_version.txt b/xkb-data_orig/xkb-data_version.txt similarity index 100% rename from xkb-data_bak/xkb-data_version.txt rename to xkb-data_orig/xkb-data_version.txt diff --git a/xkb-data_bak/xkb/geometry/pc b/xkb-data_orig/xkb/geometry/pc similarity index 100% rename from xkb-data_bak/xkb/geometry/pc rename to xkb-data_orig/xkb/geometry/pc diff --git a/xkb-data_bak/xkb/keycodes/aliases b/xkb-data_orig/xkb/keycodes/aliases similarity index 100% rename from xkb-data_bak/xkb/keycodes/aliases rename to xkb-data_orig/xkb/keycodes/aliases diff --git a/xkb-data_bak/xkb/keycodes/evdev b/xkb-data_orig/xkb/keycodes/evdev similarity index 100% rename from xkb-data_bak/xkb/keycodes/evdev rename to xkb-data_orig/xkb/keycodes/evdev diff --git a/xkb-data_bak/xkb/keycodes/xfree86 b/xkb-data_orig/xkb/keycodes/xfree86 similarity index 100% rename from xkb-data_bak/xkb/keycodes/xfree86 rename to xkb-data_orig/xkb/keycodes/xfree86 diff --git a/xkb-data_bak/xkb/rules/evdev b/xkb-data_orig/xkb/rules/evdev similarity index 100% rename from xkb-data_bak/xkb/rules/evdev rename to xkb-data_orig/xkb/rules/evdev diff --git a/xkb-data_bak/xkb/rules/evdev.lst b/xkb-data_orig/xkb/rules/evdev.lst similarity index 100% rename from xkb-data_bak/xkb/rules/evdev.lst rename to xkb-data_orig/xkb/rules/evdev.lst diff --git a/xkb-data_bak/xkb/rules/evdev.xml b/xkb-data_orig/xkb/rules/evdev.xml similarity index 100% rename from xkb-data_bak/xkb/rules/evdev.xml rename to xkb-data_orig/xkb/rules/evdev.xml diff --git a/xkb-data_bak/xkb/symbols/al b/xkb-data_orig/xkb/symbols/al similarity index 100% rename from xkb-data_bak/xkb/symbols/al rename to xkb-data_orig/xkb/symbols/al diff --git a/xkb-data_bak/xkb/symbols/at b/xkb-data_orig/xkb/symbols/at similarity index 100% rename from xkb-data_bak/xkb/symbols/at rename to xkb-data_orig/xkb/symbols/at diff --git a/xkb-data_bak/xkb/symbols/ba b/xkb-data_orig/xkb/symbols/ba similarity index 100% rename from xkb-data_bak/xkb/symbols/ba rename to xkb-data_orig/xkb/symbols/ba diff --git a/xkb-data_bak/xkb/symbols/be b/xkb-data_orig/xkb/symbols/be similarity index 100% rename from xkb-data_bak/xkb/symbols/be rename to xkb-data_orig/xkb/symbols/be diff --git a/xkb-data_bak/xkb/symbols/bg b/xkb-data_orig/xkb/symbols/bg similarity index 100% rename from xkb-data_bak/xkb/symbols/bg rename to xkb-data_orig/xkb/symbols/bg diff --git a/xkb-data_bak/xkb/symbols/br b/xkb-data_orig/xkb/symbols/br similarity index 100% rename from xkb-data_bak/xkb/symbols/br rename to xkb-data_orig/xkb/symbols/br diff --git a/xkb-data_bak/xkb/symbols/ca b/xkb-data_orig/xkb/symbols/ca similarity index 100% rename from xkb-data_bak/xkb/symbols/ca rename to xkb-data_orig/xkb/symbols/ca diff --git a/xkb-data_bak/xkb/symbols/cz b/xkb-data_orig/xkb/symbols/cz similarity index 100% rename from xkb-data_bak/xkb/symbols/cz rename to xkb-data_orig/xkb/symbols/cz diff --git a/xkb-data_bak/xkb/symbols/de b/xkb-data_orig/xkb/symbols/de similarity index 100% rename from xkb-data_bak/xkb/symbols/de rename to xkb-data_orig/xkb/symbols/de diff --git a/xkb-data_bak/xkb/symbols/dk b/xkb-data_orig/xkb/symbols/dk similarity index 100% rename from xkb-data_bak/xkb/symbols/dk rename to xkb-data_orig/xkb/symbols/dk diff --git a/xkb-data_bak/xkb/symbols/epo b/xkb-data_orig/xkb/symbols/epo similarity index 100% rename from xkb-data_bak/xkb/symbols/epo rename to xkb-data_orig/xkb/symbols/epo diff --git a/xkb-data_bak/xkb/symbols/es b/xkb-data_orig/xkb/symbols/es similarity index 100% rename from xkb-data_bak/xkb/symbols/es rename to xkb-data_orig/xkb/symbols/es diff --git a/xkb-data_bak/xkb/symbols/fi b/xkb-data_orig/xkb/symbols/fi similarity index 100% rename from xkb-data_bak/xkb/symbols/fi rename to xkb-data_orig/xkb/symbols/fi diff --git a/xkb-data_bak/xkb/symbols/fr b/xkb-data_orig/xkb/symbols/fr similarity index 100% rename from xkb-data_bak/xkb/symbols/fr rename to xkb-data_orig/xkb/symbols/fr diff --git a/xkb-data_bak/xkb/symbols/gb b/xkb-data_orig/xkb/symbols/gb similarity index 100% rename from xkb-data_bak/xkb/symbols/gb rename to xkb-data_orig/xkb/symbols/gb diff --git a/xkb-data_bak/xkb/symbols/gr b/xkb-data_orig/xkb/symbols/gr similarity index 100% rename from xkb-data_bak/xkb/symbols/gr rename to xkb-data_orig/xkb/symbols/gr diff --git a/xkb-data_bak/xkb/symbols/group b/xkb-data_orig/xkb/symbols/group similarity index 100% rename from xkb-data_bak/xkb/symbols/group rename to xkb-data_orig/xkb/symbols/group diff --git a/xkb-data_bak/xkb/symbols/hr b/xkb-data_orig/xkb/symbols/hr similarity index 100% rename from xkb-data_bak/xkb/symbols/hr rename to xkb-data_orig/xkb/symbols/hr diff --git a/xkb-data_bak/xkb/symbols/hu b/xkb-data_orig/xkb/symbols/hu similarity index 100% rename from xkb-data_bak/xkb/symbols/hu rename to xkb-data_orig/xkb/symbols/hu diff --git a/xkb-data_bak/xkb/symbols/il b/xkb-data_orig/xkb/symbols/il similarity index 100% rename from xkb-data_bak/xkb/symbols/il rename to xkb-data_orig/xkb/symbols/il diff --git a/xkb-data_bak/xkb/symbols/is b/xkb-data_orig/xkb/symbols/is similarity index 100% rename from xkb-data_bak/xkb/symbols/is rename to xkb-data_orig/xkb/symbols/is diff --git a/xkb-data_bak/xkb/symbols/it b/xkb-data_orig/xkb/symbols/it similarity index 100% rename from xkb-data_bak/xkb/symbols/it rename to xkb-data_orig/xkb/symbols/it diff --git a/xkb-data_bak/xkb/symbols/latam b/xkb-data_orig/xkb/symbols/latam similarity index 100% rename from xkb-data_bak/xkb/symbols/latam rename to xkb-data_orig/xkb/symbols/latam diff --git a/xkb-data_bak/xkb/symbols/level5 b/xkb-data_orig/xkb/symbols/level5 similarity index 100% rename from xkb-data_bak/xkb/symbols/level5 rename to xkb-data_orig/xkb/symbols/level5 diff --git a/xkb-data_bak/xkb/symbols/nl b/xkb-data_orig/xkb/symbols/nl similarity index 100% rename from xkb-data_bak/xkb/symbols/nl rename to xkb-data_orig/xkb/symbols/nl diff --git a/xkb-data_bak/xkb/symbols/no b/xkb-data_orig/xkb/symbols/no similarity index 100% rename from xkb-data_bak/xkb/symbols/no rename to xkb-data_orig/xkb/symbols/no diff --git a/xkb-data_bak/xkb/symbols/pl b/xkb-data_orig/xkb/symbols/pl similarity index 100% rename from xkb-data_bak/xkb/symbols/pl rename to xkb-data_orig/xkb/symbols/pl diff --git a/xkb-data_bak/xkb/symbols/pt b/xkb-data_orig/xkb/symbols/pt similarity index 100% rename from xkb-data_bak/xkb/symbols/pt rename to xkb-data_orig/xkb/symbols/pt diff --git a/xkb-data_bak/xkb/symbols/ro b/xkb-data_orig/xkb/symbols/ro similarity index 100% rename from xkb-data_bak/xkb/symbols/ro rename to xkb-data_orig/xkb/symbols/ro diff --git a/xkb-data_bak/xkb/symbols/rs b/xkb-data_orig/xkb/symbols/rs similarity index 100% rename from xkb-data_bak/xkb/symbols/rs rename to xkb-data_orig/xkb/symbols/rs diff --git a/xkb-data_bak/xkb/symbols/ru b/xkb-data_orig/xkb/symbols/ru similarity index 100% rename from xkb-data_bak/xkb/symbols/ru rename to xkb-data_orig/xkb/symbols/ru diff --git a/xkb-data_bak/xkb/symbols/se b/xkb-data_orig/xkb/symbols/se similarity index 100% rename from xkb-data_bak/xkb/symbols/se rename to xkb-data_orig/xkb/symbols/se diff --git a/xkb-data_bak/xkb/symbols/si b/xkb-data_orig/xkb/symbols/si similarity index 100% rename from xkb-data_bak/xkb/symbols/si rename to xkb-data_orig/xkb/symbols/si diff --git a/xkb-data_bak/xkb/symbols/sk b/xkb-data_orig/xkb/symbols/sk similarity index 100% rename from xkb-data_bak/xkb/symbols/sk rename to xkb-data_orig/xkb/symbols/sk diff --git a/xkb-data_bak/xkb/symbols/tr b/xkb-data_orig/xkb/symbols/tr similarity index 100% rename from xkb-data_bak/xkb/symbols/tr rename to xkb-data_orig/xkb/symbols/tr diff --git a/xkb-data_bak/xkb/symbols/us b/xkb-data_orig/xkb/symbols/us similarity index 100% rename from xkb-data_bak/xkb/symbols/us rename to xkb-data_orig/xkb/symbols/us diff --git a/xkb-data_bak/xkb/types/level5 b/xkb-data_orig/xkb/types/level5 similarity index 100% rename from xkb-data_bak/xkb/types/level5 rename to xkb-data_orig/xkb/types/level5 diff --git a/xkb-data_mod/xkb-data_version.txt b/xkb-data_xmod/xkb-data_version.txt similarity index 100% rename from xkb-data_mod/xkb-data_version.txt rename to xkb-data_xmod/xkb-data_version.txt diff --git a/xkb-data_mod/xkb/geometry/pc b/xkb-data_xmod/xkb/geometry/pc similarity index 100% rename from xkb-data_mod/xkb/geometry/pc rename to xkb-data_xmod/xkb/geometry/pc diff --git a/xkb-data_mod/xkb/keycodes/aliases b/xkb-data_xmod/xkb/keycodes/aliases similarity index 100% rename from xkb-data_mod/xkb/keycodes/aliases rename to xkb-data_xmod/xkb/keycodes/aliases diff --git a/xkb-data_mod/xkb/keycodes/evdev b/xkb-data_xmod/xkb/keycodes/evdev similarity index 100% rename from xkb-data_mod/xkb/keycodes/evdev rename to xkb-data_xmod/xkb/keycodes/evdev diff --git a/xkb-data_mod/xkb/keycodes/xfree86 b/xkb-data_xmod/xkb/keycodes/xfree86 similarity index 100% rename from xkb-data_mod/xkb/keycodes/xfree86 rename to xkb-data_xmod/xkb/keycodes/xfree86 diff --git a/xkb-data_mod/xkb/rules/evdev b/xkb-data_xmod/xkb/rules/evdev similarity index 100% rename from xkb-data_mod/xkb/rules/evdev rename to xkb-data_xmod/xkb/rules/evdev diff --git a/xkb-data_mod/xkb/rules/evdev.lst b/xkb-data_xmod/xkb/rules/evdev.lst similarity index 100% rename from xkb-data_mod/xkb/rules/evdev.lst rename to xkb-data_xmod/xkb/rules/evdev.lst diff --git a/xkb-data_mod/xkb/rules/evdev.xml b/xkb-data_xmod/xkb/rules/evdev.xml similarity index 100% rename from xkb-data_mod/xkb/rules/evdev.xml rename to xkb-data_xmod/xkb/rules/evdev.xml diff --git a/xkb-data_mod/xkb/symbols/al b/xkb-data_xmod/xkb/symbols/al similarity index 100% rename from xkb-data_mod/xkb/symbols/al rename to xkb-data_xmod/xkb/symbols/al diff --git a/xkb-data_mod/xkb/symbols/at b/xkb-data_xmod/xkb/symbols/at similarity index 100% rename from xkb-data_mod/xkb/symbols/at rename to xkb-data_xmod/xkb/symbols/at diff --git a/xkb-data_mod/xkb/symbols/ba b/xkb-data_xmod/xkb/symbols/ba similarity index 100% rename from xkb-data_mod/xkb/symbols/ba rename to xkb-data_xmod/xkb/symbols/ba diff --git a/xkb-data_mod/xkb/symbols/be b/xkb-data_xmod/xkb/symbols/be similarity index 100% rename from xkb-data_mod/xkb/symbols/be rename to xkb-data_xmod/xkb/symbols/be diff --git a/xkb-data_mod/xkb/symbols/bg b/xkb-data_xmod/xkb/symbols/bg similarity index 100% rename from xkb-data_mod/xkb/symbols/bg rename to xkb-data_xmod/xkb/symbols/bg diff --git a/xkb-data_mod/xkb/symbols/br b/xkb-data_xmod/xkb/symbols/br similarity index 100% rename from xkb-data_mod/xkb/symbols/br rename to xkb-data_xmod/xkb/symbols/br diff --git a/xkb-data_mod/xkb/symbols/ca b/xkb-data_xmod/xkb/symbols/ca similarity index 100% rename from xkb-data_mod/xkb/symbols/ca rename to xkb-data_xmod/xkb/symbols/ca diff --git a/xkb-data_mod/xkb/symbols/colemak b/xkb-data_xmod/xkb/symbols/colemak similarity index 100% rename from xkb-data_mod/xkb/symbols/colemak rename to xkb-data_xmod/xkb/symbols/colemak diff --git a/xkb-data_mod/xkb/symbols/colemak_eD_epo b/xkb-data_xmod/xkb/symbols/colemak_eD_epo similarity index 100% rename from xkb-data_mod/xkb/symbols/colemak_eD_epo rename to xkb-data_xmod/xkb/symbols/colemak_eD_epo diff --git a/xkb-data_mod/xkb/symbols/colemak_eD_template b/xkb-data_xmod/xkb/symbols/colemak_eD_template similarity index 100% rename from xkb-data_mod/xkb/symbols/colemak_eD_template rename to xkb-data_xmod/xkb/symbols/colemak_eD_template diff --git a/xkb-data_mod/xkb/symbols/cz b/xkb-data_xmod/xkb/symbols/cz similarity index 100% rename from xkb-data_mod/xkb/symbols/cz rename to xkb-data_xmod/xkb/symbols/cz diff --git a/xkb-data_mod/xkb/symbols/de b/xkb-data_xmod/xkb/symbols/de similarity index 100% rename from xkb-data_mod/xkb/symbols/de rename to xkb-data_xmod/xkb/symbols/de diff --git a/xkb-data_mod/xkb/symbols/dk b/xkb-data_xmod/xkb/symbols/dk similarity index 100% rename from xkb-data_mod/xkb/symbols/dk rename to xkb-data_xmod/xkb/symbols/dk diff --git a/xkb-data_mod/xkb/symbols/epo b/xkb-data_xmod/xkb/symbols/epo similarity index 100% rename from xkb-data_mod/xkb/symbols/epo rename to xkb-data_xmod/xkb/symbols/epo diff --git a/xkb-data_mod/xkb/symbols/es b/xkb-data_xmod/xkb/symbols/es similarity index 100% rename from xkb-data_mod/xkb/symbols/es rename to xkb-data_xmod/xkb/symbols/es diff --git a/xkb-data_mod/xkb/symbols/extend b/xkb-data_xmod/xkb/symbols/extend similarity index 100% rename from xkb-data_mod/xkb/symbols/extend rename to xkb-data_xmod/xkb/symbols/extend diff --git a/xkb-data_mod/xkb/symbols/fi b/xkb-data_xmod/xkb/symbols/fi similarity index 100% rename from xkb-data_mod/xkb/symbols/fi rename to xkb-data_xmod/xkb/symbols/fi diff --git a/xkb-data_mod/xkb/symbols/fr b/xkb-data_xmod/xkb/symbols/fr similarity index 100% rename from xkb-data_mod/xkb/symbols/fr rename to xkb-data_xmod/xkb/symbols/fr diff --git a/xkb-data_mod/xkb/symbols/gb b/xkb-data_xmod/xkb/symbols/gb similarity index 100% rename from xkb-data_mod/xkb/symbols/gb rename to xkb-data_xmod/xkb/symbols/gb diff --git a/xkb-data_mod/xkb/symbols/gr b/xkb-data_xmod/xkb/symbols/gr similarity index 100% rename from xkb-data_mod/xkb/symbols/gr rename to xkb-data_xmod/xkb/symbols/gr diff --git a/xkb-data_mod/xkb/symbols/group b/xkb-data_xmod/xkb/symbols/group similarity index 100% rename from xkb-data_mod/xkb/symbols/group rename to xkb-data_xmod/xkb/symbols/group diff --git a/xkb-data_mod/xkb/symbols/hr b/xkb-data_xmod/xkb/symbols/hr similarity index 100% rename from xkb-data_mod/xkb/symbols/hr rename to xkb-data_xmod/xkb/symbols/hr diff --git a/xkb-data_mod/xkb/symbols/hu b/xkb-data_xmod/xkb/symbols/hu similarity index 100% rename from xkb-data_mod/xkb/symbols/hu rename to xkb-data_xmod/xkb/symbols/hu diff --git a/xkb-data_mod/xkb/symbols/il b/xkb-data_xmod/xkb/symbols/il similarity index 100% rename from xkb-data_mod/xkb/symbols/il rename to xkb-data_xmod/xkb/symbols/il diff --git a/xkb-data_mod/xkb/symbols/is b/xkb-data_xmod/xkb/symbols/is similarity index 100% rename from xkb-data_mod/xkb/symbols/is rename to xkb-data_xmod/xkb/symbols/is diff --git a/xkb-data_mod/xkb/symbols/it b/xkb-data_xmod/xkb/symbols/it similarity index 100% rename from xkb-data_mod/xkb/symbols/it rename to xkb-data_xmod/xkb/symbols/it diff --git a/xkb-data_mod/xkb/symbols/latam b/xkb-data_xmod/xkb/symbols/latam similarity index 100% rename from xkb-data_mod/xkb/symbols/latam rename to xkb-data_xmod/xkb/symbols/latam diff --git a/xkb-data_mod/xkb/symbols/level5 b/xkb-data_xmod/xkb/symbols/level5 similarity index 100% rename from xkb-data_mod/xkb/symbols/level5 rename to xkb-data_xmod/xkb/symbols/level5 diff --git a/xkb-data_mod/xkb/symbols/nl b/xkb-data_xmod/xkb/symbols/nl similarity index 100% rename from xkb-data_mod/xkb/symbols/nl rename to xkb-data_xmod/xkb/symbols/nl diff --git a/xkb-data_mod/xkb/symbols/no b/xkb-data_xmod/xkb/symbols/no similarity index 100% rename from xkb-data_mod/xkb/symbols/no rename to xkb-data_xmod/xkb/symbols/no diff --git a/xkb-data_mod/xkb/symbols/pl b/xkb-data_xmod/xkb/symbols/pl similarity index 100% rename from xkb-data_mod/xkb/symbols/pl rename to xkb-data_xmod/xkb/symbols/pl diff --git a/xkb-data_mod/xkb/symbols/pt b/xkb-data_xmod/xkb/symbols/pt similarity index 100% rename from xkb-data_mod/xkb/symbols/pt rename to xkb-data_xmod/xkb/symbols/pt diff --git a/xkb-data_mod/xkb/symbols/ro b/xkb-data_xmod/xkb/symbols/ro similarity index 100% rename from xkb-data_mod/xkb/symbols/ro rename to xkb-data_xmod/xkb/symbols/ro diff --git a/xkb-data_mod/xkb/symbols/rs b/xkb-data_xmod/xkb/symbols/rs similarity index 100% rename from xkb-data_mod/xkb/symbols/rs rename to xkb-data_xmod/xkb/symbols/rs diff --git a/xkb-data_mod/xkb/symbols/ru b/xkb-data_xmod/xkb/symbols/ru similarity index 100% rename from xkb-data_mod/xkb/symbols/ru rename to xkb-data_xmod/xkb/symbols/ru diff --git a/xkb-data_mod/xkb/symbols/se b/xkb-data_xmod/xkb/symbols/se similarity index 100% rename from xkb-data_mod/xkb/symbols/se rename to xkb-data_xmod/xkb/symbols/se diff --git a/xkb-data_mod/xkb/symbols/si b/xkb-data_xmod/xkb/symbols/si similarity index 100% rename from xkb-data_mod/xkb/symbols/si rename to xkb-data_xmod/xkb/symbols/si diff --git a/xkb-data_mod/xkb/symbols/sk b/xkb-data_xmod/xkb/symbols/sk similarity index 100% rename from xkb-data_mod/xkb/symbols/sk rename to xkb-data_xmod/xkb/symbols/sk diff --git a/xkb-data_mod/xkb/symbols/tr b/xkb-data_xmod/xkb/symbols/tr similarity index 100% rename from xkb-data_mod/xkb/symbols/tr rename to xkb-data_xmod/xkb/symbols/tr diff --git a/xkb-data_mod/xkb/symbols/us b/xkb-data_xmod/xkb/symbols/us similarity index 100% rename from xkb-data_mod/xkb/symbols/us rename to xkb-data_xmod/xkb/symbols/us diff --git a/xkb-data_mod/xkb/types/level5 b/xkb-data_xmod/xkb/types/level5 similarity index 100% rename from xkb-data_mod/xkb/types/level5 rename to xkb-data_xmod/xkb/types/level5