From c40b832ae9dcd57f1704a2c05466254a72d3b8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Bech=20Gadmar?= Date: Thu, 11 May 2017 22:16:58 +0200 Subject: [PATCH] Minor edits --- .gitattributes | 17 +++++++ LICENSE.md | 7 +++ README.md | 7 ++- install-dreymar-xmod.sh | 19 ++++---- setxkb.sh | 7 ++- .../xkb/symbols/extend | 48 +++++++++---------- x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ru | 2 +- 7 files changed, 69 insertions(+), 38 deletions(-) create mode 100644 .gitattributes create mode 100644 LICENSE.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..bdb0cab --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..786f243 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,7 @@ +Copyright 2016, ystein Bech Gadmar (a.k.a. "DreymaR") + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 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. diff --git a/README.md b/README.md index 2c06b8e..6757dad 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ DreymaR's Big Bag of Keyboard Tricks ==================================== -For Linux (updated to XKB-data v2.17.1ub1, 2016-06) +### For Linux (updated to XKB-data v2.17.1ub1, 2016-06) * New "Colemak[eD]" AltGr mappings (lv3-4) putting dead keys on AltGr+symbol keys and reworking most other mappings * An "Extend" layer using Caps Lock as a modifier (lv5-8) for navigation/editing from the home position and more @@ -23,4 +23,7 @@ Links ----- See the [DREYMAR'S (XKB) topic on the Colemak Forums](http://forum.colemak.com/viewtopic.php?id=1438) (http://forum.colemak.com). -There are plenty of explanations and further links in there, as well as links to files. \ No newline at end of file +There are plenty of explanations and further links in there, as well as links to files. + +Happy XKB hacking! +DreymaR, 2016-10 diff --git a/install-dreymar-xmod.sh b/install-dreymar-xmod.sh index 4f2c5fa..7c018b8 100644 --- a/install-dreymar-xmod.sh +++ b/install-dreymar-xmod.sh @@ -29,19 +29,18 @@ FootStr="Happy xkb-hacking! ~ Øystein Bech 'DreymaR' Gadmar" #"- With '-i ', specify a directory path/name to install in.\n"\ #"- With '-g', also install GTK 2.0/3.0 config for XF86 Cut/Copy/Paste.\n"\ -## NOTE: The mod directory has the form "${DModTag}" with DModTag='x-mod_v_' -## - Unless you change the DModTag, it should be in the same dir as this script +## NOTE: The mod directory has the form $DModTag="x-mod_v[_]" +## - Unless you change this tag, it should be in the same dir as this script ## - It has subdirectories like 'xkb' that are to be installed (one, some or all) -## NOTE: This is the new preferred way instead of patching the system files: +## NOTE: This is now the preferred way instead of patching the system files: ## - Backup system xkb to dbak-xkb_ (and the same for any other subdirs) ## - Copy X11/xkb to ${InstDir}/dxkb, then modify files in dxkb ## - Set up setxkb.sh to run from the modified dxkb [WARNING: This may not work now!] -## - Optionally (-o) overwrite the system files instead +## - Or, (-o) overwrite the system files instead ## NOTE: The x-mod dir now holds x-mod*/xkb; eventually there may be a locale dir too. ##-------------- init ------------------------------------------ -## NOTE: '#(-a)' means that the value can be set by a command-line argument '-a ' MyDATE=`date +"%Y-%m-%d_%H-%M"` MyNAME=`basename $0` @@ -57,7 +56,7 @@ 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) -DModTag="x-mod_v${XVERSION}_${ModDATE}" # (-t) Mod dir "prefix" +DModTag="x-mod_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 @@ -69,9 +68,13 @@ SubDirs='all' # (-m) Directory/-ies inside X11 to modify (e.g., 'xkb locale', InstGTK='no' # (-g) Whether to install the GTK 2.0/3.0 config (if not present) SetXMap='no' # (-x) Whether to run the setxkb script after installing SetXStr='5aw us us' # (-s) Shortcut string for setxkb - 'mmm ll vv' (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"\ -"Run this from the directory containing the x-mod dir\n"\ +" Run this from the directory containing the x-mod dir\n"\ +"===========================================================\n"\ +"[-#] Functionality - 'default' \n"\ +"===========================================================\n"\ "[-i] - ${InstDir}\n"\ "[-o] Override install path w/ X11 - ${WriteSys}\n"\ "[-b] Force backup | location - ${X11DIR}\n"\ @@ -212,7 +215,7 @@ for That in ${SubDirs}; do if [ ${Restore} != '0' ]; then # Restore from specified backup ## Restore from backup. Pick a backup # by parameter, 1 being oldest; use 999 or such for the last one BackIt=`find "${X11DIR}/${DBakFix}${That}"* -maxdepth 0 -type d 2>/dev/null | head -n ${Restore} | tail -n 1` - [ -d "${BackIt}" ] || MyError "Unable to restore from '$(basename ${BackIt})': Not found!" + [ -d "${BackIt}" ] || MyError "Unable to locate restore dir '$(basename "${BackIt}")'" MyPoint "Restoring from backup '$(basename "${BackIt}")'" ${DoSudo} cp -a "${BackIt}/"* "${X11DIR}/${That}" 2>/dev/null \ && MyPoint "Restore done" || MyError "Restore copy error!" diff --git a/setxkb.sh b/setxkb.sh index 648bf8f..f3fbcd2 100644 --- a/setxkb.sh +++ b/setxkb.sh @@ -1,7 +1,7 @@ #!/bin/bash ## ====================================================== -## === XKBSET.sh to set the XKB keyboard options === +## === SETXKB.sh to set the XKB keyboard options === ## === by Øystein Bech "DreymaR" Gadmar, 2014 === ## ====================================================== @@ -25,7 +25,6 @@ FootStr="Happy xkb-hacking! ~ Øystein Bech 'DreymaR' Gadmar" # Options left out of this: Too complex (replace all or add another, and if so, how?) ##-------------- init ------------------------------------------ -## NOTE: '#(-a)' means that the value can be set by a command-line argument '-a ' #~ MyDATE=`date +"%Y-%m-%d_%H-%M"` MyNAME=`basename $0` @@ -47,8 +46,12 @@ AddCmd='no' # (-a) Add setxkbmap cmd to file? AddDefault="${HOME}/.bashrc" AddCmdTo=${AddDefault} # (-f) File (such as '~/.bashrc') to add setxkbmap cmd to SetXStr='' #'5aw no us' # (-s) Shortcut string for setxkb - 'model locale eD-variant(sym)' +## NOTE: '# (-a)' means that the value can be set by option argument '-a ' HelpStr="\e[1mUsage: bash ${MyNAME} [optional args]\e[0m\n"\ +"===========================================================\n"\ +"[-#] Functionality - 'default' \n"\ +"===========================================================\n"\ "[-m] - '${XKBmodel}'\n"\ "[-l] - '${XKBlayout}'\n"\ "[-o]