symbols/ie: trim superfluous comments, replace a few 0x100nnnn codes

1 files changed, 21 insertions, 89 deletions

diff --git a/symbols/ie b/symbols/ie
index 158d623..1e43a87 100644
--- a/symbols/ie
+++ b/symbols/ie
@@ -1,10 +1,10 @@
 // Keyboard layouts for Ireland.
 
-// Support for Irish (old and new orthography) and English
-// Seamus O Ciardhuain <seoc@cnds.ucd.ie>  (19 December 2002)
+// Support for Irish (old and new orthography), English, and Ogham.
+// Original author: Seamus O Ciardhuain <seoc@cnds.ucd.ie>, 2002.
 
 // The general idea is to provide the characters in ISO 8859-1,
-// ISO 8859-15, ISO 8859-14, CP1252 and "Extended Latin-8".
+// ISO 8859-14, ISO 8859-15, CP1252 and "Extended Latin-8".
 // However, not all are accessible directly because there aren't
 // enough keys; some need dead keys to access them, others the
 // "Multi_key" compose sequences.
@@ -28,33 +28,24 @@ xkb_symbols "basic" {
 
     name[Group1] = "Irish";
 
-    //
-    // Numeric row `1234567890-=
-    //
     key <TLDE> { [        grave,     notsign,            brokenbar,             NoSymbol ] };
     key <AE01> { [            1,      exclam,           exclamdown,          onesuperior ] };
     key <AE02> { [            2,    quotedbl,            trademark,          twosuperior ] };
     key <AE03> { [            3,    sterling,            copyright,        threesuperior ] };
     key <AE04> { [            4,      dollar,             EuroSign,                 cent ] };
     key <AE05> { [            5,     percent,              section,               dagger ] };
-    key <AE06> { [            6, asciicircum,      dead_circumflex,            0x1002030 ] };
-                                                                         // per thousand
-    key <AE07> { [            7,   ampersand,            paragraph,            0x100204A ] };
-                                                                          // Tironian Et
+    key <AE06> { [            6, asciicircum,      dead_circumflex,             permille ] };
+    key <AE07> { [            7,   ampersand,            paragraph,                U204A ] }; // Tironian Et
     key <AE08> { [            8,    asterisk,       dead_diaeresis,   enfilledcircbullet ] };
     key <AE09> { [            9,   parenleft,          ordfeminine,       periodcentered ] };
     key <AE10> { [            0,  parenright,            masculine,               degree ] };
     key <AE11> { [        minus,  underscore,               endash,               emdash ] };
     key <AE12> { [        equal,        plus,             notequal,            plusminus ] };
 
-    //
-    // QWERTYUIOP[]
-    //
     key <AD01> { [            q,           Q,                   oe,                   OE ] };
     key <AD02> { [            w,           W,        dead_abovedot,        dead_abovedot ] };
     key <AD03> { [            e,           E,               eacute,               Eacute ] };
-    key <AD04> { [            r,           R,           registered,            0x1002030 ] };
-                                                                         // per thousand
+    key <AD04> { [            r,           R,           registered,             permille ] };
     key <AD05> { [            t,           T,                thorn,                THORN ] };
     key <AD06> { [            y,           Y,                  yen,                   mu ] };
     key <AD07> { [            u,           U,               uacute,               Uacute ] };
@@ -64,14 +55,10 @@ xkb_symbols "basic" {
     key <AD11> { [  bracketleft,   braceleft,  leftdoublequotemark, rightdoublequotemark ] };
     key <AD12> { [ bracketright,  braceright,  leftsinglequotemark, rightsinglequotemark ] };
 
-    //
-    // ASDFGHJKL;'#
-    //
     key <AC01> { [          a,             A,               aacute,               Aacute ] };
-    key <AC02> { [          s,             S,               ssharp,            0x1001E9E ] };
+    key <AC02> { [          s,             S,               ssharp,                U1E9E ] }; // ß ẞ
     key <AC03> { [          d,             D,                  eth,                  ETH ] };
-    key <AC04> { [          f,             F,            0x1000192,             NoSymbol ] };
-                                                    // f with hook
+    key <AC04> { [          f,             F,             function,             NoSymbol ] };
     key <AC05> { [          g,             G,            copyright,             NoSymbol ] };
     key <AC06> { [          h,             H,        dead_abovedot,        dead_abovedot ] };
     key <AC07> { [          j,             J,             idotless,           onequarter ] };
@@ -81,10 +68,6 @@ xkb_symbols "basic" {
     key <AC11> { [ apostrophe,            at,                   ae,                   AE ] };
     key <BKSL> { [ numbersign,    asciitilde,        guillemotleft,       guillemotright ] };
 
-
-    //
-    // \ZXCVBNM,./
-    //
     key <LSGT> { [  backslash,           bar,           dead_grave,           dead_acute ] };
     key <AB01> { [          z,             Z,     leftanglebracket,    rightanglebracket ] };
     key <AB02> { [          x,             X,             multiply,          approximate ] };
@@ -97,14 +80,10 @@ xkb_symbols "basic" {
     key <AB09> { [     period,       greater,     greaterthanequal,   singlelowquotemark ] };
     key <AB10> { [      slash,      question,             division,         questiondown ] };
 
-
     key <SPCE> { [      space,         space,         nobreakspace,         nobreakspace ] };
 
     include "level3(ralt_switch)"
 
-    // NB: putting Shift+<RALT> as Multi_key gives odd behaviour since the
-    // order of pressing keys affects the result.
-
     include "compose(rwin)"
 };
 
@@ -127,8 +106,7 @@ xkb_symbols "CloGaelach" {
     name[Group1] = "CloGaelach";
 
     key <TLDE> { [     grave, notsign,  brokenbar,       ssharp ] };
-    key <AD04> { [         r,       R,  0x100027C,   registered ] };
-                                        // long r
+    key <AD04> { [         r,       R,      U027C,   registered ] }; // long r
     key <AD05> { [         t,       T,  tabovedot,    Tabovedot ] };
     key <AD10> { [         p,       P,  pabovedot,    Pabovedot ] };
 
@@ -137,8 +115,7 @@ xkb_symbols "CloGaelach" {
     key <AC04> { [         f,       F,  fabovedot,    Fabovedot ] };
     key <AC05> { [         g,       G,  gabovedot,    Gabovedot ] };
 
-    key <AB01> { [         z,       Z,  0x100017F,    0x1001E9B ] };
-                                        // long s,   long s dot
+    key <AB01> { [         z,       Z,      U017F,        U1E9B ] }; // long s, long s dot
     key <AB03> { [         c,       C,  cabovedot,    Cabovedot ] };
     key <AB05> { [         b,       B,  babovedot,    Babovedot ] };
     key <AB07> { [         m,       M,  mabovedot,    Mabovedot ] };
@@ -149,13 +126,10 @@ xkb_symbols "CloGaelach" {
 partial alphanumeric_keys
 xkb_symbols "UnicodeExpert" {
 
-// This should eventually be a "Unicode Expert" layout like the Mac one.
+    // This should eventually be a "Unicode Expert" layout like the Mac one.
 
     name[Group1] = "Irish (UnicodeExpert)";
 
-    //
-    // Numeric row `1234567890-=
-    //
     key <TLDE> { [        grave,     notsign,        brokenbar,        brokenbar ] };
     key <AE01> { [            1,      exclam,         NoSymbol,         NoSymbol ] };
     key <AE02> { [            2,    quotedbl, dead_doubleacute, dead_doubleacute ] };
@@ -163,22 +137,17 @@ xkb_symbols "UnicodeExpert" {
     key <AE04> { [            4,      dollar,         EuroSign,         EuroSign ] };
     key <AE05> { [            5,     percent,         NoSymbol,         NoSymbol ] };
     key <AE06> { [            6, asciicircum,  dead_circumflex,  dead_circumflex ] };
-    key <AE07> { [            7,   ampersand,        0x100204A,        0x100204A ] };
-                                                // Tironian Et
+    key <AE07> { [            7,   ampersand,            U204A,            U204A ] }; // Tironian Et
     key <AE08> { [            8,    asterisk,   dead_abovering,   dead_abovering ] };
     key <AE09> { [            9,   parenleft,       dead_breve,       dead_breve ] };
     key <AE10> { [            0,  parenright,      dead_ogonek,      dead_ogonek ] };
     key <AE11> { [        minus,  underscore,      dead_macron,      dead_macron ] };
     key <AE12> { [        equal,        plus,         NoSymbol,         NoSymbol ] };
 
-    //
-    // QWERTYUIOP[]
-    //
     key <AD01> { [            q,           Q,        NoSymbol,       NoSymbol ] };
     key <AD02> { [            w,           W,        NoSymbol,       NoSymbol ] };
     key <AD03> { [            e,           E,          eacute,         Eacute ] };
-    key <AD04> { [            r,           R,       0x100027C,      0x100027C ] };
-                                                    // long r
+    key <AD04> { [            r,           R,           U027C,          U027C ] }; // long r
     key <AD05> { [            t,           T,        NoSymbol,       NoSymbol ] };
     key <AD06> { [            y,           Y,        NoSymbol,       NoSymbol ] };
     key <AD07> { [            u,           U,          uacute,         Uacute ] };
@@ -188,9 +157,6 @@ xkb_symbols "UnicodeExpert" {
     key <AD11> { [  bracketleft,   braceleft,       dead_hook,      dead_hook ] };
     key <AD12> { [ bracketright,  braceright,       dead_horn,      dead_horn ] };
 
-    //
-    // ASDFGHJKL;'#
-    //
     key <AC01> { [          a,             A,          aacute,         Aacute ] };
     key <AC02> { [          s,             S,        NoSymbol,       NoSymbol ] };
     key <AC03> { [          d,             D,        NoSymbol,       NoSymbol ] };
@@ -204,12 +170,8 @@ xkb_symbols "UnicodeExpert" {
     key <AC11> { [ apostrophe,            at,      dead_acute,     dead_acute ] };
     key <BKSL> { [ numbersign,    asciitilde,      dead_tilde,     dead_tilde ] };
 
-    //
-    // \ZXCVBNM,./
-    //
     key <LSGT> { [  backslash,           bar,      dead_grave,     dead_grave ] };
-    key <AB01> { [          z,             Z,       0x100017F,      0x1001E9B ] };
-                                                    // long s,     long s dot
+    key <AB01> { [          z,             Z,           U017F,          U1E9B ] }; // long s, long s dot
     key <AB02> { [          x,             X,        NoSymbol,       NoSymbol ] };
     key <AB03> { [          c,             C,        NoSymbol,       NoSymbol ] };
     key <AB04> { [          v,             V,      dead_caron,     dead_caron ] };
@@ -227,19 +189,11 @@ xkb_symbols "UnicodeExpert" {
     include "compose(rwin)"
 };
 
-//
-// Ogham keyboard map for XFree86
-//
-// Seamus O Ciardhuain <seoc@cnds.ucd.ie> (17 December 2002)
-//
-// Ogham keyboard layout as recommended in I.S. 434:1999.
-// Suitable for multi-layout xkbcomp.
-// Character names are given as in the Unicode standard,
-// range U+1680 to U+169F.
-
 partial alphanumeric_keys
 xkb_symbols "ogam" {
 
+    // Ogham keyboard layout as recommended in I.S. 434:1999.
+
     name[Group1] = "Ogham";
 
     key.type[Group1] = "ONE_LEVEL";
@@ -254,9 +208,7 @@ xkb_symbols "ogam" {
 
     key <SPCE> { [ space ] };
 
-    //
-    // Top Row QWERTYUIOP
-    //
+    // Top row: QWERTYUIOP
     key <AD01> { [ 0x100168A ] };  // OGHAM LETTER CEIRT
     key <AD02> { [ 0x1001695 ] };  // OGHAM LETTER EABHADH
     key <AD03> { [ 0x1001693 ] };  // OGHAM LETTER EADHADH
@@ -268,9 +220,7 @@ xkb_symbols "ogam" {
     key <AD09> { [ 0x1001691 ] };  // OGHAM LETTER ONN
     key <AD10> { [ 0x100169A ] };  // OGHAM LETTER PEITH
 
-    //
-    // Middle Row ASDFGHJKL
-    //
+    // Middle row: ASDFGHJKL
     key <AC01> { [ 0x1001690 ] };  // OGHAM LETTER AILM
     key <AC02> { [ 0x1001684 ] };  // OGHAM LETTER SAIL
     key <AC03> { [ 0x1001687 ] };  // OGHAM LETTER DAIR
@@ -281,9 +231,7 @@ xkb_symbols "ogam" {
     key <AC08> { [ 0x1001696 ] };  // OGHAM LETTER OR
     key <AC09> { [ 0x1001682 ] };  // OGHAM LETTER LUIS
 
-    //
-    // Bottom Row ZXCVBNM
-    //
+    // Bottom row: ZXCVBNM
     key <AB01> { [ 0x100168E ] };  // OGHAM LETTER STRAIF
     key <AB02> { [ 0x1001699 ] };  // OGHAM LETTER EAMHANCHOLL
     key <AB03> { [ 0x1001689 ] };  // OGHAM LETTER COLL
@@ -320,25 +268,19 @@ xkb_symbols "ogam_is434" {
     key <TLDE> { [      grave,    notsign, 0x100169C ] }; // OGHAM REVERSED FEATHER MARK
     key <SPCE> { [      space,      space,     space ] };
 
-    //
-    // Numeric row
-    //
     key <AE01> { type[Group1]="TWO_LEVEL", [     1,      exclam            ] };
     key <AE02> { type[Group1]="TWO_LEVEL", [     2,    quotedbl            ] };
     key <AE03> { type[Group1]="TWO_LEVEL", [     3,    sterling            ] };
     key <AE04> {                           [     4,      dollar,  EuroSign ] };
     key <AE05> { type[Group1]="TWO_LEVEL", [     5,     percent            ] };
     key <AE06> { type[Group1]="TWO_LEVEL", [     6, asciicircum            ] };
-    key <AE07> {                           [     7,   ampersand, 0x100204A ] }; // Tironian Et
+    key <AE07> {                           [     7,   ampersand,     U204A ] }; // Tironian Et
     key <AE08> { type[Group1]="TWO_LEVEL", [     8,    asterisk            ] };
     key <AE09> { type[Group1]="TWO_LEVEL", [     9,   parenleft            ] };
     key <AE10> { type[Group1]="TWO_LEVEL", [     0,  parenright            ] };
     key <AE11> { type[Group1]="TWO_LEVEL", [ minus,  underscore            ] };
     key <AE12> { type[Group1]="TWO_LEVEL", [ equal,        plus            ] };
 
-    //
-    // Top Row QWERTYUIOP
-    //
     key <AD01> { [ q, Q, 0x100168A ] };  // OGHAM LETTER CEIRT
     key <AD02> { [ w, W, 0x1001695 ] };  // OGHAM LETTER EABHADH
     key <AD03> { [ e, E, 0x1001693 ] };  // OGHAM LETTER EADHADH
@@ -350,9 +292,6 @@ xkb_symbols "ogam_is434" {
     key <AD09> { [ o, O, 0x1001691 ] };  // OGHAM LETTER ONN
     key <AD10> { [ p, P, 0x100169A ] };  // OGHAM LETTER PEITH
 
-    //
-    // Middle Row ASDFGHJKL
-    //
     key <AC01> { [ a, A, 0x1001690 ] };  // OGHAM LETTER AILM
     key <AC02> { [ s, S, 0x1001684 ] };  // OGHAM LETTER SAIL
     key <AC03> { [ d, D, 0x1001687 ] };  // OGHAM LETTER DAIR
@@ -363,9 +302,6 @@ xkb_symbols "ogam_is434" {
     key <AC08> { [ k, K, 0x1001696 ] };  // OGHAM LETTER OR
     key <AC09> { [ l, L, 0x1001682 ] };  // OGHAM LETTER LUIS
 
-    //
-    // Bottom Row ZXCVBNM
-    //
     key <AB01> { [ z, Z, 0x100168E ] };  // OGHAM LETTER STRAIF
     key <AB02> { [ x, X, 0x1001699 ] };  // OGHAM LETTER EAMHANCHOLL
     key <AB03> { [ c, C, 0x1001689 ] };  // OGHAM LETTER COLL
@@ -374,9 +310,6 @@ xkb_symbols "ogam_is434" {
     key <AB06> { [ n, N, 0x1001685 ] };  // OGHAM LETTER NION
     key <AB07> { [ m, M, 0x100168B ] };  // OGHAM LETTER MUIN
 
-    // As an extension because <BKSL> and <LSGT> may not be
-    // available or sensible. These are also a bit more
-    // intuitive on a standard Irish keyboard.
     key <AB08> { [  comma,     less, 0x100169C ] }; // OGHAM REVERSED FEATHER MARK
     key <AB09> { [ period,  greater, 0x100169B ] }; // OGHAM FEATHER MARK
     key <AB10> { [  slash, question, 0x1001680 ] }; // OGHAM SPACE MARK
@@ -384,10 +317,9 @@ xkb_symbols "ogam_is434" {
     // The standard says the Ogham characters should be accessed when
     // Caps Lock is down; not clear if this means it should lock but
     // seems logical.
-
     key <CAPS>  { type[Group1] = "ONE_LEVEL", [ ISO_Level3_Lock ] };
 
-    // Also allow access to Ogham characters using RALT for convenience
+    // Also allow access to Ogham characters using RALT, for convenience.
     include "level3(ralt_switch)"
 
     // Redefine Scroll Lock as locking shift in case that's needed.