Added euro to Polish layout

... and new pl(legacy) added
https://bugs.freedesktop.org/show_bug.cgi?id=5981

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 60b41a5..2b87c7d 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3898,6 +3898,12 @@
       <variantList>
         <variant>
           <configItem>
+            <name>legacy</name>
+            <_description>Polish (legacy)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>qwertz</name>
             <_description>Polish (qwertz)</_description>
           </configItem>

diff --git a/symbols/pl b/symbols/pl
index 6d22723..fc9eb31 100644 (file)
--- a/symbols/pl
+++ b/symbols/pl
@@ -3,18 +3,69 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
+    // Visualisation and description: http://podziemie.net/xkb/pl
+    // Contact: Michał Górny <zrchos+freedesktop@gmail.com>
+
     include "latin"
 
     name[Group1]="Polish";
 
-    key <AD01>  { [         q,          Q ] };
-    key <AD02>  { [         w,          W ] };
+    key <AE01> { [         1,     exclam,     notequal,   exclamdown ] };
+    key <AE02> { [         2,         at,  twosuperior, questiondown ] };
+    key <AE04> { [         4,     dollar,         cent,   onequarter ] };
+    key <AE05> { [         5,    percent,     EuroSign,        U2030 ] };
+    key <AE06> { [         6, asciicircum,     onehalf,   logicaland ] };
+    key <AE07> { [         7,  ampersand,      section,        U2248 ] };
+    key <AE08> { [         8,   asterisk, periodcentered, threequarters ] };
+    key <AE09> { [         9,  parenleft, guillemotleft,   plusminus ] };
+    key <AE10> { [         0, parenright, guillemotright,     degree ] };
+    key <AE11> { [     minus, underscore,       endash,       emdash ] };
+
+    key <AD01> { [         q,          Q,     Greek_pi,  Greek_OMEGA ] };
+    key <AD02> { [         w,          W,           oe,           OE ] };
+    key <AD03> { [         e,          E,      eogonek,      Eogonek ] };
+    key <AD04> { [         r,          R,    copyright,   registered ] };
+    key <AD05> { [         t,          T,       ssharp,    trademark ] };
+    key <AD08> { [         i,          I,   rightarrow,        U2194 ] };
+    key <AD09> { [         o,          O,       oacute,       Oacute ] };
+
+    key <AC01> { [         a,          A,      aogonek,      Aogonek ] };
+    key <AC02> { [         s,          S,       sacute,       Sacute ] };
+    key <AC04> { [         f,          F,           ae,           AE ] };
+    key <AC06> { [         h,          H, rightsinglequotemark, U2022 ] };
+    key <AC07> { [         j,          J,        schwa,        SCHWA ] };
+    key <AC08> { [         k,          K,     ellipsis,  dead_stroke ] };
+    key <TLDE> { [     grave, asciitilde,      notsign,    logicalor ] };
+
+    key <AB01> { [         z,          Z,    zabovedot,    Zabovedot ] };
+    key <AB02> { [         x,          X,       zacute,       Zacute ] };
+    key <AB03> { [         c,          C,       cacute,       Cacute ] };
+    key <AB04> { [         v,          V, doublelowquotemark, leftsinglequotemark ] };
+    key <AB05> { [         b,          B, rightdoublequotemark, leftdoublequotemark ] };
+    key <AB06> { [         n,          N,       nacute,       Nacute ] };
+    key <AB07> { [         m,          M,           mu,     infinity ] };
+    key <AB08> { [     comma,       less, lessthanequal,    multiply ] };
+    key <AB09> { [    period,    greater, greaterthanequal, division ] };
+
+    key <SPCE> { [     space,      space, nobreakspace, nobreakspace ] };
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "legacy" {
+
+    include "latin"
+
+    name[Group1]="Polish (legacy)";
+
     key <AD03> { [         e,          E,      eogonek,      Eogonek ] };
     key <AD09> { [         o,          O,       oacute,       Oacute ] };
 
     key <AC01> { [         a,          A,      aogonek,      Aogonek ] };
     key <AC02> { [         s,          S,       sacute,       Sacute ] };
-    key <AC04>  { [         f,          F ] };
 
     key <AB01> { [         z,          Z,    zabovedot,    Zabovedot ] };
     key <AB02> { [         x,          X,       zacute,       Zacute ] };