*** dvorak	Wed Sep 21 13:56:20 2005
--- dvorak.ee	Wed Sep 21 13:59:32 2005
***************
*** 96,101 ****
--- 96,131 ----
      modifier_map Control{ Control_L };
  };
  
+ // Dvorak with Estonian characters
+ partial alphanumeric_keys
+ xkb_symbols "ee" {
+    include "dvorak(basic)"
+    name[Group1]= "Dvorak with Estonian characters";
+    
+    key <AE03>  {        [              3, numbersign     ],
+                         [        sterling                ]     };
+    key <AE04>  {        [              4, dollar         ],
+                         [        section, currency       ]     };
+    key <AE05>  {        [              5, percent        ],
+                         [        EuroSign                ]     };
+    key <AE08>  {        [              8, asterix        ],
+                         [        onehalf                 ]     };
+    key <AC01>  {        [              a, A              ],
+                         [     adiaeresis, Adiaeresis     ]     };
+    key <AC02>  {        [              o, O              ],
+                         [        otilde,  Otilde         ]     };
+    key <AC03>  {        [              e, E              ],
+                         [     odiaeresis, Odiaeresis     ]     };
+    key <AC04>  {        [              u, U              ],
+                         [     udiaeresis, Udiaeresis     ]     };
+    key <AC10>  {        [              s, S              ],
+                         [         scaron,  Scaron        ]     };   
+    key <AB10>  {        [              z, Z              ],
+                         [        zcaron,  Zcaron         ]     };
+    key <RALT>  {        [   Mode_switch,  Multi_key      ]     };
+ 
+ };
+ 
  // Norwegian Dvorak
  partial alphanumeric_keys 
  xkb_symbols "no" {