3 files changed, 24 insertions, 31 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 4b18513e9..d21891db2 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1388,18 +1388,6 @@
     </layout>
     <layout>
       <configItem>
-        <name>ad</name>
-        <!-- Keyboard indicator for Catalan layouts -->
-        <_shortDescription>ca</_shortDescription>
-        <_description>Catalan</_description>
-        <languageList>
-          <iso639Id>cat</iso639Id>
-        </languageList>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
         <name>af</name>
         <!-- Keyboard indicator for Afghani layouts -->
         <_shortDescription>fa</_shortDescription>
@@ -6361,7 +6349,7 @@
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->
       <configItem>
-        <name>eurosign</name>
+        <name>currencysign</name>
         <_description>Adding currency signs to certain keys</_description>
       </configItem>
       <option>
diff --git a/xorg-server/xkeyboard-config/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am
index af0322f0c..509a549cd 100644
--- a/xorg-server/xkeyboard-config/symbols/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr s
 
 symbolsdir = $(xkb_base)/symbols
 symbols_DATA = \
-ad af al \
+af al \
 am apl ara \
 at az \
 ba bd be \
diff --git a/xorg-server/xkeyboard-config/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo
index ed4a2774b..02de5f7aa 100644
--- a/xorg-server/xkeyboard-config/symbols/typo
+++ b/xorg-server/xkeyboard-config/symbols/typo
@@ -2,25 +2,28 @@
 // Sergei Stolyarov <sergei@regolit.com>
 //
 // Initial contribution by Alexey Ten <alexeyten+deb@gmail.com>
+// Additional contribution and code cleanup by Artur Dryomov <artur.dryomov@gmail.com>
 //
-// Based on the layout proposed by Ilya Birman, 
-// http://ilyabirman.ru/typography-layout/
-//
+// Mainly based on the layout proposed by Ilya Birman,
+// http://ilyabirman.ru/projects/typography-layout/
 
 // default layout
 default partial
 xkb_symbols "base" {
 // 1st keyboard row
     key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
-    key <AE01> { [NoSymbol, NoSymbol, onesuperior] };
-    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] };
-    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] };
-    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] };
-    key <AE05> { [NoSymbol, NoSymbol, U2030] };
-    key <AE07> { [NoSymbol, NoSymbol, ampersand] };
-    key <AE08> { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] };
-    key <AE11> { [NoSymbol, NoSymbol, emdash, hyphen] };
-    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] };
+    key <AE01> { [NoSymbol, NoSymbol, onesuperior, exclamdown] }; // "1"
+    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] }; // "2"
+    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] }; // "3"
+    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] }; // "4"
+    key <AE05> { [NoSymbol, NoSymbol, permille] }; // "5"
+    key <AE06> { [NoSymbol, NoSymbol, uparrow] }; // "6"
+    key <AE07> { [NoSymbol, NoSymbol, ampersand, questiondown] }; // "7"
+    key <AE08> { [NoSymbol, NoSymbol, infinity, oneeighth] }; // "8"
+    key <AE09> { [NoSymbol, NoSymbol, leftarrow] }; // "9"
+    key <AE10> { [NoSymbol, NoSymbol, rightarrow] }; // "0"
+    key <AE11> { [NoSymbol, NoSymbol, emdash, endash] }; // "-"
+    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] }; // "="
 
 // 2nd keyboard row
     key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
@@ -28,14 +31,14 @@ xkb_symbols "base" {
     key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
     key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
     key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
-    key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [
-    key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright ] }; // ]
+    key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [
+    key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright] }; // ]
 
 // 3rd keyboard row
-    key <AC01> { [NoSymbol, NoSymbol, U0301, NoSymbol] }; // "a"
-    key <AC02> { [NoSymbol, NoSymbol, section]}; // "s"
+    key <AC01> { [NoSymbol, NoSymbol, U0301] }; // "a"
+    key <AC02> { [NoSymbol, NoSymbol, section] }; // "s"
     key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"
-    key <AC04> { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f"
+    key <AC04> { [NoSymbol, NoSymbol, sterling] }; // "f"
     key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"
     key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"
     key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"
@@ -45,6 +48,8 @@ xkb_symbols "base" {
 // 4th keyboard row
     key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"
     key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
+    key <AB04> { [NoSymbol, NoSymbol, downarrow] }; // "v"
+    key <AB07> { [NoSymbol, NoSymbol, U2212, enfilledcircbullet] }; // "m"
     key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
     key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."
     key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"