Japanese Dvorak layout

https://bugs.freedesktop.org/show_bug.cgi?id=46015

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 6c17faa..d9883f1 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3464,6 +3464,12 @@
             <_description>Japanese (Macintosh)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Japanese (Dvorak)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>

diff --git a/symbols/jp b/symbols/jp
index a80e023..4ef77f8 100644 (file)
--- a/symbols/jp
+++ b/symbols/jp
@@ -252,3 +252,43 @@ xkb_symbols "hztg_escape" {
     replace key <HZTG> { [ Escape ] };
 };
 
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+    name[Group1]       = "Japanese (Dvorak)";
+    include "jp(OADG109A)"
+
+    key <AE11> { [ at, grave           ] };
+
+    key <AD01> { [ colon, asterisk     ] };
+    key <AD02> { [ comma,  less                ] };
+    key <AD03> { [ period, greater     ] };
+    key <AD04> { [ p, P                        ] };
+    key <AD05> { [ y, Y                        ] };
+    key <AD06> { [ f, F                        ] };
+    key <AD07> { [ g, G                        ] };
+    key <AD08> { [ c, C                        ] };
+    key <AD09> { [ r, R                        ] };
+    key <AD10> { [ l, L                        ] };
+    key <AD11> { [ slash, question     ] };
+
+    key <AC02> { [ o, O                        ] };
+    key <AC03> { [ e, E                        ] };
+    key <AC04> { [ u, U                        ] };
+    key <AC05> { [ i, I                        ] };
+    key <AC06> { [ d, D                        ] };
+    key <AC07> { [ h, H                        ] };
+    key <AC08> { [ t, T                        ] };
+    key <AC09> { [ n, N                        ] };
+    key <AC10> { [ s, S                        ] };
+    key <AC11> { [ minus, equal                ] };
+
+    key <AB01> { [ semicolon, plus     ] };
+    key <AB02> { [ q, Q                        ] };
+    key <AB03> { [ j, J                        ] };
+    key <AB04> { [ k, K                        ] };
+    key <AB05> { [ x, X                        ] };
+    key <AB06> { [ b, B                        ] };
+    key <AB08> { [ w, W                        ] };
+    key <AB09> { [ v, V                        ] };
+    key <AB10> { [ z, Z                        ] };
+};