aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in292
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in269
-rw-r--r--xorg-server/xkeyboard-config/symbols/altwin4
-rw-r--r--xorg-server/xkeyboard-config/symbols/am2
-rw-r--r--xorg-server/xkeyboard-config/symbols/apl27
-rw-r--r--xorg-server/xkeyboard-config/symbols/ara3
-rw-r--r--xorg-server/xkeyboard-config/symbols/bg2
-rw-r--r--xorg-server/xkeyboard-config/symbols/br1
-rw-r--r--xorg-server/xkeyboard-config/symbols/brai2
-rw-r--r--xorg-server/xkeyboard-config/symbols/capslock24
-rw-r--r--xorg-server/xkeyboard-config/symbols/epo3
-rw-r--r--xorg-server/xkeyboard-config/symbols/fi2
-rw-r--r--xorg-server/xkeyboard-config/symbols/group2
-rw-r--r--xorg-server/xkeyboard-config/symbols/inet18
-rw-r--r--xorg-server/xkeyboard-config/symbols/ir67
-rw-r--r--xorg-server/xkeyboard-config/symbols/jp2
-rw-r--r--xorg-server/xkeyboard-config/symbols/keypad10
-rw-r--r--xorg-server/xkeyboard-config/symbols/kr4
-rw-r--r--xorg-server/xkeyboard-config/symbols/kz2
-rw-r--r--xorg-server/xkeyboard-config/symbols/level32
-rw-r--r--xorg-server/xkeyboard-config/symbols/pc2
-rw-r--r--xorg-server/xkeyboard-config/symbols/rs12
-rw-r--r--xorg-server/xkeyboard-config/symbols/ru2
23 files changed, 417 insertions, 337 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 2bda88ba7..2e1e89d6b 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -8,7 +8,9 @@
<name>apl</name>
<_shortDescription>apl</_shortDescription>
<_description>APL keyboard symbols</_description>
- <languageList><iso639Id>eng</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -60,7 +62,9 @@
<name>ca</name>
<_shortDescription>fr</_shortDescription>
<_description>French (Canada)</_description>
- <languageList><iso639Id>fra</iso639Id></languageList>
+ <languageList>
+ <iso639Id>fra</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -133,14 +137,18 @@
<name>ir</name>
<_shortDescription>fa</_shortDescription>
<_description>Persian</_description>
- <languageList><iso639Id>per</iso639Id></languageList>
+ <languageList>
+ <iso639Id>per</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>ave</name>
<_description>Avestan</_description>
- <languageList><iso639Id>ave</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ave</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -150,7 +158,9 @@
<name>lt</name>
<_shortDescription>lt</_shortDescription>
<_description>Lithuanian</_description>
- <languageList><iso639Id>lit</iso639Id></languageList>
+ <languageList>
+ <iso639Id>lit</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -210,7 +220,7 @@
<variant>
<configItem>
<name>minuskeydvorakprogr</name>
- <_description>Latvian (programmer US Dvorak, minus variant)</_description>
+ <_description>Latvian (programmer US Dvorak, minus variant)</_description>
</configItem>
</variant>
<variant>
@@ -238,7 +248,9 @@
<name>us</name>
<_shortDescription>en</_shortDescription>
<_description>English (US)</_description>
- <languageList><iso639Id>eng</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -264,17 +276,21 @@
<configItem>
<name>crd</name>
<_description>Coeur d'Alene Salish</_description>
- <languageList><iso639Id>crd</iso639Id></languageList>
+ <languageList>
+ <iso639Id>crd</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>cz_sk_de</name>
<_description>Czech Slovak and German (US)</_description>
- <languageList><iso639Id>eng</iso639Id>
- <iso639Id>cze</iso639Id>
- <iso639Id>slo</iso639Id>
- <iso639Id>ger</iso639Id> </languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>cze</iso639Id>
+ <iso639Id>slo</iso639Id>
+ <iso639Id>ger</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -296,7 +312,9 @@
<name>pl</name>
<_shortDescription>pl</_shortDescription>
<_description>Polish</_description>
- <languageList><iso639Id>pol</iso639Id></languageList>
+ <languageList>
+ <iso639Id>pol</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -324,7 +342,9 @@
<name>ro</name>
<_shortDescription>ro</_shortDescription>
<_description>Romanian</_description>
- <languageList><iso639Id>rum</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rum</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -356,7 +376,9 @@
<name>rs</name>
<_shortDescription>sr</_shortDescription>
<_description>Serbian</_description>
- <languageList><iso639Id>srp</iso639Id></languageList>
+ <languageList>
+ <iso639Id>srp</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -378,7 +400,9 @@
<configItem>
<name>chu</name>
<_description>Church Slavonic</_description>
- <languageList><iso639Id>chu</iso639Id></languageList>
+ <languageList>
+ <iso639Id>chu</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -386,9 +410,11 @@
<name>ruu</name>
<_shortDescription>ru</_shortDescription>
<_description>Russian (with Ukrainian-Belorussian layout)</_description>
- <languageList><iso639Id>rus</iso639Id>
- <iso639Id>ukr</iso639Id>
- <iso639Id>bel</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rus</iso639Id>
+ <iso639Id>ukr</iso639Id>
+ <iso639Id>bel</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -417,19 +443,23 @@
</variant>
</variantList>
</layout>
- <layout>
+ <layout>
<configItem>
<name>il</name>
<_shortDescription>he</_shortDescription>
<_description>Hebrew</_description>
- <languageList><iso639Id>heb</iso639Id></languageList>
+ <languageList>
+ <iso639Id>heb</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>biblicalSIL</name>
<_description>Hebrew (Biblical, SIL phonetic)</_description>
- <languageList><iso639Id>heb</iso639Id></languageList>
+ <languageList>
+ <iso639Id>heb</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -439,173 +469,173 @@
<name>ara</name>
<_shortDescription>ar</_shortDescription>
<_description>Arabic</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Arabic (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>be</name>
<_shortDescription>be</_shortDescription>
<_description>Belgian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Belgian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>br</name>
<_shortDescription>pt</_shortDescription>
<_description>Portuguese (Brazil)</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Portuguese (Brazil, Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>cz</name>
<_shortDescription>cs</_shortDescription>
<_description>Czech</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Czech (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>dk</name>
<_shortDescription>da</_shortDescription>
<_description>Danish</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Danish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>nl</name>
<_shortDescription>nl</_shortDescription>
<_description>Dutch</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Dutch (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>ee</name>
<_shortDescription>et</_shortDescription>
<_description>Estonian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Estonian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>fi</name>
<_shortDescription>fi</_shortDescription>
<_description>Finnish</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Finnish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>fr</name>
<_shortDescription>fr</_shortDescription>
<_description>French</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>French (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>gr</name>
<_shortDescription>gr</_shortDescription>
<_description>Greek</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Greek (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>it</name>
<_shortDescription>it</_shortDescription>
<_description>Italian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Italian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>jp</name>
<_shortDescription>ja</_shortDescription>
<_description>Japanese</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
@@ -624,68 +654,68 @@
<_description>Japanese (Sun Type 7 - sun compatible)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>no</name>
<_shortDescription>no</_shortDescription>
<_description>Norwegian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Norwegian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>pt</name>
<_shortDescription>pt</_shortDescription>
<_description>Portuguese</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Portuguese (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>sk</name>
<_shortDescription>sk</_shortDescription>
<_description>Slovak</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Slovak (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>es</name>
<_shortDescription>es</_shortDescription>
<_description>Spanish</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Spanish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>se</name>
@@ -712,8 +742,8 @@
<name>ch</name>
<_shortDescription>de</_shortDescription>
<_description>German (Switzerland)</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6_de</name>
@@ -726,93 +756,93 @@
<_description>French (Switzerland, Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>tr</name>
<_shortDescription>tr</_shortDescription>
<_description>Turkish</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Turkish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>ua</name>
<_shortDescription>uk</_shortDescription>
<_description>Ukrainian</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Ukrainian (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>gb</name>
<_shortDescription>en</_shortDescription>
<_description>English (UK)</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>English (UK, Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>kr</name>
<_shortDescription>ko</_shortDescription>
<_description>Korean</_description>
- </configItem>
- <variantList>
+ </configItem>
+ <variantList>
<variant>
<configItem>
<name>sun_type6</name>
<_description>Korean (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
- <layout>
- <configItem>
- <name>eu</name>
- <!-- Keyboard indicator for European layouts -->
- <_shortDescription>eu</_shortDescription>
- <_description>EurKEY (US based layout with european letters)</_description>
- <languageList>
- <iso639Id>cat</iso639Id>
- <iso639Id>dan</iso639Id>
- <iso639Id>eng</iso639Id>
- <iso639Id>est</iso639Id>
- <iso639Id>fao</iso639Id>
- <iso639Id>fin</iso639Id>
- <iso639Id>ger</iso639Id>
- <iso639Id>gre</iso639Id>
- <iso639Id>gsw</iso639Id>
- <iso639Id>ita</iso639Id>
- <iso639Id>lav</iso639Id>
- <iso639Id>lit</iso639Id>
- <iso639Id>nld</iso639Id>
- <iso639Id>nor</iso639Id>
- <iso639Id>por</iso639Id>
- <iso639Id>spa</iso639Id>
- <iso639Id>swe</iso639Id>
- </languageList>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
+ <name>eu</name>
+ <!-- Keyboard indicator for European layouts -->
+ <_shortDescription>eu</_shortDescription>
+ <_description>EurKEY (US based layout with european letters)</_description>
+ <languageList>
+ <iso639Id>cat</iso639Id>
+ <iso639Id>dan</iso639Id>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>est</iso639Id>
+ <iso639Id>fao</iso639Id>
+ <iso639Id>fin</iso639Id>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>gre</iso639Id>
+ <iso639Id>gsw</iso639Id>
+ <iso639Id>ita</iso639Id>
+ <iso639Id>lav</iso639Id>
+ <iso639Id>lit</iso639Id>
+ <iso639Id>nld</iso639Id>
+ <iso639Id>nor</iso639Id>
+ <iso639Id>por</iso639Id>
+ <iso639Id>spa</iso639Id>
+ <iso639Id>swe</iso639Id>
+ </languageList>
</configItem>
</layout>
<layout>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index a7aa5de29..3fd0ce427 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -856,21 +856,21 @@
</model>
<model>
<configItem>
- <name>microsoftmult</name>
+ <name>microsoftmult</name>
<_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
<vendor>Microsoft Inc.</vendor>
</configItem>
</model>
<model>
<configItem>
- <name>microsoftelite</name>
+ <name>microsoftelite</name>
<_description>Microsoft Natural Keyboard Elite</_description>
<vendor>Microsoft Inc.</vendor>
</configItem>
</model>
<model>
<configItem>
- <name>microsoftccurve2k</name>
+ <name>microsoftccurve2k</name>
<_description>Microsoft Comfort Curve Keyboard 2000</_description>
<vendor>Microsoft Inc.</vendor>
</configItem>
@@ -1406,9 +1406,11 @@
<configItem>
<name>altgr-intl</name>
<_description>English (international AltGr dead keys)</_description>
- <languageList><iso639Id>eng</iso639Id>
- <iso639Id>fra</iso639Id>
- <iso639Id>ger</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>fra</iso639Id>
+ <iso639Id>ger</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -1421,11 +1423,13 @@
<configItem>
<name>hbs</name>
<_description>Serbo-Croatian (US)</_description>
- <languageList><iso639Id>eng</iso639Id>
- <iso639Id>bos</iso639Id>
- <iso639Id>hbs</iso639Id>
- <iso639Id>hrv</iso639Id>
- <iso639Id>srp</iso639Id> </languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>bos</iso639Id>
+ <iso639Id>hbs</iso639Id>
+ <iso639Id>hrv</iso639Id>
+ <iso639Id>srp</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -1717,9 +1721,11 @@
<!-- Keyboard indicator for Belgian layouts -->
<_shortDescription>be</_shortDescription>
<_description>Belgian</_description>
- <languageList><iso639Id>ger</iso639Id>
- <iso639Id>nld</iso639Id>
- <iso639Id>fra</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>nld</iso639Id>
+ <iso639Id>fra</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -1819,35 +1825,45 @@
<configItem>
<name>ben_baishakhi</name>
<_description>Bangla (India, Baishakhi)</_description>
- <languageList><iso639Id>ben</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ben</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_bornona</name>
<_description>Bangla (India, Bornona)</_description>
- <languageList><iso639Id>ben</iso639Id></languageList>
- </configItem>
+ <languageList>
+ <iso639Id>ben</iso639Id>
+ </languageList>
+ </configItem>
</variant>
<variant>
<configItem>
<name>ben_gitanjali</name>
<_description>Bangla (India, Uni Gitanjali)</_description>
- <languageList><iso639Id>ben</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ben</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_inscript</name>
<_description>Bangla (India, Baishakhi Inscript)</_description>
- <languageList><iso639Id>ben</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ben</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>eeyek</name>
<_description>Manipuri (Eeyek)</_description>
- <languageList><iso639Id>mni</iso639Id></languageList>
+ <languageList>
+ <iso639Id>mni</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -1933,7 +1949,9 @@
<!-- Keyboard indicator for Malayalam layouts -->
<_shortDescription>ml</_shortDescription>
<_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
- <languageList><iso639Id>mal</iso639Id></languageList>
+ <languageList>
+ <iso639Id>mal</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -2326,14 +2344,18 @@
<!-- Keyboard indicator for Cameroon layouts -->
<_shortDescription>cm</_shortDescription>
<_description>English (Cameroon)</_description>
- <languageList><iso639Id>eng</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>french</name>
<_description>French (Cameroon)</_description>
- <languageList><iso639Id>fra</iso639Id></languageList>
+ <languageList>
+ <iso639Id>fra</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -2817,8 +2839,10 @@
<!-- Keyboard indicator for Iraqi layouts -->
<_shortDescription>ar</_shortDescription>
<_description>Iraqi</_description>
- <languageList><iso639Id>ara</iso639Id>
- <iso639Id>kur</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ara</iso639Id>
+ <iso639Id>kur</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -2919,7 +2943,9 @@
<configItem>
<name>smi</name>
<_description>Northern Saami (Finland)</_description>
- <languageList><iso639Id>sme</iso639Id></languageList>
+ <languageList>
+ <iso639Id>sme</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -3232,14 +3258,18 @@
<configItem>
<name>ro</name>
<_description>Romanian (Germany)</_description>
- <languageList><iso639Id>rum</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rum</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ro_nodeadkeys</name>
<_description>Romanian (Germany, eliminate dead keys)</_description>
- <languageList><iso639Id>rum</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rum</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -3705,16 +3735,20 @@
<!-- Keyboard indicator for Russian layouts -->
<_shortDescription>ru</_shortDescription>
<_description>Russian (Kazakhstan, with Kazakh)</_description>
- <languageList><iso639Id>kaz</iso639Id>
- <iso639Id>rus</iso639Id></languageList>
+ <languageList>
+ <iso639Id>kaz</iso639Id>
+ <iso639Id>rus</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>kazrus</name>
<_description>Kazakh (with Russian)</_description>
- <languageList><iso639Id>kaz</iso639Id>
- <iso639Id>rus</iso639Id></languageList>
+ <languageList>
+ <iso639Id>kaz</iso639Id>
+ <iso639Id>rus</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -3734,7 +3768,8 @@
<configItem>
<name>stea</name>
<_description>Lao (STEA proposed standard layout)</_description>
- <languageList><iso639Id>lao</iso639Id>
+ <languageList>
+ <iso639Id>lao</iso639Id>
</languageList>
</configItem>
</variant>
@@ -4064,7 +4099,7 @@
<_description>Norwegian (Macintosh, eliminate dead keys)</_description>
</configItem>
</variant>
- <variant>
+ <variant>
<configItem>
<name>colemak</name>
<_description>Norwegian (Colemak)</_description>
@@ -4126,7 +4161,9 @@
<configItem>
<name>szl</name>
<_description>Silesian</_description>
- <languageList><iso639Id>szl</iso639Id></languageList>
+ <languageList>
+ <iso639Id>szl</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -4387,8 +4424,10 @@
<configItem>
<name>srp</name>
<_description>Serbian (Russia)</_description>
- <languageList><iso639Id>rus</iso639Id>
- <iso639Id>srp</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rus</iso639Id>
+ <iso639Id>srp</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -4668,7 +4707,9 @@
<configItem>
<name>swl</name>
<_description>Swedish Sign Language</_description>
- <languageList><iso639Id>swl</iso639Id></languageList>
+ <languageList>
+ <iso639Id>swl</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -4679,8 +4720,10 @@
<!-- Keyboard indicator for German layouts -->
<_shortDescription>de</_shortDescription>
<_description>German (Switzerland)</_description>
- <languageList><iso639Id>ger</iso639Id>
- <iso639Id>gsw</iso639Id></languageList>
+ <languageList>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>gsw</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -5578,33 +5621,37 @@
<!-- Keyboard indicator for Filipino layouts -->
<_shortDescription>ph</_shortDescription>
<_description>Filipino</_description>
- <languageList><iso639Id>eng</iso639Id>
- <iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>qwerty-bay</name>
<_description>Filipino (QWERTY Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5617,16 +5664,18 @@
<configItem>
<name>capewell-dvorak-bay</name>
<_description>Filipino (Capewell-Dvorak Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5639,16 +5688,18 @@
<configItem>
<name>capewell-qwerf2k6-bay</name>
<_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5661,16 +5712,18 @@
<configItem>
<name>colemak-bay</name>
<_description>Filipino (Colemak Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5683,16 +5736,18 @@
<configItem>
<name>dvorak-bay</name>
<_description>Filipino (Dvorak Baybayin)</_description>
- <languageList><iso639Id>bik</iso639Id>
- <iso639Id>ceb</iso639Id>
- <iso639Id>fil</iso639Id>
- <iso639Id>hil</iso639Id>
- <iso639Id>ilo</iso639Id>
- <iso639Id>pam</iso639Id>
- <iso639Id>pag</iso639Id>
- <iso639Id>phi</iso639Id>
- <iso639Id>tgl</iso639Id>
- <iso639Id>war</iso639Id></languageList>
+ <languageList>
+ <iso639Id>bik</iso639Id>
+ <iso639Id>ceb</iso639Id>
+ <iso639Id>fil</iso639Id>
+ <iso639Id>hil</iso639Id>
+ <iso639Id>ilo</iso639Id>
+ <iso639Id>pam</iso639Id>
+ <iso639Id>pag</iso639Id>
+ <iso639Id>phi</iso639Id>
+ <iso639Id>tgl</iso639Id>
+ <iso639Id>war</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -5702,7 +5757,9 @@
<name>md</name>
<_shortDescription>md</_shortDescription>
<_description>Moldavian</_description>
- <languageList><iso639Id>rum</iso639Id></languageList>
+ <languageList>
+ <iso639Id>rum</iso639Id>
+ </languageList>
</configItem>
<variantList>
<variant>
@@ -5710,7 +5767,9 @@
<name>gag</name>
<_shortDescription>gag</_shortDescription>
<_description>Moldavian (Gagauz)</_description>
- <languageList><iso639Id>gag</iso639Id></languageList>
+ <languageList>
+ <iso639Id>gag</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>
@@ -5848,7 +5907,7 @@
<name>grp:rctrl_rshift_toggle</name>
<_description>Right Ctrl+Right Shift</_description>
</configItem>
- </option>
+ </option>
<option>
<configItem>
<name>grp:ctrl_alt_toggle</name>
@@ -6263,7 +6322,7 @@
</option>
</group>
<group allowMultipleSelection="false">
- <!-- Caps Lock tweaks.
+ <!-- Caps Lock tweaks.
"Internal" capitalization means capitalization using some internal tables.
Otherwise "as Shift" - means using next group. -->
<configItem>
diff --git a/xorg-server/xkeyboard-config/symbols/altwin b/xorg-server/xkeyboard-config/symbols/altwin
index 239d4878c..76a289ad1 100644
--- a/xorg-server/xkeyboard-config/symbols/altwin
+++ b/xorg-server/xkeyboard-config/symbols/altwin
@@ -93,7 +93,7 @@ xkb_symbols "swap_alt_win" {
};
// Swap the left Alt and Win keys.
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "swap_lalt_lwin" {
key <LALT> { type[Group1] = "ONE_LEVEL",
symbols[Group1] = [ Super_L ] };
@@ -101,7 +101,7 @@ xkb_symbols "swap_lalt_lwin" {
};
// Swap the right Alt and Win keys.
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "swap_ralt_rwin" {
key <RALT> { type[Group1] = "ONE_LEVEL",
symbols[Group1] = [ Super_R ] };
diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index dbe6e96d8..21ff1e872 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -63,8 +63,6 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "olpc" {
include "am(basic)"
- name[Group1]= "Armenian";
-
include "group(olpc)"
};
diff --git a/xorg-server/xkeyboard-config/symbols/apl b/xorg-server/xkeyboard-config/symbols/apl
index c60f11723..4d81ac295 100644
--- a/xorg-server/xkeyboard-config/symbols/apl
+++ b/xorg-server/xkeyboard-config/symbols/apl
@@ -62,9 +62,9 @@ xkb_symbols "basic" {
// ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "common" {
- name[Group1]= "APL";
+ name[Group1]= "APL keyboard symbols";
key <AB01> { [ U2282 ] }; // Z: ⊂ -- Subset Of
key <AB02> { [ U2283 ] }; // X: ⊃ -- Superset Of
@@ -129,7 +129,7 @@ xkb_symbols "common" {
partial alphanumeric_keys
xkb_symbols "unified" {
- name[Group1]= "APL Keyboard Symbols: Unified Layout";
+ name[Group1]= "APL keyboard symbols (unified)";
include "apl(common)"
@@ -162,7 +162,7 @@ xkb_symbols "unified" {
partial alphanumeric_keys
xkb_symbols "sax" {
- name[Group1]= "APL Keyboard Symbols";
+ name[Group1]= "APL keyboard symbols (sax)";
include "apl(unified)"
@@ -224,7 +224,7 @@ xkb_symbols "sax" {
partial alphanumeric_keys
xkb_symbols "apl2" {
- name[Group1]= "APL Keyboard Symbols: IBM APL2";
+ name[Group1]= "APL keyboard symbols (IBM APL2)";
include "apl(common)"
@@ -284,7 +284,7 @@ xkb_symbols "apl2" {
partial alphanumeric_keys
xkb_symbols "aplplusII" {
- name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II";
+ name[Group1]= "APL keyboard symbols (Manugistics APL*PLUS II)";
// AFS - short for APL Functional Symbol
include "apl(apl2)"
@@ -321,7 +321,7 @@ xkb_symbols "aplplusII" {
partial alphanumeric_keys
xkb_symbols "aplx" {
- name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout";
+ name[Group1]= "APL keyboard symbols (APLX unified)";
include "apl(unified)"
@@ -372,9 +372,8 @@ xkb_symbols "aplx" {
// the alphabet and similar. If this keyboard is placed as the 2nd layout then it can
// be reached with a latching shift to increase group by one.
-partial alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "dyalog_base" {
- name[Group1]="APL";
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
@@ -445,9 +444,8 @@ xkb_symbols "dyalog_base" {
key <TLDE> { [ U22c4, currency] }; // diamond
};
-partial keypad_keys
+hidden partial keypad_keys
xkb_symbols "dyalog_box" {
- name[Group1]="Dyalog box";
// ┌───┬───┬───┬───┐
// │ │ │ │ │
@@ -473,10 +471,9 @@ xkb_symbols "dyalog_box" {
key <KP9> { [ U2510 ] }; // box drawing light down and left
key <KPDL> { [ U2502 ] }; // box drawing light vertical
-};
+};
-xkb_symbols "dyalog_codes" {
- name[Group1]="Dyalog Codes";
+hidden xkb_symbols "dyalog_codes" {
// Layout of private use area for this. In the style of the Unicode book
//
@@ -613,6 +610,6 @@ xkb_symbols "dyalog" {
include "apl(dyalog_base)"
include "apl(dyalog_box)"
include "apl(dyalog_codes)"
- name[Group1] = "Dyalog APL complete";
+ name[Group1] = "APL keyboard symbols (Dyalog)";
};
diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index d048b0090..9c1d57e09 100644
--- a/xorg-server/xkeyboard-config/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
@@ -96,7 +96,6 @@ xkb_symbols "azerty" {
partial hidden alphanumeric_keys
xkb_symbols "digits_KP" {
- name[Group1]= "Arabic (digits_KP)";
// Use Arabic-script digits on the keypad.
@@ -120,7 +119,7 @@ xkb_symbols "digits" {
include "ara(basic)"
name[Group1]= "Arabic (digits)";
- // Use Arabic-script digits on the numberic row.
+ // Use Arabic-script digits on the numeric row.
key <AE01> { [ 0x1000661, exclam ] };
key <AE02> { [ 0x1000662, at ] };
diff --git a/xorg-server/xkeyboard-config/symbols/bg b/xorg-server/xkeyboard-config/symbols/bg
index f44b5c60d..1de6c3065 100644
--- a/xorg-server/xkeyboard-config/symbols/bg
+++ b/xorg-server/xkeyboard-config/symbols/bg
@@ -190,7 +190,7 @@ xkb_symbols "bas_phonetic" {
// This is an extended variant of the standard Latin QWERTY layout with
// additional symbols in levels 3 and 4.
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "latin" {
key <TLDE> {[ grave, asciitilde, U2248, U2245 ]};
diff --git a/xorg-server/xkeyboard-config/symbols/br b/xorg-server/xkeyboard-config/symbols/br
index 85f5f5522..f65d13aa1 100644
--- a/xorg-server/xkeyboard-config/symbols/br
+++ b/xorg-server/xkeyboard-config/symbols/br
@@ -64,7 +64,6 @@ partial alphanumeric_keys
xkb_symbols "thinkpad" {
include "br(abnt2)"
- name[Group1]="Portuguese (Brazil)";
key <RCTL> { [ slash, question, degree, questiondown ] };
};
diff --git a/xorg-server/xkeyboard-config/symbols/brai b/xorg-server/xkeyboard-config/symbols/brai
index 66364e60e..46bc2c6b6 100644
--- a/xorg-server/xkeyboard-config/symbols/brai
+++ b/xorg-server/xkeyboard-config/symbols/brai
@@ -48,7 +48,7 @@ xkb_symbols "right_hand" {
};
// 6-dot patterns on the keypad
-partial hidden keypad_keys
+hidden partial keypad_keys
xkb_symbols "keypad" {
key <KP4> { [ braille_dot_1 ] };
key <KP1> { [ braille_dot_2 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 928d79a3e..3f4a0cd70 100644
--- a/xorg-server/xkeyboard-config/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
@@ -1,27 +1,27 @@
-default partial hidden modifier_keys
+default hidden partial modifier_keys
xkb_symbols "capslock" {
replace key <CAPS> { [ Caps_Lock ] };
modifier_map Lock { Caps_Lock };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "shiftlock" {
replace key <CAPS> { [ Shift_Lock ] };
modifier_map Shift { Shift_Lock };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "grouplock" {
replace key <CAPS> { [ ISO_Next_Group, Caps_Lock ] };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "swapescape" {
key <CAPS> { [ Escape ] };
key <ESC> { [ Caps_Lock ] };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "groupshift" {
key <CAPS> {
type[Group1] = "PC_ALT_LEVEL2",
@@ -29,41 +29,41 @@ xkb_symbols "groupshift" {
};
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "escape" {
key <CAPS> { [ Escape ] };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "backspace" {
key <CAPS> { [ BackSpace ] };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "super" {
key <CAPS> { [ Super_L ] };
modifier_map Mod4 { <CAPS> };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "hyper" {
key <CAPS> { [ Hyper_L ] };
modifier_map Mod4 { <CAPS> };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "none" {
key <CAPS> { [ VoidSymbol ] };
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "numlock" {
key <CAPS> { [ Num_Lock ] };
};
// This changes the <CAPS> key to become a Control modifier,
// but it will still produce the Caps_Lock keysym.
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "ctrl_modifier" {
replace key <CAPS> {
type[Group1] = "ONE_LEVEL",
diff --git a/xorg-server/xkeyboard-config/symbols/epo b/xorg-server/xkeyboard-config/symbols/epo
index 1f7f3fc7c..1d4000948 100644
--- a/xorg-server/xkeyboard-config/symbols/epo
+++ b/xorg-server/xkeyboard-config/symbols/epo
@@ -10,9 +10,8 @@
default partial alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]= "Esperanto";
-
include "us(basic)"
+ name[Group1]= "Esperanto";
key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index 1bf9ff074..6afed2106 100644
--- a/xorg-server/xkeyboard-config/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
@@ -98,7 +98,7 @@ xkb_symbols "classic" {
name[Group1]="Finnish (classic)";
};
-partial alphanumeric_keys hidden
+hidden partial alphanumeric_keys
xkb_symbols "fi" {
// Classic Finnish keyboard layout with dead keys
diff --git a/xorg-server/xkeyboard-config/symbols/group b/xorg-server/xkeyboard-config/symbols/group
index 91be4863f..8b00dff6e 100644
--- a/xorg-server/xkeyboard-config/symbols/group
+++ b/xorg-server/xkeyboard-config/symbols/group
@@ -410,7 +410,7 @@ xkb_symbols "alt_caps_toggle" {
};
};
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "olpc" {
key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
};
diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index 613488f05..33b058397 100644
--- a/xorg-server/xkeyboard-config/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
@@ -14,7 +14,7 @@
// setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type'
// Very common set of media keys.
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "media_common" {
key <I01> { [ XF86AudioMedia ] };
key <I10> { [ XF86AudioPrev ] };
@@ -29,7 +29,7 @@ xkb_symbols "media_common" {
};
// Popular web navigation keys.
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "nav_common" {
key <I21> { [ XF86Calculator ] };
key <I32> { [ XF86WWW ] };
@@ -45,7 +45,7 @@ xkb_symbols "nav_common" {
};
// ACPI Standard
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "acpi_common" {
key <I5E> { [ XF86PowerOff ] };
key <I5F> { [ XF86Standby ] };
@@ -56,26 +56,26 @@ xkb_symbols "acpi_common" {
};
// Combined sections, for simplicity.
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "media_nav_common" {
include "inet(media_common)"
include "inet(nav_common)"
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "media_nav_acpi_common" {
include "inet(media_common)"
include "inet(nav_common)"
include "inet(acpi_common)"
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "nav_acpi_common" {
include "inet(nav_common)"
include "inet(acpi_common)"
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "media_acpi_common" {
include "inet(media_common)"
include "inet(acpi_common)"
@@ -1001,7 +1001,7 @@ xkb_symbols "ibm_spacesaver" {
// Logitech
// Logitech common definitions
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "logitech_base" {
include "inet(media_nav_acpi_common)"
key <I02> { [ XF86HomePage ] };
@@ -1017,7 +1017,7 @@ xkb_symbols "logitech_base" {
};
// Logitech second set of common keys
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "logitech_set3" {
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 1be5e7a22..2305049a8 100644
--- a/xorg-server/xkeyboard-config/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
@@ -29,13 +29,14 @@ xkb_symbols "pes_keypad" {
name[Group1]= "Persian (with Persian keypad)";
include "ir(pes_part_basic)"
+ include "ir(pes_part_ext)"
include "ir(pes_part_keypad)"
include "nbsp(zwnj2nb3nnb4)"
include "level3(ralt_switch)"
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "pes_part_basic" {
// Persian digits
@@ -93,23 +94,23 @@ xkb_symbols "pes_part_basic" {
key <BKSL> { [ backslash, bar, 0x1002010 ] };
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "pes_part_ext" {
// Persian and ASCII digits
- key <AE01> { [ 0x10006f1, exclam, grave, 1 ] };
- key <AE02> { [ 0x10006f2, 0x100066c, at, 2 ] };
- key <AE03> { [ 0x10006f3, 0x100066b, numbersign, 3 ] };
- key <AE04> { [ 0x10006f4, 0x100fdfc, dollar, 4 ] };
- key <AE05> { [ 0x10006f5, 0x100066a, percent, 5 ] };
- key <AE06> { [ 0x10006f6, multiply, asciicircum, 6 ] };
- key <AE07> { [ 0x10006f7, Arabic_comma, ampersand, 7 ] };
- key <AE08> { [ 0x10006f8, asterisk, enfilledcircbullet, 8 ] };
- key <AE09> { [ 0x10006f9, parenright, 0x100200e, 9 ] };
- key <AE10> { [ 0x10006f0, parenleft, 0x100200f, 0 ] };
+ key <AE01> { [ Farsi_1, exclam, grave, 1 ] };
+ key <AE02> { [ Farsi_2, 0x100066c, at, 2 ] };
+ key <AE03> { [ Farsi_3, 0x100066b, numbersign, 3 ] };
+ key <AE04> { [ Farsi_4, 0x100fdfc, dollar, 4 ] };
+ key <AE05> { [ Farsi_5, 0x100066a, percent, 5 ] };
+ key <AE06> { [ Farsi_6, multiply, asciicircum, 6 ] };
+ key <AE07> { [ Farsi_7, Arabic_comma, ampersand, 7 ] };
+ key <AE08> { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] };
+ key <AE09> { [ Farsi_9, parenright, 0x100200e, 9 ] };
+ key <AE10> { [ Farsi_0, parenleft, 0x100200f, 0 ] };
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "pes_part_keypad" {
// Persian digits and Mathematical operators
@@ -121,19 +122,19 @@ xkb_symbols "pes_part_keypad" {
key <KPEN> { [ KP_Enter ] };
key <KPEQ> { [ equal ] };
- key <KP7> { [ KP_Home, 0x10006f7 ] };
- key <KP8> { [ KP_Up, 0x10006f8 ] };
- key <KP9> { [ KP_Prior, 0x10006f9 ] };
+ key <KP7> { [ KP_Home, Farsi_7 ] };
+ key <KP8> { [ KP_Up, Farsi_8 ] };
+ key <KP9> { [ KP_Prior, Farsi_9 ] };
- key <KP4> { [ KP_Left, 0x10006f4 ] };
- key <KP5> { [ KP_Begin, 0x10006f5 ] };
- key <KP6> { [ KP_Right, 0x10006f6 ] };
+ key <KP4> { [ KP_Left, Farsi_4 ] };
+ key <KP5> { [ KP_Begin, Farsi_5 ] };
+ key <KP6> { [ KP_Right, Farsi_6 ] };
- key <KP1> { [ KP_End, 0x10006f1 ] };
- key <KP2> { [ KP_Down, 0x10006f2 ] };
- key <KP3> { [ KP_Next, 0x10006f3 ] };
+ key <KP1> { [ KP_End, Farsi_1 ] };
+ key <KP2> { [ KP_Down, Farsi_2 ] };
+ key <KP3> { [ KP_Next, Farsi_3 ] };
- key <KP0> { [ KP_Insert, 0x10006f0 ] };
+ key <KP0> { [ KP_Insert, Farsi_0 ] };
key <KPDL> { [ KP_Delete, 0x100066b ] };
};
@@ -184,16 +185,16 @@ xkb_symbols "ku_ara" {
key <BKSL> { [ backslash, bar, ccedilla, Ccedilla ] };
// Digits
- key <AE01> { [ 1, exclam, 0x10006f1, grave ] };
- key <AE02> { [ 2, at, 0x10006f2, at ] };
- key <AE03> { [ 3, numbersign, 0x10006f3, 0x100066b ] };
- key <AE04> { [ 4, dollar, 0x10006f4, 0x100fdfc ] };
- key <AE05> { [ 5, percent, 0x10006f5, 0x100066a ] };
- key <AE06> { [ 6, asciicircum, 0x10006f6, multiply ] };
- key <AE07> { [ 7, ampersand, 0x10006f7, Arabic_comma ] };
- key <AE08> { [ 8, asterisk, 0x10006f8, enfilledcircbullet ] };
- key <AE09> { [ 9, parenright, 0x10006f9, 0x100200e ] };
- key <AE10> { [ 0, parenleft, 0x10006f0, 0x100200f ] };
+ key <AE01> { [ 1, exclam, Farsi_1, grave ] };
+ key <AE02> { [ 2, at, Farsi_2, at ] };
+ key <AE03> { [ 3, numbersign, Farsi_3, 0x100066b ] };
+ key <AE04> { [ 4, dollar, Farsi_4, 0x100fdfc ] };
+ key <AE05> { [ 5, percent, Farsi_5, 0x100066a ] };
+ key <AE06> { [ 6, asciicircum, Farsi_6, multiply ] };
+ key <AE07> { [ 7, ampersand, Farsi_7, Arabic_comma ] };
+ key <AE08> { [ 8, asterisk, Farsi_8, enfilledcircbullet ] };
+ key <AE09> { [ 9, parenright, Farsi_9, 0x100200e ] };
+ key <AE10> { [ 0, parenleft, Farsi_0, 0x100200f ] };
key <AE11> { [ minus, Arabic_tatweel, underscore ] };
key <AE12> { [ equal, plus, 0x1002212 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index 26dfdf9bd..3d2d03bff 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -10,7 +10,7 @@ xkb_symbols "106" {
key <AE13> { [ backslash, bar ] };
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "common" {
// "Common" keys for jp 106/109A layouts.
diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad
index 0187ecbeb..1efc02b48 100644
--- a/xorg-server/xkeyboard-config/symbols/keypad
+++ b/xorg-server/xkeyboard-config/symbols/keypad
@@ -1,9 +1,9 @@
-partial hidden keypad_keys
+hidden partial keypad_keys
xkb_symbols "overlay" {
include "keypad(overlay1)"
};
-partial hidden keypad_keys
+hidden partial keypad_keys
xkb_symbols "overlay1" {
key <KP7> { [ KP_Home ], overlay1=<KO7> };
@@ -37,7 +37,7 @@ xkb_symbols "overlay1" {
key <KODL> { [ KP_Decimal ] };
};
-partial hidden keypad_keys
+hidden partial keypad_keys
xkb_symbols "overlay2" {
key <KP7> { [ KP_Home ], overlay2=<KO7> };
@@ -71,7 +71,7 @@ xkb_symbols "overlay2" {
key <KODL> { [ KP_Decimal ] };
};
-partial hidden keypad_keys
+hidden partial keypad_keys
xkb_symbols "operators" {
// Puts some commands to control the X server on
// the fifth level of the keypad's operator keys.
@@ -93,7 +93,7 @@ xkb_symbols "operators" {
};
};
-default partial hidden keypad_keys
+default hidden partial keypad_keys
xkb_symbols "x11" {
include "keypad(operators)"
diff --git a/xorg-server/xkeyboard-config/symbols/kr b/xorg-server/xkeyboard-config/symbols/kr
index 84c0effca..1ee560bf8 100644
--- a/xorg-server/xkeyboard-config/symbols/kr
+++ b/xorg-server/xkeyboard-config/symbols/kr
@@ -13,13 +13,13 @@ xkb_symbols "kr104" {
include "kr(koreankeys_raltctl)"
};
-partial hidden function_keys
+hidden partial function_keys
xkb_symbols "koreankeys" {
key <K71> { [ Hangul ] };
key <K72> { [ Hangul_Hanja ] };
};
-partial hidden function_keys
+hidden partial function_keys
xkb_symbols "koreankeys_raltctl" {
key <RALT> { [ Hangul ] };
key <RCTL> { [ Hangul_Hanja ] };
diff --git a/xorg-server/xkeyboard-config/symbols/kz b/xorg-server/xkeyboard-config/symbols/kz
index 4f807d182..db118a0d2 100644
--- a/xorg-server/xkeyboard-config/symbols/kz
+++ b/xorg-server/xkeyboard-config/symbols/kz
@@ -204,8 +204,6 @@ xkb_symbols "olpc" {
include "kz(basic)"
- name[Group1] = "Kazakh";
-
key <TLDE> { [ parenleft, parenright ] };
key <BKSL> { [ Cyrillic_io, Cyrillic_IO ] };
diff --git a/xorg-server/xkeyboard-config/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3
index b15e24d53..1aef97056 100644
--- a/xorg-server/xkeyboard-config/symbols/level3
+++ b/xorg-server/xkeyboard-config/symbols/level3
@@ -53,7 +53,7 @@ xkb_symbols "ralt_switch_multikey" {
};
// A special case of the right-Alt switch -- for use with grp:alts_toggle.
-partial hidden modifier_keys
+hidden partial modifier_keys
xkb_symbols "ralt_switch_for_alts_toggle" {
virtual_modifiers LAlt, AltGr;
key <LALT> {
diff --git a/xorg-server/xkeyboard-config/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc
index 996324d2c..019971323 100644
--- a/xorg-server/xkeyboard-config/symbols/pc
+++ b/xorg-server/xkeyboard-config/symbols/pc
@@ -62,7 +62,7 @@ xkb_symbols "pc105" {
key <KIUP> { [ XF86KbdBrightnessUp ] };
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "editing" {
key <PRSC> {
type= "PC_ALT_LEVEL2",
diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index c39f4ed49..e164f2eee 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -45,7 +45,7 @@ xkb_symbols "yz" {
key <AB01> { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // z
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "common" {
// "Common" keys: keys that are the same
// for both latin and cyrillic keyboards.
@@ -73,7 +73,7 @@ xkb_symbols "common" {
include "kpdl(comma)"
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "cyralpha" {
key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
@@ -114,7 +114,7 @@ xkb_symbols "cyralpha" {
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "latalpha" {
key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
@@ -127,7 +127,7 @@ xkb_symbols "latalpha" {
key <BKSL> { [ zcaron, Zcaron, any, any ] }; // \ |
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "twoletter" {
// Letters which are written in latin transcription with two characters.
@@ -142,7 +142,7 @@ xkb_symbols "twoletter" {
key <AB01> { [ zcaron, Zcaron, any, any ] }; // z
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "latlevel3" {
key <TLDE> { [ any, any, notsign, notsign ] }; // ` ~
key <AE01> { [ any, any, dead_tilde, asciitilde ] }; // 1 !
@@ -196,7 +196,7 @@ xkb_symbols "latlevel3" {
key <AB10> { [ any, any, emdash, endash ] }; // / ?
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "cyrlevel3" {
key <TLDE> { [ any, any, degree, notsign ] }; // ` ~
key <AE03> { [ any, any, dead_circumflex, NoSymbol ] }; // 3 #
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 64c862b26..c4f48186f 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -21,7 +21,7 @@ xkb_symbols "winkeys" {
key <BKSL> { [ backslash, slash ] };
};
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
xkb_symbols "common" {
key <AE01> { [ 1, exclam ] };