neo
/
neo-layout
15
15
Fork 24
Code Issues 68 Pull Requests 3 Releases Wiki Activity

Fix neo qwertz conflicting shortcut complex modification #629

Merged
Mike1 merged 2 commits from siboehm/neo-layout:siboehm/FixNeoQwertzProblematicShortcuts into master 2023-04-15 17:10:49 +02:00
Conversation 5 Commits 2 Files Changed 1 +30 -28
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (NeoQwertz).keylayout
View File

@ -1148,6 +1148,7 @@
</action>
<action id="-">
<when state="none" output="-"/>
<when state="Bugfixes" output=";"/>
<when state="Ebene 1 T1 Zirkumflex" output="⁻"/>
<when state="compose" next="compose -"/>
<when state="compose +" output="±"/>
@ -1176,7 +1177,7 @@
</action>
<action id="101">
<when state="none" output="d"/>
<when state="Bugfixes" output=":"/>
<when state="Bugfixes" output="{"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ď"/>
<when state="Ebene 2 T2 Cedille" output="ḑ"/>
<when state="Ebene 3 T1 Drehen" output="p"/>
@ -1203,7 +1204,7 @@
</action>
<action id="103">
<when state="none" output="f"/>
<when state="Bugfixes" output="="/>
<when state="Bugfixes" output="}"/>
<when state="Ebene 3 T1 Drehen" output="ɟ"/>
<when state="Ebene 4 T1 Punkt darüber" output="ḟ"/>
<when state="Ebene 5 T1 Haken" output="ƒ"/>
@ -1212,7 +1213,7 @@
</action>
<action id="104">
<when state="none" output="g"/>
<when state="Bugfixes" output="&#x003E;"/>
<when state="Bugfixes" output="*"/>
<when state="Ebene 1 T1 Zirkumflex" output="ĝ"/>
<when state="Ebene 1 T3 Akut" output="ǵ"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ǧ"/>
@ -1228,7 +1229,7 @@
</action>
<action id="105">
<when state="none" output="h"/>
<when state="Bugfixes" output="&#x003C;"/>
<when state="Bugfixes" output="?"/>
<when state="Ebene 1 T1 Zirkumflex" output="ĥ"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ȟ"/>
<when state="Ebene 2 T2 Cedille" output="ḩ"/>
@ -1251,7 +1252,7 @@
</action>
<action id="106">
<when state="none" output="j"/>
<when state="Bugfixes" output=";"/>
<when state="Bugfixes" output="("/>
<when state="Ebene 1 T1 Zirkumflex" output="ĵ"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ǰ"/>
<when state="Ebene 3 T1 Drehen" output="ɾ"/>
@ -1265,7 +1266,7 @@
</action>
<action id="107">
<when state="none" output="k"/>
<when state="Bugfixes" output="!"/>
<when state="Bugfixes" output=")"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ǩ"/>
<when state="Ebene 2 T2 Cedille" output="ķ"/>
<when state="Ebene 3 T1 Drehen" output="ʞ"/>
@ -1285,6 +1286,7 @@
</action>
<action id="109">
<when state="none" output="p"/>
<when state="Bugfixes" output="…"/>
<when state="Ebene 3 T1 Drehen" output="d"/>
<when state="Ebene 4 T1 Punkt darüber" output="ṗ"/>
<when state="Ebene 5 T1 Haken" output="ƥ"/>
@ -1297,12 +1299,12 @@
</action>
<action id="110">
<when state="none" output="q"/>
<when state="Bugfixes" output="&#x0026;"/>
<when state="Bugfixes" output="…"/>
<when state="Ebene 3 T1 Drehen" output="b"/>
</action>
<action id="111">
<when state="none" output="r"/>
<when state="Bugfixes" output=")"/>
<when state="Bugfixes" output="]"/>
<when state="Ebene 1 T3 Akut" output="ŕ"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ř"/>
<when state="Ebene 2 T2 Cedille" output="ŗ"/>
@ -1319,7 +1321,7 @@
</action>
<action id="112">
<when state="none" output="s"/>
<when state="Bugfixes" output="?"/>
<when state="Bugfixes" output="/"/>
<when state="Ebene 1 T1 Zirkumflex" output="ŝ"/>
<when state="Ebene 1 T3 Akut" output="ś"/>
<when state="Ebene 2 T1 Caron Hatschek" output="š"/>
@ -1332,7 +1334,7 @@
</action>
<action id="113">
<when state="none" output="t"/>
<when state="Bugfixes" output="-"/>
<when state="Bugfixes" output="^"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ť"/>
<when state="Ebene 2 T2 Cedille" output="ţ"/>
<when state="Ebene 3 T1 Drehen" output="ʇ"/>
@ -1346,7 +1348,7 @@
</action>
<action id="114">
<when state="none" output="v"/>
<when state="Bugfixes" output="_"/>
<when state="Bugfixes" output="~"/>
<when state="Ebene 2 T3 Tilde" output="ṽ"/>
<when state="Ebene 3 T1 Drehen" output="ʌ"/>
<when state="Ebene 5 T1 Haken" output="ⱱ"/>
@ -1354,7 +1356,7 @@
</action>
<action id="115">
<when state="none" output="w"/>
<when state="Bugfixes" output="^"/>
<when state="Bugfixes" output="_"/>
<when state="Ebene 1 T1 Zirkumflex" output="ŵ"/>
<when state="Ebene 1 T2 Gravis" output="ẁ"/>
<when state="Ebene 1 T3 Akut" output="ẃ"/>
@ -1369,7 +1371,7 @@
</action>
<action id="116">
<when state="none" output="x"/>
<when state="Bugfixes" output="…"/>
<when state="Bugfixes" output="$"/>
<when state="Ebene 1 T3 Akut" output="ź"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ǯ"/>
<when state="Ebene 4 T1 Punkt darüber" output="ẋ"/>
@ -1391,7 +1393,7 @@
</action>
<action id="12">
<when state="none" output="ä"/>
<when state="Bugfixes" output="|"/>
<when state="Bugfixes" output="@"/>
<when state="Ebene 4 T2 Trema Diaeresis" output="ä"/>
<when state="Ebene 5 Spiritus lenis" output="ἠ"/>
<when state="Ebene 5 T2 Spiritus asper" output="ἡ"/>
@ -1409,12 +1411,12 @@
</action>
<action id="123">
<when state="none" output="ö"/>
<when state="Bugfixes" output="$"/>
<when state="Bugfixes" output=":"/>
<when state="Ebene 4 T2 Trema Diaeresis" output="ö"/>
</action>
<action id="124">
<when state="none" output="ü"/>
<when state="Bugfixes" output="#"/>
<when state="Bugfixes" output="ſ"/>
<when state="Ebene 1 T3 Akut" output="ǘ"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ǚ"/>
<when state="Ebene 4 T2 Trema Diaeresis" output="ü"/>
@ -1462,7 +1464,7 @@
</action>
<action id="135">
<when state="none" output="p"/>
<when state="Bugfixes" output="~"/>
<when state="Bugfixes" output="&#x0026;"/>
<when state="Ebene 3 T1 Drehen" output="d"/>
<when state="Ebene 4 T1 Punkt darüber" output="ṗ"/>
<when state="Ebene 5 T1 Haken" output="ƥ"/>
@ -2547,7 +2549,7 @@
</action>
<action id="62">
<when state="none" output="o"/>
<when state="Bugfixes" output="*"/>
<when state="Bugfixes" output="="/>
<when state="Ebene 1 T1 Zirkumflex" output="ô"/>
<when state="Ebene 1 T2 Gravis" output="ò"/>
<when state="Ebene 1 T3 Akut" output="ó"/>
@ -2635,7 +2637,7 @@
</action>
<action id="67">
<when state="none" output="i"/>
<when state="Bugfixes" output="/"/>
<when state="Bugfixes" output=">"/>
<when state="Ebene 1 T1 Zirkumflex" output="î"/>
<when state="Ebene 1 T2 Gravis" output="ì"/>
<when state="Ebene 1 T3 Akut" output="í"/>
@ -2680,7 +2682,7 @@
</action>
<action id="69">
<when state="none" output="e"/>
<when state="Bugfixes" output="}"/>
<when state="Bugfixes" output="["/>
<when state="Ebene 1 T1 Zirkumflex" output="ê"/>
<when state="Ebene 1 T2 Gravis" output="è"/>
<when state="Ebene 1 T3 Akut" output="é"/>
@ -2774,7 +2776,7 @@
</action>
<action id="75">
<when state="none" output="n"/>
<when state="Bugfixes" output="("/>
<when state="Bugfixes" output="+"/>
<when state="Ebene 1 T1 Zirkumflex" output="ⁿ"/>
<when state="Ebene 1 T2 Gravis" output="ǹ"/>
<when state="Ebene 1 T3 Akut" output="ń"/>
@ -2855,7 +2857,7 @@
</action>
<action id="80">
<when state="none" output="l"/>
<when state="Bugfixes" output="["/>
<when state="Bugfixes" output=";"/>
<when state="Ebene 1 T3 Akut" output="ĺ"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ľ"/>
<when state="Ebene 2 T2 Cedille" output="ļ"/>
@ -2879,7 +2881,7 @@
</action>
<action id="82">
<when state="none" output="z"/>
<when state="Bugfixes" output="`"/>
<when state="Bugfixes" output="!"/>
<when state="Ebene 1 T3 Akut" output="ź"/>
<when state="Ebene 2 T1 Caron Hatschek" output="ž"/>
<when state="Ebene 3 T2 Ring" output="ʑ"/>
@ -2897,7 +2899,7 @@
</action>
<action id="83">
<when state="none" output="u"/>
<when state="Bugfixes" output="\"/>
<when state="Bugfixes" output="&#x003c;"/>
<when state="Ebene 1 T1 Zirkumflex" output="û"/>
<when state="Ebene 1 T2 Gravis" output="ù"/>
<when state="Ebene 1 T3 Akut" output="ú"/>
@ -2930,7 +2932,7 @@
</action>
<action id="85">
<when state="none" output="a"/>
<when state="Bugfixes" output="{"/>
<when state="Bugfixes" output="\"/>
<when state="Ebene 1 T1 Zirkumflex" output="â"/>
<when state="Ebene 1 T2 Gravis" output="à"/>
<when state="Ebene 1 T3 Akut" output="á"/>
@ -3029,7 +3031,7 @@
</action>
<action id="92">
<when state="none" output="y"/>
<when state="Bugfixes" output="@"/>
<when state="Bugfixes" output="#"/>
<when state="Ebene 1 T1 Zirkumflex" output="ŷ"/>
<when state="Ebene 1 T2 Gravis" output="ỳ"/>
<when state="Ebene 1 T3 Akut" output="ý"/>
@ -3083,7 +3085,7 @@
</action>
<action id="98">
<when state="none" output="b"/>
<when state="Bugfixes" output="+"/>
<when state="Bugfixes" output="`"/>
<when state="Ebene 3 T1 Drehen" output="q"/>
<when state="Ebene 3 T3 Schrägstrich" output="ƀ"/>
<when state="Ebene 4 T1 Punkt darüber" output="ḃ"/>
@ -3093,7 +3095,7 @@
</action>
<action id="99">
<when state="none" output="c"/>
<when state="Bugfixes" output="]"/>
<when state="Bugfixes" output="|"/>
<when state="Ebene 1 T1 Zirkumflex" output="ĉ"/>
<when state="Ebene 1 T3 Akut" output="ć"/>
<when state="Ebene 2 T1 Caron Hatschek" output="č"/>