fixed one-handed dvorak variants, b.fd.o#5659

1 files changed, 14 insertions, 28 deletions

diff --git a/symbols/us b/symbols/us
index 21cd389..a95360a 100644
--- a/symbols/us
+++ b/symbols/us
@@ -311,8 +311,7 @@ xkb_symbols "dvorak-l" {
     name[Group1]= "USA - Left handed Dvorak";
 
     key <AE01> {	[ bracketleft,	braceleft	]	};
-    key <AE02> {	[ bracketright,	braceright	],
-		    [  dead_tilde			]	};
+    key <AE02> {	[ bracketright,	braceright	]	};
     key <AE03> {	[	slash,	question	]	};
     key <AE04> {	[	    p,	P		]	};
     key <AE05> {	[	    f,	F		]	};
@@ -324,8 +323,7 @@ xkb_symbols "dvorak-l" {
     key <AE11> {	[	    2,	at		]	};
     key <AE12> {	[	    1,	exclam 		]	};
 
-    key <AD01> {	[   semicolon,	colon 		],
-			[ dead_ogonek, dead_doubleacute ]	};
+    key <AD01> {	[   semicolon,	colon 		]	};
     key <AD02> {	[	    q,	Q		]	};
     key <AD03> {	[	    b,	B		]	};
     key <AD04> {	[	    y,	Y		]	};
@@ -333,10 +331,8 @@ xkb_symbols "dvorak-l" {
     key <AD06> {	[	    r,	R		]	};
     key <AD07> {	[	    s,	S		]	};
     key <AD08> {	[	    o,	O		]	};
-    key <AD09> {	[      period,	greater		],
-			[ dead_abovedot, periodcentered ]	};
-    key <AD10> {	[	    6,	asciicircum	],
-			[ dead_circumflex, dead_circumflex ]	};
+    key <AD09> {	[      period,	greater		]	};
+    key <AD10> {	[	    6,	asciicircum	]	};
     key <AD11> {	[	    5,	percent		]	};
     key <AD12> {	[	equal,	plus		]	};
 
@@ -352,19 +348,16 @@ xkb_symbols "dvorak-l" {
     key <AC10> {	[	    8,	asterisk	]	};
     key <AC11> {	[	    7,	ampersand	]	};
 
-    key <AB01> {	[  apostrophe,	quotedbl	],
-			[  dead_acute,	dead_diaeresis	] 	};
+    key <AB01> {	[  apostrophe,	quotedbl	] 	};
     key <AB02> {	[	    x,	X		]	};
     key <AB03> {	[	    g,	G		]	};
     key <AB04> {	[	    v,	V		]	};
     key <AB05> {	[	    w,	W		]	};
     key <AB06> {	[	    n,	N		]	};
     key <AB07> {	[	    i,	I		]	};
-    key <AB08> {	[	comma,	less		],
-			[ dead_cedilla,	dead_caron	]	};
+    key <AB08> {	[	comma,	less		]	};
     key <AB09> {	[	    0,	parenright	]	};
-    key <AB10> {	[	    9,	parenleft	],
-			[  dead_grave			]	};
+    key <AB10> {	[	    9,	parenleft	]	};
 };
 
 partial alphanumeric_keys
@@ -384,23 +377,19 @@ xkb_symbols "dvorak-r" {
     key <AE09> {	[	    p,	P		]	};
     key <AE10> {	[	slash,	question	]	};
     key <AE11> {	[ bracketleft,	braceleft	]	};
-    key <AE12> {	[ bracketright,	braceright	],
-			[  dead_tilde			]	};
+    key <AE12> {	[ bracketright,	braceright	]	};
 
     key <AD01> {	[	    5,	percent		]	};
-    key <AD02> {	[	    6,	asciicircum ],
-			[ dead_circumflex, dead_circumflex ]	};
+    key <AD02> {	[	    6,	asciicircum ]	};
     key <AD03> {	[	    q,	Q		]	};
-    key <AD04> {	[      period,	greater		], 
-			[ dead_abovedot, periodcentered	]	};
+    key <AD04> {	[      period,	greater		]	};
     key <AD05> {	[	    o,	O		]	};
     key <AD06> {	[	    r,	R		]	};
     key <AD07> {	[	    s,	S		]	};
     key <AD08> {	[	    u,	U		]	};
     key <AD09> {	[	    y,	Y		]	};
     key <AD10> {	[	    b,	B		]	};
-    key <AD11> {	[   semicolon,	colon 		],
-			[ dead_ogonek, dead_doubleacute ]	};
+    key <AD11> {	[   semicolon,	colon 		]	};
     key <AD12> {	[	equal,	plus		]	};
 
     key <AC01> {	[	    7,	ampersand	]	};
@@ -415,19 +404,16 @@ xkb_symbols "dvorak-r" {
     key <AC10> {	[	    k,	K		]	};
     key <AC11> {	[	minus,	underscore	]	};
 
-    key <AB01> {	[	    9,	parenleft	],
-			[  dead_grave			]	};
+    key <AB01> {	[	    9,	parenleft	]	};
     key <AB02> {	[	    0,	parenright	]	};
     key <AB03> {	[	    x,	X		]	};
-    key <AB04> {	[	comma,	less		],
-			[ dead_cedilla,	dead_caron	]	};
+    key <AB04> {	[	comma,	less		]	};
     key <AB05> {	[	    i,	I		]	};
     key <AB06> {	[	    n,	N		]	};
     key <AB07> {	[	    w,	W		]	};
     key <AB08> {	[	    v,	V		]	};
     key <AB09> {	[	    g,	G		]	};
-    key <AB10> {	[  apostrophe,	quotedbl	],
-			[  dead_acute,	dead_diaeresis	] 	};
+    key <AB10> {	[  apostrophe,	quotedbl	] 	};
 };
 
 // Classic dvorak layout