added us(dvorak-intl), b.fd.o#12867

diff --git a/ChangeLog b/ChangeLog
index 7bb8b18..b86fd14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-21  Sergey Udaltsov
+
+       * symbols/us, rules/base.xml.in: added us(dvorak-intl),
+       https://bugs.freedesktop.org/show_bug.cgi?id=12867
+
 2007-10-19  Sergey Udaltsov
 
        * symbols/tr, rules/base.xml.in: added tr(intl),

diff --git a/rules/base.xml.in b/rules/base.xml.in
index b65ba3a..8ee2e89 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1007,6 +1007,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>dvorak-intl</name>
+            <_description>Dvorak international</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>dvorak-l</name>
             <_description>Left handed Dvorak</_description>
           </configItem>

diff --git a/symbols/us b/symbols/us
index 6066cf4..e4d4273 100644 (file)
--- a/symbols/us
+++ b/symbols/us
@@ -254,6 +254,53 @@ xkb_symbols "dvorak" {
     key <BKSL> { [  backslash,  bar             ]       };
 };
 
+// Dvorak international
+// Stephane Magnenat (stephane at magnenat dot net, http://stephane.magnenat.net)
+// Based on information from http://www.poupinou.org/dvorak/index.html
+//
+//  `   1   2   3   4   5   6   7   8   9   0   [   ]   \
+//                  €
+//
+//      '   ,   .   p   y   f   g   c   r   l   /   =
+//          ä   ê   ë   ü           ç
+//
+//      a   o   e   u   i   d   h   t   n   s   -
+//      à   ô   é   û   î                   ß
+//
+//      ;   q   j   k   x   b   m   w   v   z
+//      â   ö   è   ù   ï
+
+partial alphanumeric_keys
+xkb_symbols "dvorak-intl" {
+
+    name[Group1]= "USA - Dvorak international";
+
+    include "us(dvorak)"
+
+    key <AE04> { [         4,  dollar,    EuroSign ] };
+
+    key <AD02> { [     comma,    less,  adiaeresis,       dead_caron ] };
+    key <AD03> { [    period, greater, ecircumflex,   periodcentered   ] };
+    key <AD04> { [         p,       P,  ediaeresis,     dead_cedilla ] };
+    key <AD05> { [         y,       Y,  udiaeresis ] };
+    key <AD08> { [         c,       C,    ccedilla,    dead_abovedot ] };
+
+    key <AC01> { [         a,       A,      agrave ] };
+    key <AC02> { [         o,       O, ocircumflex ] };
+    key <AC03> { [         e,       E,      eacute ] };
+    key <AC04> { [         u,       U, ucircumflex ] };
+    key <AC05> { [         i,       I, icircumflex ] };
+    key <AC10> { [         s,       S,      ssharp ] };
+
+    key <AB01> { [ semicolon,   colon, acircumflex ] };
+    key <AB02> { [         q,       Q,  odiaeresis,      dead_ogonek ] };
+    key <AB03> { [         j,       J,i     egrave, dead_doubleacute ] };
+    key <AB04> { [         k,       K,      ugrave ] };
+    key <AB05> { [         x,       X,  idiaeresis ] };
+
+    include "level3(ralt_switch)"
+};
+
 // Left and right handed dvorak layouts
 // by sqweek <sqweek@gmail.com> 2006-01-30
 // Based on the corresponding layouts in the console-tools package.
@@ -697,7 +744,7 @@ xkb_symbols "classmate-intl" {
 partial alphanumeric_keys
 xkb_symbols "classmate-alt-intl" {
     include "us(alt-intl)"
-    name[Group1]= "USA - ClassmatePC (Alternative International)";
+    name[Group1]= "USA - ClassmatePC (Alternative international)";
     key.type[Group1]="FOUR_LEVEL";
 
     key <LSGT> { [ backslash,  bar,            backslash,      bar ] };