summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@freedesktop.org>2014-02-04 20:04:44 +0100
committerSergey Udaltsov <sergey.udaltsov@gmail.com>2014-02-05 11:06:18 +0000
commita4c2a1a454bad621d0fefcd508899957b44e01e8 (patch)
tree66dc2da737cbd8aa2f35311dc7637cf833d92ed7
parent19c267221942470b2709f5912bc6d19c0fdbce16 (diff)
downloadxkeyboard-config-a4c2a1a454bad621d0fefcd508899957b44e01e8.tar.gz
Add 'Windows' specific variant to dk, es, fi, it and no layouts
Keyboards for use with Windows seem to have symbols imprinted on some layouts which don't match the mappings defined by national standards and/or what has chosen as default for the respective language. Here a second EuroSymbol is added to the AltGr-5 key for the dk, es, fi, it and no layouts. A language specific variant model has been chosen to be able to extend these mappings on a per language basis in the future. Signed-off-by: Egbert Eich <eich@freedesktop.org>
-rw-r--r--rules/base.xml.in31
-rw-r--r--symbols/dk8
-rw-r--r--symbols/es8
-rw-r--r--symbols/fi8
-rw-r--r--symbols/it8
-rw-r--r--symbols/no8
6 files changed, 71 insertions, 0 deletions
diff --git a/rules/base.xml.in b/rules/base.xml.in
index cf0c76f..f098dac 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2644,6 +2644,12 @@
</variant>
<variant>
<configItem>
+ <name>winkeys</name>
+ <_description>Danish (Winkeys)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>mac</name>
<_description>Danish (Macintosh)</_description>
</configItem>
@@ -2898,6 +2904,12 @@
</variant>
<variant>
<configItem>
+ <name>winkeys</name>
+ <_description>Finnish (Winkeys)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>smi</name>
<_description>Northern Saami (Finland)</_description>
<languageList><iso639Id>sme</iso639Id></languageList>
@@ -3556,6 +3568,12 @@
</variant>
<variant>
<configItem>
+ <name>winkeys</name>
+ <_description>Italian (Winkeys)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>mac</name>
<_description>Italian (Macintosh)</_description>
</configItem>
@@ -3993,6 +4011,12 @@
</variant>
<variant>
<configItem>
+ <name>winkeys</name>
+ <_description>Norwegian (Winkeys)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>dvorak</name>
<_description>Norwegian (Dvorak)</_description>
</configItem>
@@ -4511,6 +4535,13 @@
<_description>Spanish (eliminate dead keys)</_description>
</configItem>
</variant>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>winkeys</name>
+ <_description>Spanish (Winkeys)</_description>
+ </configItem>
+ </variant>
<variant>
<configItem>
<name>deadtilde</name>
diff --git a/symbols/dk b/symbols/dk
index 838478b..5098027 100644
--- a/symbols/dk
+++ b/symbols/dk
@@ -42,6 +42,14 @@ xkb_symbols "nodeadkeys" {
};
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+
+ include "dk(basic)"
+ name[Group1] = "Danish (Winkeys)";
+ include "eurosign(5)"
+};
+
// Copied from macintosh_vndr/dk
partial alphanumeric_keys
xkb_symbols "mac" {
diff --git a/symbols/es b/symbols/es
index 9e963a2..749a86d 100644
--- a/symbols/es
+++ b/symbols/es
@@ -26,6 +26,14 @@ xkb_symbols "basic" {
include "level3(ralt_switch)"
};
+partial alphanumeric
+xkb_symbols "winkeys" {
+
+ include "es(basic)"
+ name[Group1]="Spanish (Winkeys)";
+ include "eurosign(5)"
+};
+
partial alphanumeric_keys
xkb_symbols "Sundeadkeys" {
diff --git a/symbols/fi b/symbols/fi
index 4fdcc2a..1818243 100644
--- a/symbols/fi
+++ b/symbols/fi
@@ -83,6 +83,14 @@ xkb_symbols "kotoistus" {
};
partial alphanumeric_keys
+xkb_symbols "winkeys" {
+
+ include "fi(kotoistus)"
+ name[Group1]="Finnish (Winkeys)";
+ include "eurosign(5)"
+};
+
+partial alphanumeric_keys
xkb_symbols "classic" {
include "fi(fi)"
diff --git a/symbols/it b/symbols/it
index 2673cf9..8dd4365 100644
--- a/symbols/it
+++ b/symbols/it
@@ -61,6 +61,14 @@ xkb_symbols "nodeadkeys" {
key <BKSL> { [ ugrave, section, grave, breve ] };
};
+partial alphanueric_keys
+xkb_symbols "winkeys" {
+
+ include "it(basic)"
+ name[Group1]="Italian (Winkeys)";
+ include "eurosign(5)"
+};
+
// Copied from macintosh_vndr/it
partial alphanumeric_keys
xkb_symbols "mac" {
diff --git a/symbols/no b/symbols/no
index 5609de0..fe79d9b 100644
--- a/symbols/no
+++ b/symbols/no
@@ -52,6 +52,14 @@ xkb_symbols "nodeadkeys" {
key <AB09> { [ period, colon, periodcentered, abovedot ] };
};
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+
+ include "no(basic)"
+ name[Group1]="Norwegian (Winkeys)";
+ include "eurosign(5)"
+};
+
// Norwegian Dvorak
partial alphanumeric_keys
xkb_symbols "dvorak" {