Merge pull request 'Layer 4 und Ziffernblock fixes für Bone/NeoQwertz' (#662) from jgosmann/neo-layout:fix-l4-bone-neoqwertz into master

Reviewed-on: #662
This commit is contained in:
Mike1 2024-09-17 08:45:23 +02:00
commit f17996189f
2 changed files with 262 additions and 104 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.1" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "file://localhost/System/Library/DTDs/KeyboardLayout.dtd">
<!--Last edited by Ukelele version 346 on 2022-06-19 at 16:37 (CEST)-->
<keyboard group="126" id="-14683" name="Deutsch (Bone)" maxout="3">
<!--Last edited by Ukelele version 396 on 2024-09-15 at 15:45 (GMT+2)-->
<keyboard group="126" id="-5743" name="Deutsch (Bone)" maxout="3">
<layouts>
<layout first="0" last="0" mapSet="138" modifiers="30"/>
</layouts>
@ -101,12 +101,13 @@
<key code="67" output="*"/>
<key code="69" output="+"/>
<key code="70" output="&#x001C;"/>
<key code="71" output="&#x001B;"/>
<key code="71" output="&#x0009;"/>
<key code="72" output="&#x001F;"/>
<key code="75" output="/"/>
<key code="76" output="&#x000D;"/>
<key code="77" output="&#x001E;"/>
<key code="78" output="-"/>
<key code="79" output=""/>
<key code="80" output="&#x0010;"/>
<key code="81" output="="/>
<key code="82" output="0"/>
@ -207,30 +208,30 @@
<key code="52" output="&#x0003;"/>
<key code="53" output="&#x001B;"/>
<key code="64" output="&#x0010;"/>
<key code="65" output=""/>
<key code="65" output="."/>
<key code="66" output="*"/>
<key code="67" output=""/>
<key code="69" output=""/>
<key code="67" action="action 4"/>
<key code="69" action="action 6"/>
<key code="70" output="+"/>
<key code="71" output="&#x001B;"/>
<key code="71" action="&#x001B;"/>
<key code="72" output="="/>
<key code="75" output=""/>
<key code="75" action="action 3"/>
<key code="76" output="&#x0003;"/>
<key code="77" output="/"/>
<key code="78" output=""/>
<key code="78" action="action 5"/>
<key code="79" output="&#x0010;"/>
<key code="80" output="&#x0010;"/>
<key code="81" output=""/>
<key code="82" output=""/>
<key code="83" output=""/>
<key code="84" output=""/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=""/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="82" output=""/>
<key code="83" output=""/>
<key code="84" output=""/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=""/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="96" output="&#x0010;"/>
<key code="97" output="&#x0010;"/>
<key code="98" output="&#x0010;"/>
@ -558,30 +559,30 @@
<key code="52" output="&#x0003;"/>
<key code="53" output="&#x001B;"/>
<key code="64" output="&#x0010;"/>
<key code="65" output=""/>
<key code="65" output=","/>
<key code="66" output="&#x001D;"/>
<key code="67" output=""/>
<key code="69" output=""/>
<key code="67" output=""/>
<key code="69" output="±"/>
<key code="70" output="&#x001C;"/>
<key code="71" output="&#x001B;"/>
<key code="71" output="="/>
<key code="72" output="&#x001F;"/>
<key code="75" output=""/>
<key code="75" output="÷"/>
<key code="76" output="&#x0003;"/>
<key code="77" output="&#x001E;"/>
<key code="78" output=""/>
<key code="78" output=""/>
<key code="79" output="&#x0010;"/>
<key code="80" output="&#x0010;"/>
<key code="81" output=""/>
<key code="82" output=""/>
<key code="83" output=""/>
<key code="84" output=""/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=""/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="82" output="%"/>
<key code="83" output=""/>
<key code="84" output=""/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=":"/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="96" output="&#x0010;"/>
<key code="97" output="&#x0010;"/>
<key code="98" output="&#x0010;"/>
@ -672,30 +673,30 @@
<key code="55" output=""/>
<key code="58" output=""/>
<key code="64" output="&#x0010;"/>
<key code="65" output=""/>
<key code="65" action="action 19"/>
<key code="66" output="*"/>
<key code="67" output=""/>
<key code="69" output=""/>
<key code="67" action="action 8"/>
<key code="69" action="action 16"/>
<key code="70" output="+"/>
<key code="71" output="&#x001B;"/>
<key code="71" action="&#x001B; 1"/>
<key code="72" output="="/>
<key code="75" output=""/>
<key code="75" action="action 7"/>
<key code="76" output="&#x0003;"/>
<key code="77" output="/"/>
<key code="78" output=""/>
<key code="78" action="action 12"/>
<key code="79" output="&#x0010;"/>
<key code="80" output="&#x0010;"/>
<key code="81" output=""/>
<key code="82" output=""/>
<key code="82" action="action 18"/>
<key code="83" action="Ebene 4 und 6 1"/>
<key code="84" action="Bugfixes"/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=""/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="85" action="action 17"/>
<key code="86" action="action 13"/>
<key code="87" action="action 14"/>
<key code="88" action="action 15"/>
<key code="89" action="action 9"/>
<key code="91" action="action 10"/>
<key code="92" action="action 11"/>
<key code="96" output="&#x0010;"/>
<key code="97" output="&#x0010;"/>
<key code="98" output="&#x0010;"/>
@ -1184,6 +1185,14 @@
<action id="&#x000C;">
<when state="none" next="Ebene 4 und 6"/>
</action>
<action id="&#x001B;">
<when state="none" output="&#x0009;"/>
<when state="Ebene 4 und 6" output="≠"/>
</action>
<action id="&#x001B; 1">
<when state="none" output="≈"/>
<when state="Ebene 4 und 6" output="≡"/>
</action>
<action id="&#x0027;">
<when state="none" output="&#x0027;"/>
</action>
@ -2333,6 +2342,7 @@
<when state="none" output="B"/>
<when state="Ebene 3 T1 Drehen" output="𐐒"/>
<when state="Ebene 4 T1 Punkt darüber" output="Ḃ"/>
<when state="Ebene 4 und 6" output="¿"/>
<when state="Ebene 5 T1 Haken" output="Ɓ"/>
<when state="Ebene 6 T1 Punkt darunter" output="Ḅ"/>
<when state="Ebene 6 T2 Macron" output="Ḇ"/>
@ -2434,7 +2444,6 @@
<when state="none" output="K"/>
<when state="Ebene 2 T1 Caron Hatschek" output="Ǩ"/>
<when state="Ebene 2 T2 Cedille" output="Ķ"/>
<when state="Ebene 4 und 6" output="¡"/>
<when state="Ebene 5 T1 Haken" output="Ƙ"/>
<when state="Ebene 6 T1 Punkt darunter" output="Ḳ"/>
<when state="Ebene 6 T2 Macron" output="Ḵ"/>
@ -2454,6 +2463,7 @@
<when state="none" output="P"/>
<when state="Ebene 3 T1 Drehen" output="Ԁ"/>
<when state="Ebene 4 T1 Punkt darüber" output="Ṗ"/>
<when state="Ebene 4 und 6" output="¡"/>
<when state="Ebene 5 T1 Haken" output="Ƥ"/>
</action>
<action id="40">
@ -3179,14 +3189,16 @@
<when state="compso greater" output="≫"/>
</action>
<action id="Bugfixes">
<when state="none" next="Bugfixes"/>
<when state="none" output=""/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="Ebene 4 und 6">
<when state="none" output=" "/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="Ebene 4 und 6 1">
<when state="none" next="Ebene 4 und 6"/>
<when state="none" output="≤"/>
<when state="Ebene 4 und 6" output="⌊"/>
</action>
<action id="Ebene 4 und 7">
<when state="none" next="Ebene 4 und 6"/>
@ -3210,10 +3222,78 @@
<when state="none" output=""/>
<when state="Ebene 4 und 6" output="√"/>
</action>
<action id="action 10">
<when state="none" output="∩"/>
<when state="Ebene 4 und 6" output="⋂"/>
</action>
<action id="action 11">
<when state="none" output="≫"/>
<when state="Ebene 4 und 6" output="⌉"/>
</action>
<action id="action 12">
<when state="none" output="⊖"/>
<when state="Ebene 4 und 6" output="∸"/>
</action>
<action id="action 13">
<when state="none" output="⊂"/>
<when state="Ebene 4 und 6" output="⊆"/>
</action>
<action id="action 14">
<when state="none" output="⊶"/>
<when state="Ebene 4 und 6" output="⊷"/>
</action>
<action id="action 15">
<when state="none" output="⊃"/>
<when state="Ebene 4 und 6" output="⊇"/>
</action>
<action id="action 16">
<when state="none" output="⊕"/>
<when state="Ebene 4 und 6" output="∔"/>
</action>
<action id="action 17">
<when state="none" output="≥"/>
<when state="Ebene 4 und 6" output="⌋"/>
</action>
<action id="action 18">
<when state="none" output="‰"/>
<when state="Ebene 4 und 6" output="□"/>
</action>
<action id="action 19">
<when state="none" output=""/>
<when state="Ebene 4 und 6" output="″"/>
</action>
<action id="action 2">
<when state="none" output=""/>
<when state="Ebene 4 und 6" output="⊂"/>
</action>
<action id="action 3">
<when state="none" output="/"/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="action 4">
<when state="none" output="*"/>
<when state="Ebene 4 und 6" output="×"/>
</action>
<action id="action 5">
<when state="none" output="-"/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="action 6">
<when state="none" output="+"/>
<when state="Ebene 4 und 6" output="∓"/>
</action>
<action id="action 7">
<when state="none" output="⌀"/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="action 8">
<when state="none" output="⊙"/>
<when state="Ebene 4 und 6" output="⊗"/>
</action>
<action id="action 9">
<when state="none" output="≪"/>
<when state="Ebene 4 und 6" output="⌈"/>
</action>
<action id="compose">
<when state="none" next="compose"/>
<when state="Ebene 2 T1 Caron Hatschek" next="caron compose"/>

View File

@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "file://localhost/System/Library/DTDs/KeyboardLayout.dtd">
<!--Last edited by Ukelele version 346 on 2022-06-19 at 16:38 (CEST)-->
<!--Last edited by Ukelele version 396 on 2024-09-15 at 15:45 (GMT+2)-->
<keyboard group="126" id="-7045" name="Deutsch (NeoQwertz)" maxout="3">
<layouts>
<layout first="0" last="0" mapSet="138" modifiers="30"/>
@ -101,7 +101,7 @@
<key code="67" output="*"/>
<key code="69" output="+"/>
<key code="70" output="&#x001C;"/>
<key code="71" output="&#x001B;"/>
<key code="71" output="&#x0009;"/>
<key code="72" output="&#x001F;"/>
<key code="75" output="/"/>
<key code="76" output="&#x000D;"/>
@ -208,30 +208,30 @@
<key code="52" output="&#x0003;"/>
<key code="53" output="&#x001B;"/>
<key code="64" output="&#x0010;"/>
<key code="65" output=""/>
<key code="65" output="."/>
<key code="66" output="*"/>
<key code="67" output=""/>
<key code="69" output=""/>
<key code="67" action="action 3"/>
<key code="69" action="action 5"/>
<key code="70" output="+"/>
<key code="71" output="&#x001B;"/>
<key code="71" action="&#x001B;"/>
<key code="72" output="="/>
<key code="75" output=""/>
<key code="75" action="action 2"/>
<key code="76" output="&#x0003;"/>
<key code="77" output="/"/>
<key code="78" output=""/>
<key code="78" action="action 4"/>
<key code="79" output="&#x0010;"/>
<key code="80" output="&#x0010;"/>
<key code="81" output=""/>
<key code="82" output=""/>
<key code="83" output=""/>
<key code="84" output=""/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=""/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="82" output=""/>
<key code="83" output=""/>
<key code="84" output=""/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=""/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="96" output="&#x0010;"/>
<key code="97" output="&#x0010;"/>
<key code="98" output="&#x0010;"/>
@ -527,30 +527,30 @@
<key code="52" output="&#x0003;"/>
<key code="53" output="&#x001B;"/>
<key code="64" output="&#x0010;"/>
<key code="65" output=""/>
<key code="65" output=","/>
<key code="66" output="&#x001D;"/>
<key code="67" output=""/>
<key code="69" output=""/>
<key code="67" output=""/>
<key code="69" output="±"/>
<key code="70" output="&#x001C;"/>
<key code="71" output="&#x001B;"/>
<key code="71" output="="/>
<key code="72" output="&#x001F;"/>
<key code="75" output=""/>
<key code="75" output="÷"/>
<key code="76" output="&#x0003;"/>
<key code="77" output="&#x001E;"/>
<key code="78" output=""/>
<key code="78" output=""/>
<key code="79" output="&#x0010;"/>
<key code="80" output="&#x0010;"/>
<key code="81" output=""/>
<key code="82" output=""/>
<key code="83" output=""/>
<key code="84" output=""/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=""/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="82" output="%"/>
<key code="83" output=""/>
<key code="84" output=""/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=":"/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="96" output="&#x0010;"/>
<key code="97" output="&#x0010;"/>
<key code="98" output="&#x0010;"/>
@ -641,30 +641,30 @@
<key code="55" output=""/>
<key code="58" output=""/>
<key code="64" output="&#x0010;"/>
<key code="65" output=""/>
<key code="65" action="action 18"/>
<key code="66" output="*"/>
<key code="67" output=""/>
<key code="69" output=""/>
<key code="67" action="action 7"/>
<key code="69" action="action 15"/>
<key code="70" output="+"/>
<key code="71" output="&#x001B;"/>
<key code="71" action="&#x001B; 1"/>
<key code="72" output="="/>
<key code="75" output=""/>
<key code="75" action="action 6"/>
<key code="76" output="&#x0003;"/>
<key code="77" output="/"/>
<key code="78" output=""/>
<key code="78" action="action 11"/>
<key code="79" output="&#x0010;"/>
<key code="80" output="&#x0010;"/>
<key code="81" output=""/>
<key code="82" output=""/>
<key code="82" action="action 17"/>
<key code="83" action="Ebene 4 und 6 1"/>
<key code="84" action="Bugfixes"/>
<key code="85" output=""/>
<key code="86" output=""/>
<key code="87" output=""/>
<key code="88" output=""/>
<key code="89" output=""/>
<key code="91" output=""/>
<key code="92" output=""/>
<key code="85" action="action 16"/>
<key code="86" action="action 12"/>
<key code="87" action="action 13"/>
<key code="88" action="action 14"/>
<key code="89" action="action 8"/>
<key code="91" action="action 9"/>
<key code="92" action="action 10"/>
<key code="96" output="&#x0010;"/>
<key code="97" output="&#x0010;"/>
<key code="98" output="&#x0010;"/>
@ -1137,6 +1137,14 @@
<action id="&#x000C;">
<when state="none" next="Ebene 4 und 6"/>
</action>
<action id="&#x001B;">
<when state="none" output="&#x0009;"/>
<when state="Ebene 4 und 6" output="≠"/>
</action>
<action id="&#x001B; 1">
<when state="none" output="≈"/>
<when state="Ebene 4 und 6" output="≡"/>
</action>
<action id="&#x0027;">
<when state="none" output="&#x0027;"/>
</action>
@ -2360,6 +2368,7 @@
<when state="Ebene 3 T3 Schrägstrich" output="Ħ"/>
<when state="Ebene 4 T1 Punkt darüber" output="Ḣ"/>
<when state="Ebene 4 T2 Trema Diaeresis" output="Ḧ"/>
<when state="Ebene 4 und 6" output="¿"/>
<when state="Ebene 6 T1 Punkt darunter" output="Ḥ"/>
<when state="Ebene 6 T3 Breve" output="Ḫ"/>
<when state="compose -" output="Ħ"/>
@ -2389,7 +2398,6 @@
<when state="none" output="K"/>
<when state="Ebene 2 T1 Caron Hatschek" output="Ǩ"/>
<when state="Ebene 2 T2 Cedille" output="Ķ"/>
<when state="Ebene 4 und 6" output="¡"/>
<when state="Ebene 5 T1 Haken" output="Ƙ"/>
<when state="Ebene 6 T1 Punkt darunter" output="Ḳ"/>
<when state="Ebene 6 T2 Macron" output="Ḵ"/>
@ -2439,7 +2447,6 @@
<when state="Ebene 2 T2 Cedille" output="Ş"/>
<when state="Ebene 3 T1 Drehen" output="Ƨ"/>
<when state="Ebene 4 T1 Punkt darüber" output="Ṡ"/>
<when state="Ebene 4 und 6" output="¿"/>
<when state="Ebene 6 T1 Punkt darunter" output="Ṣ"/>
<!--<when state="compose" next="compose S"/>-->
</action>
@ -2874,6 +2881,7 @@
<when state="Ebene 2 T1 Caron Hatschek" output="Ž"/>
<when state="Ebene 3 T3 Schrägstrich" output="Ƶ"/>
<when state="Ebene 4 T1 Punkt darüber" output="Ż"/>
<when state="Ebene 4 und 6" output="¡"/>
<when state="Ebene 6 T1 Punkt darunter" output="Ẓ"/>
<when state="Ebene 6 T2 Macron" output="Ẕ"/>
<when state="caron compose D" output="DŽ"/>
@ -3134,14 +3142,16 @@
<when state="compso greater" output="≫"/>
</action>
<action id="Bugfixes">
<when state="none" next="Bugfixes"/>
<when state="none" output=""/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="Ebene 4 und 6">
<when state="none" next="Ebene 4 und 6"/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="Ebene 4 und 6 1">
<when state="none" next="Ebene 4 und 6"/>
<when state="none" output="≤"/>
<when state="Ebene 4 und 6" output="⌊"/>
</action>
<action id="`">
<when state="none" next="Ebene 1 T2 Gravis"/>
@ -3157,6 +3167,74 @@
<when state="none" output=""/>
<when state="Ebene 4 und 6" output="√"/>
</action>
<action id="action 10">
<when state="none" output="≫"/>
<when state="Ebene 4 und 6" output="⌉"/>
</action>
<action id="action 11">
<when state="none" output="⊖"/>
<when state="Ebene 4 und 6" output="∸"/>
</action>
<action id="action 12">
<when state="none" output="⊂"/>
<when state="Ebene 4 und 6" output="⊆"/>
</action>
<action id="action 13">
<when state="none" output="⊶"/>
<when state="Ebene 4 und 6" output="⊷"/>
</action>
<action id="action 14">
<when state="none" output="⊃"/>
<when state="Ebene 4 und 6" output="⊇"/>
</action>
<action id="action 15">
<when state="none" output="⊕"/>
<when state="Ebene 4 und 6" output="∔"/>
</action>
<action id="action 16">
<when state="none" output="≥"/>
<when state="Ebene 4 und 6" output="⌋"/>
</action>
<action id="action 17">
<when state="none" output="‰"/>
<when state="Ebene 4 und 6" output="□"/>
</action>
<action id="action 18">
<when state="none" output=""/>
<when state="Ebene 4 und 6" output="″"/>
</action>
<action id="action 2">
<when state="none" output="/"/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="action 3">
<when state="none" output="*"/>
<when state="Ebene 4 und 6" output="×"/>
</action>
<action id="action 4">
<when state="none" output="-"/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="action 5">
<when state="none" output="+"/>
<when state="Ebene 4 und 6" output="∓"/>
</action>
<action id="action 6">
<when state="none" output="⌀"/>
<when state="Ebene 4 und 6" output=""/>
</action>
<action id="action 7">
<when state="none" output="⊙"/>
<when state="Ebene 4 und 6" output="⊗"/>
</action>
<action id="action 8">
<when state="none" output="≪"/>
<when state="Ebene 4 und 6" output="⌈"/>
</action>
<action id="action 9">
<when state="none" output="∩"/>
<when state="Ebene 4 und 6" output="⋂"/>
</action>
<action id="compose">
<when state="none" next="compose"/>
<when state="Ebene 2 T1 Caron Hatschek" next="caron compose"/>