From ecbffc0a436fa28018db8d0f3c967f58fc329754 Mon Sep 17 00:00:00 2001
From: barkloaf <46911272+barkloaf@users.noreply.github.com>
Date: Sun, 11 Jul 2021 00:45:16 -0700
Subject: [PATCH] no control
---
ahk/us-refor.ahk | 41 ---------
keylayout/us-refor.keylayout | 152 +++-----------------------------
klc/us-refor.klc | 97 ++++++++++----------
pkl/layouts/us-refor/layout.ini | 100 ++++++++++-----------
us-refor.json | 84 +++++++++---------
xkb/symbols/us-refor | 98 +++++++++-----------
xkb/types/us-refor | 110 +++--------------------
7 files changed, 206 insertions(+), 476 deletions(-)
diff --git a/ahk/us-refor.ahk b/ahk/us-refor.ahk
index 3d2683c..7ab6845 100644
--- a/ahk/us-refor.ahk
+++ b/ahk/us-refor.ahk
@@ -171,7 +171,6 @@ SC056::LShift ; QWERTY Iso
#if
SC029::Send {Blind}{U+0060} ; `
+SC029::Send {Blind}{U+007e} ; ~
-^SC029::Return
>!<^SC029::
; grave
if (DeadKeys.item("grave") == "") {
@@ -230,7 +229,6 @@ Return
#if
SC002::Send {Blind}{U+0031} ; 1
+SC002::Send {Blind}{U+0021} ; !
-^SC002::Return
>!<^SC002::Send {Blind}{U+00a1} ; ¡
+>!<^SC002::Send {Blind}{U+00b9} ; ¹
@@ -238,7 +236,6 @@ SC002::Send {Blind}{U+0031} ; 1
#if
SC003::Send {Blind}{U+0032} ; 2
+SC003::Send {Blind}{U+0040} ; @
-^SC003::Return
>!<^SC003::Send {Blind}{U+00b2} ; ²
+>!<^SC003::
; doubleacute
@@ -258,14 +255,12 @@ Return
#if
SC004::Send {Blind}{U+0033} ; 3
+SC004::Send {Blind}{U+0023} ; #
-^SC004::Return
>!<^SC004::Send {Blind}{U+00b3} ; ³
; QWERTY 4
#if
SC005::Send {Blind}{U+0034} ; 4
+SC005::Send {Blind}{U+0024} ; $
-^SC005::Return
>!<^SC005::Send {Blind}{U+00a3} ; £
+>!<^SC005::
; currency
@@ -327,7 +322,6 @@ Return
#if
SC006::Send {Blind}{U+0035} ; 5
+SC006::Send {Blind}{U+0025} ; %
-^SC006::Return
>!<^SC006::Send {Blind}{U+20ac} ; €
+>!<^SC006::
; caron
@@ -378,7 +372,6 @@ Return
#if
SC007::Send {Blind}{U+0036} ; 6
+SC007::Send {Blind}{U+005e} ; ^
-^SC007::Return
>!<^SC007::Send {Blind}{U+00bc} ; ¼
+>!<^SC007::
; circumflex
@@ -420,7 +413,6 @@ Return
#if
SC008::Send {Blind}{U+0037} ; 7
+SC008::Send {Blind}{U+0026} ; &
-^SC008::Return
>!<^SC008::Send {Blind}{U+00bd} ; ½
+>!<^SC008::
; cedilla
@@ -458,7 +450,6 @@ Return
#if
SC009::Send {Blind}{U+0038} ; 8
+SC009::Send {Blind}{U+002a} ; *
-^SC009::Return
>!<^SC009::Send {Blind}{U+00be} ; ¾
+>!<^SC009::
; ogonek
@@ -484,7 +475,6 @@ Return
#if
SC00a::Send {Blind}{U+0039} ; 9
+SC00a::Send {Blind}{U+0028} ; (
-^SC00a::Return
>!<^SC00a::Send {Blind}{U+2018} ; ‘
+>!<^SC00a::
; breve
@@ -512,7 +502,6 @@ Return
#if
SC00b::Send {Blind}{U+0030} ; 0
+SC00b::Send {Blind}{U+0029} ; )
-^SC00b::Return
>!<^SC00b::Send {Blind}{U+2019} ; ’
+>!<^SC00b::
; overring
@@ -534,7 +523,6 @@ Return
#if
SC00c::Send {Blind}{U+002d} ; -
+SC00c::Send {Blind}{U+005f} ; _
-^SC00c::Return
>!<^SC00c::Send {Blind}{U+00a5} ; ¥
+>!<^SC00c::
; macron
@@ -569,7 +557,6 @@ Return
#if
SC00d::Send {Blind}{U+003d} ; =
+SC00d::Send {Blind}{U+002b} ; +
-^SC00d::Return
>!<^SC00d::Send {Blind}{U+00d7} ; ×
+>!<^SC00d::Send {Blind}{U+00f7} ; ÷
@@ -589,7 +576,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0071} ; q
}
Return
-^SC010::Return
>!<^SC010::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00e4} ; ä
@@ -621,7 +607,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0077} ; w
}
Return
-^SC011::Return
>!<^SC011::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00e5} ; å
@@ -653,7 +638,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0065} ; e
}
Return
-^SC012::Return
>!<^SC012::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00e9} ; é
@@ -685,7 +669,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0072} ; r
}
Return
-^SC013::Return
>!<^SC013::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00ae} ; ®
@@ -717,7 +700,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0074} ; t
}
Return
-^SC014::Return
>!<^SC014::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00fe} ; þ
@@ -749,7 +731,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0079} ; y
}
Return
-^SC015::Return
>!<^SC015::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00fc} ; ü
@@ -781,7 +762,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0075} ; u
}
Return
-^SC016::Return
>!<^SC016::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00fa} ; ú
@@ -813,7 +793,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0069} ; i
}
Return
-^SC017::Return
>!<^SC017::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00ed} ; í
@@ -845,7 +824,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+006f} ; o
}
Return
-^SC018::Return
>!<^SC018::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00f3} ; ó
@@ -877,7 +855,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0070} ; p
}
Return
-^SC019::Return
>!<^SC019::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00f8} ; ø
@@ -897,7 +874,6 @@ Return
#if
SC01a::Send {Blind}{U+005b} ; [
+SC01a::Send {Blind}{U+007b} ; {
-^SC01a::Send {Blind}{U+001b} ;
>!<^SC01a::Send {Blind}{U+00ab} ; «
+>!<^SC01a::Send {Blind}{U+201c} ; “
@@ -905,7 +881,6 @@ SC01a::Send {Blind}{U+005b} ; [
#if
SC01b::Send {Blind}{U+005d} ; ]
+SC01b::Send {Blind}{U+007d} ; }
-^SC01b::Send {Blind}{U+001d} ;
>!<^SC01b::Send {Blind}{U+00bb} ; »
+>!<^SC01b::Send {Blind}{U+201d} ; ”
@@ -913,7 +888,6 @@ SC01b::Send {Blind}{U+005d} ; ]
#if
SC02b::Send {Blind}{U+005c} ; \
+SC02b::Send {Blind}{U+007c} ; |
-^SC02b::Send {Blind}{U+001c} ;
>!<^SC02b::Send {Blind}{U+00ac} ; ¬
+>!<^SC02b::Send {Blind}{U+00a6} ; ¦
@@ -933,7 +907,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0061} ; a
}
Return
-^SC01e::Return
>!<^SC01e::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00e1} ; á
@@ -965,7 +938,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0073} ; s
}
Return
-^SC01f::Return
>!<^SC01f::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00df} ; ß
@@ -997,7 +969,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0064} ; d
}
Return
-^SC020::Return
>!<^SC020::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00f0} ; ð
@@ -1097,7 +1068,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+006b} ; k
}
Return
-^SC025::Return
>!<^SC025::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0153} ; œ
@@ -1129,7 +1099,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+006c} ; l
}
Return
-^SC026::Return
>!<^SC026::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0142} ; ł
@@ -1149,7 +1118,6 @@ Return
#if
SC027::Send {Blind}{U+003b} ; ;
+SC027::Send {Blind}{U+003a} ; :
-^SC027::Return
>!<^SC027::Send {Blind}{U+00b6} ; ¶
+>!<^SC027::Send {Blind}{U+00b0} ; °
@@ -1157,7 +1125,6 @@ SC027::Send {Blind}{U+003b} ; ;
#if
SC028::Send {Blind}{U+0027} ; '
+SC028::Send {Blind}{U+0022} ; "
-^SC028::Return
>!<^SC028::
; acute
if (DeadKeys.item("acute") == "") {
@@ -1250,7 +1217,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+007a} ; z
}
Return
-^SC02c::Return
>!<^SC02c::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00e6} ; æ
@@ -1299,7 +1265,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+0063} ; c
}
Return
-^SC02e::Return
>!<^SC02e::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00a9} ; ©
@@ -1365,7 +1330,6 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+006e} ; n
}
Return
-^SC031::Return
>!<^SC031::
if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+00f1} ; ñ
@@ -1397,14 +1361,12 @@ if not GetKeyState("CapsLock", "T") {
Send {Blind}{U+006d} ; m
}
Return
-^SC032::Return
>!<^SC032::Send {Blind}{U+00b5} ; µ
; QWERTY ,
#if
SC033::Send {Blind}{U+002c} ; ,
+SC033::Send {Blind}{U+003c} ; <
-^SC033::Return
>!<^SC033::Send {Blind}{U+00e7} ; ç
+>!<^SC033::Send {Blind}{U+00c7} ; Ç
@@ -1412,7 +1374,6 @@ SC033::Send {Blind}{U+002c} ; ,
#if
SC034::Send {Blind}{U+002e} ; .
+SC034::Send {Blind}{U+003e} ; >
-^SC034::Return
>!<^SC034::
; underdot
if (DeadKeys.item("underdot") == "") {
@@ -1516,7 +1477,6 @@ Return
#if
SC035::Send {Blind}{U+002f} ; /
+SC035::Send {Blind}{U+003f} ; ?
-^SC035::Return
>!<^SC035::Send {Blind}{U+00bf} ; ¿
+>!<^SC035::
; solidus
@@ -1580,6 +1540,5 @@ Return
#if
SC039::Send {Blind}{U+0020} ;
+SC039::Send {Blind}{U+0020} ;
-^SC039::Send {Blind}{U+0020} ;
>!<^SC039::Send {Blind}{U+00a0} ;
+>!<^SC039::Send {Blind}{U+200b} ;
diff --git a/keylayout/us-refor.keylayout b/keylayout/us-refor.keylayout
index ff514cc..583e05c 100644
--- a/keylayout/us-refor.keylayout
+++ b/keylayout/us-refor.keylayout
@@ -10,34 +10,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
+
@@ -236,66 +230,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -392,7 +326,7 @@
-
+
@@ -489,7 +423,7 @@
-
+
@@ -586,7 +520,7 @@
-
+
@@ -683,67 +617,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -840,7 +714,7 @@
-
+
diff --git a/klc/us-refor.klc b/klc/us-refor.klc
index 4c35fb7..8d0590a 100644
--- a/klc/us-refor.klc
+++ b/klc/us-refor.klc
@@ -13,60 +13,59 @@ SHIFTSTATE
0
1
-2
6
7
LAYOUT
-29 OEM_3 0 0060 007e -1 0060@ 007e@ // QWERTY ~: `, ~, , cdk:grave, cdk:tilde
-02 1 0 1 0021 -1 00a1 00b9 // QWERTY 1: 1, !, , ¡, ¹
-03 2 0 2 0040 -1 00b2 02dd@ // QWERTY 2: 2, @, , ², cdk:doubleacute
-04 3 0 3 0023 -1 00b3 00b3 // QWERTY 3: 3, #, , ³, ³
-05 4 0 4 0024 -1 00a3 00a4@ // QWERTY 4: 4, $, , £, cdk:currency
-06 5 0 5 0025 -1 20ac 02c7@ // QWERTY 5: 5, %, , €, cdk:caron
-07 6 0 6 005e -1 00bc 005e@ // QWERTY 6: 6, ^, , ¼, cdk:circumflex
-08 7 0 7 0026 -1 00bd 00b8@ // QWERTY 7: 7, &, , ½, cdk:cedilla
-09 8 0 8 002a -1 00be 02db@ // QWERTY 8: 8, *, , ¾, cdk:ogonek
-0a 9 0 9 0028 -1 2018 02d8@ // QWERTY 9: 9, (, , ‘, cdk:breve
-0b 0 0 0 0029 -1 2019 02da@ // QWERTY 0: 0, ), , ’, cdk:overring
-0c OEM_MINUS 0 002d 005f -1 00a5 00af@ // QWERTY -: -, _, , ¥, cdk:macron
-0d OEM_PLUS 0 003d 002b -1 00d7 00f7 // QWERTY +: =, +, , ×, ÷
-10 Q 1 q Q -1 00e4 00c4 // QWERTY Q: q, Q, , ä, Ä
-11 W 1 w W -1 00e5 00c5 // QWERTY W: w, W, , å, Å
-12 E 1 e E -1 00e9 00c9 // QWERTY E: e, E, , é, É
-13 R 1 r R -1 00ae 2122 // QWERTY R: r, R, , ®, ™
-14 T 1 t T -1 00fe 00de // QWERTY T: t, T, , þ, Þ
-15 Y 1 y Y -1 00fc 00dc // QWERTY Y: y, Y, , ü, Ü
-16 U 1 u U -1 00fa 00da // QWERTY U: u, U, , ú, Ú
-17 I 1 i I -1 00ed 00cd // QWERTY I: i, I, , í, Í
-18 O 1 o O -1 00f3 00d3 // QWERTY O: o, O, , ó, Ó
-19 P 1 p P -1 00f8 00d8 // QWERTY P: p, P, , ø, Ø
-1a OEM_4 0 005b 007b 001b 00ab 201c // QWERTY [: [, {, , «, “
-1b OEM_6 0 005d 007d 001d 00bb 201d // QWERTY ]: ], }, , », ”
-2b OEM_5 0 005c 007c 001c 00ac 00a6 // QWERTY \: \, |, , ¬, ¦
-1e A 1 a A -1 00e1 00c1 // QWERTY A: a, A, , á, Á
-1f S 1 s S -1 00df 00a7 // QWERTY S: s, S, , ß, §
-20 D 1 d D -1 00f0 00d0 // QWERTY D: d, D, , ð, Ð
-21 F 1 f F f f f // QWERTY F: f, F, f, f, f
-22 G 1 g G g g g // QWERTY G: g, G, g, g, g
-23 H 1 h H h h h // QWERTY H: h, H, h, h, h
-24 J 1 j J j j j // QWERTY J: j, J, j, j, j
-25 K 1 k K -1 0153 0152 // QWERTY K: k, K, , œ, Œ
-26 L 1 l L -1 0142 0141 // QWERTY L: l, L, , ł, Ł
-27 OEM_1 0 003b 003a -1 00b6 00b0 // QWERTY ;: ;, :, , ¶, °
-28 OEM_7 0 0027 0022 -1 00b4@ 00a8@ // QWERTY ': ', ", , cdk:acute, cdk:diaeresis
-2c Z 1 z Z -1 00e6 00c6 // QWERTY Z: z, Z, , æ, Æ
-2d X 1 x X x x x // QWERTY X: x, X, x, x, x
-2e C 1 c C -1 00a9 00a2 // QWERTY C: c, C, , ©, ¢
-2f V 1 v V v v v // QWERTY V: v, V, v, v, v
-30 B 1 b B b b b // QWERTY B: b, B, b, b, b
-31 N 1 n N -1 00f1 00d1 // QWERTY N: n, N, , ñ, Ñ
-32 M 1 m M -1 00b5 00b5 // QWERTY M: m, M, , µ, µ
-33 OEM_COMMA 0 002c 003c -1 00e7 00c7 // QWERTY ,: ,, <, , ç, Ç
-34 OEM_PERIOD 0 002e 003e -1 0803@ 02d9@ // QWERTY .: ., >, , cdk:underdot, cdk:overdot
-35 OEM_2 0 002f 003f -1 00bf 002f@ // QWERTY /: /, ?, , ¿, cdk:solidus
-39 SPACE 0 0020 0020 0020 00a0 200b // QWERTY Space: , , , ,
+29 OEM_3 0 0060 007e 0060@ 007e@ // QWERTY ~: `, ~, cdk:grave, cdk:tilde
+02 1 0 1 0021 00a1 00b9 // QWERTY 1: 1, !, ¡, ¹
+03 2 0 2 0040 00b2 02dd@ // QWERTY 2: 2, @, ², cdk:doubleacute
+04 3 0 3 0023 00b3 00b3 // QWERTY 3: 3, #, ³, ³
+05 4 0 4 0024 00a3 00a4@ // QWERTY 4: 4, $, £, cdk:currency
+06 5 0 5 0025 20ac 02c7@ // QWERTY 5: 5, %, €, cdk:caron
+07 6 0 6 005e 00bc 005e@ // QWERTY 6: 6, ^, ¼, cdk:circumflex
+08 7 0 7 0026 00bd 00b8@ // QWERTY 7: 7, &, ½, cdk:cedilla
+09 8 0 8 002a 00be 02db@ // QWERTY 8: 8, *, ¾, cdk:ogonek
+0a 9 0 9 0028 2018 02d8@ // QWERTY 9: 9, (, ‘, cdk:breve
+0b 0 0 0 0029 2019 02da@ // QWERTY 0: 0, ), ’, cdk:overring
+0c OEM_MINUS 0 002d 005f 00a5 00af@ // QWERTY -: -, _, ¥, cdk:macron
+0d OEM_PLUS 0 003d 002b 00d7 00f7 // QWERTY +: =, +, ×, ÷
+10 Q 1 q Q 00e4 00c4 // QWERTY Q: q, Q, ä, Ä
+11 W 1 w W 00e5 00c5 // QWERTY W: w, W, å, Å
+12 E 1 e E 00e9 00c9 // QWERTY E: e, E, é, É
+13 R 1 r R 00ae 2122 // QWERTY R: r, R, ®, ™
+14 T 1 t T 00fe 00de // QWERTY T: t, T, þ, Þ
+15 Y 1 y Y 00fc 00dc // QWERTY Y: y, Y, ü, Ü
+16 U 1 u U 00fa 00da // QWERTY U: u, U, ú, Ú
+17 I 1 i I 00ed 00cd // QWERTY I: i, I, í, Í
+18 O 1 o O 00f3 00d3 // QWERTY O: o, O, ó, Ó
+19 P 1 p P 00f8 00d8 // QWERTY P: p, P, ø, Ø
+1a OEM_4 0 005b 007b 00ab 201c // QWERTY [: [, {, «, “
+1b OEM_6 0 005d 007d 00bb 201d // QWERTY ]: ], }, », ”
+2b OEM_5 0 005c 007c 00ac 00a6 // QWERTY \: \, |, ¬, ¦
+1e A 1 a A 00e1 00c1 // QWERTY A: a, A, á, Á
+1f S 1 s S 00df 00a7 // QWERTY S: s, S, ß, §
+20 D 1 d D 00f0 00d0 // QWERTY D: d, D, ð, Ð
+21 F 1 f F f f // QWERTY F: f, F, f, f
+22 G 1 g G g g // QWERTY G: g, G, g, g
+23 H 1 h H h h // QWERTY H: h, H, h, h
+24 J 1 j J j j // QWERTY J: j, J, j, j
+25 K 1 k K 0153 0152 // QWERTY K: k, K, œ, Œ
+26 L 1 l L 0142 0141 // QWERTY L: l, L, ł, Ł
+27 OEM_1 0 003b 003a 00b6 00b0 // QWERTY ;: ;, :, ¶, °
+28 OEM_7 0 0027 0022 00b4@ 00a8@ // QWERTY ': ', ", cdk:acute, cdk:diaeresis
+2c Z 1 z Z 00e6 00c6 // QWERTY Z: z, Z, æ, Æ
+2d X 1 x X x x // QWERTY X: x, X, x, x
+2e C 1 c C 00a9 00a2 // QWERTY C: c, C, ©, ¢
+2f V 1 v V v v // QWERTY V: v, V, v, v
+30 B 1 b B b b // QWERTY B: b, B, b, b
+31 N 1 n N 00f1 00d1 // QWERTY N: n, N, ñ, Ñ
+32 M 1 m M 00b5 00b5 // QWERTY M: m, M, µ, µ
+33 OEM_COMMA 0 002c 003c 00e7 00c7 // QWERTY ,: ,, <, ç, Ç
+34 OEM_PERIOD 0 002e 003e 0803@ 02d9@ // QWERTY .: ., >, cdk:underdot, cdk:overdot
+35 OEM_2 0 002f 003f 00bf 002f@ // QWERTY /: /, ?, ¿, cdk:solidus
+39 SPACE 0 0020 0020 00a0 200b // QWERTY Space: , , ,
DEADKEY 0060 // grave
diff --git a/pkl/layouts/us-refor/layout.ini b/pkl/layouts/us-refor/layout.ini
index 7b09082..5738ab4 100644
--- a/pkl/layouts/us-refor/layout.ini
+++ b/pkl/layouts/us-refor/layout.ini
@@ -10,62 +10,62 @@ copyright = (c) 2021 barkloaf
company = barkloaf
homepage = http://pkl.sourceforge.net/
-generated_at = 2021-06-28 05:45:58
+generated_at = 2021-07-11 00:28:39
[global]
-shiftstates = 0:1:2:6:7
+shiftstates = 0:1:6:7
[layout]
-SC029 = OEM_3 0 ` ~ -- dk1 dk2 ; QWERTY ~: grave, tilde
-SC002 = 1 0 1 ! -- ¡ ¹ ; QWERTY 1
-SC003 = 2 0 2 @ -- ² dk3 ; QWERTY 2: doubleacute
-SC004 = 3 0 3 # -- ³ ³ ; QWERTY 3
-SC005 = 4 0 4 $ -- £ dk4 ; QWERTY 4: currency
-SC006 = 5 0 5 % -- € dk5 ; QWERTY 5: caron
-SC007 = 6 0 6 ^ -- ¼ dk6 ; QWERTY 6: circumflex
-SC008 = 7 0 7 & -- ½ dk7 ; QWERTY 7: cedilla
-SC009 = 8 0 8 * -- ¾ dk8 ; QWERTY 8: ogonek
-SC00a = 9 0 9 ( -- ‘ dk9 ; QWERTY 9: breve
-SC00b = 0 0 0 ) -- ’ dk10 ; QWERTY 0: overring
-SC00c = OEM_MINUS 0 - _ -- ¥ dk11 ; QWERTY -: macron
-SC00d = OEM_PLUS 0 = + -- × ÷ ; QWERTY +
-SC010 = Q 1 q Q -- ä Ä ; QWERTY Q
-SC011 = W 1 w W -- å Å ; QWERTY W
-SC012 = E 1 e E -- é É ; QWERTY E
-SC013 = R 1 r R -- ® ™ ; QWERTY R
-SC014 = T 1 t T -- þ Þ ; QWERTY T
-SC015 = Y 1 y Y -- ü Ü ; QWERTY Y
-SC016 = U 1 u U -- ú Ú ; QWERTY U
-SC017 = I 1 i I -- í Í ; QWERTY I
-SC018 = O 1 o O -- ó Ó ; QWERTY O
-SC019 = P 1 p P -- ø Ø ; QWERTY P
-SC01a = OEM_4 0 [ { « “ ; QWERTY [
-SC01b = OEM_6 0 ] } » ” ; QWERTY ]
-SC02b = OEM_5 0 \ | ¬ ¦ ; QWERTY \
-SC01e = A 1 a A -- á Á ; QWERTY A
-SC01f = S 1 s S -- ß § ; QWERTY S
-SC020 = D 1 d D -- ð Ð ; QWERTY D
-SC021 = F 1 f F f f f ; QWERTY F
-SC022 = G 1 g G g g g ; QWERTY G
-SC023 = H 1 h H h h h ; QWERTY H
-SC024 = J 1 j J j j j ; QWERTY J
-SC025 = K 1 k K -- œ Œ ; QWERTY K
-SC026 = L 1 l L -- ł Ł ; QWERTY L
-SC027 = OEM_1 0 ; : -- ¶ ° ; QWERTY ;
-SC028 = OEM_7 0 ' " -- dk12 dk13 ; QWERTY ': acute, diaeresis
-SC02c = Z 1 z Z -- æ Æ ; QWERTY Z
-SC02d = X 1 x X x x x ; QWERTY X
-SC02e = C 1 c C -- © ¢ ; QWERTY C
-SC02f = V 1 v V v v v ; QWERTY V
-SC030 = B 1 b B b b b ; QWERTY B
-SC031 = N 1 n N -- ñ Ñ ; QWERTY N
-SC032 = M 1 m M -- µ µ ; QWERTY M
-SC033 = OEM_COMMA 0 , < -- ç Ç ; QWERTY ,
-SC034 = OEM_PERIOD 0 . > -- dk14 dk15 ; QWERTY .: underdot, overdot
-SC035 = OEM_2 0 / ? -- ¿ dk16 ; QWERTY /: solidus
-SC039 = SPACE 0 ={space} ={space} ={space} ; QWERTY Space
+SC029 = OEM_3 0 ` ~ dk1 dk2 ; QWERTY ~: grave, tilde
+SC002 = 1 0 1 ! ¡ ¹ ; QWERTY 1
+SC003 = 2 0 2 @ ² dk3 ; QWERTY 2: doubleacute
+SC004 = 3 0 3 # ³ ³ ; QWERTY 3
+SC005 = 4 0 4 $ £ dk4 ; QWERTY 4: currency
+SC006 = 5 0 5 % € dk5 ; QWERTY 5: caron
+SC007 = 6 0 6 ^ ¼ dk6 ; QWERTY 6: circumflex
+SC008 = 7 0 7 & ½ dk7 ; QWERTY 7: cedilla
+SC009 = 8 0 8 * ¾ dk8 ; QWERTY 8: ogonek
+SC00a = 9 0 9 ( ‘ dk9 ; QWERTY 9: breve
+SC00b = 0 0 0 ) ’ dk10 ; QWERTY 0: overring
+SC00c = OEM_MINUS 0 - _ ¥ dk11 ; QWERTY -: macron
+SC00d = OEM_PLUS 0 = + × ÷ ; QWERTY +
+SC010 = Q 1 q Q ä Ä ; QWERTY Q
+SC011 = W 1 w W å Å ; QWERTY W
+SC012 = E 1 e E é É ; QWERTY E
+SC013 = R 1 r R ® ™ ; QWERTY R
+SC014 = T 1 t T þ Þ ; QWERTY T
+SC015 = Y 1 y Y ü Ü ; QWERTY Y
+SC016 = U 1 u U ú Ú ; QWERTY U
+SC017 = I 1 i I í Í ; QWERTY I
+SC018 = O 1 o O ó Ó ; QWERTY O
+SC019 = P 1 p P ø Ø ; QWERTY P
+SC01a = OEM_4 0 [ { « “ ; QWERTY [
+SC01b = OEM_6 0 ] } » ” ; QWERTY ]
+SC02b = OEM_5 0 \ | ¬ ¦ ; QWERTY \
+SC01e = A 1 a A á Á ; QWERTY A
+SC01f = S 1 s S ß § ; QWERTY S
+SC020 = D 1 d D ð Ð ; QWERTY D
+SC021 = F 1 f F f f ; QWERTY F
+SC022 = G 1 g G g g ; QWERTY G
+SC023 = H 1 h H h h ; QWERTY H
+SC024 = J 1 j J j j ; QWERTY J
+SC025 = K 1 k K œ Œ ; QWERTY K
+SC026 = L 1 l L ł Ł ; QWERTY L
+SC027 = OEM_1 0 ; : ¶ ° ; QWERTY ;
+SC028 = OEM_7 0 ' " dk12 dk13 ; QWERTY ': acute, diaeresis
+SC02c = Z 1 z Z æ Æ ; QWERTY Z
+SC02d = X 1 x X x x ; QWERTY X
+SC02e = C 1 c C © ¢ ; QWERTY C
+SC02f = V 1 v V v v ; QWERTY V
+SC030 = B 1 b B b b ; QWERTY B
+SC031 = N 1 n N ñ Ñ ; QWERTY N
+SC032 = M 1 m M µ µ ; QWERTY M
+SC033 = OEM_COMMA 0 , < ç Ç ; QWERTY ,
+SC034 = OEM_PERIOD 0 . > dk14 dk15 ; QWERTY .: underdot, overdot
+SC035 = OEM_2 0 / ? ¿ dk16 ; QWERTY /: solidus
+SC039 = SPACE 0 ={space} ={space} ; QWERTY Space
SC056 = LShift modifier ; QWERTY Iso
diff --git a/us-refor.json b/us-refor.json
index 121ac3b..5b5ab90 100644
--- a/us-refor.json
+++ b/us-refor.json
@@ -8,56 +8,56 @@
[ "Alt_R", "AltGr" ],
[ "Iso", "Shift_L" ]
],
- "shiftlevels": [ "None", "Shift", "Control", "AltGr", "Shift+AltGr" ],
+ "shiftlevels": [ "None", "Shift", "AltGr", "Shift+AltGr" ],
"keys": [
- { "pos": "~", "letters": [ "`", "~", "", "cdk:grave", "cdk:tilde" ] },
- { "pos": "1", "letters": [ "1", "!", "", "¡", "¹" ] },
- { "pos": "2", "letters": [ "2", "@", "", "²", "cdk:doubleacute" ] },
- { "pos": "3", "letters": [ "3", "#", "", "³" ] },
- { "pos": "4", "letters": [ "4", "$", "", "£", "cdk:currency" ] },
- { "pos": "5", "letters": [ "5", "%", "", "€", "cdk:caron" ] },
- { "pos": "6", "letters": [ "6", "^", "", "¼", "cdk:circumflex" ] },
- { "pos": "7", "letters": [ "7", "&", "", "½", "cdk:cedilla" ] },
- { "pos": "8", "letters": [ "8", "*", "", "¾", "cdk:ogonek" ] },
- { "pos": "9", "letters": [ "9", "(", "", "‘", "cdk:breve" ] },
- { "pos": "0", "letters": [ "0", ")", "", "’", "cdk:overring" ] },
- { "pos": "-", "letters": [ "-", "_", "", "¥", "cdk:macron" ] },
- { "pos": "+", "letters": [ "=", "+", "", "×", "÷" ] },
- { "pos": "Q", "letters": [ "q", "Q", "", "ä", "Ä" ] },
- { "pos": "W", "letters": [ "w", "W", "", "å", "Å" ] },
- { "pos": "E", "letters": [ "e", "E", "", "é", "É" ] },
- { "pos": "R", "letters": [ "r", "R", "", "®", "™" ] },
- { "pos": "T", "letters": [ "t", "T", "", "þ", "Þ" ] },
- { "pos": "Y", "letters": [ "y", "Y", "", "ü", "Ü" ] },
- { "pos": "U", "letters": [ "u", "U", "", "ú", "Ú" ] },
- { "pos": "I", "letters": [ "i", "I", "", "í", "Í" ] },
- { "pos": "O", "letters": [ "o", "O", "", "ó", "Ó" ] },
- { "pos": "P", "letters": [ "p", "P", "", "ø", "Ø" ] },
- { "pos": "[", "letters": [ "[", "{", "\u001b", "«", "“" ] },
- { "pos": "]", "letters": [ "]", "}", "\u001d", "»", "”" ] },
- { "pos": "\\", "letters": [ "\\", "|", "\u001c", "¬", "¦" ] },
- { "pos": "A", "letters": [ "a", "A", "", "á", "Á" ] },
- { "pos": "S", "letters": [ "s", "S", "", "ß", "§" ] },
- { "pos": "D", "letters": [ "d", "D", "", "ð", "Ð" ] },
+ { "pos": "~", "letters": [ "`", "~", "cdk:grave", "cdk:tilde" ] },
+ { "pos": "1", "letters": [ "1", "!", "¡", "¹" ] },
+ { "pos": "2", "letters": [ "2", "@", "²", "cdk:doubleacute" ] },
+ { "pos": "3", "letters": [ "3", "#", "³" ] },
+ { "pos": "4", "letters": [ "4", "$", "£", "cdk:currency" ] },
+ { "pos": "5", "letters": [ "5", "%", "€", "cdk:caron" ] },
+ { "pos": "6", "letters": [ "6", "^", "¼", "cdk:circumflex" ] },
+ { "pos": "7", "letters": [ "7", "&", "½", "cdk:cedilla" ] },
+ { "pos": "8", "letters": [ "8", "*", "¾", "cdk:ogonek" ] },
+ { "pos": "9", "letters": [ "9", "(", "‘", "cdk:breve" ] },
+ { "pos": "0", "letters": [ "0", ")", "’", "cdk:overring" ] },
+ { "pos": "-", "letters": [ "-", "_", "¥", "cdk:macron" ] },
+ { "pos": "+", "letters": [ "=", "+", "×", "÷" ] },
+ { "pos": "Q", "letters": [ "q", "Q", "ä", "Ä" ] },
+ { "pos": "W", "letters": [ "w", "W", "å", "Å" ] },
+ { "pos": "E", "letters": [ "e", "E", "é", "É" ] },
+ { "pos": "R", "letters": [ "r", "R", "®", "™" ] },
+ { "pos": "T", "letters": [ "t", "T", "þ", "Þ" ] },
+ { "pos": "Y", "letters": [ "y", "Y", "ü", "Ü" ] },
+ { "pos": "U", "letters": [ "u", "U", "ú", "Ú" ] },
+ { "pos": "I", "letters": [ "i", "I", "í", "Í" ] },
+ { "pos": "O", "letters": [ "o", "O", "ó", "Ó" ] },
+ { "pos": "P", "letters": [ "p", "P", "ø", "Ø" ] },
+ { "pos": "[", "letters": [ "[", "{", "«", "“" ] },
+ { "pos": "]", "letters": [ "]", "}", "»", "”" ] },
+ { "pos": "\\", "letters": [ "\\", "|", "¬", "¦" ] },
+ { "pos": "A", "letters": [ "a", "A", "á", "Á" ] },
+ { "pos": "S", "letters": [ "s", "S", "ß", "§" ] },
+ { "pos": "D", "letters": [ "d", "D", "ð", "Ð" ] },
{ "pos": "F", "letters": [ "f", "F" ] },
{ "pos": "G", "letters": [ "g", "G" ] },
{ "pos": "H", "letters": [ "h", "H" ] },
{ "pos": "J", "letters": [ "j", "J" ] },
- { "pos": "K", "letters": [ "k", "K", "", "œ", "Œ" ] },
- { "pos": "L", "letters": [ "l", "L", "", "ł", "Ł" ] },
- { "pos": ";", "letters": [ ";", ":", "", "¶", "°" ] },
- { "pos": "'", "letters": [ "'", "\"", "", "cdk:acute", "cdk:diaeresis" ] },
- { "pos": "Z", "letters": [ "z", "Z", "", "æ", "Æ" ] },
+ { "pos": "K", "letters": [ "k", "K", "œ", "Œ" ] },
+ { "pos": "L", "letters": [ "l", "L", "ł", "Ł" ] },
+ { "pos": ";", "letters": [ ";", ":", "¶", "°" ] },
+ { "pos": "'", "letters": [ "'", "\"", "cdk:acute", "cdk:diaeresis" ] },
+ { "pos": "Z", "letters": [ "z", "Z", "æ", "Æ" ] },
{ "pos": "X", "letters": [ "x", "X" ] },
- { "pos": "C", "letters": [ "c", "C", "", "©", "¢" ] },
+ { "pos": "C", "letters": [ "c", "C", "©", "¢" ] },
{ "pos": "V", "letters": [ "v", "V" ] },
{ "pos": "B", "letters": [ "b", "B" ] },
- { "pos": "N", "letters": [ "n", "N", "", "ñ", "Ñ" ] },
- { "pos": "M", "letters": [ "m", "M", "", "µ" ] },
- { "pos": ",", "letters": [ ",", "<", "", "ç", "Ç" ] },
- { "pos": ".", "letters": [ ".", ">", "", "cdk:underdot", "cdk:overdot" ] },
- { "pos": "/", "letters": [ "/", "?", "", "¿", "cdk:solidus" ] },
- { "pos": "Space", "letters": [ " ", " ", " ", " ", "" ] }
+ { "pos": "N", "letters": [ "n", "N", "ñ", "Ñ" ] },
+ { "pos": "M", "letters": [ "m", "M", "µ" ] },
+ { "pos": ",", "letters": [ ",", "<", "ç", "Ç" ] },
+ { "pos": ".", "letters": [ ".", ">", "cdk:underdot", "cdk:overdot" ] },
+ { "pos": "/", "letters": [ "/", "?", "¿", "cdk:solidus" ] },
+ { "pos": "Space", "letters": [ " ", " ", " ", "" ] }
],
"customDeadKeys": [
{
diff --git a/xkb/symbols/us-refor b/xkb/symbols/us-refor
index 31df341..bcd8259 100644
--- a/xkb/symbols/us-refor
+++ b/xkb/symbols/us-refor
@@ -3,70 +3,54 @@
default
xkb_symbols "basic" {
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR";
- key { [ grave, asciitilde, VoidSymbol, dead_grave, dead_tilde ] };
- key { [ 1, exclam, VoidSymbol, exclamdown, onesuperior ] };
- key { [ 2, at, VoidSymbol, twosuperior, dead_doubleacute ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR";
- key { [ 3, numbersign, VoidSymbol, threesuperior ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR";
- key { [ 4, dollar, VoidSymbol, sterling, dead_currency ] };
- key { [ 5, percent, VoidSymbol, EuroSign, dead_caron ] };
- key { [ 6, asciicircum, VoidSymbol, onequarter, dead_circumflex ] };
- key { [ 7, ampersand, VoidSymbol, onehalf, dead_cedilla ] };
- key { [ 8, asterisk, VoidSymbol, threequarters, dead_ogonek ] };
- key { [ 9, parenleft, VoidSymbol, leftsinglequotemark, dead_breve ] };
- key { [ 0, parenright, VoidSymbol, rightsinglequotemark, dead_abovering ] };
- key { [ minus, underscore, VoidSymbol, yen, dead_macron ] };
- key { [ equal, plus, VoidSymbol, multiply, division ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR_ALPHABETIC";
- key { [ q, Q, VoidSymbol, adiaeresis, Adiaeresis ] };
- key { [ w, W, VoidSymbol, aring, Aring ] };
- key { [ e, E, VoidSymbol, eacute, Eacute ] };
- key { [ r, R, VoidSymbol, registered, trademark ] };
- key { [ t, T, VoidSymbol, thorn, THORN ] };
- key { [ y, Y, VoidSymbol, udiaeresis, Udiaeresis ] };
- key { [ u, U, VoidSymbol, uacute, Uacute ] };
- key { [ i, I, VoidSymbol, iacute, Iacute ] };
- key { [ o, O, VoidSymbol, oacute, Oacute ] };
- key { [ p, P, VoidSymbol, oslash, Oslash ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR";
- key { [ bracketleft, braceleft, U001B, guillemotleft, leftdoublequotemark ] };
- key { [ bracketright, braceright, U001D, guillemotright, rightdoublequotemark ] };
- key { [ backslash, bar, U001C, notsign, brokenbar ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR_ALPHABETIC";
- key { [ a, A, VoidSymbol, aacute, Aacute ] };
- key { [ s, S, VoidSymbol, ssharp, section ] };
- key { [ d, D, VoidSymbol, eth, ETH ] };
- key.type[Group1] = "ALPHABETIC";
+ key { [ grave, asciitilde, dead_grave, dead_tilde ] };
+ key { [ 1, exclam, exclamdown, onesuperior ] };
+ key { [ 2, at, twosuperior, dead_doubleacute ] };
+ key { [ 3, numbersign, threesuperior ] };
+ key { [ 4, dollar, sterling, dead_currency ] };
+ key { [ 5, percent, EuroSign, dead_caron ] };
+ key { [ 6, asciicircum, onequarter, dead_circumflex ] };
+ key { [ 7, ampersand, onehalf, dead_cedilla ] };
+ key { [ 8, asterisk, threequarters, dead_ogonek ] };
+ key { [ 9, parenleft, leftsinglequotemark, dead_breve ] };
+ key { [ 0, parenright, rightsinglequotemark, dead_abovering ] };
+ key { [ minus, underscore, yen, dead_macron ] };
+ key { [ equal, plus, multiply, division ] };
+ key { [ q, Q, adiaeresis, Adiaeresis ] };
+ key { [ w, W, aring, Aring ] };
+ key { [ e, E, eacute, Eacute ] };
+ key { [ r, R, registered, trademark ] };
+ key { [ t, T, thorn, THORN ] };
+ key { [ y, Y, udiaeresis, Udiaeresis ] };
+ key { [ u, U, uacute, Uacute ] };
+ key { [ i, I, iacute, Iacute ] };
+ key { [ o, O, oacute, Oacute ] };
+ key { [ p, P, oslash, Oslash ] };
+ key { [ bracketleft, braceleft, guillemotleft, leftdoublequotemark ] };
+ key { [ bracketright, braceright, guillemotright, rightdoublequotemark ] };
+ key { [ backslash, bar, notsign, brokenbar ] };
+ key { [ a, A, aacute, Aacute ] };
+ key { [ s, S, ssharp, section ] };
+ key { [ d, D, eth, ETH ] };
key { [ f, F ] };
key { [ g, G ] };
key { [ h, H ] };
key { [ j, J ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR_ALPHABETIC";
- key { [ k, K, VoidSymbol, oe, OE ] };
- key { [ l, L, VoidSymbol, lstroke, Lstroke ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR";
- key { [ semicolon, colon, VoidSymbol, paragraph, degree ] };
- key { [ apostrophe, quotedbl, VoidSymbol, dead_acute, dead_diaeresis ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR_ALPHABETIC";
- key { [ z, Z, VoidSymbol, ae, AE ] };
- key.type[Group1] = "ALPHABETIC";
+ key { [ k, K, oe, OE ] };
+ key { [ l, L, lstroke, Lstroke ] };
+ key { [ semicolon, colon, paragraph, degree ] };
+ key { [ apostrophe, quotedbl, dead_acute, dead_diaeresis ] };
+ key { [ z, Z, ae, AE ] };
key { [ x, X ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR_ALPHABETIC";
- key { [ c, C, VoidSymbol, copyright, cent ] };
- key.type[Group1] = "ALPHABETIC";
+ key { [ c, C, copyright, cent ] };
key { [ v, V ] };
key { [ b, B ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR_ALPHABETIC";
- key { [ n, N, VoidSymbol, ntilde, Ntilde ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_ALPHABETIC";
- key { [ m, M, VoidSymbol, mu ] };
- key.type[Group1] = "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR";
- key { [ comma, less, VoidSymbol, ccedilla, Ccedilla ] };
- key { [ period, greater, VoidSymbol, dead_belowdot, dead_abovedot ] };
- key { [ slash, question, VoidSymbol, questiondown, dead_stroke ] };
- key { [ space, space, space, nobreakspace, U200B ] };
+ key { [ n, N, ntilde, Ntilde ] };
+ key { [ m, M, mu ] };
+ key { [ comma, less, ccedilla, Ccedilla ] };
+ key { [ period, greater, dead_belowdot, dead_abovedot ] };
+ key { [ slash, question, questiondown, dead_stroke ] };
+ key { [ space, space, nobreakspace, U200B ] };
key.type[Group1] = "ONE_LEVEL";
key { [ Shift_L ],
actions[Group1] = [ SetMods(mods=Shift) ] };
diff --git a/xkb/types/us-refor b/xkb/types/us-refor
index a406276..cff85ca 100644
--- a/xkb/types/us-refor
+++ b/xkb/types/us-refor
@@ -5,124 +5,38 @@ default xkb_types "basic" {
virtual_modifiers LevelThree;
- type "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR" {
- modifiers = LevelThree+Control+Shift;
+ type "NONE_SHIFT_ALTGR" {
+ modifiers = LevelThree+Shift;
map[None] = Level1;
map[Shift] = Level2;
- map[Control] = Level3;
- map[Control+Shift] = Level3;
- map[LevelThree] = Level4;
- map[LevelThree+Shift] = Level5;
- map[LevelThree+Control] = Level4;
- map[LevelThree+Control+Shift] = Level4;
+ map[LevelThree] = Level3;
+ map[LevelThree+Shift] = Level3;
- preserve[Control] = Control;
- preserve[Control+Shift] = Control+Shift;
- preserve[LevelThree+Control] = Control;
- preserve[LevelThree+Control+Shift] = Control+Shift;
-
- level_name[Level1] = "Base";
- level_name[Level2] = "Shift";
- level_name[Level3] = "Control";
- level_name[Level4] = "AltGr";
- level_name[Level5] = "ShiftAltGr";
- };
-
- type "NONE_SHIFT_CONTROL_ALTGR" {
- modifiers = LevelThree+Control+Shift;
-
- map[None] = Level1;
- map[Shift] = Level2;
- map[Control] = Level3;
- map[Control+Shift] = Level3;
- map[LevelThree] = Level4;
- map[LevelThree+Shift] = Level4;
- map[LevelThree+Control] = Level4;
- map[LevelThree+Control+Shift] = Level4;
-
- preserve[Control] = Control;
- preserve[Control+Shift] = Control+Shift;
preserve[LevelThree+Shift] = Shift;
- preserve[LevelThree+Control] = Control;
- preserve[LevelThree+Control+Shift] = Control+Shift;
-
- level_name[Level1] = "Base";
- level_name[Level2] = "Shift";
- level_name[Level3] = "Control";
- level_name[Level4] = "AltGr";
- };
-
- type "NONE_SHIFT_CONTROL_ALTGR_SHIFT+ALTGR_ALPHABETIC" {
- modifiers = LevelThree+Control+Shift+Lock;
-
- map[None] = Level1;
- map[Lock] = Level2;
- map[Shift] = Level2;
- map[Shift+Lock] = Level1;
- map[Control] = Level3;
- map[Control+Lock] = Level3;
- map[Control+Shift] = Level3;
- map[Control+Shift+Lock] = Level3;
- map[LevelThree] = Level4;
- map[LevelThree+Lock] = Level5;
- map[LevelThree+Shift] = Level5;
- map[LevelThree+Shift+Lock] = Level4;
- map[LevelThree+Control] = Level4;
- map[LevelThree+Control+Lock] = Level4;
- map[LevelThree+Control+Shift] = Level4;
- map[LevelThree+Control+Shift+Lock] = Level4;
-
- preserve[Control] = Control;
- preserve[Control+Lock] = Control;
- preserve[Control+Shift] = Control+Shift;
- preserve[Control+Shift+Lock] = Control;
- preserve[LevelThree+Control] = Control;
- preserve[LevelThree+Control+Lock] = Control;
- preserve[LevelThree+Control+Shift] = Control+Shift;
- preserve[LevelThree+Control+Shift+Lock] = Control;
level_name[Level1] = "Base";
level_name[Level2] = "Shift";
- level_name[Level3] = "Control";
- level_name[Level4] = "AltGr";
- level_name[Level5] = "ShiftAltGr";
+ level_name[Level3] = "AltGr";
};
- type "NONE_SHIFT_CONTROL_ALTGR_ALPHABETIC" {
- modifiers = LevelThree+Control+Shift+Lock;
+ type "NONE_SHIFT_ALTGR_ALPHABETIC" {
+ modifiers = LevelThree+Shift+Lock;
map[None] = Level1;
map[Lock] = Level2;
map[Shift] = Level2;
map[Shift+Lock] = Level1;
- map[Control] = Level3;
- map[Control+Lock] = Level3;
- map[Control+Shift] = Level3;
- map[Control+Shift+Lock] = Level3;
- map[LevelThree] = Level4;
- map[LevelThree+Lock] = Level4;
- map[LevelThree+Shift] = Level4;
- map[LevelThree+Shift+Lock] = Level4;
- map[LevelThree+Control] = Level4;
- map[LevelThree+Control+Lock] = Level4;
- map[LevelThree+Control+Shift] = Level4;
- map[LevelThree+Control+Shift+Lock] = Level4;
+ map[LevelThree] = Level3;
+ map[LevelThree+Lock] = Level3;
+ map[LevelThree+Shift] = Level3;
+ map[LevelThree+Shift+Lock] = Level3;
- preserve[Control] = Control;
- preserve[Control+Lock] = Control;
- preserve[Control+Shift] = Control+Shift;
- preserve[Control+Shift+Lock] = Control;
preserve[LevelThree+Shift] = Shift;
- preserve[LevelThree+Control] = Control;
- preserve[LevelThree+Control+Lock] = Control;
- preserve[LevelThree+Control+Shift] = Control+Shift;
- preserve[LevelThree+Control+Shift+Lock] = Control;
level_name[Level1] = "Base";
level_name[Level2] = "Shift";
- level_name[Level3] = "Control";
- level_name[Level4] = "AltGr";
+ level_name[Level3] = "AltGr";
};
};