symbols: mention the target country at the top of most layout files

Also replace some 0x100nnnn codes with Unnnn, and tweak some comments.

59 files changed, 210 insertions, 148 deletions

diff --git a/symbols/al b/symbols/al
index 089d864..b583886 100644
--- a/symbols/al
+++ b/symbols/al
@@ -1,4 +1,6 @@
-// Albanian keyboard layout, by Pablo Saratxaga <pablo@mandrakesoft.com>.
+// Keyboard layouts for Albania.
+
+// Basic Albanian layout, by Pablo Saratxaga <pablo@mandrakesoft.com>.
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/am b/symbols/am
index 532fda0..fa91547 100644
--- a/symbols/am
+++ b/symbols/am
@@ -1,3 +1,5 @@
+// Keyboard layouts for Armenia.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/at b/symbols/at
index a195e94..b82959e 100644
--- a/symbols/at
+++ b/symbols/at
@@ -1,3 +1,5 @@
+// Keyboard layouts for Austria.
+
 default
 xkb_symbols "basic" {
 
diff --git a/symbols/au b/symbols/au
index bba66af..ec9dee0 100644
--- a/symbols/au
+++ b/symbols/au
@@ -1,6 +1,6 @@
-//
-// Default Australian is the same as American
-//
+// Keyboard layout for Australia.
+
+// The default Australian layout is the same as the American.
 default partial alphanumeric_keys
 xkb_symbols "basic" {
     include "us(basic)"
diff --git a/symbols/az b/symbols/az
index 8c4f3a5..fd47fcc 100644
--- a/symbols/az
+++ b/symbols/az
@@ -1,8 +1,8 @@
-// Symbols definition for a Azerbaijani keyboard layout.
-// Based on AZS 495-2010 standard.
+// Keyboard layouts for Azerbaijan.
+
+// Azerbaijani layout, based on the AZS 495-2010 standard.
 // 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
 // 2015 - Adil Aliyev <adilaliev@gmail.com>
-
 default partial alphanumeric_keys
 xkb_symbols "latin" {
 
diff --git a/symbols/ba b/symbols/ba
index 4692ea8..f5f7f0a 100644
--- a/symbols/ba
+++ b/symbols/ba
@@ -1,3 +1,5 @@
+// Keyboard layouts for Bosnia.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/be b/symbols/be
index 573b76e..aef8c46 100644
--- a/symbols/be
+++ b/symbols/be
@@ -1,3 +1,5 @@
+// Keyboard layouts for Belgium.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/bg b/symbols/bg
index 1907a76..1604f63 100644
--- a/symbols/bg
+++ b/symbols/bg
@@ -1,3 +1,5 @@
+// Keyboard layouts for Bulgaria.
+
 //////////////////////////////////////////////////////////////////////////
 // Copyright (C) 1999, 2000, 2007, 2009 by Anton Zinoviev <anton@lml.bas.bg>
 //
@@ -44,9 +46,8 @@
 
 //////////////////////////////////////////////////////////////////////////
 
-// Describes Bulgarian keyboard "BDS" modified according to the
-// the new state standard BDS 5237:2006 and extended with symbols in
-// levels 3 and 4.
+// Describes Bulgarian keyboard "BDS" according to the new state standard
+// BDS 5237:2006 and extended with symbols in levels 3 and 4.
 default partial alphanumeric_keys
 xkb_symbols "bds" {
 
diff --git a/symbols/br b/symbols/br
index 3ecc029..7a30e2f 100644
--- a/symbols/br
+++ b/symbols/br
@@ -1,3 +1,5 @@
+// Keyboard layouts for Brazil.
+
 default
 xkb_symbols "abnt2" {
 
diff --git a/symbols/bw b/symbols/bw
index 8e62755..a588142 100644
--- a/symbols/bw
+++ b/symbols/bw
@@ -1,3 +1,5 @@
+// Keyboard layout for Botswana.
+
 default partial alphanumeric_keys
 xkb_symbols "tswana" {
 
@@ -5,15 +7,15 @@ xkb_symbols "tswana" {
 
     name[Group1]= "Tswana";
 
-    key <TLDE> {[     grave,  asciitilde,  0x01000300,  0x01000303 ]};  // COMBINING GRAVE ACCENT, COMBINING TILDE
-    key <AE06> {[         6, asciicircum,  0x01000302              ]};  // COMBINING CIRCUMFLEX ACCENT
-    key <AE08> {[         8,    asterisk,  0x01000307,  0x01000323 ]};  // COMBINING DOT ABOVE, COMBINING DOT BELOW
-    key <AE09> {[         9,   parenleft,  0x01000306              ]};  // COMBINING BREVE
-    key <AE10> {[         0,  parenright,  0x0100030c              ]};  // COMBINING CARON
-    key <AE11> {[     minus,  underscore,  0x01000304,  0x01000331 ]};  // COMBINING MACRON, COMBINING MACRON BELOW
+    key <TLDE> {[     grave,  asciitilde,  U0300,  U0303 ]};  // COMBINING GRAVE ACCENT, COMBINING TILDE
+    key <AE06> {[         6, asciicircum,  U0302         ]};  // COMBINING CIRCUMFLEX ACCENT
+    key <AE08> {[         8,    asterisk,  U0307,  U0323 ]};  // COMBINING DOT ABOVE, COMBINING DOT BELOW
+    key <AE09> {[         9,   parenleft,  U0306         ]};  // COMBINING BREVE
+    key <AE10> {[         0,  parenright,  U030c         ]};  // COMBINING CARON
+    key <AE11> {[     minus,  underscore,  U0304,  U0331 ]};  // COMBINING MACRON, COMBINING MACRON BELOW
 
-    key <AC10> {[ semicolon,       colon,  0x01000324,  0x01000324 ]};  // COMBINING DIAERESIS BELOW
-    key <AC11> {[apostrophe,    quotedbl,  0x01000301,  0x01000308 ]};  // COMBINING ACUTE ACCENT, COMBINING DIAERESIS
+    key <AC10> {[ semicolon,       colon,  U0324,  U0324 ]};  // COMBINING DIAERESIS BELOW
+    key <AC11> {[apostrophe,    quotedbl,  U0301,  U0308 ]};  // COMBINING ACUTE ACCENT, COMBINING DIAERESIS
 
     include "level3(ralt_switch)"
 };
diff --git a/symbols/ca b/symbols/ca
index ba00ec6..a8502c4 100644
--- a/symbols/ca
+++ b/symbols/ca
@@ -1,3 +1,5 @@
+// Keyboard layouts for Canada.
+
 default partial
 xkb_symbols "fr" {
     name[Group1] = "French (Canada)";
diff --git a/symbols/cd b/symbols/cd
index a1457fe..c8b4346 100644
--- a/symbols/cd
+++ b/symbols/cd
@@ -1,3 +1,5 @@
+// Keyboard layout for Congo.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/ch b/symbols/ch
index 3f56e51..790362f 100644
--- a/symbols/ch
+++ b/symbols/ch
@@ -1,3 +1,5 @@
+// Keyboard layouts for Switzerland.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/cz b/symbols/cz
index 7442ab7..b32296f 100644
--- a/symbols/cz
+++ b/symbols/cz
@@ -1,3 +1,5 @@
+// Keyboard layouts for Czechia.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/eg b/symbols/eg
index cfad8ee..06f444b 100644
--- a/symbols/eg
+++ b/symbols/eg
@@ -1,6 +1,7 @@
-// Coptic language layout based on coptic-dictionary.org
-// with added diacritics.
+// Keyboard layouts for Egypt.
 
+// Coptic-language layout, based on https://coptic-dictionary.org,
+// with added diacritics.
 default  partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
@@ -44,6 +45,7 @@ xkb_symbols "basic" {
     key <AC09> { [ U2C97, U2C96 ] };
     key <AC10> { [ U03E7, U03E6 ] };
     key <AC11> { [ U2CC9, U2CC8 ] };
+    key <BKSL> { [ U0304, U0323 ] };
 
     key <AB01> { [ U2C8D, U2C8C ] };
     key <AB02> { [ U2C9D, U2C9C ] };
@@ -55,6 +57,4 @@ xkb_symbols "basic" {
     key <AB08> { [ U03ED, U03EC ] };
     key <AB09> { [ U03EF, U03EE ] };
     key <AB10> { [ U2C8F, U2C8E ] };
-
-    key <BKSL> { [ U0304, U0323 ] };
 };
diff --git a/symbols/es b/symbols/es
index b144187..ddb8d0a 100644
--- a/symbols/es
+++ b/symbols/es
@@ -1,5 +1,6 @@
-// Modified for a real Spanish keyboard by Jon Tombs.
+// Keyboard layouts for Spain.
 
+// Modified for a real Spanish keyboard by Jon Tombs.
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
@@ -12,7 +13,7 @@ xkb_symbols "basic" {
     key <AE03>	{ [         3, periodcentered, numbersign,   sterling ]	};
     key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};
     key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [exclamdown, questiondown, dead_cedilla, dead_ogonek ]	};
+    key <AE12>	{ [exclamdown, questiondown, dead_cedilla, dead_ogonek]	};
 
     key <AD11>	{ [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };
     key <AD12>	{ [      plus,   asterisk, bracketright,  dead_macron ]	};
@@ -48,7 +49,7 @@ xkb_symbols "nodeadkeys" {
     key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
 };
 
-// Spanish mapping (note R-H exchange)
+// Spanish Dvorak mapping (note R-H exchange)
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
 
diff --git a/symbols/et b/symbols/et
index 7ebe545..cf06223 100644
--- a/symbols/et
+++ b/symbols/et
@@ -1,9 +1,8 @@
-//
-// Ethiopia
-// Designed as a part of OLPC project
+// Keyboard layouts for Ethiopia.
+
+// Designed as a part of OLPC project.
 //
 // 2007 Sergey Udaltsov <svu@gnome.org>
-//
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
@@ -20,7 +19,7 @@ xkb_symbols "olpc" {
 
     key <AE01>	{ [        0x01001369,  0x01001372 ] }; // 1
     key <AE02>	{ [        0x0100136a,  0x01001373 ] }; // 2
-    key <AE03>	{ [        0x0100136b,  0x01001374 ] }; // 3 
+    key <AE03>	{ [        0x0100136b,  0x01001374 ] }; // 3
     key <AE04>	{ [        0x0100136c,  0x01001375 ] }; // 4
     key <AE05>	{ [        0x0100136d,  0x01001376 ] }; // 5
     key <AE06>	{ [        0x0100136e,  0x01001377 ] }; // 6
@@ -56,6 +55,7 @@ xkb_symbols "olpc" {
 
     key <AC10>	{ [        0x01001362,  0x01001361 ]	}; // :;
     key <AC11>  { [        0x01001366,  0x01001365 ]    }; // '"
+    key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl
 
     key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z
     key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x
@@ -69,7 +69,5 @@ xkb_symbols "olpc" {
     key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >
     key <AB10>  { [        0x01001367,  question   ]    }; // ?
 
-    key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl
-
     include "group(olpc)"
 };
diff --git a/symbols/fi b/symbols/fi
index e2c277a..71f1c22 100644
--- a/symbols/fi
+++ b/symbols/fi
@@ -1,10 +1,8 @@
-//
-// X keyboard maps for Finland
-//
+// Keyboard layouts for Finland.
+
 // SFS 5966 / Kotoistus keymap created by Troy Korjuslommi
 // Classic keymap based on traditional by Marko Myllynen
 // Eliminate deadkeys alternative sent by Linus Torvalds
-//
 
 default partial alphanumeric_keys
 xkb_symbols "kotoistus" {
diff --git a/symbols/fo b/symbols/fo
index 4d6dce1..07864be 100644
--- a/symbols/fo
+++ b/symbols/fo
@@ -1,3 +1,5 @@
+// Keyboard layouts for the Faroe Islands.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/fr b/symbols/fr
index a31fa5d..0f6494f 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -1,3 +1,5 @@
+// Keyboard layouts for France.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/gh b/symbols/gh
index b5a3508..a0bbaf3 100644
--- a/symbols/gh
+++ b/symbols/gh
@@ -1,3 +1,5 @@
+// Keyboard layouts for Ghana.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/gn b/symbols/gn
index d56976d..afe3042 100644
--- a/symbols/gn
+++ b/symbols/gn
@@ -1,5 +1,6 @@
-// Keyboard layout for N'Ko, by Denis Jacquerye.
-// See https://bugs.freedesktop.org/11702.
+// Keyboard layout for Guinea.
+
+// Layout for N'Ko, by Denis Jacquerye.
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/gr b/symbols/gr
index 17d5125..f92370a 100644
--- a/symbols/gr
+++ b/symbols/gr
@@ -1,5 +1,5 @@
-// Hellenic keyboard map for X.org
-//
+// Keyboard layouts for Greece.
+
 // Original version:
 //   Kostas Gewrgiou <gewrgiou@imbc.gr>
 // Heavily modified and maintained by:
@@ -10,7 +10,6 @@
 //   the Hellenic language by:
 //   Web Dolphins® <foo@foofootus.eu>
 
-
 default  partial alphanumeric_keys alternate_group
 xkb_symbols "basic" {
 	include "gr(simple)"
diff --git a/symbols/hr b/symbols/hr
index 43472ac..7892ee6 100644
--- a/symbols/hr
+++ b/symbols/hr
@@ -1,3 +1,5 @@
+// Keyboard layouts for Croatia.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/hu b/symbols/hu
index 3801962..aabd1c0 100644
--- a/symbols/hu
+++ b/symbols/hu
@@ -1,6 +1,6 @@
-// New style XKB layout for some widely used Hungarian keyboard layouts
-//
-// Based on old style 'xkb/symbols/hu"
+// Keyboard layouts for Hungary.
+
+// Some widely used Hungarian keyboard layouts.
 //
 // (C) 2002-2004 Soós Péter <sp@osb.hu>
 // (C) 2010 Andras Timar <timar@fsf.hu>
@@ -433,9 +433,7 @@ xkb_symbols "def_common" {
 
 // EXTRAS:
 
-// New style XKB layout used Old Hungarian keyboard layouts
-//
-// 
+// Old Hungarian keyboard layouts.
 //
 // (C) 2013 Andras Tisza
 // (C) 2017,2018,2020  Viktor Kovacs <kov.h.vik@gmail.com>
@@ -450,12 +448,12 @@ xkb_symbols "def_common" {
 // Changes:
 // 2013 - Planned Old Hungarian layout
 // 2017 - Added Old Hungarian layout
-// 2018 - Resolved several easy-to-use issue, added extra punctuation and quotation marks  
-// 2020 - Added ligature capable layout ( with Zero-widt-joiner), added copyright, copyleft symbols 
-// 2020 - Added ZWNJ key to "Old Hungarian (for ligatures)", replaced its ohu_lig id to oldhunlig, replaced its ohu_lig short description to oldhun(lig).
+// 2018 - Resolved several easy-of-use issues, added extra punctuation and quotation marks.
+// 2020 - Added ligature-capable layout (with zero-width-joiner), added copyright, copyleft symbols.
+// 2020 - Added ZWNJ key to "Old Hungarian (for ligatures)", changed its ohu_lig id to oldhunlig.
 // Added "oldhun_magic_numpad" for both "Old Hungarian" layouts, as a specialised numpad.
 
-// Old Hungartian layout
+// Old Hungarian layout
 partial alphanumeric_keys
 xkb_symbols "oldhun" {
 name[Group1]="Old Hungarian";
diff --git a/symbols/id b/symbols/id
index c24908d..03aef2c 100644
--- a/symbols/id
+++ b/symbols/id
@@ -1,3 +1,5 @@
+// Keyboard layouts for Indonesia.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/ie b/symbols/ie
index 5f22d36..4eda291 100644
--- a/symbols/ie
+++ b/symbols/ie
@@ -1,4 +1,4 @@
-// Irish keyboard map
+// Keyboard layouts for Ireland.
 
 // Support for Irish (old and new orthography) and English
 // Seamus O Ciardhuain <seoc@cnds.ucd.ie>  (19 December 2002)
@@ -6,20 +6,14 @@
 // The general idea is to provide the characters in ISO 8859-1,
 // ISO 8859-15, ISO 8859-14, CP1252 and "Extended Latin-8".
 // However, not all are accessible directly because there aren't
-// enough keys; some need deadkeys to access them, others the 
+// enough keys; some need dead keys to access them, others the
 // "Multi_key" compose sequences.
 
-// Designed to be similar to the layouts used on Windows
-// and the Macintosh.
-
-// Everything is in Group 1 to be compatible with the
-// multi-layout keyboard support in XFree86 4.3.
-
 // The basic layout is a modern keyboard, but dotted consonants are
-// accessible using a deadkey (AltGr+H or AltGr+W).
+// accessible using a dead key (AltGr+H or AltGr+W).
 // If a proper Clo Gaelach keyboard is needed, then use the layout
 // defined below as ie(CloGaelach), which gives dotted consonants
-// without use of a deadkey.
+// without use of a dead key.
 
 
 default partial alphanumeric_keys
diff --git a/symbols/il b/symbols/il
index fbc57dd..754922e 100644
--- a/symbols/il
+++ b/symbols/il
@@ -1,4 +1,6 @@
-// This is an implemetation of the Israeli standard SI-1452 (2013)
+// Keyboard layouts for Israel.
+
+// This is an implemetation of the Israeli standard SI-1452 (2013).
 // It does not implement changes to the English layout, as that part
 // of the standard is not normative nor really useful in the context
 // of xkb.
@@ -7,7 +9,6 @@
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
-    // uses the kbd layout in use in Israel.
 
     name[Group1]= "Hebrew";
     key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC";
diff --git a/symbols/iq b/symbols/iq
index 597690d..01a1b27 100644
--- a/symbols/iq
+++ b/symbols/iq
@@ -1,6 +1,4 @@
-// Iraque keyboard layout,
-
-// 3-Level layout
+// Keyboard layouts for Iraq.
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
diff --git a/symbols/it b/symbols/it
index c9f1b4e..8eaf245 100644
--- a/symbols/it
+++ b/symbols/it
@@ -1,3 +1,5 @@
+// Keyboard layouts for Italy.
+
 // 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it)
 // 03 December 2017 - Added it(intl) and it(scn), please refer to
 //                    Cadèmia Siciliana <l10n@cademiasiciliana.org>
diff --git a/symbols/kr b/symbols/kr
index 9d094e4..842762a 100644
--- a/symbols/kr
+++ b/symbols/kr
@@ -1,3 +1,5 @@
+// Keyboard layouts for Korea.
+
 default  alphanumeric_keys
 xkb_symbols "kr106" {
     include "us"
diff --git a/symbols/kz b/symbols/kz
index 0dabebd..4f26243 100644
--- a/symbols/kz
+++ b/symbols/kz
@@ -1,6 +1,7 @@
+// Keyboard layouts for Kazachstan.
+
 // Based on http://www.sci.kz/~sairan/keyboard/kzkbd.html
 // Baurzhan Ismagulov <ibr@radix50.net>
-//
 
 // TODO:
 // 1. AltGr with TLDE and LSGT.
diff --git a/symbols/lk b/symbols/lk
index 3f4a512..257366d 100644
--- a/symbols/lk
+++ b/symbols/lk
@@ -1,4 +1,5 @@
-// X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)
+// Keyboard layouts for Sri Lanka.
+
 // Maintainer  : Harshula Jayasuriya <harshula@gmail.com>
 // Last Updated: 2011-05-25
 // This is a phonetic static mapping for a standard US-English keyboard
diff --git a/symbols/ma b/symbols/ma
index 300069c..46654a3 100644
--- a/symbols/ma
+++ b/symbols/ma
@@ -1,4 +1,6 @@
-// Arabic AZERTY with modern Latin digits 
+// Keyboard layouts for Morocco.
+
+// Arabic AZERTY with modern Latin digits
 default partial alphanumeric_keys
 xkb_symbols "arabic" {
     include "ara(azerty)"
diff --git a/symbols/md b/symbols/md
index 0ceb145..06fc70b 100644
--- a/symbols/md
+++ b/symbols/md
@@ -1,3 +1,5 @@
+// Keyboard layouts for Moldava.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
@@ -27,8 +29,8 @@ xkb_symbols "basic" {
 
 // A, Ä, B, C, Ç, D, E, Ê, F, G, H, I, İ, J, K, L, M, N, O, Ö, P, R, S, Ş, T, Ţ, U, Ü, V, Y, Z.
 
-partial alphanumeric_keys								
-xkb_symbols "gag" {								
+partial alphanumeric_keys
+xkb_symbols "gag" {
 
     include "us(basic)"
 
@@ -87,4 +89,4 @@ xkb_symbols "gag" {
     key <BKSL> 	{	[	backslash,	bar			]	};
 
     include "level3(ralt_switch)"
-};								
+};
diff --git a/symbols/me b/symbols/me
index d85b8f1..41be1c6 100644
--- a/symbols/me
+++ b/symbols/me
@@ -1,7 +1,4 @@
-// Montenegro keyboard mapping
-//
-// Initially, a copy of Serbian variants
-//
+// Keyboard layouts for Montenegro.
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
diff --git a/symbols/mk b/symbols/mk
index 7e168ed..e1b715e 100644
--- a/symbols/mk
+++ b/symbols/mk
@@ -1,8 +1,9 @@
+// Keyboard layouts for North Macedonia.
+
 // Author: Damjan Georgievski <penguinista AT mail.net.mk>
 // Revision: 1.5
-
 default partial alphanumeric_keys
-xkb_symbols "basic" { 
+xkb_symbols "basic" {
     name[Group1]= "Macedonian";
 
     key <AB01> { [     Cyrillic_ze,     Cyrillic_ZE	]	};
diff --git a/symbols/ml b/symbols/ml
index 8dd3a06..06db31c 100644
--- a/symbols/ml
+++ b/symbols/ml
@@ -1,3 +1,5 @@
+// Keyboard layouts for Mali.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/mv b/symbols/mv
index e73a7f4..c2cb861 100644
--- a/symbols/mv
+++ b/symbols/mv
@@ -1,3 +1,5 @@
+// Keyboard layout for the Maldives.
+
 // Layout for the Thaana script (for the Dhivehi language).
 default partial alphanumeric_keys
 xkb_symbols "basic" {
@@ -18,40 +20,40 @@ xkb_symbols "basic" {
     key <AE11> {[        minus,   underscore ]};
     key <AE12> {[        equal,         plus ]};
 
-    key <AD01> {[    0x10007B0,    0x10007A4 ]};
-    key <AD02> {[    0x1000787,    0x10007A2 ]};
-    key <AD03> {[    0x10007AC,    0x10007AD ]};
-    key <AD04> {[    0x1000783,    0x100079C ]};
-    key <AD05> {[    0x100078C,    0x1000793 ]};
-    key <AD06> {[    0x1000794,    0x10007A0 ]};
-    key <AD07> {[    0x10007AA,    0x10007AB ]};
-    key <AD08> {[    0x10007A8,    0x10007A9 ]};
-    key <AD09> {[    0x10007AE,    0x10007AF ]};
-    key <AD10> {[    0x1000795,     division ]};
+    key <AD01> {[        U07B0,        U07A4 ]};
+    key <AD02> {[        U0787,        U07A2 ]};
+    key <AD03> {[        U07AC,        U07AD ]};
+    key <AD04> {[        U0783,        U079C ]};
+    key <AD05> {[        U078C,        U0793 ]};
+    key <AD06> {[        U0794,        U07A0 ]};
+    key <AD07> {[        U07AA,        U07AB ]};
+    key <AD08> {[        U07A8,        U07A9 ]};
+    key <AD09> {[        U07AE,        U07AF ]};
+    key <AD10> {[        U0795,     division ]};
     key <AD11> {[  bracketleft,    braceleft ]};
     key <AD12> {[ bracketright,   braceright ]};
 
-    key <AC01> {[    0x10007A6,    0x10007A7 ]};
-    key <AC02> {[    0x1000790,    0x1000781 ]};
-    key <AC03> {[    0x100078B,    0x1000791 ]};
-    key <AC04> {[    0x100078A,    0x100fdf2 ]};
-    key <AC05> {[    0x100078E,    0x10007A3 ]};
-    key <AC06> {[    0x1000780,    0x1000799 ]};
-    key <AC07> {[    0x1000796,    0x100079B ]};
-    key <AC08> {[    0x1000786,    0x100079A ]};
-    key <AC09> {[    0x100078D,    0x1000785 ]};
+    key <AC01> {[        U07A6,        U07A7 ]};
+    key <AC02> {[        U0790,        U0781 ]};
+    key <AC03> {[        U078B,        U0791 ]};
+    key <AC04> {[        U078A,        Ufdf2 ]};
+    key <AC05> {[        U078E,        U07A3 ]};
+    key <AC06> {[        U0780,        U0799 ]};
+    key <AC07> {[        U0796,        U079B ]};
+    key <AC08> {[        U0786,        U079A ]};
+    key <AC09> {[        U078D,        U0785 ]};
     key <AC10> {[    semicolon,        colon ]};
     key <AC11> {[   apostrophe,     quotedbl ]};
     key <BKSL> {[    backslash,          bar ]};
 
     key <LSGT> {[          bar,    brokenbar ]};
-    key <AB01> {[    0x1000792,    0x10007A1 ]};
-    key <AB02> {[     multiply,    0x1000798 ]};
-    key <AB03> {[    0x1000797,    0x100079D ]};
-    key <AB04> {[    0x1000788,    0x10007A5 ]};
-    key <AB05> {[    0x1000784,    0x100079E ]};
-    key <AB06> {[    0x1000782,    0x100078F ]};
-    key <AB07> {[    0x1000789,    0x100079F ]};
+    key <AB01> {[        U0792,        U07A1 ]};
+    key <AB02> {[     multiply,        U0798 ]};
+    key <AB03> {[        U0797,        U079D ]};
+    key <AB04> {[        U0788,        U07A5 ]};
+    key <AB05> {[        U0784,        U079E ]};
+    key <AB06> {[        U0782,        U078F ]};
+    key <AB07> {[        U0789,        U079F ]};
     key <AB08> {[ Arabic_comma,         less ]};
     key <AB09> {[       period,      greater ]};
     key <AB10> {[        slash, Arabic_question_mark ]};
diff --git a/symbols/my b/symbols/my
index de4ba02..ee4bcc2 100644
--- a/symbols/my
+++ b/symbols/my
@@ -1,3 +1,5 @@
+// Keyboard layouts for Malaysia.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Malay (Jawi, Arabic Keyboard)";
diff --git a/symbols/ng b/symbols/ng
index 2865f7b..1b42ee1 100644
--- a/symbols/ng
+++ b/symbols/ng
@@ -1,3 +1,5 @@
+// Keyboard layouts for Nigeria.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
@@ -28,7 +30,7 @@ xkb_symbols "igbo" {
     key <AD01> { [ 0x01001ECB, 0x01001ECA,          q,          Q ] };
     key <AB02> { [ 0x01001E45, 0x01001E44,          x,          X ] };
     key <AC10> { [ 0x01001EE5, 0x01001EE4,   semicolon,	    colon ] };
-    key <AD11> { [ 0x01001ECD, 0x01001ECC, bracketleft, braceleft ] };		 
+    key <AD11> { [ 0x01001ECD, 0x01001ECC, bracketleft, braceleft ] };
 };
 
 partial alphanumeric_keys
diff --git a/symbols/nl b/symbols/nl
index f3f617b..1b83708 100644
--- a/symbols/nl
+++ b/symbols/nl
@@ -1,3 +1,5 @@
+// Keyboard layouts for the Netherlands.
+
 // Basic layout, based on converted file, from keytable file to xkb/symbols/ file
 // with mk_xkb by root@linux.chanae.stben.be Tue Sep 30 00:53:29 MET DST 1997
 //
diff --git a/symbols/np b/symbols/np
index 8910e62..6fe8e23 100644
--- a/symbols/np
+++ b/symbols/np
@@ -1,3 +1,5 @@
+// Keyboard layouts for Nepal.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/pk b/symbols/pk
index 4ddc00a..6f92511 100644
--- a/symbols/pk
+++ b/symbols/pk
@@ -1,8 +1,8 @@
+// Keyboard layouts for Pakistan.
+
 // Urdu keymap, originally developed by Zaeem Arshad <zaeem@linux.net.pk>
-//
 // (Third-level symbols are yet to be put in. The unavailable symbols
 // are those which do not have a corresponding glyph in Unicode.)
-
 default partial alphanumeric_keys
 xkb_symbols "urd-phonetic" {
 
diff --git a/symbols/pl b/symbols/pl
index d53df5e..a439af3 100644
--- a/symbols/pl
+++ b/symbols/pl
@@ -1,3 +1,5 @@
+// Keyboard layouts for Poland.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/pt b/symbols/pt
index 1733d9f..6e5a359 100644
--- a/symbols/pt
+++ b/symbols/pt
@@ -1,3 +1,5 @@
+// Keyboard layouts for Portugal.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/ru b/symbols/ru
index 2a77083..1df19b3 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -1,4 +1,5 @@
 // Keyboard layouts for Russia.
+
 // AEN <aen@logic.ru>
 // 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
 // 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
diff --git a/symbols/se b/symbols/se
index 7640a7c..64cf669 100644
--- a/symbols/se
+++ b/symbols/se
@@ -1,3 +1,5 @@
+// Keyboard layouts for Sweden.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
     include "latin(type2)"
diff --git a/symbols/si b/symbols/si
index d67dff2..c53fa9a 100644
--- a/symbols/si
+++ b/symbols/si
@@ -1,3 +1,5 @@
+// Keyboard layouts for Slovenia.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/sk b/symbols/sk
index c8e24dc..2bc5083 100644
--- a/symbols/sk
+++ b/symbols/sk
@@ -1,3 +1,5 @@
+// Keyboard layouts for Slovakia.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/sn b/symbols/sn
index d58e869..6345330 100644
--- a/symbols/sn
+++ b/symbols/sn
@@ -1,3 +1,5 @@
+// Keyboard layout for Senegal.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
@@ -5,37 +7,37 @@ xkb_symbols "basic" {
 
     name[Group1]="Wolof";
 
-    key <TLDE>	{ [twosuperior,   percent,      notsign,      notsign ]	};
-    key <AE01>	{ [ ampersand,          1,          bar,     NoSymbol ]	};
-    key <AE02>	{ [    eacute,          2,   asciitilde,       Eacute ]	};
-    key <AE03>	{ [  quotedbl,          3,   numbersign,      cedilla ]	};
-    key <AE04>	{ [apostrophe,          4,    braceleft,        acute ]	};
-    key <AE05>	{ [ parenleft,          5,  bracketleft,    diaeresis ]	};
-    key <AE06>	{ [     minus,          6,          bar,    brokenbar ]	};
-    key <AE07>	{ [    egrave,          7,   dead_grave,       Egrave ]	};
-    key <AE08>	{ [underscore,          8,    backslash,       macron ]	};
-    key <AE09>	{ [  ccedilla,          9,  asciicircum,     Ccedilla ]	};
-    key <AE10>	{ [    agrave,          0,           at,       Agrave ]	};
-    key <AE11>	{ [parenright,     degree, bracketright,   ydiaeresis ]	};
-    key <AE12>	{ [     equal,       plus,   braceright,threequarters ]	};
-
-    key <AD01>	{ [         a,          A,           ae,           AE ]	};
-    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
-    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
-    key <AD11>	{ [       eng,        ENG,  bracketleft, bracketright ] };
-    key <AD12>	{ [    dollar,   sterling,     currency,  ecircumflex ]	};
-
-    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
-    key <AC10>	{ [         m,          M,           mu,    masculine ]	};
-    key <AC11>	{ [    ntilde,     Ntilde,        acute,   dead_acute ]	};
-    key <BKSL>	{ [        mu,   sterling,        grave,   dead_grave ]	};
-
-    key <LSGT>	{ [      less,    greater,          bar,     NoSymbol ] };
-    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};
-    key <AB07>	{ [     comma,   question, questiondown,     NoSymbol ] };
-    key <AB08>	{ [ semicolon,     period,        U2022,     multiply ]	}; // bullet
-    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
-    key <AB10>	{ [    exclam,    section,   exclamdown,     NoSymbol ] };
+    key <TLDE>	{[twosuperior,    percent,      notsign,      notsign ]};
+    key <AE01>	{[  ampersand,          1,          bar,     NoSymbol ]};
+    key <AE02>	{[     eacute,          2,   asciitilde,       Eacute ]};
+    key <AE03>	{[   quotedbl,          3,   numbersign,      cedilla ]};
+    key <AE04>	{[ apostrophe,          4,    braceleft,        acute ]};
+    key <AE05>	{[  parenleft,          5,  bracketleft,    diaeresis ]};
+    key <AE06>	{[      minus,          6,          bar,    brokenbar ]};
+    key <AE07>	{[     egrave,          7,   dead_grave,       Egrave ]};
+    key <AE08>	{[ underscore,          8,    backslash,       macron ]};
+    key <AE09>	{[   ccedilla,          9,  asciicircum,     Ccedilla ]};
+    key <AE10>	{[     agrave,          0,           at,       Agrave ]};
+    key <AE11>	{[ parenright,     degree, bracketright,   ydiaeresis ]};
+    key <AE12>	{[      equal,       plus,   braceright,threequarters ]};
+
+    key <AD01>	{[          a,          A,           ae,           AE ]};
+    key <AD02>	{[          z,          Z, guillemotleft,        less ]};
+    key <AD03>	{[          e,          E,     EuroSign,         cent ]};
+    key <AD11>	{[        eng,        ENG,  bracketleft, bracketright ]};
+    key <AD12>	{[     dollar,   sterling,     currency,  ecircumflex ]};
+
+    key <AC01>	{[          q,          Q,           at,  Greek_OMEGA ]};
+    key <AC10>	{[          m,          M,           mu,    masculine ]};
+    key <AC11>	{[     ntilde,     Ntilde,        acute,   dead_acute ]};
+    key <BKSL>	{[         mu,   sterling,        grave,   dead_grave ]};
+
+    key <LSGT>	{[       less,    greater,          bar,     NoSymbol ]};
+    key <AB01>	{[          w,          W,      lstroke,      Lstroke ]};
+    key <AB07>	{[      comma,   question, questiondown,     NoSymbol ]};
+    key <AB08>	{[  semicolon,     period,        U2022,     multiply ]}; // bullet
+    key <AB09>	{[      colon,      slash, periodcentered,   division ]};
+    key <AB10>	{[     exclam,    section,   exclamdown,     NoSymbol ]};
 
     include "level3(ralt_switch)"
 };
diff --git a/symbols/tg b/symbols/tg
index 3b3f1e2..bbca3b4 100644
--- a/symbols/tg
+++ b/symbols/tg
@@ -1,3 +1,5 @@
+// Keyboard layout for Togo.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/th b/symbols/th
index d3aa379..3b7ad90 100644
--- a/symbols/th
+++ b/symbols/th
@@ -1,9 +1,9 @@
+// Keyboard layouts for Thailand.
+
 default partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Thai";
 
-    // converted to THai keysysms - Pablo Saratxaga <pablo@mandrakesoft.com>
-
     key <TLDE> { [ underscore,		percent		]	};
     key <AE01> { [ Thai_lakkhangyao,	plus		]	};
     key <AE02> { [ slash,		Thai_leknung	]	};
diff --git a/symbols/tm b/symbols/tm
index 88537d0..116f226 100644
--- a/symbols/tm
+++ b/symbols/tm
@@ -1,6 +1,8 @@
+// Keyboard layouts for Turkmenistan.
+
 // Nazar Annagurban <nazar_xg@hotmail.com>, 2009
 
-// Default layout (based on Vista Turkmen layout)
+// Default layout (based on Vista Turkmen layout).
 default partial
 xkb_symbols "basic" {
 
diff --git a/symbols/tr b/symbols/tr
index 7d62ef7..bf23d08 100644
--- a/symbols/tr
+++ b/symbols/tr
@@ -1,4 +1,5 @@
 // Keyboard layouts for Turkey.
+
 // This file distributed without any expressed or implied warranty.
 // Nilgün Belma Bugüner <nilgun@belgeler.org>, 2005
 
diff --git a/symbols/tw b/symbols/tw
index bb7d2b6..e04db88 100644
--- a/symbols/tw
+++ b/symbols/tw
@@ -1,3 +1,5 @@
+// Keyboard layouts for Taiwan.
+
 default partial alphanumeric_keys
 xkb_symbols "tw" {
 
diff --git a/symbols/tz b/symbols/tz
index 7078018..866b5e8 100644
--- a/symbols/tz
+++ b/symbols/tz
@@ -1,7 +1,8 @@
-// Keyboard layout for Swahili in Arabic script.
+// Keyboard layout for Tanzania.
+
+// Layout for Swahili in Arabic script.
 // Based on Martin Vidner's Buckwalter transliteration variant of the Arabic keyboard.
 // Please notify Kevin Donnelly (kevin@dotmon.com) of any corrections or omission.
-
 default partial alphanumeric_keys
 xkb_symbols "swa" {
 
diff --git a/symbols/us b/symbols/us
index 507ae24..ad018ae 100644
--- a/symbols/us
+++ b/symbols/us
@@ -1,3 +1,5 @@
+// Keyboard layouts for the United States of America.
+
 default partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
diff --git a/symbols/za b/symbols/za
index 4e357c2..6d88566 100644
--- a/symbols/za
+++ b/symbols/za
@@ -1,12 +1,10 @@
-// Based on the Latvian and GB keyboard maps.
+// Keyboard layout for South Africa.
 
+// Dead keys and letters with diacritics on the upper levels.
+// Original author: Dwayne Bailey (dwayne@translate.org.za).
 default partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
-    // Describes the differences between an en_US layout
-    // and a South African layout with dead keys.
-    // By Dwayne Bailey (dwayne@translate.org.za).
-
     include "latin"
 
     name[Group1]="English (South Africa)";