From 8f3ca53bd09cf4138db2f58715442e5427822dfe Mon Sep 17 00:00:00 2001
From: mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Thu, 29 Sep 2011 14:00:31 +0000
Subject: • ED1256 ist eine neue Funktion, mit der man die Ebenen 1, 2, 5 und 6
 gemeinsam umstellen kann. Bis es eine bessere Möglichkeit gibt, die Ebenen
 5+6 mit der Veränderung der Ebenen 1+2 automatisch mitzuziehen, ist das ein
 einfacher Kompromiss. • DIEgO zur Liste der »NordTast«-Layouts hinzugefügt.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@2405 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/neo-vars/src/source/keydefinitions.ahk |  19 ++
 windows/neo-vars/src/source/nordtast.ahk       | 250 +++++++++++++++----------
 2 files changed, 167 insertions(+), 102 deletions(-)

(limited to 'windows/neo-vars/src')

diff --git a/windows/neo-vars/src/source/keydefinitions.ahk b/windows/neo-vars/src/source/keydefinitions.ahk
index 829e634..2a94c31 100644
--- a/windows/neo-vars/src/source/keydefinitions.ahk
+++ b/windows/neo-vars/src/source/keydefinitions.ahk
@@ -203,6 +203,25 @@ ED12(scpos,caps,e1a,e2a) {
   SetKeyPos("CP2" . pos, e2)
 }
 
+ED1256(scpos,caps,e1a,e2a,e5a,e6a) {
+  global
+  pos := vksc%scpos%
+  e1  := EncodeUniComposeA(e1a)
+  e2  := EncodeUniComposeA(e2a)
+  e5  := EncodeUniComposeA(e5a)
+  e6  := EncodeUniComposeA(e6a)
+  if (caps == 0) {
+    NOC%pos% := 1
+    UNSH%e1% := 0
+  } else {
+    NOC%pos% := 0
+    UNSH%e1% := 1 ; unshift wenn caps lock + Shift?
+  }
+  SetKeyPos("CP1" . pos, e1)
+  SetKeyPos("CP2" . pos, e2)
+  SetKeyPos("CP5" . pos, e5)
+  SetKeyPos("CP6" . pos, e6)
+}
 
 Comp := ""
 
diff --git a/windows/neo-vars/src/source/nordtast.ahk b/windows/neo-vars/src/source/nordtast.ahk
index e2dcb60..2be1723 100644
--- a/windows/neo-vars/src/source/nordtast.ahk
+++ b/windows/neo-vars/src/source/nordtast.ahk
@@ -16,6 +16,11 @@ CharProcNordTt() {
     CharProcNordT2()
     if (zeigeModusBox)
       TrayTip,NordTast-Belegungsvariante,Die Belegungsvariante AdNW wurde aktiviert. Zum Umschalten`, Mod3+F12 druecken.,10,1
+  } else if (isNordTast == 2) {
+    isNordTast := 3
+    CharProcNordT3()
+    if (zeigeModusBox)
+      TrayTip,NordTast-Belegungsvariante,Die Belegungsvariante DIEgO wurde aktiviert. Zum Umschalten`, Mod3+F12 druecken.,10,1
   } else {
     isNordTast := 0
     CharProcNordT0()
@@ -27,118 +32,157 @@ CharProcNordTt() {
 CharProcNordT1() {
   global
   ; Tastaturbelegungsvariante aktivieren
-  ED12("010",1,"ä","Ä")
-  ED12("011",1,"u","U")
-  ED12("012",1,"o","O")
-  ED12("013",1,"b","B")
-  ED12("014",1,"p","P")
-  ED12("015",1,"k","K")
-  ED12("016",1,"g","G")
-  ED12("017",1,"l","L")
-  ED12("018",1,"m","M")
-  ED12("019",1,"f","F")
-  ED12("01A",1,"x","X")
-
-  ED12("01E",1,"a","A")
-  ED12("01F",1,"i","I")
-  ED12("020",1,"e","E")
-  ED12("021",1,"t","T")
-  ED12("022",1,"c","C")
-  ED12("023",1,"h","H")
-  ED12("024",1,"d","D")
-  ED12("025",1,"n","N")
-  ED12("026",1,"r","R")
-  ED12("027",1,"s","S")
-  ED12("028",1,"ß","ẞ")
-
-  ED12("02C",0,".","•")
-  ED12("02D",0,",","–")
-  ED12("02E",1,"ü","Ü")
-  ED12("02F",1,"ö","Ö")
-  ED12("030",1,"q","Q")
-  ED12("031",1,"y","Y")
-  ED12("032",1,"z","Z")
-  ED12("033",1,"w","W")
-  ED12("034",1,"v","V")
-  ED12("035",1,"j","J")
+  ED1256("010",1,"ä","Ä","η","ℵ")
+  ED1256("011",1,"u","U","" ,"⊂")
+  ED1256("012",1,"o","O","ο","∈")
+  ED1256("013",1,"b","B","β","⇐")
+  ED1256("014",1,"p","P","π","Π")
+  ED1256("015",1,"k","K","κ","×")
+  ED1256("016",1,"g","G","γ","Γ")
+  ED1256("017",1,"l","L","λ","Λ")
+  ED1256("018",1,"m","M","μ","⇔")
+  ED1256("019",1,"f","F","φ","Φ")
+  ED1256("01A",1,"x","X","ξ","Ξ")
+
+  ED1256("01E",1,"a","A","α","∀")
+  ED1256("01F",1,"i","I","ι","∫")
+  ED1256("020",1,"e","E","ε","∃")
+  ED1256("021",1,"t","T","τ","∂")
+  ED1256("022",1,"c","C","χ","ℂ")
+  ED1256("023",1,"h","H","ψ","Ψ")
+  ED1256("024",1,"d","D","δ","Δ")
+  ED1256("025",1,"n","N","ν","ℕ")
+  ED1256("026",1,"r","R","ρ","ℝ")
+  ED1256("027",1,"s","S","σ","Σ")
+  ED1256("028",1,"ß","ẞ","ς","∘")
+
+  ED1256("02C",0,".","•","ϑ","↦")
+  ED1256("02D",0,",","–","ϱ","⇒")
+  ED1256("02E",1,"ü","Ü","" ,"∪")
+  ED1256("02F",1,"ö","Ö","ϵ","∩")
+  ED1256("030",1,"q","Q","ϕ","ℚ")
+  ED1256("031",1,"y","Y","υ","∇")
+  ED1256("032",1,"z","Z","ζ","ℤ")
+  ED1256("033",1,"w","W","ω","Ω")
+  ED1256("034",1,"v","V","" ,"√")
+  ED1256("035",1,"j","J","θ","Θ")
 }
 
 CharProcNordT2() {
   global
   ; Tastaturbelegungsvariante Aus der Neo-Welt (AdNW) aktivieren
-  ED12("010",1,"k","K")
-  ED12("011",1,"u","U")
-  ED12("012",1,"ü","Ü")
-  ED12("013",0,".","•")
-  ED12("014",1,"ä","Ä")
-  ED12("015",1,"v","V")
-  ED12("016",1,"g","G")
-  ED12("017",1,"c","C")
-  ED12("018",1,"l","L")
-  ED12("019",1,"j","J")
-  ED12("01A",1,"f","F")
-
-  ED12("01E",1,"h","H")
-  ED12("01F",1,"i","I")
-  ED12("020",1,"e","E")
-  ED12("021",1,"a","A")
-  ED12("022",1,"o","O")
-  ED12("023",1,"d","D")
-  ED12("024",1,"t","T")
-  ED12("025",1,"r","R")
-  ED12("026",1,"n","N")
-  ED12("027",1,"s","S")
-  ED12("028",1,"ß","ẞ")
-
-  ED12("02C",1,"x","X")
-  ED12("02D",1,"y","Y")
-  ED12("02E",1,"ö","Ö")
-  ED12("02F",0,",","–")
-  ED12("030",1,"q","Q")
-  ED12("031",1,"b","B")
-  ED12("032",1,"p","P")
-  ED12("033",1,"w","W")
-  ED12("034",1,"m","M")
-  ED12("035",1,"z","Z")
+  ED1256("010",1,"k","K","κ","×")
+  ED1256("011",1,"u","U","" ,"⊂")
+  ED1256("012",1,"ü","Ü","" ,"∪")
+  ED1256("013",0,".","•","ϑ","↦")
+  ED1256("014",1,"ä","Ä","η","ℵ")
+  ED1256("015",1,"v","V","" ,"√")
+  ED1256("016",1,"g","G","γ","Γ")
+  ED1256("017",1,"c","C","χ","ℂ")
+  ED1256("018",1,"l","L","λ","Λ")
+  ED1256("019",1,"j","J","θ","Θ")
+  ED1256("01A",1,"f","F","φ","Φ")
+
+  ED1256("01E",1,"h","H","ψ","Ψ")
+  ED1256("01F",1,"i","I","ι","∫")
+  ED1256("020",1,"e","E","ε","∃")
+  ED1256("021",1,"a","A","α","∀")
+  ED1256("022",1,"o","O","ο","∈")
+  ED1256("023",1,"d","D","δ","Δ")
+  ED1256("024",1,"t","T","τ","∂")
+  ED1256("025",1,"r","R","ρ","ℝ")
+  ED1256("026",1,"n","N","ν","ℕ")
+  ED1256("027",1,"s","S","σ","Σ")
+  ED1256("028",1,"ß","ẞ","ς","∘")
+
+  ED1256("02C",1,"x","X","ξ","Ξ")
+  ED1256("02D",1,"y","Y","υ","∇")
+  ED1256("02E",1,"ö","Ö","ϵ","∩")
+  ED1256("02F",0,",","–","ϱ","⇒")
+  ED1256("030",1,"q","Q","ϕ","ℚ")
+  ED1256("031",1,"b","B","β","⇐")
+  ED1256("032",1,"p","P","π","Π")
+  ED1256("033",1,"w","W","ω","Ω")
+  ED1256("034",1,"m","M","μ","⇔")
+  ED1256("035",1,"z","Z","ζ","ℤ")
+}
+
+CharProcNordT3() {
+  global
+  ; Tastaturbelegungsvariante DIEgO aktivieren
+  ED1256("010",1,"p","P","π","Π")
+  ED1256("011",1,"u","U","" ,"⊂")
+  ED1256("012",1,"ü","Ü","" ,"∪")
+  ED1256("013",0,".","•","ϑ","↦")
+  ED1256("014",1,"ä","Ä","η","ℵ")
+  ED1256("015",1,"j","J","θ","Θ")
+  ED1256("016",1,"c","C","χ","ℂ")
+  ED1256("017",1,"l","L","λ","Λ")
+  ED1256("018",1,"h","H","ψ","Ψ")
+  ED1256("019",1,"x","X","ξ","Ξ")
+  ED1256("01A",1,"z","Z","ζ","ℤ")
+
+  ED1256("01E",1,"d","D","δ","Δ")
+  ED1256("01F",1,"i","I","ι","∫")
+  ED1256("020",1,"e","E","ε","∃")
+  ED1256("021",1,"a","A","α","∀")
+  ED1256("022",1,"o","O","ο","∈")
+  ED1256("023",1,"g","G","γ","Γ")
+  ED1256("024",1,"t","T","τ","∂")
+  ED1256("025",1,"r","R","ρ","ℝ")
+  ED1256("026",1,"n","N","ν","ℕ")
+  ED1256("027",1,"s","S","σ","Σ")
+  ED1256("028",1,"ß","ẞ","ς","∘")
+
+  ED1256("02C",1,"k","K","κ","×")
+  ED1256("02D",1,"y","Y","υ","∇")
+  ED1256("02E",1,"ö","Ö","ϵ","∩")
+  ED1256("02F",0,",","–","ϱ","⇒")
+  ED1256("030",1,"q","Q","ϕ","ℚ")
+  ED1256("031",1,"m","M","μ","⇔")
+  ED1256("032",1,"v","V","" ,"√")
+  ED1256("033",1,"w","W","ω","Ω")
+  ED1256("034",1,"b","B","β","⇐")
+  ED1256("035",1,"f","F","φ","Φ")
 }
 
 CharProcNordT0() {
   global
   ; Tastaturbelegungsvariante deaktivieren
-  ED12("010",1,"x","X")
-  ED12("011",1,"v","V")
-  ED12("012",1,"l","L")
-  ED12("013",1,"c","C")
-  ED12("014",1,"w","W")
-  ED12("015",1,"k","K")
-  ED12("016",1,"h","H")
-  ED12("017",1,"g","G")
-  ED12("018",1,"f","F")
-  ED12("019",1,"q","Q")
-  ED12("01A",1,"ß","ẞ")
-
-  ED12("01E",1,"u","U")
-  ED12("01F",1,"i","I")
-  ED12("020",1,"a","A")
-  ED12("021",1,"e","E")
-  ED12("022",1,"o","O")
-  ED12("023",1,"s","S")
-  ED12("024",1,"n","N")
-  ED12("025",1,"r","R")
-  ED12("026",1,"t","T")
-  ED12("027",1,"d","D")
-  ED12("028",1,"y","Y")
-
-  ED12("02C",1,"ü","Ü")
-  ED12("02D",1,"ö","Ö")
-  ED12("02E",1,"ä","Ä")
-  ED12("02F",1,"p","P")
-  ED12("030",1,"z","Z")
-  ED12("031",1,"b","B")
-  ED12("032",1,"m","M")
-  ED12("033",0,",","–")
-  ED12("034",0,".","•")
-  ED12("035",1,"j","J")
+  ED1256("010",1,"x","X","ξ","Ξ")
+  ED1256("011",1,"v","V","" ,"√")
+  ED1256("012",1,"l","L","λ","Λ")
+  ED1256("013",1,"c","C","χ","ℂ")
+  ED1256("014",1,"w","W","ω","Ω")
+  ED1256("015",1,"k","K","κ","×")
+  ED1256("016",1,"h","H","ψ","Ψ")
+  ED1256("017",1,"g","G","γ","Γ")
+  ED1256("018",1,"f","F","φ","Φ")
+  ED1256("019",1,"q","Q","ϕ","ℚ")
+  ED1256("01A",1,"ß","ẞ","ς","∘")
+
+  ED1256("01E",1,"u","U","" ,"⊂")
+  ED1256("01F",1,"i","I","ι","∫")
+  ED1256("020",1,"a","A","α","∀")
+  ED1256("021",1,"e","E","ε","∃")
+  ED1256("022",1,"o","O","ο","∈")
+  ED1256("023",1,"s","S","σ","Σ")
+  ED1256("024",1,"n","N","ν","ℕ")
+  ED1256("025",1,"r","R","ρ","ℝ")
+  ED1256("026",1,"t","T","τ","∂")
+  ED1256("027",1,"d","D","δ","Δ")
+  ED1256("028",1,"y","Y","υ","∇")
+
+  ED1256("02C",1,"ü","Ü","" ,"∪")
+  ED1256("02D",1,"ö","Ö","ϵ","∩")
+  ED1256("02E",1,"ä","Ä","η","ℵ")
+  ED1256("02F",1,"p","P","π","Π")
+  ED1256("030",1,"z","Z","ζ","ℤ")
+  ED1256("031",1,"b","B","β","⇐")
+  ED1256("032",1,"m","M","μ","⇔")
+  ED1256("033",0,",","–","ϱ","⇒")
+  ED1256("034",0,".","•","ϑ","↦")
+  ED1256("035",1,"j","J","θ","Θ")
 }
 
 ActivateNordTast() {
@@ -151,6 +195,8 @@ ActivateNordTast() {
     CharProcNordT1()
   else if (isNordTast == 2)
     CharProcNordT2()
+  else if (isNordTast == 3)
+    CharProcNordT3()
 }
 
 ActivateNordTast()
-- 
cgit v1.2.3