From 5e02471c57ee77345dab68809c20f057bf35e8b8 Mon Sep 17 00:00:00 2001
From: Olivier Mehani <shtrom@ssji.net>
Date: Mon, 30 Nov 2009 23:08:05 +0100
Subject: [PATCH 2/3] The dvorak-intl variant for the us layout has an
 identical per-key mapping to the us(intl) aka "I
 just swapped my keys over."

---
 rules/base.xml.in |    6 ++++
 symbols/us        |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index f5fd58f..0cdd51a 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1245,6 +1245,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>dvorak-intl</name>
+            <_description>Dvorak international (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>dvorak-alt-intl</name>
             <_description>Dvorak alternative international (no dead keys; former dvorak-intl)</_description>
           </configItem>
diff --git a/symbols/us b/symbols/us
index a33e8f0..289a963 100644
--- a/symbols/us
+++ b/symbols/us
@@ -253,6 +253,73 @@ xkb_symbols "dvorak" {
     key <BKSL> { [  backslash,  bar             ]       };
 };
 
+// Dvorak international with dead keys
+// Olivier Mehani (shtrom-xorg@ssji.net)
+// Reproduce the per-key mapping of us(intl) for the dvorak layout
+// aka "I just swapped my keys over"
+partial alphanumeric_keys
+xkb_symbols "dvorak-intl" {
+
+    name[Group1]= "USA - Dvorak international (with dead keys)";
+
+    include "us(dvorak)"
+
+    key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
+
+    key <AE01> { [	   1,     exclam,    exclamdown,      onesuperior ] };
+    key <AE02> { [	   2,         at,   twosuperior, dead_doubleacute ] };
+    key <AE03> { [	   3, numbersign, threesuperior,      dead_macron ] };
+    key <AE04> { [	   4,     dollar,      currency,         sterling ] };
+    key <AE05> { [	   5,    percent,      EuroSign,     dead_cedilla ] };
+    key <AE06> { [    6, dead_circumflex,    onequarter,      asciicircum ] };
+    key <AE07> { [	   7,  ampersand,       onehalf,	dead_horn ] };
+    key <AE08> { [	   8,   asterisk, threequarters,      dead_ogonek ] };
+    key <AE09> { [	   9,  parenleft, leftsinglequotemark, dead_breve ] };
+    key <AE10> { [	   0, parenright, rightsinglequotemark, dead_abovering ] };
+    key <AE11> { [ bracketleft,  braceleft,  guillemotleft, leftdoublequotemark ] };
+    key <AE12> { [bracketright, braceright, guillemotright, rightdoublequotemark ] };
+
+    key <AD01> { [dead_acute, dead_diaeresis, apostrophe,        quotedbl ] };
+    key <AD02> { [     comma,       less,      ccedilla,         Ccedilla ] };
+    key <AD03> { [    period,    greater, dead_abovedot,       dead_caron ] };
+    key <AD04> { [	   p,          P,    odiaeresis,       Odiaeresis ] };
+    key <AD05> { [	   y,          Y,    udiaeresis,       Udiaeresis ] };
+    // key <AD06> { [	   f,	F		]	};
+    // key <AD07> { [	   g,	G		]	};
+    key <AD08> { [	   c,          C,     copyright,             cent ] };
+    key <AD09> { [	   r,          R,    registered,       registered ] };
+    key <AD10> { [	   l,          L,        oslash,         Ooblique ] };
+    // key <AD11> { [     slash,   question,  questiondown,        dead_hook ] };
+    // key <AD12> { [     equal,       plus,      multiply,         division ] };
+
+    key <AC01> { [	   a,          A,        aacute,           Aacute ] };
+    key <AC02> { [	   o,          O,        oacute,           Oacute ] };
+    key <AC03> { [	   e,          E,        eacute,           Eacute ] };
+    key <AC04> { [	   u,          U,        uacute,           Uacute ] };
+    key <AC05> { [	   i,          I,        iacute,           Iacute ] };
+    key <AC06> { [	   d,          D,           eth,              ETH ] };
+    // key <AC07> { [	   h,	H		]	};
+    key <AC08> { [	   t,          T,         thorn,            THORN ] };
+    key <AC09> { [	   n,          N,        ntilde,           Ntilde ] };
+    key <AC10> { [	   s,          S,        ssharp,          section ] };
+    // key <AC11> { [     minus, underscore,           yen,    dead_belowdot ] };
+
+    key <AB01> { [ semicolon,      colon,     paragraph,           degree ] };
+    key <AB02> { [	   q,          Q,    adiaeresis,       Adiaeresis ] };
+    // key <AB03> { [	   j,	J		]	};
+    key <AB04> { [	   k,          K,            oe,               OE ] };
+    // key <AB05> { [	   x,	X		]	};
+    // key <AB06> { [	   b,	B		]	};
+    key <AB07> { [	   m,          M,            mu,               mu ] };
+    key <AB08> { [	   w,          W,         aring,            Aring ] };
+    // key <AB09> { [	   v,	V		]	};
+    key <AB10> { [	   z,          Z,            ae,               AE ] };
+
+    key <BKSL> { [ backslash,        bar,       notsign,        brokenbar ] };
+
+    include "level3(ralt_switch)"
+};
+
 // Dvorak international without dead keys
 // Stephane Magnenat (stephane at magnenat dot net, http://stephane.magnenat.net)
 // Based on information from http://www.poupinou.org/dvorak/index.html
-- 
1.6.4.4