xkbdesc/symbols am, 1.7, 1.8 ara, 1.4, 1.5 az, 1.4, 1.5 be, 1.5,
1.6 ben, 1.3, 1.4 bg, 1.6, 1.7 br, 1.6, 1.7 by, 1.5, 1.6 ca,
1.8, 1.9 ch, 1.7, 1.8 cz, 1.7, 1.8 de, 1.5, 1.6 deva, 1.3,
1.4 dk, 1.5, 1.6 ee, 1.5, 1.6 es, 1.5, 1.6 fi, 1.5, 1.6 fo,
1.6, 1.7 fr, 1.7, 1.8 gb, 1.6, 1.7 ge, 1.4, 1.5 gr, 1.4,
1.5 hr, 1.6, 1.7 hu, 1.5, 1.6 ie, 1.4, 1.5 il, 1.7, 1.8 is,
1.5, 1.6 it, 1.5, 1.6 latam, 1.4, 1.5 lt, 1.7, 1.8 lv, 1.6,
1.7 mal, 1.3, 1.4 mkd, 1.1, 1.2 mt, 1.7, 1.8 no, 1.6, 1.7 ogam,
1.3, 1.4 pl, 1.7, 1.8 pt, 1.5, 1.6 ro, 1.6, 1.7 ru, 1.5,
1.6 se, 1.6, 1.7 sk, 1.7, 1.8 smi, 1.5, 1.6 srp, 1.5, 1.6 syr,
1.4, 1.5 tam, 1.3, 1.4 th, 1.5, 1.6 tr, 1.6, 1.7 ua, 1.5,
1.6 us, 1.10, 1.11
Sergey V. Oudaltsov
xlibs-commit@pdx.freedesktop.org
Sat Jan 15 18:18:23 PST 2005
Committed by: svu
Update of /cvs/xlibs/xkbdesc/symbols
In directory gabe:/tmp/cvs-serv27174/symbols
Modified Files:
am ara az be ben bg br by ca ch cz de deva dk ee es fi fo fr
gb ge gr hr hu ie il is it latam lt lv mal mkd mt no ogam pl
pt ro ru se sk smi srp syr tam th tr ua us
Log Message:
introducing the consistency in the group names
Index: am
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- am 6 Jan 2005 01:33:31 -0000 1.7
+++ am 16 Jan 2005 02:18:20 -0000 1.8
@@ -68,6 +68,7 @@
xkb_symbols "phonetic" {
include "am(basic)"
+ name[Group1]= "Armenia - Phonetic";
key <BKSL> { [ 0x1000577, 0x1000547 ] };
Index: ara
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ara,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ara 9 Oct 2004 17:29:27 -0000 1.4
+++ ara 16 Jan 2005 02:18:20 -0000 1.5
@@ -71,11 +71,13 @@
partial alphanumeric_keys
xkb_symbols "qwerty" {
include "ara(basic)"
+ name[Group1]= "Arabic - qwerty";
};
partial alphanumeric_keys
xkb_symbols "azerty" {
include "ara(basic)"
+ name[Group1]= "Arabic - azerty";
// the north african arabic keyboard differs from the middle east one
// by the numeric row; it follows French keyboard style
@@ -103,6 +105,7 @@
partial alphanumeric_keys
xkb_symbols "digits" {
include "ara(basic)"
+ name[Group1]= "Arabic - digits";
// use arabic script digits
@@ -121,11 +124,13 @@
partial alphanumeric_keys
xkb_symbols "qwerty_digits" {
include "ara(digits)"
+ name[Group1]= "Arabic - qwerty/digits";
};
partial alphanumeric_keys
xkb_symbols "azerty_digits" {
include "ara(azerty)"
+ name[Group1]= "Arabic - azerty/digits";
key <AE01> { [ ampersand, 0x1000661 ] };
key <AE02> { [ eacute, 0x1000662 ] };
Index: az
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/az,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- az 22 Dec 2004 21:51:19 -0000 1.4
+++ az 16 Jan 2005 02:18:20 -0000 1.5
@@ -9,7 +9,7 @@
include "us"
- name[Group1]= "Azerbaijan (Latin)";
+ name[Group1]= "Azerbaijan";
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
@@ -42,7 +42,7 @@
partial alphanumeric_keys
xkb_symbols "cyrillic" {
- name[Group1]= "Azerbaijan (Cyrillic)";
+ name[Group1]= "Azerbaijan - Cyrillic";
key <AE02> {[ 2, quotedbl ] };
key <AE03> {[ 3, numbersign ] };
Index: be
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/be,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- be 22 Dec 2004 21:51:19 -0000 1.5
+++ be 16 Jan 2005 02:18:20 -0000 1.6
@@ -49,6 +49,7 @@
partial alphanumeric_keys
xkb_symbols "iso-alternate" {
include "be(basic)"
+ name[Group1]="Belgium - ISO Alternate";
key <AD01> { [ a, A, ae, AE ] };
key <AD02> { [ z, Z, guillemotleft, less ] };
@@ -59,11 +60,12 @@
};
partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
+xkb_symbols "sundeadkeys" {
// Use the Sun dead keys
include "be(basic)"
+ name[Group1]="Belgium - Sun dead keys";
key <AD11> { [SunFA_Circum, SunFA_Diaeresis, bracketleft, bracketleft] };
key <AC11> { [ ugrave, percent, SunFA_Acute, SunFA_Acute ] };
@@ -73,11 +75,11 @@
};
partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
+xkb_symbols "Sundeadkeys" {
// Use the Sun dead keys
- include "be(Sundeadkeys)"
+ include "be(sundeadkeys)"
};
@@ -87,6 +89,7 @@
// Eliminates dead keys from the basic Belgian layout
include "be(basic)"
+ name[Group1]="Belgium - Eliminate dead keys";
key <AE12> { [ minus, underscore, cedilla, ogonek ] };
key <AD11> { [asciicircum, diaeresis, bracketleft, bracketleft] };
Index: ben
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ben,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ben 9 Oct 2004 17:31:42 -0000 1.3
+++ ben 16 Jan 2005 02:18:20 -0000 1.4
@@ -70,7 +70,7 @@
};
xkb_symbols "probhat" {
- name[Group1]= "Bengali";
+ name[Group1]= "Bengali - Probhat";
key <ESC> { [ Escape ] };
// numbers
Index: bg
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/bg,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bg 22 Dec 2004 21:51:19 -0000 1.6
+++ bg 16 Jan 2005 02:18:20 -0000 1.7
@@ -81,7 +81,7 @@
partial alphanumeric_keys
xkb_symbols "phonetic" {
- name[Group1]= "Bulgaria (phonetic)";
+ name[Group1]= "Bulgaria - Phonetic";
key <TLDE> { [ Cyrillic_che, Cyrillic_CHE ] };
key <AE01> { [ 1, exclam ] };
Index: br
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/br,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- br 22 Dec 2004 21:51:19 -0000 1.6
+++ br 16 Jan 2005 02:18:20 -0000 1.7
@@ -9,10 +9,10 @@
// $XdotOrg: xc/programs/xkbcomp/symbols/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $
// $XFree86: xc/programs/xkbcomp/symbols/br,v 1.3 2003/04/19 12:22:11 pascal Exp $
+default
xkb_symbols "abnt2" {
include "latin"
-
name[Group1]="Brazil";
key <AE02> { [ 2, at, twosuperior, onehalf ] };
@@ -53,6 +53,7 @@
xkb_symbols "nodeadkeys" {
include "br(abnt2)" // for consistent naming
+ name[Group1]="Brazil - Eliminate dead keys";
key <AE06> { [ 6, diaeresis, notsign, notsign ] };
key <AD11> { [apostrophe, grave ] };
Index: by
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/by,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- by 22 Dec 2004 21:51:19 -0000 1.5
+++ by 16 Jan 2005 02:18:20 -0000 1.6
@@ -62,6 +62,7 @@
partial alphanumeric_keys
xkb_symbols "winkeys" {
include "by(basic)"
+ name[Group1]= "Belarus - Winkeys";
key <AE04> { [ 4, semicolon ] };
key <AE03> { [ 3, numbersign ] };
key <AE05> { [ 5, percent ] };
Index: ca
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ca,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ca 22 Dec 2004 21:51:19 -0000 1.8
+++ ca 16 Jan 2005 02:18:20 -0000 1.9
@@ -2,7 +2,7 @@
default partial
xkb_symbols "fr" {
- name[Group1] = "Canada (French)";
+ name[Group1] = "Canada";
key <TLDE> { [ numbersign, bar, backslash ] };
key <AE01> { [ 1, exclam, plusminus ] };
@@ -62,7 +62,7 @@
};
xkb_symbols "fr-dvorak" {
- name[Group1] = "Canada (French Dvorak)";
+ name[Group1] = "Canada - French Dvorak";
key <TLDE> { [ numbersign, bar, backslash ] };
key <AE01> { [ 1, exclam, plusminus ] };
@@ -124,7 +124,7 @@
partial
xkb_symbols "fr-legacy" {
- name[Group1] = "Canada (French Legacy)";
+ name[Group1] = "Canada - French (legacy)";
include "ca(fr)"
@@ -170,7 +170,7 @@
partial
xkb_symbols "multi" {
- name[Group1] = "Canada (Multilingual)";
+ name[Group1] = "Canada - Multilingual";
include "ca(fr)"
@@ -208,7 +208,7 @@
partial
xkb_symbols "multi-2gr" {
- name[Group1] = "Canada (Multilingual group2)";
+ name[Group1] = "Canada - Multilingual, second part";
key <TLDE> { [ VoidSymbol, hyphen ] };
key <AE01> { [ onesuperior, exclamdown ] };
Index: ch
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ch 22 Dec 2004 21:51:19 -0000 1.7
+++ ch 16 Jan 2005 02:18:20 -0000 1.8
@@ -13,7 +13,7 @@
include "latin"
// Alphanumeric section
- name[Group1]= "Switzerland (German)";
+ name[Group1]= "Switzerland";
key <TLDE> { [ section, degree ] };
key <AE01> { [ 1, plus, bar, exclamdown ] };
key <AE02> { [ 2, quotedbl, at, oneeighth ] };
@@ -53,7 +53,7 @@
partial alphanumeric_keys
xkb_symbols "de_Sundeadkeys" {
- // modify the default Swiss German layout to use Sun dead keys
+ // modify the basic Swiss German layout to use Sun dead keys
include "ch(basic)"
key <AE11> { [ apostrophe, question, SunFA_Acute ] };
key <AE12> { [ SunFA_Circum, SunFA_Grave, SunFA_Tilde ] };
@@ -63,12 +63,14 @@
partial alphanumeric_keys
xkb_symbols "de_sundeadkeys" {
include "ch(de_Sundeadkeys)"
+ name[Group1]= "Switzerland - German, Sun dead keys";
};
partial alphanumeric_keys
xkb_symbols "de_nodeadkeys" {
- // modify the default Swiss German layout not to have any dead keys
+ // modify the basic Swiss German layout not to have any dead keys
include "ch(basic)"
+ name[Group1]= "Switzerland - German, eliminate dead keys";
key <AE11> { [ apostrophe, question, acute ] };
key <AE12> { [ asciicircum, grave, asciitilde ] };
key <AD12> { [ diaeresis, exclam, bracketright ] };
@@ -81,7 +83,7 @@
// keyboard and a very simple Swiss/French keybaord
include "ch(basic)"
- name[Group1]= "Switzerland (French)";
+ name[Group1]= "Switzerland - French";
override key <AD11> {
[ egrave, udiaeresis, bracketleft ]
@@ -96,7 +98,7 @@
partial alphanumeric_keys
xkb_symbols "fr_Sundeadkeys" {
- // modify the default Swiss French layout to use Sun dead keys
+ // modify the basic Swiss French layout to use Sun dead keys
include "ch(fr)"
key <AE11> { [ apostrophe, question, SunFA_Acute ] };
key <AE12> { [ SunFA_Circum, SunFA_Grave, SunFA_Tilde ] };
@@ -106,12 +108,14 @@
partial alphanumeric_keys
xkb_symbols "fr_sundeadkeys" {
include "ch(fr_Sundeadkeys)"
+ name[Group1]= "Switzerland - French, Sun dead keys";
};
partial alphanumeric_keys
xkb_symbols "fr_nodeadkeys" {
- // modify the default Swiss French layout not to have any dead keys
+ // modify the basic Swiss French layout not to have any dead keys
include "ch(fr)"
+ name[Group1]= "Switzerland - French, eliminate dead keys";
key <AE11> { [ apostrophe, question, acute ] };
key <AE12> { [ asciicircum, grave, asciitilde ] };
key <AD12> { [ diaeresis, exclam, bracketright ] };
Index: cz
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/cz,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cz 22 Dec 2004 23:15:28 -0000 1.7
+++ cz 16 Jan 2005 02:18:20 -0000 1.8
@@ -2,7 +2,7 @@
// $XFree86: xc/programs/xkbcomp/symbols/cz,v 1.2 2002/11/22 04:02:22 dawes
// Exp $
-partial alphanumeric_keys
+partial default alphanumeric_keys
xkb_symbols "basic" {
// This layout conforms to a new cz compromise standard designed
@@ -79,6 +79,7 @@
// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
xkb_symbols "bksl" {
include "cz(basic)"
+ name[Group1]= "Czechia - Extended Backslash";
key <BKSL> { [ backslash, bar, slash, NoSymbol ] };
};
@@ -91,6 +92,7 @@
// 2001 by Kamil Toman <ktoman@email.cz>
include "cz(basic)"
+ name[Group1]= "Czechia - qwerty";
key <AB01> { [ z, Z, degree, NoSymbol ] };
key <AD06> { [ y, Y, NoSymbol, NoSymbol ] };
@@ -100,5 +102,7 @@
xkb_symbols "qwerty_bksl" {
include "cz(qwerty)"
+ name[Group1]= "Czechia - qwerty, extended Backslash";
+
key <BKSL> { [ backslash, bar, slash, NoSymbol ] };
};
Index: de
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/de,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- de 22 Dec 2004 21:51:19 -0000 1.5
+++ de 16 Jan 2005 02:18:20 -0000 1.6
@@ -4,6 +4,7 @@
// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
+default
xkb_symbols "basic" {
include "latin(type4)"
@@ -36,9 +37,10 @@
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
- // modify the default German layout to not have any dead keys
+ // modify the basic German layout to not have any dead keys
include "de(basic)"
+ name[Group1]="Germany - Eliminate dead keys";
key <TLDE> { [asciicircum, degree, notsign, notsign ] };
key <AE12> { [ acute, grave, cedilla, cedilla ] };
@@ -52,11 +54,12 @@
partial alphanumeric_keys
xkb_symbols "deadgraveacute" {
- // modify the default German layout to have only acute and grave
+ // modify the basic German layout to have only acute and grave
// as dead keys (tilde and circumflex are needed as spacing characters
// in many programming languages)
include "de(basic)"
+ name[Group1]="Germany - Dead grave acute";
key <TLDE> { [asciicircum, degree, notsign, notsign ] };
key <AD12> { [ plus, asterisk, asciitilde, dead_macron ] };
@@ -65,18 +68,20 @@
partial alphanumeric_keys
xkb_symbols "deadacute" {
- // modify the default German layout to have only acute as
+ // modify the basic German layout to have only acute as
// dead keys (ASCII grave, tilde and circumflex are needed as
// spacing characters in many programming languages and text formatters)
include "de(deadgraveacute)"
+ name[Group1]="Germany - Dead acute";
+
key <AE12> { [dead_acute, grave, dead_cedilla, dead_ogonek ] };
key <BKSL> { [numbersign, apostrophe, dead_grave, dead_grave ] };
};
partial alphanumeric_keys
-xkb_symbols "de_ro" {
+xkb_symbols "ro" {
// add romanian-specific letters to the basic German layout.
// Romanian symbols are accessible with combination of <AltGr> and
// 'a', 's', 't', 'i', 'ä (ä)' (+<Shift> for capital letters).
@@ -85,7 +90,7 @@
include "de(basic)"
- name[Group1]="Romanian for German keyboard";
+ name[Group1]="Germany - Romanian keyboard with German letters";
key <AD05> { [ t, T, tcedilla, Tcedilla ] };
key <AD08> { [ i, I, icircumflex, Icircumflex ] };
@@ -95,11 +100,12 @@
};
partial alphanumeric_keys
-xkb_symbols "de_ro_nodeadkeys" {
+xkb_symbols "ro_nodeadkeys" {
// add romanian-specific letters to the German nodeadkeys layout.
// Read the comment for de_ro !
include "de(nodeadkeys)"
+ name[Group1]="Germany - Romanian keyboard with German letters, eliminate dead keys";
key <AD05> { [ t, T, tcedilla, Tcedilla ] };
key <AD08> { [ i, I, icircumflex, Icircumflex ] };
Index: deva
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/deva,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- deva 9 Oct 2004 17:35:01 -0000 1.3
+++ deva 16 Jan 2005 02:18:20 -0000 1.4
@@ -4,7 +4,7 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]= "Hindi";
+ name[Group1]= "Devanagari";
key <TLDE> { [ 0x100094A, 0x1000912 ] };
Index: dk
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/dk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dk 22 Dec 2004 21:51:19 -0000 1.5
+++ dk 16 Jan 2005 02:18:20 -0000 1.6
@@ -33,6 +33,8 @@
include "dk(basic)"
+ name[Group1]="Denmark - Eliminate dead keys";
+
key <AE12> { [ acute, grave, bar, ogonek ] };
key <AD11> { [ aring, Aring, diaeresis, degree ] };
key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] };
Index: ee
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ee,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ee 22 Dec 2004 21:51:19 -0000 1.5
+++ ee 16 Jan 2005 02:18:20 -0000 1.6
@@ -44,6 +44,7 @@
// Modifies the basic Estonian layout to eliminate all dead keys
include "ee(basic)"
+ name[Group1]="Estonia - Eliminate dead keys";
key <TLDE> { [asciicircum,asciitilde ] };
key <AE12> { [apostrophe, grave ] };
Index: es
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/es,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- es 22 Dec 2004 21:51:19 -0000 1.5
+++ es 16 Jan 2005 02:18:20 -0000 1.6
@@ -44,6 +44,8 @@
xkb_symbols "sundeadkeys" {
include "es(Sundeadkeys)"
+
+ name[Group1]="Spain - Sun dead keys";
};
partial alphanumeric_keys
@@ -51,6 +53,8 @@
include "es(basic)"
+ name[Group1]="Spain - Eliminate dead keys";
+
key <AD11> { [ grave, asciicircum, bracketleft, degree ] };
key <AD12> { [ plus, asterisk, bracketright, macron ] };
key <AC10> { [ ntilde, Ntilde, asciitilde, doubleacute ] };
Index: fi
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/fi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fi 22 Dec 2004 21:51:19 -0000 1.5
+++ fi 16 Jan 2005 02:18:20 -0000 1.6
@@ -68,6 +68,8 @@
include "latin(type2_nodeadkeys)"
include "fi(fi)"
+ name[Group1]="Finland - Eliminate dead keys";
+
key <AE12> { [ acute, grave ] };
key <AD12> { [ diaeresis, asciicircum, asciitilde, caron ] };
};
Index: fo
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/fo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fo 22 Dec 2004 21:51:19 -0000 1.6
+++ fo 16 Jan 2005 02:18:20 -0000 1.7
@@ -1,6 +1,6 @@
// $XKeyboardConfig$
-partial alphanumeric_keys
+partial default alphanumeric_keys
xkb_symbols "basic" {
include "latin(type2)"
@@ -37,6 +37,8 @@
include "fo(basic)"
+ name[Group1]= "Faroe Islands - Eliminate dead keys";
+
key <AE12> { [ acute, grave, bar, ogonek ] };
key <AD11> { [ aring, Aring, diaeresis, degree ] };
key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] };
Index: fr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/fr,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fr 22 Dec 2004 21:51:19 -0000 1.7
+++ fr 16 Jan 2005 02:18:20 -0000 1.8
@@ -60,6 +60,7 @@
xkb_symbols "sundeadkeys" {
include "fr(Sundeadkeys)"
+ name[Group1]="France - Sun dead keys";
};
partial alphanumeric_keys
@@ -69,6 +70,8 @@
include "fr(basic)"
+ name[Group1]="France - Eliminate dead keys";
+
key <AE12> { [ equal, plus, braceright, ogonek ] };
key <AD11> { [asciicircum, diaeresis ] };
key <AD12> { [ dollar, sterling, currency, macron ] };
@@ -150,7 +153,7 @@
include "latin"
- name[Group1]="fr-latin9";
+ name[Group1]="France - Alternative";
key <TLDE> { [ oe, OE, leftdoublequotemark, rightdoublequotemark ] };
key <AE01> { [ ampersand, 1, dead_acute, periodcentered ] };
@@ -231,6 +234,7 @@
include "fr(latin9_Sundeadkeys)"
+ name[Group1]="France - Alternative, Sun dead keys";
};
partial alphanumeric_keys
@@ -240,6 +244,8 @@
include "fr(latin9)"
+ name[Group1]="France - Alternative, eliminate dead keys";
+
key <AE01> { [ ampersand, 1, apostrophe, periodcentered ] };
key <AE07> { [ egrave, 7, grave, Egrave ] };
key <AE12> { [ equal, plus, braceright ] };
@@ -252,7 +258,7 @@
partial alphanumeric_keys
xkb_symbols "dvorak" {
- name[Group1]= "French dvorak";
+ name[Group1]= "France - Dvorak";
key <TLDE> { [ oe, OE, ae, AE ] };
Index: gb
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/gb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gb 22 Dec 2004 21:51:19 -0000 1.6
+++ gb 16 Jan 2005 02:18:20 -0000 1.7
@@ -29,7 +29,7 @@
include "level3(ralt_switch)"
};
-partial default alphanumeric_keys
+partial alphanumeric_keys
xkb_symbols "intl" {
// Describes the differences between a very simple en_US
@@ -45,7 +45,7 @@
include "latin"
- name[Group1]="United Kingdom";
+ name[Group1]="United Kingdom - International (with dead keys)";
key <AE02> { [ 2, dead_diaeresis, twosuperior, onehalf ] };
key <AE03> { [ 3, sterling, threesuperior, onethird ] };
@@ -68,6 +68,8 @@
xkb_symbols "dvorak" {
include "us(dvorak)"
+ name[Group1]="United Kingdom - Dvorak";
+
key <BKSL> { [ numbersign, asciitilde ] };
key <AE02> { [ 2, quotedbl, twosuperior, NoSymbol ] };
key <AE03> { [ 3, sterling, threesuperior, NoSymbol ] };
Index: ge
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ge,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ge 22 Dec 2004 21:51:19 -0000 1.4
+++ ge 16 Jan 2005 02:18:20 -0000 1.5
@@ -60,7 +60,7 @@
partial alphanumeric_keys
xkb_symbols "ru" {
- name[Group1]= "Georgia";
+ name[Group1]= "Georgia - Russian";
key <TLDE> { [ asciicircum, asciitilde ] };
key <AE01> { [ 1, exclam ] };
Index: gr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/gr,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gr 22 Dec 2004 21:51:19 -0000 1.4
+++ gr 16 Jan 2005 02:18:20 -0000 1.5
@@ -85,6 +85,8 @@
include "gr(basic)"
+ name[Group1] = "Greece - Extended";
+
key.type = "THREE_LEVEL";
key <AE05> { [ 5, percent, EuroSign ] };
@@ -103,6 +105,8 @@
include "gr(extended)"
+ name[Group1] = "Greece - Polytonic";
+
key.type = "THREE_LEVEL";
key <AD11> { [ dead_tilde, dead_diaeresis, dead_macron ] };
@@ -118,6 +122,8 @@
include "gr(basic)"
+ name[Group1] = "Greece - Eliminate dead keys";
+
key <AC10> { [ semicolon, colon ] };
};
Index: hr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/hr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hr 22 Dec 2004 21:51:19 -0000 1.6
+++ hr 16 Jan 2005 02:18:20 -0000 1.7
@@ -57,7 +57,7 @@
// by Vlatko Kosturjak (kost at linux.hr)
// Alphanumeric section
- name[Group1]= "Croatia (US)";
+ name[Group1]= "Croatia - US keyboard with Croatian letters";
key <AD01> { [ q, Q ],
[ backslash ] };
key <AD02> { [ w, W ],
Index: hu
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/hu,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hu 22 Dec 2004 21:51:19 -0000 1.5
+++ hu 16 Jan 2005 02:18:20 -0000 1.6
@@ -23,25 +23,29 @@
// Default layout
default partial
xkb_symbols "basic" {
- include "hu(102_qwertz_comma_dead)"
+include "hu(102_qwertz_comma_dead)"
+name[Group1] = "Hungary";
};
// Standard layout
partial
xkb_symbols "standard" {
- include "hu(102_qwertz_comma_dead)"
+include "hu(102_qwertz_comma_dead)"
+name[Group1] = "Hungary - Standard";
};
// Standard layout without dead key support
partial
xkb_symbols "nodeadkeys" {
- include "hu(102_qwertz_comma_nodead)"
+include "hu(102_qwertz_comma_nodead)"
+name[Group1] = "Hungary - Eliminate dead keys";
};
// Qwerty layout
partial
xkb_symbols "qwerty" {
- include "hu(101_qwerty_comma_dead)"
+include "hu(101_qwerty_comma_dead)"
+name[Group1] = "Hungary - qwerty";
};
// Main layouts
@@ -52,14 +56,14 @@
// and with dead key support
partial
xkb_symbols "101_qwertz_comma_dead" {
- name[Group1] = "Hungary";
- include "latin"
- include "hu(def_101)"
- include "hu(def_qwertz)"
- include "keypad(comma)"
- include "hu(def_dead)"
- include "hu(def_common)"
- include "level3(ralt_switch)"
+name[Group1] = "Hungary - 101/qwertz/comma/Dead keys";
+include "latin"
+include "hu(def_101)"
+include "hu(def_qwertz)"
+include "keypad(comma)"
+include "hu(def_dead)"
+include "hu(def_common)"
+include "level3(ralt_switch)"
};
// 101_qwertz_comma_nodead
@@ -68,7 +72,7 @@
// and without dead key support
partial
xkb_symbols "101_qwertz_comma_nodead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 101/qwertz/comma/Eliminate dead keys";
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
@@ -84,7 +88,7 @@
// and with dead key support
partial
xkb_symbols "101_qwertz_dot_dead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 101/qwertz/dot/Dead keys";
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
@@ -100,7 +104,7 @@
// and without dead key support
partial
xkb_symbols "101_qwertz_dot_nodead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 101/qwertz/dot/Eliminate dead keys";
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
@@ -116,7 +120,7 @@
// and with dead key support
partial
xkb_symbols "101_qwerty_comma_dead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 101/qwerty/comma/Dead keys";
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
@@ -132,7 +136,7 @@
// and without dead key support
partial
xkb_symbols "101_qwerty_comma_nodead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 101/qwerty/comma/Eliminate dead keys";
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
@@ -148,7 +152,7 @@
// and with dead key support
partial
xkb_symbols "101_qwerty_dot_dead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 101/qwerty/dot/Dead keys";
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
@@ -164,7 +168,7 @@
// and without dead key support
partial
xkb_symbols "101_qwerty_dot_nodead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 101/qwerty/dot/Eliminate dead keys";
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
@@ -180,7 +184,7 @@
// and with dead key support
partial
xkb_symbols "102_qwertz_comma_dead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 102/qwertz/comma/Dead keys";
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
@@ -196,7 +200,7 @@
// and without dead key support
partial
xkb_symbols "102_qwertz_comma_nodead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 102/qwertz/comma/Eliminate dead keys";
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
@@ -212,7 +216,7 @@
// and with dead key support
partial
xkb_symbols "102_qwertz_dot_dead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 102/qwertz/dot/Dead keys";
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
@@ -228,7 +232,7 @@
// and without dead key support
partial
xkb_symbols "102_qwertz_dot_nodead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 102/qwertz/dot/Eliminate dead keys";
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
@@ -244,7 +248,7 @@
// and with dead key support
partial
xkb_symbols "102_qwerty_comma_dead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 102/qwerty/comma/Dead keys";
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
@@ -260,7 +264,7 @@
// and without dead key support
partial
xkb_symbols "102_qwerty_comma_nodead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 102/qwerty/comma/Eliminate dead keys";
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
@@ -276,7 +280,7 @@
// and with dead key support
partial
xkb_symbols "102_qwerty_dot_dead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 102/qwerty/dot/Dead keys";
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
@@ -292,7 +296,7 @@
// and without dead key support
partial
xkb_symbols "102_qwerty_dot_nodead" {
- name[Group1] = "Hungary";
+ name[Group1] = "Hungary - 102/qwerty/dot/Eliminate dead keys";
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
Index: ie
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ie,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ie 22 Dec 2004 21:51:19 -0000 1.4
+++ ie 16 Jan 2005 02:18:20 -0000 1.5
@@ -123,6 +123,9 @@
// For laptops which don't have the RWIN key but are otherwise
// the same as 105-key layouts.
include "ie(basic)"
+
+ name[Group1] = "Ireland - Laptop";
+
key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] };
};
@@ -142,7 +145,7 @@
include "ie(basic)"
- name[Group1] = "Ireland (Clo Gaelach)";
+ name[Group1] = "Ireland - CloGaelach";
key <TLDE> { [ grave, notsign, brokenbar, ssharp ] };
key <AD04> { [ r, R, 0x100027C, registered ] };
@@ -169,6 +172,7 @@
// For laptops which don't have the RWIN key but are otherwise
// the same as 105-key layouts.
include "ie(CloGaelach)"
+ name[Group1] = "Ireland - CloGaelach Laptop";
key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] };
};
@@ -177,7 +181,7 @@
// This should eventually be a "Unicode Expert" layout like the Mac one.
- name[Group1] = "Ireland (Unicode Expert)";
+ name[Group1] = "Ireland - UnicodeExpert";
//
// Numeric row `1234567890-=
Index: il
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/il,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- il 22 Dec 2004 21:51:19 -0000 1.7
+++ il 16 Jan 2005 02:18:20 -0000 1.8
@@ -60,7 +60,7 @@
// nikud patter based on Dekel Tsur's Hebrew mapping for LyX
partial alphanumeric_keys
xkb_symbols "lyx" {
- name[Group1]= "Israel";
+ name[Group1]= "Israel - lyx";
key <TLDE> { [ semicolon, asciitilde ] };
// On some key (e.g. AD01, right below) there is not yet mapping for the
@@ -119,7 +119,7 @@
// layout.
partial alphanumeric_keys
xkb_symbols "si1452" {
- name[Group1]= "Israel";
+ name[Group1]= "Israel - si1452";
include "il(basic)"
@@ -159,7 +159,7 @@
// uses the phonetic layout from old Slackware 'il.map' file
- name[Group1]= "Israel (phonetic)";
+ name[Group1]= "Israel - Phonetic";
key <AE12> { [ equal, plus ],
[ hebrew_doublelowline, hebrew_doublelowline ]};
Index: is
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/is,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- is 22 Dec 2004 21:51:19 -0000 1.5
+++ is 16 Jan 2005 02:18:20 -0000 1.6
@@ -34,10 +34,12 @@
partial alphanumeric_keys
xkb_symbols "Sundeadkeys" {
- // modify the default Icelandic layout to use Sun dead keys
+ // modify the basic Icelandic layout to use Sun dead keys
include "is(basic)"
+ name[Group1]="Iceland - Sun dead keys";
+
key <TLDE> { [SunFA_Circum, degree, notsign, notsign ] };
key <AE12> { [SunFA_Acute, SunFA_Grave, SunFA_Cedilla, SunFA_Cedilla ] };
key <AD11> { [udiaeresis, Udiaeresis, SunFA_Diaeresis, SunFA_Diaeresis ] };
@@ -50,10 +52,12 @@
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
- // modify the default Icelandic layout to not have any dead keys
+ // modify the basic Icelandic layout to not have any dead keys
include "is(basic)"
+ name[Group1]="Iceland - Eliminate dead keys";
+
key <TLDE> { [asciicircum, degree, notsign, notsign ] };
key <AE12> { [apostrophe, grave, cedilla, cedilla ] };
key <AD11> { [udiaeresis, Udiaeresis, diaeresis, diaeresis ] };
Index: it
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/it,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- it 22 Dec 2004 21:51:19 -0000 1.5
+++ it 16 Jan 2005 02:18:20 -0000 1.6
@@ -47,6 +47,8 @@
include "it(basic)"
+ name[Group1]="Italy - Eliminate dead keys";
+
key <AE02> { [ 2, quotedbl, twosuperior, doubleacute ] };
key <AE03> { [ 3, sterling,threesuperior, asciitilde ] };
Index: latam
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/latam,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- latam 9 Oct 2004 17:40:26 -0000 1.4
+++ latam 16 Jan 2005 02:18:20 -0000 1.5
@@ -42,7 +42,7 @@
partial alphanumeric_keys
xkb_symbols "sundeadkeys" {
include "latam(Sundeadkeys)"
-
+ name[Group1]="Latin American - Sun dead keys";
};
partial alphanumeric_keys
@@ -50,6 +50,8 @@
include "latam(basic)"
+ name[Group1]="Latin American - Eliminate dead keys";
+
key <AE12> { [questiondown, exclamdown, cedilla, ogonek ] };
key <AD11> { [ grave, asciicircum, bracketleft, degree ] };
key <AD12> { [ plus, asterisk, bracketright, macron ] };
Index: lt
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/lt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lt 22 Dec 2004 21:51:19 -0000 1.7
+++ lt 16 Jan 2005 02:18:20 -0000 1.8
@@ -43,7 +43,7 @@
include "latin"
- name[Group1]="Lithuania";
+ name[Group1]="Lithuania - US keyboard with Lithuanian letters";
key <AE01> { [ 1, exclam, aogonek, Aogonek ] };
key <AE02> { [ 2, at, ccaron, Ccaron ] };
@@ -75,7 +75,7 @@
include "latin"
- name[Group1]= "Lithuania";
+ name[Group1]= "Lithuania - Standard";
key <TLDE> {[ grave, asciitilde, acute ]};
key <AE01> {[ exclam, 1, at ]};
Index: lv
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/lv,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lv 22 Dec 2004 21:51:19 -0000 1.6
+++ lv 16 Jan 2005 02:18:20 -0000 1.7
@@ -95,6 +95,8 @@
include "lv(basic)"
+ name[Group1]= "Latvia - Apostrophe (') variant";
+
key <AC11> {[ISO_Level3_Latch, quotedbl, apostrophe, quotedbl]};
key <SPCE> {[space, space, apostrophe]};
modifier_map Mod5 { <AC11> };
@@ -106,6 +108,8 @@
include "lv(basic)"
+ name[Group1]= "Latvia - Tilde (~) variant";
+
key <TLDE> {[ISO_Level3_Latch, asciitilde, grave, acute]};
key <SPCE> {[space, space, asciitilde]};
modifier_map Mod5 { <TLDE> };
@@ -117,6 +121,8 @@
include "lv(basic)"
+ name[Group1]= "Latvia - F-letter (F) variant";
+
key <AC04> {[ISO_Level3_Latch, ISO_Level3_Latch, f, F]};
key <SPCE> {[space, space, f, F]};
modifier_map Mod5 { <AC04> };
Index: mal
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/mal,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mal 9 Oct 2004 18:34:15 -0000 1.3
+++ mal 16 Jan 2005 02:18:20 -0000 1.4
@@ -79,6 +79,8 @@
include "mal(basic)"
+ name[Group1] = "Malayalam - With Malayalam digits";
+
key <AE01> { [ 0x01000d67 , exclam ] };
key <AE02> { [ 0x01000d68 , at ] };
key <AE03> { [ 0x01000d69 , numbersign ] };
Index: mkd
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/mkd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mkd 9 Dec 2004 00:44:38 -0000 1.1
+++ mkd 16 Jan 2005 02:18:20 -0000 1.2
@@ -62,5 +62,6 @@
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
include "mkd(basic)"
+ name[Group1]= "Macedonian - Eliminate dead keys";
key <TLDE> { [ grave, asciitilde ] };
};
Index: mt
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/mt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mt 22 Dec 2004 21:51:19 -0000 1.7
+++ mt 16 Jan 2005 02:18:20 -0000 1.8
@@ -38,7 +38,7 @@
// Maltese keyboard map (based on MSA Standard DMS100, annex A)
// by Ramon Casha (ramon.casha@linux.org.mt)
-partial default alphanumeric_keys
+partial alphanumeric_keys
xkb_symbols "us" {
include "mt(basic)"
@@ -46,7 +46,7 @@
// Describes the differences between the mt
// keyboard and a US-based physical keyboard
- name[Group1]="Maltese (US layout)";
+ name[Group1]="Malta - US keyboard with Maltian letters";
key <BKSL> { [ zabovedot, Zabovedot, backslash, bar ] };
Index: no
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/no,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- no 22 Dec 2004 21:51:19 -0000 1.6
+++ no 16 Jan 2005 02:18:20 -0000 1.7
@@ -4,7 +4,7 @@
// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/no,v 1.3 2002/12/19 01:07:56 dawes Exp $
-partial alphanumeric_keys
+partial default alphanumeric_keys
xkb_symbols "basic" {
// Describes the differences between a very simple en_US
@@ -38,6 +38,8 @@
include "no(basic)"
+ name[Group1]="Norway - Eliminate dead keys";
+
key <AE12> { [ backslash, grave, acute, ogonek ] };
key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] };
key <AC10> { [ oslash, Ooblique, acute, doubleacute ] };
@@ -51,6 +53,8 @@
xkb_symbols "dvorak" {
include "us(dvorak)"
+ name[Group1]="Norway - Dvorak";
+
key <TLDE> { [ bar, section, brokenbar, paragraph ] };
key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
Index: ogam
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ogam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ogam 9 Oct 2004 18:34:15 -0000 1.3
+++ ogam 16 Jan 2005 02:18:20 -0000 1.4
@@ -83,6 +83,9 @@
// For laptops which don't have the RWIN key but are otherwise
// the same as 105-key layouts.
include "ogam(basic)"
+
+ name[Group1] = "Ogham - Laptop";
+
key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] };
};
@@ -93,7 +96,7 @@
// This has the full layout of IS434 with an Irish QWERTY keyboard,
// and the Ogham characters accessed when CAPS LOCK is on.
- name[Group1] = "Ogham (IS434)";
+ name[Group1] = "Ogham - IS434";
key.type[Group1] = "THREE_LEVEL";
@@ -197,6 +200,9 @@
// For laptops which don't have the RWIN key but are otherwise
// the same as 105-key layouts.
include "ogam(is434)"
+
+ name[Group1] = "Ogham - IS434 laptop";
+
key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] };
};
Index: pl
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pl 22 Dec 2004 21:51:19 -0000 1.7
+++ pl 16 Jan 2005 02:18:20 -0000 1.8
@@ -35,7 +35,7 @@
include "latin(type3)"
- name[Group1]="Poland";
+ name[Group1]="Poland - qwertz";
key <AE01> { [ 1, exclam, asciitilde, exclamdown ] };
key <AE02> { [ 2, quotedbl, dead_caron, oneeighth ] };
@@ -73,8 +73,8 @@
// Polish Dvorak keymaps
// by Rafal Rzepecki <divide@users.sf.net>
-// The default keymap "pl" places Polish quotes on quotemark key and
-// moves the dead symbols from there to "1/!" key. If you are used to default
+// 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.
@@ -84,7 +84,7 @@
xkb_symbols "dvorak" {
include "us(dvorak)"
- name[Group1] = "Poland (Dvorak)";
+ name[Group1] = "Poland - Dvorak";
key <AD08> { [ c, C, cacute, Cacute ] };
key <AD10> { [ l, L, lstroke, Lstroke ] };
@@ -110,6 +110,8 @@
xkb_symbols "dvorak_quotes" {
include "pl(dvorak)"
+ name[Group1] = "Poland - Dvorak, Polish quotes on quotemark key";
+
key <AD01> { [ apostrophe, quotedbl, doublelowquotemark, rightdoublequotemark ] };
// Dead symbols moved to this key
@@ -121,5 +123,7 @@
xkb_symbols "dvorak_altquotes" {
include "pl(dvorak)"
+ name[Group1] = "Poland - Dvorak, Polish quotes on key 1/!";
+
key <AE01> { [ 1, exclam, doublelowquotemark, rightdoublequotemark ] };
};
Index: pt
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/pt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pt 22 Dec 2004 21:51:19 -0000 1.5
+++ pt 16 Jan 2005 02:18:20 -0000 1.6
@@ -42,6 +42,7 @@
xkb_symbols "sundeadkeys" {
include "pt(Sundeadkeys)" // for consistent naming
+ name[Group1]="Portugal - Sun dead keys";
};
partial alphanumeric_keys
@@ -49,6 +50,8 @@
include "pt(basic)" // for consistent naming
+ name[Group1]="Portugal - Eliminate dead keys";
+
key <AE12> { [guillemotleft, guillemotright, cedilla, ogonek ] };
key <AD11> { [ plus, asterisk, quotedbl, quotedbl ] };
key <AD12> { [ acute, grave ] };
Index: ro
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ro,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ro 22 Dec 2004 21:51:19 -0000 1.6
+++ ro 16 Jan 2005 02:18:20 -0000 1.7
@@ -70,7 +70,7 @@
include "latin"
- name[Group1]="Romanian for us-keyboard";
+ name[Group1]="Romania - US keyboard with Romanian letters ";
key <AD01> { [ q, Q, acircumflex, Acircumflex ] };
key <AD05> { [ t, T, tcedilla, Tcedilla ] };
@@ -91,7 +91,7 @@
include "ro(basic)"
- name[Group1]="German for Romanian keyboard";
+ name[Group1]="Romania - Romanian keyboard with German letters";
key <AD07> { [ u, U, udiaeresis, Udiaeresis ] };
key <AD09> { [ o, O, odiaeresis, Odiaeresis ] };
Index: ru
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ru,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ru 22 Dec 2004 21:51:19 -0000 1.5
+++ ru 16 Jan 2005 02:18:20 -0000 1.6
@@ -72,6 +72,7 @@
partial alphanumeric_keys
xkb_symbols "winkeys" {
include "ru(basic)"
+ name[Group1]= "Russia - Winkeys";
key <AE03> { [ 3, numerosign ] };
key <AE04> { [ 4, semicolon ] };
key <AE05> { [ 5, percent ] };
@@ -85,6 +86,7 @@
partial alphanumeric_keys
xkb_symbols "typewriter" {
include "ru(basic)"
+ name[Group1]= "Russia - Typewriter";
key <TLDE> { [ apostrophe, quotedbl ] };
key <AE01> { [ exclam, 1 ] };
key <AE02> { [ numerosign, 2 ] };
@@ -107,7 +109,7 @@
partial alphanumeric_keys
xkb_symbols "phonetic" {
- name[Group1]= "Russia (phonetic)";
+ name[Group1]= "Russia - Phonetic";
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
@@ -169,6 +171,7 @@
partial alphanumeric_keys
xkb_symbols "rstu" {
include "ru(basic)"
+ name[Group1]= "Russia - Ukrainian standard RSTU";
key <TLDE> { [ apostrophe, question ] };
key <AE01> { [ exclam, 1 ] };
Index: se
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/se,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- se 22 Dec 2004 21:51:19 -0000 1.6
+++ se 16 Jan 2005 02:18:20 -0000 1.7
@@ -4,7 +4,7 @@
// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/se,v 1.5 2003/01/26 02:01:48 dawes Exp $
-partial alphanumeric_keys
+partial default alphanumeric_keys
xkb_symbols "basic" {
include "latin(type2)"
include "se(se)"
@@ -42,6 +42,8 @@
include "latin(type2_nodeadkeys)"
include "se(se)"
+ name[Group1]="Sweden - Eliminate dead keys";
+
key <AE12> { [ acute, grave, plusminus, notsign ] };
};
@@ -51,6 +53,8 @@
xkb_symbols "dvorak" {
include "no(dvorak)"
+ name[Group1]="Sweden - Dvorak";
+
key <TLDE> { [ section, onehalf ] };
key <AE04> { [ 4, currency, dollar, onequarter ] };
Index: sk
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/sk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sk 22 Dec 2004 21:51:19 -0000 1.7
+++ sk 16 Jan 2005 02:18:20 -0000 1.8
@@ -3,7 +3,7 @@
// $XFree86: xc/programs/xkbcomp/symbols/sk,v 1.2 2002/11/22 04:02:22 dawes
// Exp $
-partial alphanumeric_keys
+partial default alphanumeric_keys
xkb_symbols "basic" {
// This layout conforms to a new sk compromise standard designed
@@ -81,6 +81,8 @@
xkb_symbols "bksl" {
include "sk(basic)"
+ name[Group1] = "Slovakia - Extended Backslash";
+
key <BKSL> { [ backslash, bar, slash, NoSymbol ] };
};
@@ -93,6 +95,8 @@
include "sk(basic)"
+ name[Group1] = "Slovakia - qwerty";
+
key <AB01> { [ z, Z, degree, NoSymbol ] };
key <AD06> { [ y, Y, NoSymbol, NoSymbol ] };
};
@@ -101,5 +105,7 @@
xkb_symbols "qwerty_bksl" {
include "sk(qwerty)"
+ name[Group1] = "Slovakia - qwerty, extended Backslash";
+
key <BKSL> { [ backslash, bar, slash, NoSymbol ] };
};
Index: smi
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/smi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- smi 22 Dec 2004 21:51:19 -0000 1.5
+++ smi 16 Jan 2005 02:18:20 -0000 1.6
@@ -11,11 +11,11 @@
//
// $XFree86: xc/programs/xkbcomp/symbols/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $
-partial alphanumeric_keys
+partial default alphanumeric_keys
xkb_symbols "basic" {
include "latin"
- name[Group1]= "Sami languages (Other)";
+ name[Group1]= "Northern Saami";
key <AE01> { [ 1, exclam, copyright, exclamdown ] };
key <AE02> { [ 2, quotedbl, at, registered ] };
@@ -71,7 +71,7 @@
include "level3(ralt_switch)"
};
- xkb_symbols "sefi" {
+xkb_symbols "sefi" {
// Describes the differences between a Norwegian Northern Sami
// (keyboard with dead key support) and a Swedish/Finnish Sami
@@ -80,6 +80,8 @@
include "smi(basic)"
+ name[Group1]= "Northern Saami - Finish and Swedish";
+
key <AC10> { [odiaeresis, Odiaeresis, oslash, Ooblique ] };
key <AC11> { [adiaeresis, Adiaeresis, ae, AE ] };
};
@@ -91,5 +93,7 @@
include "smi(basic)"
+ name[Group1]= "Northern Saami - Eliminate dead keys";
+
key <AE12> { [ backslash, grave, acute, ogonek ] };
};
Index: srp
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/srp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- srp 14 Sep 2004 19:38:47 -0000 1.5
+++ srp 16 Jan 2005 02:18:20 -0000 1.6
@@ -11,9 +11,9 @@
// $XKeyboardConfig$
default partial alphanumeric_keys
-xkb_symbols "default" {
+xkb_symbols "basic" {
- name[Group1]= "Serbian Cyrillic";
+ name[Group1]= "Serbian";
include "srp(level3)"
include "srp(common)"
@@ -25,9 +25,9 @@
xkb_symbols "yz" {
// Cyrillic_zhe and Cyrillic_ze swapped.
- name[Group1]= "Serbian Cyrillic (swap Zhe, Ze)";
+ name[Group1]= "Serbian - Z and ZHE swapped";
- include "srp(default)"
+ include "srp(basic)"
key <AD06> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // y
key <AB01> { [ Cyrillic_ze, Cyrillic_ZE, any,any ] }; // z
@@ -214,7 +214,7 @@
partial alphanumeric_keys
xkb_symbols "latin" {
- name[Group1]= "Serbian Latin";
+ name[Group1]= "Serbian - Latin";
include "srp(level3)"
include "srp(common)"
@@ -227,7 +227,7 @@
// This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
// as single character). You get the title form with AltGr+Shift.
- name[Group1]= "Serbian Latin Unicode";
+ name[Group1]= "Serbian - Latin Unicode";
include "srp(latin)"
include "srp(twoletter)"
@@ -237,7 +237,7 @@
xkb_symbols "latinyz" {
// For those who insist on using "english-position" Z and Y.
- name[Group1]= "Serbian Latin (swap Y, Z)";
+ name[Group1]= "Serbian - Latin qwerty";
include "srp(latin)"
@@ -249,7 +249,7 @@
xkb_symbols "latinunicodeyz" {
// Unicode, ZHE and Z swapped.
- name[Group1]= "Serbian Latin Unicode (swap ZHE, Z)";
+ name[Group1]= "Serbian - Latin Unicode qwerty";
include "srp(latinunicode)"
@@ -260,9 +260,9 @@
xkb_symbols "alternatequotes" {
// Another acceptable »pair of quotes« for Serbian
- name[Group1]= "Serbian Latin with alternate quotes";
+ name[Group1]= "Serbian - With guillemots";
- include "srp(default)"
+ include "srp(basic)"
key <AC02> { [ any,any, guillemotright, NoSymbol ] }; // s
key <AC03> { [ any,any, guillemotleft, NoSymbol ] }; // d
@@ -271,7 +271,7 @@
xkb_symbols "latinalternatequotes" {
// Another acceptable »pair of quotes« for Serbian
- name[Group1]= "Serbian Latin with alternate quotes";
+ name[Group1]= "Serbian - Latin with guillemots";
include "srp(latin)"
Index: syr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/syr,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- syr 9 Oct 2004 18:34:15 -0000 1.4
+++ syr 16 Jan 2005 02:18:20 -0000 1.5
@@ -78,7 +78,7 @@
partial alphanumeric_keys
xkb_symbols "phonetic" {
- name[Group1]= "Syriac(phonetic)";
+ name[Group1]= "Syriac - Phonetic";
key <TLDE> { [ 0x100070F, 0x100032E, Arabic_shadda ] };
key <AE01> { [ 1, exclam, 0x1000701 ] };
Index: tam
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/tam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tam 22 Dec 2004 21:51:19 -0000 1.3
+++ tam 16 Jan 2005 02:18:20 -0000 1.4
@@ -13,7 +13,7 @@
// Author : Thuraiappah Vaseeharan <vasee@ieee.org>
// Last Modified: Sat Jan 5 17:11:26 CST 2002
- name[Group1]= "Tamil (TSCII)";
+ name[Group1]= "Tamil";
key <AE01> { [ 0x10000b7, 0x10000a4 ] }; // aytham
key <AE02> { [ 0x1000082, 0x10000a5 ] }; // shri
@@ -69,7 +69,7 @@
// Author: Thuraiappah Vaseeharan <t_vasee@yahoo.com>
// Date : Sun Aug 12 02:23:00 CDT 2001
- name[Group1]= "Tamil";
+ name[Group1]= "Tamil - Typewrite-style keymap; TAB encoding";
// numeral row
key <AE01> { [ 0x10000e7, 0x10000a7 ] } ;
@@ -126,7 +126,7 @@
// Date : Sat Feb 9 21:10:48 CST 2002
// Mapping:
- name[Group1]= "Tamil";
+ name[Group1]= "Tamil - Typewrite-style keymap; Unicode encoding";
// granthas
key <AE01> { [ 0x1000b83 ] } ;
@@ -174,7 +174,7 @@
partial alphanumeric_keys
xkb_symbols "INSCRIPT" {
- name[Group1]= "Tamil";
+ name[Group1]= "Tamil - INSCRIPT layout";
key <TLDE> { [ 0x1000BCA, 0x1000B92 ] };
Index: th
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/th,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- th 22 Dec 2004 21:51:19 -0000 1.5
+++ th 16 Jan 2005 02:18:20 -0000 1.6
@@ -6,7 +6,7 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]= "Thailand (Kedmanee)";
+ name[Group1]= "Thailand";
// converted to THai keysysms - Pablo Saratxaga <pablo@mandrakesoft.com>
@@ -65,7 +65,7 @@
partial alphanumeric_keys
xkb_symbols "pat" {
- name[Group1]= "Thailand (Pattachote)";
+ name[Group1]= "Thailand - Pattachote";
// The thai layout defines a second keyboard group and changes
// the behavior of a few modifier keys.
@@ -127,7 +127,7 @@
partial alphanumeric_keys
xkb_symbols "tis" {
- name[Group1]= "Thailand (TIS-820.2538)";
+ name[Group1]= "Thailand - TIS-820.2538";
// The thai layout defines a second keyboard group and changes
// the behavior of a few modifier keys.
Index: tr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/tr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tr 22 Dec 2004 21:51:19 -0000 1.6
+++ tr 16 Jan 2005 02:18:20 -0000 1.7
@@ -13,7 +13,7 @@
include "latin"
- name[Group1]="Turkey";
+ name[Group1]="Turkish";
key <AE01> { [ 1, exclam, onesuperior, exclamdown ] };
key <AE02> { [ 2, apostrophe, sterling, twosuperior ] };
@@ -66,7 +66,7 @@
include "latin"
- name[Group1]="Turkey";
+ name[Group1]="Turkish - (F)";
key <AE01> { [ 1, exclam, onesuperior, exclamdown ] };
key <AE02> { [ 2, quotedbl, twosuperior, VoidSymbol ] };
@@ -129,7 +129,7 @@
include "latin"
- name[Group1]="Turkey";
+ name[Group1]="Turkish - Alt-Q";
key <AE07> { [ 7, ampersand, lowleftcorner, upleftcorner ] };
key <AE08> { [ 8, asterisk, leftt, topt ] };
Index: ua
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ua,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ua 22 Dec 2004 21:51:19 -0000 1.5
+++ ua 16 Jan 2005 02:18:20 -0000 1.6
@@ -71,6 +71,8 @@
xkb_symbols "winkeys" {
include "ua(basic)"
+ name[Group1]= "Ukraine - Winkeys";
+
key <AE03> { [ 3, numerosign ] };
key <AE04> { [ 4, semicolon ] };
key <AE05> { [ 5, percent ] };
@@ -84,6 +86,8 @@
xkb_symbols "typewriter" {
include "ua(basic)"
+ name[Group1]= "Ukraine - Typewriter";
+
key <TLDE> { [ apostrophe, quotedbl ] };
key <AE01> { [ exclam, 1 ] };
key <AE02> { [ numerosign, 2 ] };
@@ -111,6 +115,8 @@
xkb_symbols "phonetic" {
include "ua(basic)"
+ name[Group1]= "Ukraine - Phonetic";
+
key <LatQ> { [ Cyrillic_ya, Cyrillic_YA ] };
key <LatW> { [ Cyrillic_ve, Cyrillic_VE ] };
key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] };
@@ -155,6 +161,8 @@
xkb_symbols "rstu" {
include "ua(basic)"
+ name[Group1]= "Ukraine - Ukrainian standard RSTU";
+
key <TLDE> { [ apostrophe, question ] };
key <AE01> { [ exclam, 1 ] };
key <AE02> { [ quotedbl, 2 ] };
Index: us
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/us,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- us 22 Dec 2004 21:51:19 -0000 1.10
+++ us 16 Jan 2005 02:18:20 -0000 1.11
@@ -8,7 +8,7 @@
partial hidden alphanumeric_keys modifier_keys
xkb_symbols "basic" {
- name[Group1]= "United States";
+ name[Group1]= "U.S. English";
include "pc(common)"
@@ -71,7 +71,7 @@
partial alphanumeric_keys
xkb_symbols "intl" {
- name[Group1]= "United States (International)";
+ name[Group1]= "U.S. English - International (with dead keys)";
include "us(basic)"
@@ -153,7 +153,8 @@
partial alphanumeric_keys
xkb_symbols "alt-intl" {
- name[Group1]= "United States (us_intl)";
+ name[Group1]= "U.S. English - Alternative international (former us_intl)";
+
include "us"
key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] };
@@ -183,7 +184,7 @@
partial alphanumeric_keys
xkb_symbols "dvorak" {
- name[Group1]= "United States (Dvorak)";
+ name[Group1]= "U.S. English - Dvorak";
// Alphanumeric section
More information about the xlibs-commit
mailing list