keyboard/altgr: recover ukext combining characters

From accompanying descriptions on wikipedia.

diff --git a/altgr-ukext.eng.inc.pl b/altgr-ukext.eng.inc.pl
index 0eb81c673a22642974cce7bab53aa81d5dc6c99c..d5f77494460d42daa9b65452d3a7cad88de31737 100644 (file)
--- a/altgr-ukext.eng.inc.pl
+++ b/altgr-ukext.eng.inc.pl
@@ -1,20 +1,18 @@
 use utf8;
 our %rows = (
-       '¬' => '◌',
-       '`' => '◌',
        '~' => '¦',
        '!' => '¡',
        '1' => '¹',
-       '"' => '½',
-       '2' => '◌',
-       '£' => '⅓',
+       '@' => '½', # uk "
+       '2' => "\N{COMBINING DIAERESIS}",
+       '#' => '⅓', # uk £
        '3' => '³',
        '$' => '¼',
        '4' => '€',
        '%' => '⅜',
        '5' => '½',
        '^' => '⅝',
-       '6' => '◌',
+       '6' => "\N{COMBINING CIRCUMFLEX ACCENT}",
        '&' => '⅞',
        '7' => '{',
        '*' => '™',
@@ -25,8 +23,8 @@ our %rows = (
        '0' => '}',
        '_' => '¿',
        '-' => '\\',
-       '+' => '◌',
-       '=' => '◌',
+       '+' => "\N{COMBINING OGONEK}",
+       '=' => "\N{COMBINING CEDILLA}",
        'Q' => 'Ω',
        'q' => '@',
        'W' => 'Ẃ',
@@ -47,10 +45,8 @@ our %rows = (
        'o' => 'ó',
        'P' => 'Þ',
        'p' => 'þ',
-       '{' => '◌',
-       '[' => '◌',
-       '}' => '◌',
-       ']' => '◌',
+       '{' => "\N{COMBINING RING ABOVE}",
+       '}' => "\N{COMBINING MACRON}",
        'A' => 'Á',
        'a' => 'á',
        'S' => '§',
@@ -63,20 +59,20 @@ our %rows = (
        'g' => 'ŋ',
        'H' => 'Ħ',
        'h' => 'ħ',
-       'J' => '◌',
-       'j' => '◌',
+       'J' => "\N{COMBINING HORN}",
+       'j' => "\N{COMBINING HOOK ABOVE}",
        'K' => '&',
        'k' => 'ĸ',
        'L' => 'Ł',
        'l' => 'ł',
-       ':' => '◌',
-       ';' => '◌',
-       '@' => '◌',
-       '\'' => '◌',
-       '~' => '◌',
-       '#' => '◌',
-       '|' => '¦',
-       '\\'=> '|',
+       ':' => "\N{COMBINING DOUBLE ACUTE ACCENT}",
+       ';' => "\N{COMBINING ACUTE ACCENT}",
+       '"' => "\N{COMBINING CARON}", # uk @
+       "'" => "\N{COMBINING ACUTE ACCENT}", # same as ;?
+       '|' => "\N{COMBINING TILDE}",
+       '\\'=> "\N{COMBINING BREVE}",
+       '~' => "\N{COMBINING GRAVE ACCENT}",
+       '`' => '¦',
        'Z' => '<',
        'z' => '«',
        'X' => '>',
@@ -95,9 +91,11 @@ our %rows = (
        ',' => '─',
        '>' => '÷',
        '.' => '·',
-       '?' => '◌',
-       '/' => '◌',
+       '?' => "\N{COMBINING DOT ABOVE}",
+       '/' => "\N{COMBINING DOT BELOW}",
 );
+$rows{'['} = $rows{'2'};
+$rows{']'} = $rows{'#'};
 
 +{
        %{ do 'keyboard.eng.inc.pl' },