Add files via upload

Some code cleanup has been made concerning the 'Caps Lock' key state.

diff --git a/UltimateKEYS - 2019-10-01.ahk b/UltimateKEYS - 2019-10-01.ahk
index d4ace0a9efaa31d8b4fd3b8abd843f173190818f..0dd6e7da4a495852a2052120a81e5327d72aaa48 100644 (file)
--- a/UltimateKEYS - 2019-10-01.ahk
+++ b/UltimateKEYS - 2019-10-01.ahk
@@ -474,339 +474,339 @@ dkSymbols.item("|") := "⁞"  ; vertical four dots
 dkSymbols.item(" ") := "·"  ; middle dot\r
 \r
 \r
->!a::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+a::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ä  ; a with diaeresis\r
   else\r
     Send Ä  ; A with diaeresis\r
 return\r
->!+a::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!a::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ä  ; A with diaeresis\r
   else\r
     Send ä  ; a with diaeresis\r
 return\r
 \r
->!z::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+z::\r
+  if GetKeyState("CapsLock", "T")\r
     Send à  ; a with grave\r
   else\r
     Send À  ; A with grave\r
 return\r
->!+z::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!z::\r
+  if GetKeyState("CapsLock", "T")\r
     Send À  ; A with grave\r
   else\r
     Send à  ; a with grave\r
 return\r
 \r
->!x::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+x::\r
+  if GetKeyState("CapsLock", "T")\r
     Send á  ; a with acute\r
   else\r
     Send Á  ; A with acute\r
 return\r
->!+x::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!x::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Á  ; A with acute\r
   else\r
     Send á  ; a with acute\r
 return\r
 \r
->!q::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+q::\r
+  if GetKeyState("CapsLock", "T")\r
     Send æ  ; letter ae\r
   else\r
     Send Æ  ; letter AE\r
 return\r
->!+q::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!q::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Æ  ; letter AE\r
   else\r
     Send æ  ; letter ae\r
 return\r
 \r
->!w::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+w::\r
+  if GetKeyState("CapsLock", "T")\r
     Send å  ; a with ring above\r
   else\r
     Send Å  ; A with ring above\r
 return\r
->!+w::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!w::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Å  ; A with ring above\r
   else\r
     Send å  ; a with ring above\r
 return\r
 \r
->!c::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+c::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ç  ; c with cedilla\r
   else\r
     Send Ç  ; C with cedilla\r
 return\r
->!+c::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!c::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ç  ; C with cedilla\r
   else\r
     Send ç  ; c with cedilla\r
 return\r
 \r
->!d::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+d::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ð  ; small letter eth\r
   else\r
     Send Ð  ; capital letter eth\r
 return\r
->!+d::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!d::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ð  ; capital letter eth\r
   else\r
     Send ð  ; small letter eth\r
 return\r
 \r
->!e::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+e::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ë  ; e with diaeresis\r
   else\r
     Send Ë  ; E with diaeresis\r
 return\r
->!+e::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!e::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ë  ; E with diaeresis\r
   else\r
     Send ë  ; e with diaeresis\r
 return\r
 \r
->!f::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+f::\r
+  if GetKeyState("CapsLock", "T")\r
     Send è  ; e with grave\r
   else\r
     Send È  ; E with grave\r
 return\r
->!+f::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!f::\r
+  if GetKeyState("CapsLock", "T")\r
     Send È  ; E with grave\r
   else\r
     Send è  ; e with grave\r
 return\r
 \r
->!g::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+g::\r
+  if GetKeyState("CapsLock", "T")\r
     Send é  ; e with acute\r
   else\r
     Send É  ; E with acute\r
 return\r
->!+g::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!g::\r
+  if GetKeyState("CapsLock", "T")\r
     Send É  ; E with acute\r
   else\r
     Send é  ; e with acute\r
 return\r
 \r
->!i::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+i::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ï  ; i with diaeresis\r
   else\r
     Send Ï  ; I with diaeresis\r
 return\r
->!+i::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!i::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ï  ; I with diaeresis\r
   else\r
     Send ï  ; i with diaeresis\r
 return\r
 \r
->!v::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+v::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ì  ; i with grave\r
   else\r
     Send Ì  ; I with grave\r
 return\r
->!+v::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!v::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ì  ; I with grave\r
   else\r
     Send ì  ; i with grave\r
 return\r
 \r
->!b::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+b::\r
+  if GetKeyState("CapsLock", "T")\r
     Send í  ; i with acute\r
   else\r
     Send Í  ; I with acute\r
 return\r
->!+b::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!b::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Í  ; I with acute\r
   else\r
     Send í  ; i with acute\r
 return\r
 \r
->!o::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+o::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ö  ; o with diaeresis\r
   else\r
     Send Ö  ; O with diaeresis\r
 return\r
->!+o::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!o::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ö  ; O with diaeresis\r
   else\r
     Send ö  ; o with diaeresis\r
 return\r
 \r
->!,::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!<::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ò  ; o with grave\r
   else\r
     Send Ò  ; O with grave\r
 return\r
->!<::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!,::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ò  ; O with grave\r
   else\r
     Send ò  ; o with grave\r
 return\r
 \r
->!.::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!>::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ó  ; o with acute\r
   else\r
     Send Ó  ; O with acute\r
 return\r
->!>::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!.::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ó  ; O with acute\r
   else\r
     Send ó  ; o with acute\r
 return\r
 \r
->!l::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+l::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ø  ; o with stroke\r
   else\r
     Send Ø  ; O with stroke\r
 return\r
->!+l::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!l::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ø  ; O with stroke\r
   else\r
     Send ø  ; o with stroke\r
 return\r
 \r
->!p::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+p::\r
+  if GetKeyState("CapsLock", "T")\r
     Send œ  ; ligature oe\r
   else\r
     Send Π ; ligature OE\r
 return\r
->!+p::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!p::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Π ; ligature OE\r
   else\r
     Send œ  ; ligature oe\r
 return\r
 \r
->!n::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+n::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ñ  ; n with tilde\r
   else\r
     Send Ñ  ; N with tilde\r
 return\r
->!+n::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!n::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ñ  ; N with tilde\r
   else\r
     Send ñ  ; n with tilde\r
 return\r
 \r
->!s::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+s::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ß  ; small sharp s (Eszett)\r
   else\r
     Send ẞ  ; capital sharp S (capital Eszett)\r
 return\r
->!+s::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!s::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ẞ  ; capital sharp S (capital Eszett)\r
   else\r
     Send ß  ; small sharp s (Eszett)\r
 return\r
 \r
->!t::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+t::\r
+  if GetKeyState("CapsLock", "T")\r
     Send þ  ; small letter thorn\r
   else\r
     Send Þ  ; capital letter thorn\r
 return\r
->!+t::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!t::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Þ  ; capital letter thorn\r
   else\r
     Send þ  ; small letter thorn\r
 return\r
 \r
->!u::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+u::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ü  ; u with diaeresis\r
   else\r
     Send Ü  ; U with diaeresis\r
 return\r
->!+u::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!u::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ü  ; U with diaeresis\r
   else\r
     Send ü  ; u with diaeresis\r
 return\r
 \r
->!h::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+h::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ù  ; u with grave\r
   else\r
     Send Ù  ; U with grave\r
 return\r
->!+h::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!h::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ù  ; U with grave\r
   else\r
     Send ù  ; u with grave\r
 return\r
 \r
->!j::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+j::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ú  ; u with acute\r
   else\r
     Send Ú  ; U with acute\r
 return\r
->!+j::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!j::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ú  ; U with acute\r
   else\r
     Send ú  ; u with acute\r
 return\r
 \r
->!y::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+y::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ÿ  ; y with diaeresis\r
   else\r
     Send Ÿ  ; Y with diaeresis\r
 return\r
->!+y::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!y::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ÿ  ; Y with diaeresis\r
   else\r
     Send ÿ  ; y with diaeresis\r
 return\r
 \r
->!r::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!+r::\r
+  if GetKeyState("CapsLock", "T")\r
     Send ý  ; y with acute\r
   else\r
     Send Ý  ; Y with acute\r
 return\r
->!+r::\r
-  if GetKeyState("Capslock", "T") == 0\r
+>!r::\r
+  if GetKeyState("CapsLock", "T")\r
     Send Ý  ; Y with acute\r
   else\r
     Send ý  ; y with acute\r