Add the Colemak-DH-Wide keyboard layout.

3 files changed, 125 insertions, 4 deletions

diff --git a/rules/base.xml b/rules/base.xml
index dca28e11..83dfa528 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -1409,8 +1409,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>colemak_dh_iso</name>
-            <description>English (Colemak-DH ISO)</description>
+            <name>colemak_dh_wide</name>
+            <description>English (Colemak-DH Wide)</description>
           </configItem>
         </variant>
         <variant>
@@ -1419,7 +1419,18 @@
             <description>English (Colemak-DH Ortholinear)</description>
           </configItem>
         </variant>
-
+        <variant>
+          <configItem>
+            <name>colemak_dh_iso</name>
+            <description>English (Colemak-DH ISO)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>colemak_dh_wide_iso</name>
+            <description>English (Colemak-DH Wide ISO)</description>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
@@ -4896,6 +4907,18 @@
             <description>Norwegian (Colemak)</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>colemak_dh</name>
+            <description>Norwegian (Colemak-DH)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>colemak_dh_wide</name>
+            <description>Norwegian (Colemak-DH Wide)</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff --git a/symbols/no b/symbols/no
index fbf342c1..cf35d4e7 100644
--- a/symbols/no
+++ b/symbols/no
@@ -249,6 +249,33 @@ xkb_symbols "colemak" {
     key <AB06>	{ [         k,          K,          kra,    ampersand ] };
 };
 
+// Having a Colemak-DH variant in the Norwegian layout provides validation for users that this layout is suitable for typing Norwegian text.
+// Furthermore, staying true to the US layout gives interchangabilty benefits which far outperforms the benefits of providing a unique layout.
+// You can use the referenced layout to type Norwegian characters. See: https://colemak.com/Multilingual#Norwegian_.28Norsk_bokm.C3.A5l.29
+
+// Colemak-DH (ISO) symbols for xkb on X.Org Server 7.x
+// 2014-10-25 by SteveP, https://colemakmods.github.io/mod-dh/
+
+xkb_symbols "colemak_dh" {
+
+    name[Group1]= "Norwegian (Colemak-DH)";
+    include "us(colemak_dh_iso)"
+    
+
+    include "level3(ralt_switch)"
+};
+
+// Colemak-DH (Wide ISO) symbols for xkb on X.Org Server 7.x
+// https://colemakmods.github.io/mod-dh/
+
+xkb_symbols "colemak_dh_wide" {
+
+    include "us(colemak_dh_wide_iso)"
+    name[Group1]= "Norwegian (Colemak-DH Wide)";
+
+    include "level3(ralt_switch)"
+};
+
 // EXTRAS:
 
 partial alphanumeric_keys
diff --git a/symbols/us b/symbols/us
index b628701c..5a64e7ae 100644
--- a/symbols/us
+++ b/symbols/us
@@ -917,11 +917,57 @@ xkb_symbols "colemak_dh" {
     key <AB09> { [       period,      greater,   dead_abovedot,       asciitilde ] };
     key <AB10> { [        slash,     question,    questiondown,       asciitilde ] };
 
+    key <CAPS> { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
     key <SPCE> { [        space,        space,           space,     nobreakspace ] };
 
     include "level3(ralt_switch)"
 };
 
+// Colemak-DH (Wide) symbols for xkb on X.Org Server 7.x
+// https://colemakmods.github.io/mod-dh/
+
+xkb_symbols "colemak_dh_wide" {
+
+    include "us(colemak_dh)"
+    name[Group1]= "English (Colemak-DH Wide)";
+
+
+    key <AE07> { [        equal,         plus,             multiply,             division ] };
+    key <AE08> { [            7,    ampersand,                  eth,                  ETH ] };
+    key <AE09> { [            8,     asterisk,                thorn,                THORN ] };
+    key <AE10> { [            9,    parenleft,  leftsinglequotemark,  leftdoublequotemark ] };
+    key <AE11> { [            0,   parenright, rightsinglequotemark, rightdoublequotemark ] };
+    key <AE12> { [        minus,   underscore,               endash,               emdash ] };
+
+
+    key <AD06> { [  bracketleft,    braceleft,        guillemotleft,            0x1002039 ] };
+    key <AD07> { [            j,            J,              dstroke,              Dstroke ] };
+    key <AD08> { [            l,            L,              lstroke,              Lstroke ] };
+    key <AD09> { [            u,            U,               uacute,               Uacute ] };
+    key <AD10> { [            y,            Y,           udiaeresis,           Udiaeresis ] };
+    key <AD11> { [    semicolon,        colon,           odiaeresis,           Odiaeresis ] };
+    key <AD12> { [   apostrophe,     quotedbl,               otilde,               Otilde ] };
+
+
+    key <AC06> { [ bracketright,   braceright,       guillemotright,            0x100203a ] };
+    key <AC07> { [            m,            M,          dead_macron,           asciitilde ] };
+    key <AC08> { [            n,            N,               ntilde,               Ntilde ] };
+    key <AC09> { [            e,            E,               eacute,               Eacute ] };
+    key <AC10> { [            i,            I,               iacute,               Iacute ] };
+    key <AC11> { [            o,            O,               oacute,               Oacute ] };
+
+
+    key <AB06> { [        slash,     question,         questiondown,           asciitilde ] };
+    key <AB07> { [            k,            K,       dead_abovering,           asciitilde ] };
+    key <AB08> { [            h,            H,           dead_caron,           asciitilde ] };
+    key <AB09> { [        comma,         less,         dead_cedilla,           asciitilde ] };
+    key <AB10> { [       period,      greater,        dead_abovedot,           asciitilde ] };
+    key <AB11> { [        slash,     question,         questiondown,           asciitilde ] };
+
+    include "level3(ralt_switch)"
+};
+
+
 // Colemak-DH (ISO) symbols for xkb on X.Org Server 7.x
 // https://colemakmods.github.io/mod-dh/
 
@@ -930,7 +976,32 @@ xkb_symbols "colemak_dh_iso" {
     include "us(colemak_dh)"
     name[Group1]= "English (Colemak-DH ISO)";
 
-    key <AB05> { [ backslash, bar, asciitilde, brokenbar] };
+
+    key <BKSL> { [ numbersign, asciitilde,  backslash,       bar ] };
+
+
+    key <AB05> { [  backslash,        bar, asciitilde, brokenbar ] };
+
+
+    include "level3(ralt_switch)"
+};
+
+// Colemak-DH (Wide ISO) symbols for xkb on X.Org Server 7.x
+// https://colemakmods.github.io/mod-dh/
+
+xkb_symbols "colemak_dh_wide_iso" {
+
+    include "us(colemak_dh_wide)"
+    name[Group1]= "English (Colemak-DH Wide ISO)";
+
+
+    key <AD12> { [ numbersign, asciitilde,    backslash,  bar       ] };
+    key <BKSL> { [ apostrophe,   quotedbl,       otilde,     Otilde ] };
+
+
+    key <AB05> { [  backslash,        bar,   asciitilde,  brokenbar ] };
+    key <AB06> { [      slash,   question, questiondown, asciitilde ] };
+
 
     include "level3(ralt_switch)"
 };