symbols/gh: improve alignment, shorten to Unnnn codes, shrink whitespace

Also add comments after the Unnnn codes, and drop redundant includes.

1 files changed, 90 insertions, 74 deletions

diff --git a/symbols/gh b/symbols/gh
index 8dbd5c9..9affb58 100644
--- a/symbols/gh
+++ b/symbols/gh
@@ -7,68 +7,78 @@ xkb_symbols "basic" {
 
     name[Group1]= "English (Ghana)";
 
-    key <AE04> { [          4, 0x010020B5,     dollar,       cent ] };
+    key <AE04>	{[          4,      U20B5,     dollar,       cent ]}; // ₵ (cedi sign)
+
     include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "akan" {
+
     include "gh(basic)"
 
     name[Group1]= "Akan";
 
-    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
-    key <AB02> { [ 0x01000254, 0x01000186,          x,          X ] };
+    key <AD01>	{[      U025B,      U0190,          q,          Q ]}; // ɛ Ɛ
+    key <AB02>	{[      U0254,      U0186,          x,          X ]}; // ɔ Ɔ
 };
 
 partial alphanumeric_keys
 xkb_symbols "ga" {
+
     include "gh(basic)"
 
     name[Group1]= "Ga";
 
-    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
-    key <AB02> { [ 0x01000254, 0x01000186,          x,          X ] };
-    key <AB03> { [ 0x0100014B, 0x0100014A,          c,          C ] };
+    key <AD01>	{[      U025B,      U0190,          q,          Q ]}; // ɛ Ɛ
+    key <AB02>	{[      U0254,      U0186,          x,          X ]}; // ɔ Ɔ
+    key <AB03>	{[      U014B,      U014A,          c,          C ]}; // ŋ Ŋ
 };
 
 partial alphanumeric_keys
 xkb_symbols "ewe" {
+
     include "gh(basic)"
 
     name[Group1]= "Ewe";
 
-    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
-    key <AB03> { [ 0x0100014B, 0x0100014A,          c,          C ] };
-    key <AD11> { [ 0x01000254, 0x01000186,  braceleft,  braceleft ] };
-    key <AD12> { [ 0x0100028B, 0x010001B2, braceright, braceright ] };
-    key <BKSL> { [ 0x01000256, 0x01000189,  backslash,  backslash ] };
-    key <AC07> { [ 0x01000192, 0x01000191,          j,          J ] };
-    key <AC05> { [          g,          G, 0x01000263, 0x01000194 ] };
+    key <AD01>	{[      U025B,      U0190,          q,          Q ]}; // ɛ Ɛ
+    key <AD11>	{[      U0254,      U0186,  braceleft,  braceleft ]}; // ɔ Ɔ
+    key <AD12>	{[      U028B,      U01B2, braceright, braceright ]}; // ʋ Ʋ
+    key <BKSL>	{[      U0256,      U0189,  backslash,  backslash ]}; // ɖ Ɖ
+
+    key <AC05>	{[          g,          G,      U0263,      U0194 ]}; // ɣ Ɣ
+    key <AC07>	{[      U0192,      U0191,          j,          J ]}; // ƒ Ƒ
+
+    key <AB03>	{[      U014B,      U014A,          c,          C ]}; // ŋ Ŋ
 };
 
 partial alphanumeric_keys
 xkb_symbols "fula" {
+
     include "gh(basic)"
 
     name[Group1]= "Fula";
 
-    key <AD01> { [          q,          Q,          q,          Q ] };
-    key <AD02> { [ udiaeresis, Udiaeresis,          w,          W ] };
-    key <AD03> { [          e,          E,   EuroSign,	     cent ] };
-    key <AD11> { [ 0x010001B4, 0x010001B3,bracketleft,  braceleft ] };
-    key <AD12> { [     gcaron,     Gcaron,bracketright, braceright] };
-    key <AC03> { [ 0x01000257, 0x0100018A,         d,           D ] };
-    key <AC10> { [ 0x01000131, 0x01000130, semicolon,       colon ] };
-    key <AC11> { [ 0x010001DD, 0x0100018E,apostrophe,    quotedbl ] };
-    key <AB01> { [ 0x01000272, 0x0100019D,         z,           Z ] };
-    key <AB07> { [     ntilde,     Ntilde,         m,           M ] };
-    key <AB09> { [   ccedilla,   Ccedilla,    period,     greater ] };
-    key <AB10> { [   scedilla,   Scedilla,     slash,    question ] };
+    key <AD01>	{[          q,          Q,          q,          Q ]};
+    key <AD02>	{[ udiaeresis, Udiaeresis,          w,          W ]};
+    key <AD03>	{[          e,          E,   EuroSign,	     cent ]};
+    key <AD11>	{[      U01B4,      U01B3,bracketleft,  braceleft ]}; // ƴ Ƴ
+    key <AD12>	{[     gcaron,     Gcaron,bracketright, braceright]};
+
+    key <AC03>	{[      U0257,      U018A,          d,          D ]}; // ɗ Ɗ
+    key <AC10>	{[      U0131,      U0130,  semicolon,      colon ]}; // ı İ
+    key <AC11>	{[      U01DD,      U018E, apostrophe,   quotedbl ]}; // ǝ Ǝ
+
+    key <AB01>	{[      U0272,      U019D,          z,          Z ]}; // ɲ Ɲ
+    key <AB07>	{[     ntilde,     Ntilde,          m,          M ]};
+    key <AB09>	{[   ccedilla,   Ccedilla,     period,    greater ]};
+    key <AB10>	{[   scedilla,   Scedilla,      slash,   question ]};
 };
 
 partial alphanumeric_keys
 xkb_symbols "hausa" {
+
     include "gh(fula)"
 
     name[Group1]= "Hausa (Ghana)";
@@ -76,74 +86,80 @@ xkb_symbols "hausa" {
 
 partial alphanumeric_keys
 xkb_symbols "generic" {
+
     include "gh(basic)"
 
     name[Group1]= "English (Ghana, multilingual)";
 
-    key <AD03> { [          e,	        E, 0x0100025b, 0x01000190 ] };
-    key <AB03> { [          c,          C, 0x01000254, 0x01000186 ] };
-    key <AC03> { [          d,          D, 0x01000256, 0x01000189 ] };
-    key <AC04> { [          f,          F, 0x01000192, 0x01000191 ] };
-    key <AC05> { [          g,          G, 0x01000263, 0x01000194 ] };
-    key <AB06> { [          n,          N, 0x0100014b, 0x0100014a ] };
-    key <AB01> { [          z,          Z, 0x010001B6, 0x010001B5 ] };
-    key <AB04> { [          v,          V, 0x0100028B, 0x010001B2 ] };
-	key <AE04> { [          4,     dollar, 0x010020B5,       cent ] };
-    include "level3(ralt_switch)"
+    key <AE04>	{[          4,     dollar,      U20B5,       cent ]}; // ₵ (cedi sign)
+
+    key <AD03>	{[          e,	        E,      U025b,      U0190 ]}; // ɛ Ɛ
+
+    key <AC03>	{[          d,          D,      U0256,      U0189 ]}; // ɖ Ɖ
+    key <AC04>	{[          f,          F,      U0192,      U0191 ]}; // ƒ Ƒ
+    key <AC05>	{[          g,          G,      U0263,      U0194 ]}; // ɣ Ɣ
+
+    key <AB01>	{[          z,          Z,      U01B6,      U01B5 ]}; // ƶ Ƶ
+    key <AB03>	{[          c,          C,      U0254,      U0186 ]}; // ɔ Ɔ
+    key <AB04>	{[          v,          V,      U028B,      U01B2 ]}; // ʋ Ʋ
+    key <AB06>	{[          n,          N,      U014b,      U014a ]}; // ŋ Ŋ
 };
 
 partial alphanumeric_keys
 xkb_symbols "avn" {
+
     include "gh(basic)"
 
     name[Group1]= "Avatime";
 
-    key <TLDE> { [      grave,     asciitilde,   0x01000300,  0x01000303 ] }; // combining grave; combining tilde
-    key <AE04> { [          4,         dollar,         cent,  0x010020B5 ] }; // ¢, ₵
-    key <AE11> { [      minus,     underscore,   0x01000304,  0x01000304 ] }; // combining macron
-    key <AD01> { [ 0x0100028B,      0x010001B2                           ] }; // ʋ, Ʋ
-    key <AD07> { [          u,              U,   0x0100028A,  0x010001B1 ] }; // ʊ, Ʊ
-    key <AD08> { [          i,              I,   0x01000269,  0x01000196 ] }; // ɩ, Ɩ
-    key <AD11> { [ 0x0100025B,      0x01000190, bracketleft,  braceleft  ] }; // ɛ, Ɛ
-    key <AC03> { [          d,              D,   0x01000256,  0x01000189 ] }; // ɖ, Ɖ
-    key <AC04> { [          f,              F,   0x01000192,  0x01000191 ] }; // ƒ, Ƒ
-    key <AC07> { [ 0x0100014B,      0x0100014A                           ] }; // ŋ, Ŋ
-    key <AC11> { [ apostrophe,       quotedbl,   0x01000301,  0x01000301 ] }; // combining acute
-    key <AB03> { [ 0x01000254,      0x01000186                           ] }; // ɔ, Ɔ
+    key <TLDE>	{[      grave, asciitilde,      U0300,      U0303 ]}; // combining grave; combining tilde
+    key <AE04>	{[          4,     dollar,       cent,      U20B5 ]}; // ¢, ₵
+    key <AE11>	{[      minus, underscore,      U0304,      U0304 ]}; // combining macron
 
-    include "level3(ralt_switch)"
-};
+    key <AD01>	{[      U028B,      U01B2                         ]}; // ʋ, Ʋ
+    key <AD07>	{[          u,          U,      U028A,      U01B1 ]}; // ʊ, Ʊ
+    key <AD08>	{[          i,          I,      U0269,      U0196 ]}; // ɩ, Ɩ
+    key <AD11>	{[      U025B,      U0190,bracketleft,  braceleft ]}; // ɛ, Ɛ
 
-// This keyboard layout fully imitates the 'Ghana Unicode' layout which is used in GILLBT on Windows with Keyman.
-// However, in this layout a 3rd level key (R ALT) is used rather than dead keys.
-// Also it has three additional features:
-// 1) combining macron above: <R ALT> + <SHIFT> + <->
-// 2) cent: <R ALT> + <4> or <R ALT> + <SHIFT> + <4>
-// 3) ʊ/Ʊ: <R ALT> + <u>/<U>
+    key <AC03>	{[          d,          D,      U0256,      U0189 ]}; // ɖ, Ɖ
+    key <AC04>	{[          f,          F,      U0192,      U0191 ]}; // ƒ, Ƒ
+    key <AC07>	{[      U014B,      U014A                         ]}; // ŋ, Ŋ
+    key <AC11>	{[ apostrophe,   quotedbl,      U0301,      U0301 ]}; // combining acute
 
+    key <AB03>	{[      U0254,      U0186                         ]}; // ɔ, Ɔ
+};
+
+// This layout imitates the 'Ghana Unicode' layout as used in GILLBT on Windows with Keyman.
+// However, this layout uses a 3rd level key (the right Alt key: AltGr) rather than dead keys.
+// It also has three additional symbols:
+// 1) combining macron above: <Shift> + <AltGr> + <->
+// 2) cent: <AltGr> + <4>
+// 3) ʊ/Ʊ: <AltGr> + <u>/<U>
 partial alphanumeric_keys
 xkb_symbols "gillbt" {
+
     include "gh(basic)"
 
     name[Group1]= "English (Ghana, GILLBT)";
 
-    key <TLDE> { [ grave,      asciitilde,  0x01000300,   0x01000303  ] }; // combining grave; combining tilde
-    key <AE04> { [ 4,          dollar,      cent,         0x010020B5  ] }; // ¢, ₵
-    key <AE06> { [ 6,          asciicircum, 0x01000302,   0x01000302  ] }; // combining circumflex accent
-    key <AE11> { [ minus,      underscore,  0x01000331,   0x01000304  ] }; // combining macron below; combining macron above
-    key <AE12> { [ 0x0100014B, 0x0100014A,  equal,        plus        ] }; // ŋ, Ŋ
-    key <AD01> { [ 0x0100028B, 0x010001B2,  q,            Q           ] }; // ʋ, Ʋ
-    key <AD03> { [ e,          E,           0x010001DD,   0x0100018E  ] }; // ǝ, Ǝ
-    key <AD07> { [ u,          U,           0x0100028A,   0x010001B1  ] }; // ʊ, Ʊ
-    key <AD11> { [ 0x0100025B, 0x01000190,  bracketleft,  braceleft   ] }; // ɛ, Ɛ
-    key <AD12> { [ 0x01000254, 0x01000186,  bracketright, braceright  ] }; // ɔ, Ɔ
-    key <AC03> { [ d,          D,           0x01000256,   0x01000189  ] }; // ɖ, Ɖ
-    key <AC04> { [ f,          F,           0x01000192,   0x01000191  ] }; // ƒ, Ƒ
-    key <AC05> { [ g,          G,           0x01000263,   0x01000194  ] }; // ɣ, Ɣ
-    key <AC11> { [ apostrophe, quotedbl,    0x01000301,   0x01000301  ] }; // combining acute
-    key <AB01> { [ z,          Z,           0x01000292,   0x010001B7  ] }; // ʒ, Ʒ
-    key <AB02> { [ 0x01000269, 0x01000196,  x,            X           ] }; // ɩ, Ɩ
-    key <AB03> { [ c,          C,           ccedilla,     Ccedilla    ] }; // ç, Ç
-
-    include "level3(ralt_switch)"
+    key <TLDE>	{[ grave,      asciitilde,  U0300,        U0303       ]}; // combining grave; combining tilde
+    key <AE04>	{[ 4,          dollar,      cent,         U20B5       ]}; // ¢, ₵
+    key <AE06>	{[ 6,          asciicircum, U0302,        U0302       ]}; // combining circumflex accent
+    key <AE11>	{[ minus,      underscore,  U0331,        U0304       ]}; // combining macron below; combining macron above
+    key <AE12>	{[ U014B,      U014A,       equal,        plus        ]}; // ŋ, Ŋ
+
+    key <AD01>	{[ U028B,      U01B2,       q,            Q           ]}; // ʋ, Ʋ
+    key <AD03>	{[ e,          E,           U01DD,        U018E       ]}; // ǝ, Ǝ
+    key <AD07>	{[ u,          U,           U028A,        U01B1       ]}; // ʊ, Ʊ
+    key <AD11>	{[ U025B,      U0190,       bracketleft,  braceleft   ]}; // ɛ, Ɛ
+    key <AD12>	{[ U0254,      U0186,       bracketright, braceright  ]}; // ɔ, Ɔ
+
+    key <AC03>	{[ d,          D,           U0256,        U0189       ]}; // ɖ, Ɖ
+    key <AC04>	{[ f,          F,           U0192,        U0191       ]}; // ƒ, Ƒ
+    key <AC05>	{[ g,          G,           U0263,        U0194       ]}; // ɣ, Ɣ
+    key <AC11>	{[ apostrophe, quotedbl,    U0301,        U0301       ]}; // combining acute
+
+    key <AB01>	{[ z,          Z,           U0292,        U01B7       ]}; // ʒ, Ʒ
+    key <AB02>	{[ U0269,      U0196,       x,            X           ]}; // ɩ, Ɩ
+    key <AB03>	{[ c,          C,           ccedilla,     Ccedilla    ]}; // ç, Ç
 };