From 7f925440f8dffa75408d90022678f0738c9f78f6 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Wed, 1 Sep 2010 22:04:12 +0100 Subject: [PATCH] Cleanup and update Lithuanian keyboard layouts https://bugs.freedesktop.org/show_bug.cgi?id=29932 --- symbols/lt | 461 ++++++++++++++++++++++++++++++----------------------------- symbols/nbsp | 2 +- 2 files changed, 235 insertions(+), 228 deletions(-) diff --git a/symbols/lt b/symbols/lt index 5956ace..a832d50 100644 --- a/symbols/lt +++ b/symbols/lt @@ -1,163 +1,168 @@ // $XKeyboardConfig$ -// based on -// Lithuanian keyboard map by Ričardas Čepas -// merged into one file by Nerijus Baliūnas -// Added number and special characters writing in basic lt layout with RAlt by -// Mantas Kriaučiūnas , 2004 +// Separate keymaps merged into one file by Nerijus Baliūnas, 2002 // // $XFree86: xc/programs/xkbcomp/symbols/lt,v 1.3 2002/12/14 22:26:11 dawes Exp $ -// If you want to have 2 layouts, use +// Lithuanian Numeric layout - Lithuanian letters on the numeric row +// based on Lithuanian keyboard map by Ričardas Čepas +// 3rd and 4th levels added by Mantas Kriaučiūnas , 2004 +// Minor modifications and cleanup by Rimas Kudelis , 2010 +// +// If you want two layouts, use: // Option "XkbLayout" "lt,lt(us)" - -// Lithuanian Baltic layout - Lithuanian letters on the numeric row partial default alphanumeric_keys modifier_keys xkb_symbols "basic" { include "latin" + include "eurosign(e)" + include "level3(ralt_switch)" name[Group1]="Lithuania"; - key { [ aogonek, Aogonek, 1, exclam ] }; - key { [ ccaron, Ccaron, 2, at ] }; - key { [ eogonek, Eogonek, 3, numbersign ] }; - key { [ eabovedot, Eabovedot, 4, dollar ] }; - key { [ iogonek, Iogonek, 5, percent ] }; - key { [ scaron, Scaron, 6, asciicircum ] }; - key { [ uogonek, Uogonek, 7, ampersand ] }; - key { [ umacron, Umacron, 8, asterisk ] }; - key { [doublelowquotemark, parenleft, 9, parenleft ] }; - key { [leftdoublequotemark,parenright, 0, parenright ] }; - key { [ zcaron, Zcaron, equal, plus ] }; - - key { [ endash, EuroSign ] }; - - include "level3(ralt_switch)" + key {[ grave, asciitilde, acute ]}; + key {[ aogonek, Aogonek, 1, exclam ]}; + key {[ ccaron, Ccaron, 2, at ]}; + key {[ eogonek, Eogonek, 3, numbersign ]}; + key {[ eabovedot, Eabovedot, 4, dollar ]}; + key {[ iogonek, Iogonek, 5, percent ]}; + key {[ scaron, Scaron, 6, asciicircum ]}; + key {[ uogonek, Uogonek, 7, ampersand ]}; + key {[ umacron, Umacron, 8, asterisk ]}; + key {[ doublelowquotemark, parenleft, 9, parenleft ]}; + key {[ leftdoublequotemark, parenright, 0, parenright ]}; + key {[ minus, underscore, endash ]}; + key {[ zcaron, Zcaron, equal, plus ]}; + + key {[ endash, EuroSign ]}; }; -// Similar to the above, but you should use Right Alt + numeric row +// Similar to the above, but uses 3rd and 4th levels in the numeric row // for Lithuanian letters partial alphanumeric_keys modifier_keys xkb_symbols "us" { include "latin" + include "eurosign(e)" + include "level3(ralt_switch)" name[Group1]="Lithuania - US keyboard with Lithuanian letters"; - key { [ 1, exclam, aogonek, Aogonek ] }; - key { [ 2, at, ccaron, Ccaron ] }; - key { [ 3, numbersign, eogonek, Eogonek ] }; - key { [ 4, dollar, eabovedot, Eabovedot ] }; - key { [ 5, percent, iogonek, Iogonek ] }; - key { [ 6, asciicircum, scaron, Scaron ] }; - key { [ 7, ampersand, uogonek, Uogonek ] }; - key { [ 8, asterisk, umacron, Umacron ] }; - key { [ 9, parenleft, doublelowquotemark, parenleft ] }; - key { [ 0, parenright, leftdoublequotemark,parenright ] }; - key { [ equal, plus, zcaron, Zcaron ] }; - - key { [ e, E, endash, EuroSign ] }; - key { [ endash, EuroSign ] }; - - include "level3(ralt_switch)" + key {[ grave, asciitilde, acute ]}; + key {[ 1, exclam, aogonek, Aogonek ]}; + key {[ 2, at, ccaron, Ccaron ]}; + key {[ 3, numbersign, eogonek, Eogonek ]}; + key {[ 4, dollar, eabovedot, Eabovedot ]}; + key {[ 5, percent, iogonek, Iogonek ]}; + key {[ 6, asciicircum, scaron, Scaron ]}; + key {[ 7, ampersand, uogonek, Uogonek ]}; + key {[ 8, asterisk, umacron, Umacron ]}; + key {[ 9, parenleft, doublelowquotemark, parenleft ]}; + key {[ 0, parenright, leftdoublequotemark, parenright ]}; + key {[ minus, underscore, endash ]}; + key {[ equal, plus, zcaron, Zcaron ]}; + + key {[ endash, EuroSign ]}; }; -// Lithuanian keyboard map by Gediminas Paulauskas -// Minor modification by Ričardas Čepas according to http://sun3.mif.vu.lt/cs/TK4/lithkeyb.html - -// Describes Lithuanian keymap LST 1582:2000 +// Lithuanian keymap LST 1582:2000 +// The standard is described at http://ims.mii.lt/klav/ // Extensions: B01 L3 is "<" , B02 L3 is ">" and B03 L3 is endash to make this // layout usable with pc101 and pc104 keyboards. +// +// Made by Gediminas Paulauskas +// Minor modifications by Ričardas Čepas and Rimas Kudelis partial alphanumeric_keys modifier_keys xkb_symbols "std" { include "latin" - - name[Group1]= "Lithuania - Standard"; - - key {[ grave, asciitilde, acute ]}; - key {[ exclam, 1, at ]}; - key {[ minus, 2, underscore ]}; - key {[ slash, 3, numbersign ]}; - key {[ semicolon, 4, dollar ]}; - key {[ colon, 5, section ]}; - key {[ comma, 6, asciicircum ]}; - key {[ period, 7, ampersand ]}; - key {[ equal, 8, asterisk ]}; - key {[ parenleft, 9, bracketleft ]}; - key {[ parenright, 0, bracketright ]}; - key {[ question, plus, apostrophe ]}; - key {[ x, X, percent ]}; - key {[ aogonek, Aogonek ]}; - key {[ zcaron, Zcaron ]}; - key {[ e, E, EuroSign ]}; - key {[ iogonek, Iogonek, braceleft ]}; - key {[ w, W, braceright ]}; - key {[ scaron, Scaron ]}; - key {[ uogonek, Uogonek ]}; - key {[ eabovedot, Eabovedot, quotedbl ]}; - key {[ z, Z, less ]}; - key {[ umacron, Umacron, greater ]}; - key {[ c, C, endash ]}; - key {[ ccaron, Ccaron, doublelowquotemark ]}; - key {[ f, F, leftdoublequotemark ]}; -// this is actually right quote for Lithuanian - key {[ eogonek, Eogonek, backslash ]}; - key {[ q, Q, bar ]}; - key {[ space, space, nobreakspace, nobreakspace ]}; - - key {[ less, greater, endash ]}; - + include "eurosign(e)" + include "nbsp(level3)" include "kpdl(comma)" - include "level3(ralt_switch)" + + name[Group1]="Lithuania - Standard"; + + key {[ grave, asciitilde, acute ]}; + key {[ exclam, 1, at ]}; + key {[ minus, 2, underscore ]}; + key {[ slash, 3, numbersign ]}; + key {[ semicolon, 4, dollar ]}; + key {[ colon, 5, section ]}; + key {[ comma, 6, asciicircum ]}; + key {[ period, 7, ampersand ]}; + key {[ equal, 8, asterisk ]}; + key {[ parenleft, 9, bracketleft ]}; + key {[ parenright, 0, bracketright ]}; + key {[ question, plus, apostrophe ]}; + key {[ x, X, percent ]}; + + key {[ aogonek, Aogonek ]}; + key {[ zcaron, Zcaron ]}; + key {[ iogonek, Iogonek, braceleft ]}; + key {[ w, W, braceright ]}; + + key {[ scaron, Scaron ]}; + key {[ uogonek, Uogonek ]}; + key {[ eabovedot, Eabovedot, quotedbl ]}; + key {[ q, Q, bar ]}; + + key {[ less, greater, endash ]}; + key {[ z, Z, less ]}; + key {[ umacron, Umacron, greater ]}; + key {[ c, C, endash ]}; + key {[ ccaron, Ccaron, doublelowquotemark ]}; + key {[ f, F, leftdoublequotemark ]}; + key {[ eogonek, Eogonek, backslash ]}; }; -// Lithuanian keyboard map by Piter PUNK -// Describes Lithuanian keymap LST 1205-92 -// +// Lithuanian keymap LST 1205-92 +// This standard was made deprecated by LST 1582:2000 above. // This keyboard is also know as IBM layout. -// We follow the map found at: http://www.kada.lt/litwin/Kbdlta.gif -// and info from Edis Tamoshauskas +// We follow the map shown at: http://www.registrucentras.lt/litwin/kbdlta.gif +// and info from Edis Tamošauskas +// +// Made by Piter PUNK +// Minor modifications and cleanup by Rimas Kudelis, 2010 partial alphanumeric_keys modifier_keys xkb_symbols "ibm" { include "latin" - - name[Group1]= "Lithuania - IBM (LST 1205-92)"; - - key {[ grave, asciitilde ]}; - key {[ exclam, 1 ]}; - key {[ quotedbl, 2, at ]}; - key {[ slash, 3, numbersign ]}; - key {[ semicolon, 4, dollar ]}; - key {[ colon, 5, percent ]}; - key {[ comma, 6, asciicircum ]}; - key {[ period, 7, ampersand ]}; - key {[ question, 8, asterisk ]}; - key {[ parenleft, 9 ]}; - key {[ parenright, 0 ]}; - key {[ underscore, minus ]}; - key {[ plus, equal ]}; - key {[ aogonek, Aogonek, q, Q ]}; - key {[ zcaron, Zcaron, w, W ]}; - key {[ e, E, EuroSign ]}; - key {[ iogonek, Iogonek, bracketleft, braceleft ]}; - key {[ doublelowquotemark, leftdoublequotemark, bracketright, braceright ]}; - key {[ uogonek, Uogonek, semicolon, colon ]}; - key {[ eabovedot, Eabovedot, apostrophe, quotedbl ]}; - key {[ umacron, Umacron, x, X ]}; - key {[ ccaron, Ccaron, comma, less ]}; - key {[ scaron, Scaron, period, greater ]}; - key {[ eogonek, Eogonek, slash, question ]}; - key {[ space, space, nobreakspace, nobreakspace ]}; - - key {[ less, greater, endash ]}; - + include "eurosign(e)" + include "nbsp(level3)" include "level3(ralt_switch)" + + name[Group1]="Lithuania - IBM (LST 1205-92)"; + + key {[ grave, asciitilde, acute ]}; + key {[ exclam, 1 ]}; + key {[ quotedbl, 2, at ]}; + key {[ slash, 3, numbersign ]}; + key {[ semicolon, 4, dollar ]}; + key {[ colon, 5, percent ]}; + key {[ comma, 6, asciicircum ]}; + key {[ period, 7, ampersand ]}; + key {[ question, 8, asterisk ]}; + key {[ parenleft, 9 ]}; + key {[ parenright, 0 ]}; + key {[ underscore, minus, endash ]}; + key {[ plus, equal ]}; + + key {[ aogonek, Aogonek, q, Q ]}; + key {[ zcaron, Zcaron, w, W ]}; + key {[ iogonek, Iogonek, bracketleft, braceleft ]}; + key {[ doublelowquotemark, leftdoublequotemark, bracketright, braceright ]}; + + key {[ uogonek, Uogonek, semicolon, colon ]}; + key {[ eabovedot, Eabovedot, apostrophe, quotedbl ]}; + + key {[ less, greater, endash ]}; + key {[ umacron, Umacron, x, X ]}; + key {[ ccaron, Ccaron, comma, less ]}; + key {[ scaron, Scaron, period, greater ]}; + key {[ eogonek, Eogonek, slash, question ]}; }; // LEKP and LEKPa layouts 1.0 @@ -170,125 +175,127 @@ xkb_symbols "ibm" { // http://creativecommons.org/licenses/by-nc-sa/3.0/ or send // a letter to Creative Commons, 171 Second Street, Suite 300, // San Francisco, California, 94105, USA. +// +// Minor cleanup by Rimas Kudelis, 2010 partial alphanumeric_keys modifier_keys xkb_symbols "lekp" { - name[Group1]="Lithuania - LEKP"; - key { [ grave, asciitilde, acute ] }; - key { [ slash, numbersign, bar ] }; - key { [ backslash, at, section ] }; - key { [ period, braceleft ] }; - key { [ comma, braceright ] }; - key { [ f, F ] }; - key { [ exclam, endash ] }; - key { [ w, W ] }; - key { [ uogonek, Uogonek ] }; - key { [ iogonek, Iogonek ] }; - key { [ parenleft, doublelowquotemark, registered ] }; - key { [ parenright, leftdoublequotemark, copyright ] }; - key { [ colon, ampersand, trademark ] }; - - key { [ apostrophe, underscore ] }; - - key { [ q, Q, EuroSign ] }; - key { [ g, G, 7 ] }; - key { [ r, R, 8 ] }; - key { [ l, L, 9 ] }; - key { [ d, D, percent ] }; - key { [ ccaron, Ccaron ] }; - key { [ j, J ] }; - key { [ u, U, period ] }; - key { [ eabovedot, Eabovedot, minus ] }; - key { [ eogonek, Eogonek, slash ] }; - key { [ question, bracketleft, division ] }; - key { [ equal, bracketright ] }; - - key { [ BackSpace ] }; - key { [ a, A, 0 ] }; - key { [ k, K, 4 ] }; - key { [ s, S, 5 ] }; - key { [ t, T, 6 ] }; - key { [ m, M, dollar ] }; - key { [ p, P ] }; - key { [ n, N ] }; - key { [ e, E, comma ] }; - key { [ i, I, plus ] }; - key { [ o, O, asterisk ] }; - key { [ y, Y, multiply ] }; - - key { [ z, Z, asciicircum ] }; - key { [ x, X, 1 ] }; - key { [ c, C, 2 ] }; - key { [ v, V, 3 ] }; - key { [ zcaron, Zcaron ] }; - key { [ scaron, Scaron ] }; - key { [ b, B, degree ] }; - key { [ umacron, Umacron, less ] }; - key { [ aogonek, Aogonek, greater ] }; - key { [ h, H ] }; - - key { [ semicolon, quotedbl, sterling ] }; - + + include "capslock(backspace)" include "level3(ralt_switch)" + + name[Group1]="Lithuania - LEKP"; + + key {[ grave, asciitilde, acute ]}; + key {[ slash, numbersign, bar ]}; + key {[ backslash, at, section ]}; + key {[ period, braceleft ]}; + key {[ comma, braceright ]}; + key {[ f, F ]}; + key {[ exclam, endash ]}; + key {[ w, W ]}; + key {[ uogonek, Uogonek ]}; + key {[ iogonek, Iogonek ]}; + key {[ parenleft, doublelowquotemark, registered ]}; + key {[ parenright, leftdoublequotemark, copyright ]}; + key {[ colon, ampersand, trademark ]}; + + key {[ q, Q, EuroSign ]}; + key {[ g, G, 7 ]}; + key {[ r, R, 8 ]}; + key {[ l, L, 9 ]}; + key {[ d, D, percent ]}; + key {[ ccaron, Ccaron ]}; + key {[ j, J ]}; + key {[ u, U, period ]}; + key {[ eabovedot, Eabovedot, minus ]}; + key {[ eogonek, Eogonek, slash ]}; + key {[ question, bracketleft, division ]}; + key {[ equal, bracketright ]}; + + key {[ a, A, 0 ]}; + key {[ k, K, 4 ]}; + key {[ s, S, 5 ]}; + key {[ t, T, 6 ]}; + key {[ m, M, dollar ]}; + key {[ p, P ]}; + key {[ n, N ]}; + key {[ e, E, comma ]}; + key {[ i, I, plus ]}; + key {[ o, O, asterisk ]}; + key {[ y, Y, multiply ]}; + key {[ apostrophe, underscore ]}; + + key {[ semicolon, quotedbl, sterling ]}; + key {[ z, Z, asciicircum ]}; + key {[ x, X, 1 ]}; + key {[ c, C, 2 ]}; + key {[ v, V, 3 ]}; + key {[ zcaron, Zcaron ]}; + key {[ scaron, Scaron ]}; + key {[ b, B, degree ]}; + key {[ umacron, Umacron, less ]}; + key {[ aogonek, Aogonek, greater ]}; + key {[ h, H ]}; }; partial alphanumeric_keys modifier_keys xkb_symbols "lekpa" { - name[Group1]="Lithuania - LEKPa"; - key { [ grave, asciitilde, acute ] }; - key { [ slash, quotedbl, bar ] }; - key { [ backslash, at, section ] }; - key { [ period, braceleft, numbersign ] }; - key { [ comma, braceright, sterling ] }; - key { [ f, F, ampersand ] }; - key { [ exclam, endash ] }; - key { [ w, W ] }; - key { [ uogonek, Uogonek ] }; - key { [ iogonek, Iogonek ] }; - key { [ parenleft, doublelowquotemark, registered ] }; - key { [ parenright, leftdoublequotemark, copyright ] }; - key { [ colon, semicolon, trademark ] }; - - key { [ apostrophe, underscore ] }; - - key { [ q, Q, EuroSign ] }; - key { [ g, G, 7 ] }; - key { [ r, R, 8 ] }; - key { [ l, L, 9 ] }; - key { [ d, D, percent ] }; - key { [ ccaron, Ccaron ] }; - key { [ j, J ] }; - key { [ u, U, period ] }; - key { [ eabovedot, Eabovedot, minus ] }; - key { [ eogonek, Eogonek, slash ] }; - key { [ question, bracketleft, division ] }; - key { [ equal, bracketright ] }; - - key { [ BackSpace ] }; - key { [ a, A, 0 ] }; - key { [ k, K, 4 ] }; - key { [ s, S, 5 ] }; - key { [ t, T, 6 ] }; - key { [ m, M, dollar ] }; - key { [ p, P ] }; - key { [ n, N ] }; - key { [ e, E, comma ] }; - key { [ i, I, plus ] }; - key { [ o, O, asterisk ] }; - key { [ y, Y, multiply ] }; - - key { [ z, Z, asciicircum ] }; - key { [ x, X, 1 ] }; - key { [ c, C, 2 ] }; - key { [ v, V, 3 ] }; - key { [ zcaron, Zcaron ] }; - key { [ scaron, Scaron ] }; - key { [ b, B, degree ] }; - key { [ umacron, Umacron, less ] }; - key { [ aogonek, Aogonek, greater ] }; - key { [ h, H ] }; - + include "capslock(backspace)" include "level3(ralt_switch)" + + name[Group1]="Lithuania - LEKPa"; + + key {[ grave, asciitilde, acute ]}; + key {[ slash, quotedbl, bar ]}; + key {[ backslash, at, section ]}; + key {[ period, braceleft, numbersign ]}; + key {[ comma, braceright, sterling ]}; + key {[ f, F, ampersand ]}; + key {[ exclam, endash ]}; + key {[ w, W ]}; + key {[ uogonek, Uogonek ]}; + key {[ iogonek, Iogonek ]}; + key {[ parenleft, doublelowquotemark, registered ]}; + key {[ parenright, leftdoublequotemark, copyright ]}; + key {[ colon, semicolon, trademark ]}; + + key {[ q, Q, EuroSign ]}; + key {[ g, G, 7 ]}; + key {[ r, R, 8 ]}; + key {[ l, L, 9 ]}; + key {[ d, D, percent ]}; + key {[ ccaron, Ccaron ]}; + key {[ j, J ]}; + key {[ u, U, period ]}; + key {[ eabovedot, Eabovedot, minus ]}; + key {[ eogonek, Eogonek, slash ]}; + key {[ question, bracketleft, division ]}; + key {[ equal, bracketright ]}; + + key {[ a, A, 0 ]}; + key {[ k, K, 4 ]}; + key {[ s, S, 5 ]}; + key {[ t, T, 6 ]}; + key {[ m, M, dollar ]}; + key {[ p, P ]}; + key {[ n, N ]}; + key {[ e, E, comma ]}; + key {[ i, I, plus ]}; + key {[ o, O, asterisk ]}; + key {[ y, Y, multiply ]}; + key {[ apostrophe, underscore ]}; + + key {[ z, Z, asciicircum ]}; + key {[ x, X, 1 ]}; + key {[ c, C, 2 ]}; + key {[ v, V, 3 ]}; + key {[ zcaron, Zcaron ]}; + key {[ scaron, Scaron ]}; + key {[ b, B, degree ]}; + key {[ umacron, Umacron, less ]}; + key {[ aogonek, Aogonek, greater ]}; + key {[ h, H ]}; }; diff --git a/symbols/nbsp b/symbols/nbsp index 2f273be..0c3d403 100644 --- a/symbols/nbsp +++ b/symbols/nbsp @@ -32,7 +32,7 @@ xkb_symbols "level2" { // level3 & level3ns provide no-breaking spaces starting from level3 // This is good for typographers but experience shows many users accidently // type no-breaking spaces on the CLI (resulting in errors) -// Used by fr(latin9) +// Used by fr(latin9) and lt(std) partial xkb_symbols "level3" { key { -- 2.7.4