From 987e0b84fc6725d925968f22a98400b3e13d1bf2 Mon Sep 17 00:00:00 2001 From: mösi Date: Wed, 29 Oct 2008 00:07:15 +0000 Subject: Auch wenn so gut wie keine Tastaturen diverse Spezialzeichen haben, nehm ich sie mal mit rein. dead_space gefixt git-svn-id: https://svn.neo-layout.org@1055 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/neo-vars/en_us.ahk | 109 +++++++++++++++++++++++++-------------- windows/neo-vars/makecompose.ahk | 15 ++++-- windows/neo-vars/neocomp.ahk | 11 ++-- 3 files changed, 88 insertions(+), 47 deletions(-) (limited to 'windows/neo-vars') diff --git a/windows/neo-vars/en_us.ahk b/windows/neo-vars/en_us.ahk index d8e7bf6..070a0bc 100644 --- a/windows/neo-vars/en_us.ahk +++ b/windows/neo-vars/en_us.ahk @@ -512,8 +512,8 @@ CDTcflxSCompU005FU0061:="U00AA" CDSCompU005EU005FU0061:="U00AA" CDTcflxU0032:="U00B2" CDSCompU005EU0032:="U00B2" -; illegal KP_Space in : "²" twosuperior # SUPERSCRIPT TWO -; illegal KP_Space in : "²" twosuperior # SUPERSCRIPT TWO +CDTcflxSNSpc:="U00B2" +CDSCompU005ESNSpc:="U00B2" CDTcflxSN__2:="U00B2" CDSCompU005ESN__2:="U00B2" CDTcflxU0033:="U00B3" @@ -5339,8 +5339,8 @@ CDTcflxU2212:="U207B" CDSCompU005EU2212:="U207B" CDTcflxU003D:="U207C" CDSCompU005EU003D:="U207C" -; illegal KP_Equal in : "⁼" U207C # SUPERSCRIPT EQUALS SIGN -; illegal KP_Equal in : "⁼" U207C # SUPERSCRIPT EQUALS SIGN +CDTcflxSNEql:="U207C" +CDSCompU005ESNEql:="U207C" CDTcflxU0028:="U207D" CDSCompU005EU0028:="U207D" CDTcflxU0029:="U207E" @@ -5358,10 +5358,10 @@ CDSCompU005FSN__1:="U2081" CDSCompU005FU0031:="U2081" CDSCompU005FSN__1:="U2081" CDSCompU005FU0032:="U2082" -; illegal KP_Space in : "₂" U2082 # SUBSCRIPT TWO +CDSCompU005FSNSpc:="U2082" CDSCompU005FSN__2:="U2082" CDSCompU005FU0032:="U2082" -; illegal KP_Space in : "₂" U2082 # SUBSCRIPT TWO +CDSCompU005FSNSpc:="U2082" CDSCompU005FSN__2:="U2082" CDSCompU005FU0033:="U2083" CDSCompU005FSN__3:="U2083" @@ -5398,9 +5398,9 @@ CDSCompU005FSNAdd:="U208A" CDSCompU005FU2212:="U208B" CDSCompU005FU2212:="U208B" CDSCompU005FU003D:="U208C" -; illegal KP_Equal in : "₌" U208C # SUBSCRIPT EQUALS SIGN +CDSCompU005FSNEql:="U208C" CDSCompU005FU003D:="U208C" -; illegal KP_Equal in : "₌" U208C # SUBSCRIPT EQUALS SIGN +CDSCompU005FSNEql:="U208C" CDSCompU005FU0028:="U208D" CDSCompU005FU0028:="U208D" CDSCompU005FU0029:="U208E" @@ -5437,7 +5437,8 @@ CDSCompU223CU0338:="U2247" CMSCompU2248:=1 CDSCompU2248U0338:="U2249" CDSCompU003DU0338:="U2260" -; illegal KP_Equal in : "≠" notequal # NOT EQUAL TO +CMSCompSNEql:=1 +CDSCompSNEqlU0338:="U2260" CMSCompU2261:=1 CDSCompU2261U0338:="U2262" CMSCompU224d:=1 @@ -5502,7 +5503,8 @@ CMSCompU0028SN__1:=1 CDSCompU0028SN__1U0029:="U2460" CMSCompU0028U0032:=1 CDSCompU0028U0032U0029:="U2461" -; illegal KP_Space in : "②" U2461 # CIRCLED DIGIT TWO +CMSCompU0028SNSpc:=1 +CDSCompU0028SNSpcU0029:="U2461" CMSCompU0028SN__2:=1 CDSCompU0028SN__2U0029:="U2461" CMSCompU0028U0033:=1 @@ -5551,12 +5553,14 @@ CMSCompU0028SN__1SN__1:=1 CDSCompU0028SN__1SN__1U0029:="U246A" CMSCompU0028U0031U0032:=1 CDSCompU0028U0031U0032U0029:="U246B" -; illegal KP_Space in <1> : "⑫" U246B # CIRCLED NUMBER TWELVE +CMSCompU0028U0031SNSpc:=1 +CDSCompU0028U0031SNSpcU0029:="U246B" CMSCompU0028U0031SN__2:=1 CDSCompU0028U0031SN__2U0029:="U246B" CMSCompU0028SN__1U0032:=1 CDSCompU0028SN__1U0032U0029:="U246B" -; illegal KP_Space in : "⑫" U246B # CIRCLED NUMBER TWELVE +CMSCompU0028SN__1SNSpc:=1 +CDSCompU0028SN__1SNSpcU0029:="U246B" CMSCompU0028SN__1SN__2:=1 CDSCompU0028SN__1SN__2U0029:="U246B" CMSCompU0028U0031U0033:=1 @@ -5619,8 +5623,10 @@ CMSCompU0028U0032U0030:=1 CDSCompU0028U0032U0030U0029:="U2473" CMSCompU0028U0032SN__0:=1 CDSCompU0028U0032SN__0U0029:="U2473" -; illegal KP_Space in <0> : "⑳" U2473 # CIRCLED NUMBER TWENTY -; illegal KP_Space in : "⑳" U2473 # CIRCLED NUMBER TWENTY +CMSCompU0028SNSpcU0030:=1 +CDSCompU0028SNSpcU0030U0029:="U2473" +CMSCompU0028SNSpcSN__0:=1 +CDSCompU0028SNSpcSN__0U0029:="U2473" CMSCompU0028SN__2U0030:=1 CDSCompU0028SN__2U0030U0029:="U2473" CMSCompU0028SN__2SN__0:=1 @@ -5825,31 +5831,40 @@ CMSCompU0028U0032U0031:=1 CDSCompU0028U0032U0031U0029:="U3251" CMSCompU0028U0032SN__1:=1 CDSCompU0028U0032SN__1U0029:="U3251" -; illegal KP_Space in <1> : "㉑" U3251 # CIRCLED NUMBER TWENTY ONE -; illegal KP_Space in : "㉑" U3251 # CIRCLED NUMBER TWENTY ONE +CMSCompU0028SNSpcU0031:=1 +CDSCompU0028SNSpcU0031U0029:="U3251" +CMSCompU0028SNSpcSN__1:=1 +CDSCompU0028SNSpcSN__1U0029:="U3251" CMSCompU0028SN__2U0031:=1 CDSCompU0028SN__2U0031U0029:="U3251" CMSCompU0028SN__2SN__1:=1 CDSCompU0028SN__2SN__1U0029:="U3251" CMSCompU0028U0032U0032:=1 CDSCompU0028U0032U0032U0029:="U3252" -; illegal KP_Space in <2> : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO +CMSCompU0028U0032SNSpc:=1 +CDSCompU0028U0032SNSpcU0029:="U3252" CMSCompU0028U0032SN__2:=1 CDSCompU0028U0032SN__2U0029:="U3252" -; illegal KP_Space in <2> : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO -; illegal KP_Space in : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO -; illegal KP_Space in : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO +CMSCompU0028SNSpcU0032:=1 +CDSCompU0028SNSpcU0032U0029:="U3252" +CMSCompU0028SNSpcSNSpc:=1 +CDSCompU0028SNSpcSNSpcU0029:="U3252" +CMSCompU0028SNSpcSN__2:=1 +CDSCompU0028SNSpcSN__2U0029:="U3252" CMSCompU0028SN__2U0032:=1 CDSCompU0028SN__2U0032U0029:="U3252" -; illegal KP_Space in : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO +CMSCompU0028SN__2SNSpc:=1 +CDSCompU0028SN__2SNSpcU0029:="U3252" CMSCompU0028SN__2SN__2:=1 CDSCompU0028SN__2SN__2U0029:="U3252" CMSCompU0028U0032U0033:=1 CDSCompU0028U0032U0033U0029:="U3253" CMSCompU0028U0032SN__3:=1 CDSCompU0028U0032SN__3U0029:="U3253" -; illegal KP_Space in <3> : "㉓" U3253 # CIRCLED NUMBER TWENTY THREE -; illegal KP_Space in : "㉓" U3253 # CIRCLED NUMBER TWENTY THREE +CMSCompU0028SNSpcU0033:=1 +CDSCompU0028SNSpcU0033U0029:="U3253" +CMSCompU0028SNSpcSN__3:=1 +CDSCompU0028SNSpcSN__3U0029:="U3253" CMSCompU0028SN__2U0033:=1 CDSCompU0028SN__2U0033U0029:="U3253" CMSCompU0028SN__2SN__3:=1 @@ -5858,8 +5873,10 @@ CMSCompU0028U0032U0034:=1 CDSCompU0028U0032U0034U0029:="U3254" CMSCompU0028U0032SN__4:=1 CDSCompU0028U0032SN__4U0029:="U3254" -; illegal KP_Space in <4> : "㉔" U3254 # CIRCLED NUMBER TWENTY FOUR -; illegal KP_Space in : "㉔" U3254 # CIRCLED NUMBER TWENTY FOUR +CMSCompU0028SNSpcU0034:=1 +CDSCompU0028SNSpcU0034U0029:="U3254" +CMSCompU0028SNSpcSN__4:=1 +CDSCompU0028SNSpcSN__4U0029:="U3254" CMSCompU0028SN__2U0034:=1 CDSCompU0028SN__2U0034U0029:="U3254" CMSCompU0028SN__2SN__4:=1 @@ -5868,8 +5885,10 @@ CMSCompU0028U0032U0035:=1 CDSCompU0028U0032U0035U0029:="U3255" CMSCompU0028U0032SN__5:=1 CDSCompU0028U0032SN__5U0029:="U3255" -; illegal KP_Space in <5> : "㉕" U3255 # CIRCLED NUMBER TWENTY FIVE -; illegal KP_Space in : "㉕" U3255 # CIRCLED NUMBER TWENTY FIVE +CMSCompU0028SNSpcU0035:=1 +CDSCompU0028SNSpcU0035U0029:="U3255" +CMSCompU0028SNSpcSN__5:=1 +CDSCompU0028SNSpcSN__5U0029:="U3255" CMSCompU0028SN__2U0035:=1 CDSCompU0028SN__2U0035U0029:="U3255" CMSCompU0028SN__2SN__5:=1 @@ -5878,8 +5897,10 @@ CMSCompU0028U0032U0036:=1 CDSCompU0028U0032U0036U0029:="U3256" CMSCompU0028U0032SN__6:=1 CDSCompU0028U0032SN__6U0029:="U3256" -; illegal KP_Space in <6> : "㉖" U3256 # CIRCLED NUMBER TWENTY SIX -; illegal KP_Space in : "㉖" U3256 # CIRCLED NUMBER TWENTY SIX +CMSCompU0028SNSpcU0036:=1 +CDSCompU0028SNSpcU0036U0029:="U3256" +CMSCompU0028SNSpcSN__6:=1 +CDSCompU0028SNSpcSN__6U0029:="U3256" CMSCompU0028SN__2U0036:=1 CDSCompU0028SN__2U0036U0029:="U3256" CMSCompU0028SN__2SN__6:=1 @@ -5888,8 +5909,10 @@ CMSCompU0028U0032U0037:=1 CDSCompU0028U0032U0037U0029:="U3257" CMSCompU0028U0032SN__7:=1 CDSCompU0028U0032SN__7U0029:="U3257" -; illegal KP_Space in <7> : "㉗" U3257 # CIRCLED NUMBER TWENTY SEVEN -; illegal KP_Space in : "㉗" U3257 # CIRCLED NUMBER TWENTY SEVEN +CMSCompU0028SNSpcU0037:=1 +CDSCompU0028SNSpcU0037U0029:="U3257" +CMSCompU0028SNSpcSN__7:=1 +CDSCompU0028SNSpcSN__7U0029:="U3257" CMSCompU0028SN__2U0037:=1 CDSCompU0028SN__2U0037U0029:="U3257" CMSCompU0028SN__2SN__7:=1 @@ -5898,8 +5921,10 @@ CMSCompU0028U0032U0038:=1 CDSCompU0028U0032U0038U0029:="U3258" CMSCompU0028U0032SN__8:=1 CDSCompU0028U0032SN__8U0029:="U3258" -; illegal KP_Space in <8> : "㉘" U3258 # CIRCLED NUMBER TWENTY EIGHT -; illegal KP_Space in : "㉘" U3258 # CIRCLED NUMBER TWENTY EIGHT +CMSCompU0028SNSpcU0038:=1 +CDSCompU0028SNSpcU0038U0029:="U3258" +CMSCompU0028SNSpcSN__8:=1 +CDSCompU0028SNSpcSN__8U0029:="U3258" CMSCompU0028SN__2U0038:=1 CDSCompU0028SN__2U0038U0029:="U3258" CMSCompU0028SN__2SN__8:=1 @@ -5908,8 +5933,10 @@ CMSCompU0028U0032U0039:=1 CDSCompU0028U0032U0039U0029:="U3259" CMSCompU0028U0032SN__9:=1 CDSCompU0028U0032SN__9U0029:="U3259" -; illegal KP_Space in <9> : "㉙" U3259 # CIRCLED NUMBER TWENTY NINE -; illegal KP_Space in : "㉙" U3259 # CIRCLED NUMBER TWENTY NINE +CMSCompU0028SNSpcU0039:=1 +CDSCompU0028SNSpcU0039U0029:="U3259" +CMSCompU0028SNSpcSN__9:=1 +CDSCompU0028SNSpcSN__9U0029:="U3259" CMSCompU0028SN__2U0039:=1 CDSCompU0028SN__2U0039U0029:="U3259" CMSCompU0028SN__2SN__9:=1 @@ -5932,12 +5959,14 @@ CMSCompU0028SN__3SN__1:=1 CDSCompU0028SN__3SN__1U0029:="U325B" CMSCompU0028U0033U0032:=1 CDSCompU0028U0033U0032U0029:="U325C" -; illegal KP_Space in <3> : "㉜" U325C # CIRCLED NUMBER THIRTY TWO +CMSCompU0028U0033SNSpc:=1 +CDSCompU0028U0033SNSpcU0029:="U325C" CMSCompU0028U0033SN__2:=1 CDSCompU0028U0033SN__2U0029:="U325C" CMSCompU0028SN__3U0032:=1 CDSCompU0028SN__3U0032U0029:="U325C" -; illegal KP_Space in : "㉜" U325C # CIRCLED NUMBER THIRTY TWO +CMSCompU0028SN__3SNSpc:=1 +CDSCompU0028SN__3SNSpcU0029:="U325C" CMSCompU0028SN__3SN__2:=1 CDSCompU0028SN__3SN__2U0029:="U325C" CMSCompU0028U0033U0033:=1 @@ -6168,12 +6197,14 @@ CMSCompU0028SN__4SN__1:=1 CDSCompU0028SN__4SN__1U0029:="U32B6" CMSCompU0028U0034U0032:=1 CDSCompU0028U0034U0032U0029:="U32B7" -; illegal KP_Space in <4> : "㊷" U32B7 # CIRCLED NUMBER FORTY TWO +CMSCompU0028U0034SNSpc:=1 +CDSCompU0028U0034SNSpcU0029:="U32B7" CMSCompU0028U0034SN__2:=1 CDSCompU0028U0034SN__2U0029:="U32B7" CMSCompU0028SN__4U0032:=1 CDSCompU0028SN__4U0032U0029:="U32B7" -; illegal KP_Space in : "㊷" U32B7 # CIRCLED NUMBER FORTY TWO +CMSCompU0028SN__4SNSpc:=1 +CDSCompU0028SN__4SNSpcU0029:="U32B7" CMSCompU0028SN__4SN__2:=1 CDSCompU0028SN__4SN__2U0029:="U32B7" CMSCompU0028U0034U0033:=1 diff --git a/windows/neo-vars/makecompose.ahk b/windows/neo-vars/makecompose.ahk index 7833fae..0794a9c 100644 --- a/windows/neo-vars/makecompose.ahk +++ b/windows/neo-vars/makecompose.ahk @@ -31,7 +31,13 @@ convertXkbsym(X) { check("Page_Down" ,"SPgDn") check("End" ,"S_End") check("Insert" ,"S_Ins") + check("KP_Space" ,"SNSpc") ; not + check("KP_Tab" ,"SNTab") ; not check("KP_Enter" ,"SNEnt") + check("KP_F1" ,"SNF_1") ; not + check("KP_F2" ,"SNF_2") ; not + check("KP_F3" ,"SNF_3") ; not + check("KP_F4" ,"SNF_4") ; not check("KP_Home" ,"SNHom") check("KP_Left" ,"SN_Le") check("KP_Up" ,"SN_Up") @@ -42,13 +48,16 @@ convertXkbsym(X) { check("KP_Next" ,"SNPDn") check("KP_Page_Down" ,"SNPDn") check("KP_End" ,"SNEnd") + check("KP_Begin" ,"SNBgn") ; not check("KP_Insert" ,"SNIns") check("KP_Delete" ,"SNDel") + check("KP_Equal" ,"SNEql") ; not + check("KP_Multiply" ,"SNMul") check("KP_Add" ,"SNAdd") + check("KP_Separator" ,"SNSep") ; not check("KP_Subtract" ,"SNSub") - check("KP_Multiply" ,"SNMul") - check("KP_Divide" ,"SNDiv") check("KP_Decimal" ,"SNDot") + check("KP_Divide" ,"SNDiv") check("KP_0" ,"SN__0") check("KP_1" ,"SN__1") check("KP_2" ,"SN__2") @@ -75,7 +84,7 @@ convertXkbsym(X) { check("dead_doubleacute" ,"Tdbac") check("dead_stroke" ,"Tstrk") check("space" ,"U0020") - check("dead_space" ,"U0020") + check("dead_space" ,"U00A0") check("exclam" ,"U0021") check("quotedbl" ,"U0022") check("numbersign" ,"U0023") diff --git a/windows/neo-vars/neocomp.ahk b/windows/neo-vars/neocomp.ahk index a12bf38..5ed1570 100644 --- a/windows/neo-vars/neocomp.ahk +++ b/windows/neo-vars/neocomp.ahk @@ -89,6 +89,7 @@ CDSCompU0047U0059:="U03A5" CDSCompU0067U0059:="U03A5" CDSCompU0047U0058:="U03A7" CDSCompU0067U0058:="U03A7" +CDTacutU03B1:="U1F71" CDU1FBFU03B1:="U1F00" CDU1FFEU03B1:="U1F01" CMU1FBFTgrav:=1 @@ -423,8 +424,11 @@ CDTcediTacutU03C9:="U1FF4" CDTtldeU03C9:="U1FF6" CDTtldeTcediU03C9:="U1FF7" CDTcediTtldeU03C9:="U1FF7" -; illegal *entry* in TONOS : "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS -; illegal *entry* in TONOS : "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS +CMTacutSComp:=1 +CMTacutSCompU0047:=1 +CDTacutSCompU0047U0041:="U0386" +CMTacutSCompU0067:=1 +CDTacutSCompU0067U0041:="U0386" CMU1FBFSComp:=1 CMU1FBFSCompU0047:=1 CDU1FBFSCompU0047U0041:="U1F08" @@ -710,10 +714,7 @@ CMTgravSCompU0047:=1 CDTgravSCompU0047U0041:="U1FBA" CMTgravSCompU0067:=1 CDTgravSCompU0067U0041:="U1FBA" -CMTacutSComp:=1 -CMTacutSCompU0047:=1 CDTacutSCompU0047U0041:="U1FBB" -CMTacutSCompU0067:=1 CDTacutSCompU0067U0041:="U1FBB" CMTcediSComp:=1 CMTcediSCompU0047:=1 -- cgit v1.2.3