fontconfig mesa xserver xkeyboard-config git update 2 May 2012

3 files changed, 18 insertions, 3 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk
index 1187a99bd..1deea28aa 100644
--- a/xorg-server/xkeyboard-config/symbols/dk
+++ b/xorg-server/xkeyboard-config/symbols/dk
@@ -69,4 +69,5 @@ xkb_symbols "dvorak" {
     include "no(dvorak)"
 
     name[Group1]= "Danish (Dvorak)";
+    key <AD12> { [  asciitilde, asciicircum, dead_diaeresis, dead_tilde ] };
 };
diff --git a/xorg-server/xkeyboard-config/symbols/latin b/xorg-server/xkeyboard-config/symbols/latin
index 77b99d46c..424768ead 100644
--- a/xorg-server/xkeyboard-config/symbols/latin
+++ b/xorg-server/xkeyboard-config/symbols/latin
@@ -35,7 +35,7 @@ xkb_symbols "basic" {
     key <AC04>	{ [         f,          F,      dstroke,  ordfeminine ]	};
     key <AC05>	{ [         g,          G,          eng,          ENG ]	};
     key <AC06>	{ [         h,          H,      hstroke,      Hstroke ]	};
-    key <AC07>	{ [         j,          J,            j,            J ]	};
+    key <AC07>	{ [         j,          J,    dead_hook,    dead_horn ] };
     key <AC08>	{ [         k,          K,          kra,    ampersand ]	};
     key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]	};
     key <AC10>	{ [ semicolon,    colon, dead_acute, dead_doubleacute ]	};
diff --git a/xorg-server/xkeyboard-config/symbols/me b/xorg-server/xkeyboard-config/symbols/me
index dd81567c2..54d63e130 100644
--- a/xorg-server/xkeyboard-config/symbols/me
+++ b/xorg-server/xkeyboard-config/symbols/me
@@ -7,8 +7,10 @@ default partial alphanumeric_keys
 xkb_symbols "basic" {
   include "rs(latin)"
   name[Group1]= "Montenegrin";
-};
 
+  key <AD06> { [ any, any, zacute, Zacute ] }; // z
+  key <AC02> { [ any, any, sacute, Sacute ] }; // s
+};
 
 partial alphanumeric_keys
 xkb_symbols "cyrillic" {
@@ -16,7 +18,6 @@ xkb_symbols "cyrillic" {
   name[Group1]= "Montenegrin (Cyrillic)";
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "cyrillicyz" {
   include "rs(yz)"
@@ -27,18 +28,27 @@ partial alphanumeric_keys
 xkb_symbols "latinunicode" {
   include "rs(latinunicode)"
   name[Group1]= "Montenegrin (Latin Unicode)";
+
+  key <AD06> { [ any, any, zacute, Zacute ] }; // z
+  key <AC02> { [ any, any, sacute, Sacute ] }; // s
 };
 
 partial alphanumeric_keys
 xkb_symbols "latinyz" {
   include "rs(latinyz)"
   name[Group1]= "Montenegrin (Latin qwerty)";
+
+  key <AB02> { [ any, any, zacute, Zacute ] }; // z
+  key <AC02> { [ any, any, sacute, Sacute ] }; // s
 };
 
 partial alphanumeric_keys
 xkb_symbols "latinunicodeyz" {
   include "rs(latinunicodeyz)"
   name[Group1]= "Montenegrin (Latin Unicode qwerty)";
+
+  key <AB02> { [ any, any, zacute, Zacute ] }; // z
+  key <AC02> { [ any, any, sacute, Sacute ] }; // s
 };
 
 xkb_symbols "cyrillicalternatequotes" {
@@ -49,4 +59,8 @@ xkb_symbols "cyrillicalternatequotes" {
 xkb_symbols "latinalternatequotes" {
   include "rs(latinalternatequotes)"
   name[Group1]= "Montenegrin (Latin with guillemets)";
+
+  key <AD06> { [ any, any, zacute,        Zacute         ] }; // z
+  key <AC02> { [ any, any, sacute,        Sacute         ] }; // s
+  key <LSGT> { [ any, any, guillemotleft, guillemotright ] }; // <
 };