diff options
| -rw-r--r-- | rules/base | 8 | ||||
| -rw-r--r-- | rules/base.xml.in | 17 | ||||
| -rw-r--r-- | symbols/Makefile.am | 2 | ||||
| -rw-r--r-- | symbols/pl | 42 | ||||
| -rw-r--r-- | symbols/pl2 | 46 |
5 files changed, 55 insertions, 60 deletions
@@ -9,12 +9,12 @@ // // Layouts that still need be composed by old rules -! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hu hu_qwerty lt_std mn vn hr_US +! $oldlayouts = az bs ca ch hu hu_qwerty lt_std mn vn hr_US // If you want non-latin layouts implicitly include the en_US layout // uncomment lines below -//! $nonlatin = am ar ben bg by dev el ge_la ge_ru guj gur il il_phonetic\ -// ir iu kan lo mk mm ml ori ru sr syr syr_phonetic tel th\ +//! $nonlatin = am ar ben bg by dev el ge guj gur il \ +// ir iu kan lo mk mm ml ori ru sr syr tel th\ // tj tml ua ! $pcmodels = pc101 pc102 pc104 pc105 @@ -30,7 +30,7 @@ * = xfree86 ! $azerty = be fr fr-latin9 -! $qwertz = al cz de hr pl2 ro si sk +! $qwertz = al cz de hr ro si sk ! layout[1] = keycodes $azerty = +aliases(azerty) diff --git a/rules/base.xml.in b/rules/base.xml.in index eaeedea5..8758fb1a 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -1579,15 +1579,14 @@ <_shortDescription>Pol</_shortDescription> <_description>Polish</_description> </configItem> - <variantList/> - </layout> - <layout> - <configItem> - <name>pl2</name> - <_shortDescription>Pol</_shortDescription> - <_description>Polish (qwertz)</_description> - </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>qwertz</name> + <_description>qwertz</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> diff --git a/symbols/Makefile.am b/symbols/Makefile.am index 79178ada..1c824c08 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -18,7 +18,7 @@ lo lt lv \ mk ml mm \ mt nl \ no ogham ori \ -pc pl pl2 \ +pc pl \ pt ro ru \ sapmi se \ si \ @@ -23,3 +23,45 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; + +partial alphanumeric_keys +xkb_symbols "qwertz" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple QWERTZ Polish keybaord + + include "latin(type3)" + + name[Group1]="Polish"; + + key <AE01> { [ 1, exclam, asciitilde, exclamdown ] }; + key <AE02> { [ 2, quotedbl, dead_caron, oneeighth ] }; + key <AE03> { [ 3, numbersign, dead_circumflex, sterling ] }; + key <AE04> { [ 4, dollar, dead_breve, dollar ] }; + key <AE05> { [ 5, percent, degree, threeeighths ] }; + key <AE06> { [ 6, ampersand, dead_ogonek, fiveeighths ] }; + key <AE07> { [ 7, slash, dead_grave, seveneighths ] }; + key <AE08> { [ 8, parenleft, dead_abovedot, trademark ] }; + key <AE09> { [ 9, parenright, dead_acute, plusminus ] }; + key <AE10> { [ 0, equal, dead_doubleacute, degree ] }; + key <AE11> { [ plus, question, dead_diaeresis, questiondown ] }; + key <AE12> { [apostrophe, asterisk, dead_cedilla, dead_ogonek ] }; + + key <AD03> { [ e, E, EuroSign, cent ] }; + key <AD11> { [ zabovedot, nacute, division, dead_abovering ] }; + key <AD12> { [ sacute, cacute, multiply, dead_macron ] }; + + key <AC02> { [ s, S, dstroke, section ] }; + key <AC03> { [ d, D, Dstroke, ETH ] }; + key <AC08> { [ k, K, kra, ampersand ] }; + key <AC09> { [ l, L, lstroke, Lstroke ] }; + key <AC10> { [ lstroke, Lstroke, dollar, dead_doubleacute ] }; + key <AC11> { [ aogonek, eogonek, ssharp, dead_caron ] }; + key <TLDE> { [ abovedot, dead_ogonek, notsign, notsign ] }; + + key <BKSL> { [ oacute, zacute, dead_grave, dead_breve ] }; + key <AB03> { [ c, C, cent, copyright ] }; + + include "level3(ralt_switch)" +}; + diff --git a/symbols/pl2 b/symbols/pl2 deleted file mode 100644 index e9d92299..00000000 --- a/symbols/pl2 +++ /dev/null @@ -1,46 +0,0 @@ - -// based on a keyboard map from an 'xkb/symbols/pl2' file -// -// $XFree86: xc/programs/xkbcomp/symbols/pl2,v 1.4 2003/04/19 12:22:12 pascal Exp $ - -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple QWERTZ Polish keybaord - - include "latin(type3)" - - name[Group1]="Polish"; - - key <AE01> { [ 1, exclam, asciitilde, exclamdown ] }; - key <AE02> { [ 2, quotedbl, dead_caron, oneeighth ] }; - key <AE03> { [ 3, numbersign, dead_circumflex, sterling ] }; - key <AE04> { [ 4, dollar, dead_breve, dollar ] }; - key <AE05> { [ 5, percent, degree, threeeighths ] }; - key <AE06> { [ 6, ampersand, dead_ogonek, fiveeighths ] }; - key <AE07> { [ 7, slash, dead_grave, seveneighths ] }; - key <AE08> { [ 8, parenleft, dead_abovedot, trademark ] }; - key <AE09> { [ 9, parenright, dead_acute, plusminus ] }; - key <AE10> { [ 0, equal, dead_doubleacute, degree ] }; - key <AE11> { [ plus, question, dead_diaeresis, questiondown ] }; - key <AE12> { [apostrophe, asterisk, dead_cedilla, dead_ogonek ] }; - - key <AD03> { [ e, E, EuroSign, cent ] }; - key <AD11> { [ zabovedot, nacute, division, dead_abovering ] }; - key <AD12> { [ sacute, cacute, multiply, dead_macron ] }; - - key <AC02> { [ s, S, dstroke, section ] }; - key <AC03> { [ d, D, Dstroke, ETH ] }; - key <AC08> { [ k, K, kra, ampersand ] }; - key <AC09> { [ l, L, lstroke, Lstroke ] }; - key <AC10> { [ lstroke, Lstroke, dollar, dead_doubleacute ] }; - key <AC11> { [ aogonek, eogonek, ssharp, dead_caron ] }; - key <TLDE> { [ abovedot, dead_ogonek, notsign, notsign ] }; - - key <BKSL> { [ oacute, zacute, dead_grave, dead_breve ] }; - key <AB03> { [ c, C, cent, copyright ] }; - - include "level3(ralt_switch)" -}; - |