aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/rules
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-17 08:42:32 +0000
committermarha <marha@users.sourceforge.net>2010-06-17 08:42:32 +0000
commit9a9031807c9e3dbef3713a72a654d8a1f763bea3 (patch)
tree5698c75c8fd0b76cf33a0b390d69b03cf039aa37 /xorg-server/xkbdata.src/rules
parenteb8e32daea99b6e3ebf134efeeba184c23817f08 (diff)
parent85597ff9162e3fe37b73efd9b9e3d92cd793383a (diff)
downloadvcxsrv-9a9031807c9e3dbef3713a72a654d8a1f763bea3.tar.gz
vcxsrv-9a9031807c9e3dbef3713a72a654d8a1f763bea3.tar.bz2
vcxsrv-9a9031807c9e3dbef3713a72a654d8a1f763bea3.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/rules')
-rw-r--r--xorg-server/xkbdata.src/rules/base.extras.xml.in155
-rw-r--r--xorg-server/xkbdata.src/rules/extras/variantsMapping.lst9
2 files changed, 91 insertions, 73 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.extras.xml.in b/xorg-server/xkbdata.src/rules/base.extras.xml.in
index 7e32c3140..a17205e54 100644
--- a/xorg-server/xkbdata.src/rules/base.extras.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.extras.xml.in
@@ -1,69 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<xkbConfigRegistry>
- <modelList/>
- <layoutList>
- <layout>
- <configItem>
- <name>apl</name>
- <_shortDescription>APL</_shortDescription>
- <_description>APL</_description>
- <languageList><iso639Id>eng</iso639Id></languageList>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>us</name>
- <_shortDescription>USA</_shortDescription>
- <_description>USA</_description>
- <languageList><iso639Id>eng</iso639Id></languageList>
- </configItem>
- <variantList>
- <variant>
- <configItem>
- <name>intl-unicode</name>
- <_description>International (AltGr Unicode combining)</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>alt-intl-unicode</name>
- <_description>International (AltGr Unicode combining, alternative)</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>ats</name>
- <_description>Atsina</_description>
- <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>crd</name>
- <_description>Couer D'alene Salish</_description>
- <languageList><iso639Id>crd</iso639Id></languageList>
- </configItem>
- </variant>
- </variantList>
- </layout>
- <layout>
- <configItem>
- <name>rs</name>
- <_shortDescription>SRB</_shortDescription>
- <_description>Serbia</_description>
- <languageList><iso639Id>srp</iso639Id></languageList>
- </configItem>
- <variantList>
- <variant>
- <configItem>
- <name>combiningkeys</name>
- <_description>Combining accents instead of dead keys</_description>
- </configItem>
- </variant>
- </variantList>
- </layout>
- </layoutList>
- <optionList/>
-</xkbConfigRegistry>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+ <modelList/>
+ <layoutList>
+ <layout>
+ <configItem>
+ <name>apl</name>
+ <_shortDescription>APL</_shortDescription>
+ <_description>APL</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
+ <name>ir</name>
+ <_shortDescription>Iran</_shortDescription>
+ <_description>Iran</_description>
+ <languageList><iso639Id>per</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>ave</name>
+ <_description>Avestan</_description>
+ <languageList><iso639Id>ave</iso639Id></languageList>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
+ <name>us</name>
+ <_shortDescription>USA</_shortDescription>
+ <_description>USA</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>intl-unicode</name>
+ <_description>International (AltGr Unicode combining)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>alt-intl-unicode</name>
+ <_description>International (AltGr Unicode combining, alternative)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>ats</name>
+ <_description>Atsina</_description>
+ <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crd</name>
+ <_description>Couer D'alene Salish</_description>
+ <languageList><iso639Id>crd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
+ <name>rs</name>
+ <_shortDescription>SRB</_shortDescription>
+ <_description>Serbia</_description>
+ <languageList><iso639Id>srp</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>combiningkeys</name>
+ <_description>Combining accents instead of dead keys</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ </layoutList>
+ <optionList/>
+</xkbConfigRegistry>
diff --git a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
index c49f70e0c..36af488d1 100644
--- a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
+++ b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
@@ -1,4 +1,5 @@
-rs combiningkeys extras/rs combiningkeys
-us alt-intl-unicode extras/us alt-intl-unicode
-us crd extras/us crd
-us intl-unicode extras/us intl-unicode
+rs combiningkeys extras/rs combiningkeys
+ir ave extras/ir ave
+us alt-intl-unicode extras/us alt-intl-unicode
+us crd extras/us crd
+us intl-unicode extras/us intl-unicode