aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/symbols/latin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-08-19 09:07:37 +0200
committermarha <marha@users.sourceforge.net>2013-08-19 09:07:37 +0200
commit2d042f719910c5aa1ba9f4a47b21009c729c345e (patch)
tree2b20d89d5f1ca342ca6f1d817c18b324adf7086f /xorg-server/xkeyboard-config/symbols/latin
parentc3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff)
parent854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff)
downloadvcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz
vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2
vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013 Conflicts: fontconfig/src/fccache.c
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/latin')
-rw-r--r--xorg-server/xkeyboard-config/symbols/latin24
1 files changed, 12 insertions, 12 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/latin b/xorg-server/xkeyboard-config/symbols/latin
index 424768ead..8cabe73e3 100644
--- a/xorg-server/xkeyboard-config/symbols/latin
+++ b/xorg-server/xkeyboard-config/symbols/latin
@@ -105,7 +105,7 @@ xkb_symbols "type3" {
key <AC05> { [ g, G, bracketright, ENG ] };
key <AC08> { [ k, K, lstroke, ampersand ] };
- key <AB01> { [ y, Y, guillemotleft, less ] };
+ key <AB01> { [ y, Y, guillemotleft, less ] };
key <AB04> { [ v, V, at, grave ] };
key <AB05> { [ b, B, braceleft, apostrophe ] };
key <AB06> { [ n, N, braceright, braceright ] };
@@ -114,9 +114,9 @@ xkb_symbols "type3" {
key <AB09> { [ period, colon, greater, division ] };
};
-// Another one Latin common layout
+// Another common Latin layout
// (German, Estonian, Spanish, Icelandic, Italian, Latin American, Portuguese)
-
+
partial
xkb_symbols "type4" {
@@ -150,7 +150,7 @@ xkb_symbols "nodeadkeys" {
partial
xkb_symbols "type2_nodeadkeys" {
-
+
include "latin(nodeadkeys)"
key <AD11> { [ aring, Aring, diaeresis, degree ] };
@@ -162,13 +162,13 @@ xkb_symbols "type2_nodeadkeys" {
partial
xkb_symbols "type3_nodeadkeys" {
-
+
include "latin(nodeadkeys)"
};
partial
xkb_symbols "type4_nodeadkeys" {
-
+
include "latin(nodeadkeys)"
key <AB10> { [ minus, underscore, dead_belowdot, abovedot ] };
@@ -178,12 +178,12 @@ xkb_symbols "type4_nodeadkeys" {
// See http://marcinwolinski.pl/keyboard/ for a description.
// Used by pl(intl)
//
-// ┌────┐
-// │ 2 4│ 2 = Shift, 4 = Level3 + Shift
-// │ 1 3│ 1 = Normal, 3 = Level3
-// └────┘
+// ┌─────┐
+// │ 2 4 │ 2 = Shift, 4 = Level3 + Shift
+// │ 1 3 │ 1 = Normal, 3 = Level3
+// └─────┘
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ~ ~ │ ! ' │ @ " │ # ˝ │ $ ¸ │ % ˇ │ ^ ^ │ & ˘ │ * ˙ │ ( ̣ │ ) ° │ _ ¯ │ + ˛ ┃ ⌫ Back ┃
+// │ ~ ~ │ ! ' │ @ " │ # ˝ │ $ ¸ │ % ˇ │ ^ ^ │ & ˘ │ * ̇ │ ( ̣ │ ) ° │ _ ¯ │ + ˛ ┃ ⌫ Back- ┃
// │ ` ` │ 1 ¡ │ 2 © │ 3 • │ 4 § │ 5 € │ 6 ¢ │ 7 − │ 8 × │ 9 ÷ │ 0 ° │ - – │ = — ┃ space ┃
// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
// ┃ ┃ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { « │ } » ┃ Enter ┃
@@ -198,7 +198,7 @@ xkb_symbols "type4_nodeadkeys" {
// ┃ ┃ ┃ ┃ ␣ ⍽ ┃ ┃ ┃ ┃
// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Space ⍽ ┃AltGr ⇮┃Menu ┃Ctrl ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-
+
partial
xkb_symbols "intl" {