1 files changed, 21 insertions, 35 deletions

diff --git a/jr b/jr
index 7034a9d..2c0f33a 100644
--- a/jr
+++ b/jr
@@ -1,7 +1,8 @@
 // Josh's Dvorak Keyboard Layout Some xtra stuff.
 // Josh Rahm (joshuarahm@gmail.com)
 
-default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
+default partial alphanumeric_keys
+xkb_symbols "josh-dvorak-intl" {
   name[Group1]= "English (Josh, Dvorak, international with dead keys)";
   name[Group2]= "English (Josh, Dvorak, Vi Mode)";
 
@@ -29,8 +30,9 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group2] = []
   };
   key <RWIN> {
-    symbols[Group1] = [Control_R, Control_R, Control_R, Control_R, Control_R, Control_R, Control_R, Control_R],
-    symbols[Group2] = []
+    type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level3_Shift]
+    // symbols[Group1] = [Control_R, Control_R, Control_R, Control_R, Control_R, Control_R, Control_R, Control_R],
+    // symbols[Group2] = []
   };
   key <LCTL> {
     symbols[Group1] = [Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L],
@@ -321,72 +323,56 @@ xkb_symbols "jdvp" {
   key.type = "EIGHT_LEVEL";
 
   key <TLDE> {
-    symbols[Group1] = [dollar, asciitilde] ,
-    symbols[Group2] = [End, voidsymbol]
+    symbols[Group1] = [dollar, asciitilde]
   };
   key <AE01> {
-    symbols[Group1] = [ ampersand, percent ] ,
-    symbols[Group2] = []
+    symbols[Group1] = [ ampersand, percent ]
   };
   key <AE02> {
-    symbols[Group1] = [ bracketleft, 7, currency ],
-    symbols[Group2] = []
+    symbols[Group1] = [ bracketleft, 7, currency, nosymbol, U2087, U2077 ]
   };
   key <AE03> {
-    symbols[Group1] = [ braceleft, 5, cent ],
-    symbols[Group2] = [ Up ]
+    symbols[Group1] = [ braceleft, 5, cent, nosymbol, U2085, U2075 ]
   };
   key <AE04> {
-    symbols[Group1] = [ braceright, 3, yen ],
-    symbols[Group2] = [ Down ]
+    symbols[Group1] = [ braceright, 3, yen, nosymbol, U2083, threesuperior ]
   };
   key <AE05> {
-    symbols[Group1] = [ parenleft, 1, EuroSign ],
-    symbols[Group2] = []
+    symbols[Group1] = [ parenleft, 1, EuroSign, nosymbol, U2081, U00B9 ]
   };
   key <AE06> {
-    symbols[Group1] = [ equal, 9, sterling ],
-    symbols[Group2] = []
+    symbols[Group1] = [ equal, 9, sterling, nosymbol, U2089, U2079 ]
   };
 
   // symbols row, right side
   key <AE07> {
-    symbols[Group1] = [asterisk, 0],
-    symbols[Group2] = [voidsymbol, Home]
+    symbols[Group1] = [asterisk, 0, nosymbol, nosymbol, U2080, U2070]
   };
   key <AE08> {
-    symbols[Group1] = [ parenright, 2, onehalf ],
-    symbols[Group2] = []
+    symbols[Group1] = [ parenright, 2, onehalf, nosymbol, U2082, U00B2 ]
   };
   key <AE09> {
-    symbols[Group1] = [ plus, 4 ],
-    symbols[Group2] = []
+    symbols[Group1] = [ plus, 4, nosymbol, nosymbol, U2084, U2074 ]
   };
   key <AE10> {
-    symbols[Group1] = [ bracketright, 6 ],
-    symbols[Group2] = []
+    symbols[Group1] = [ bracketright, 6, nosymbol, nosymbol, U2086, U2076 ]
   };
   key <AE11> {
-    symbols[Group1] = [ exclam, 8, exclamdown, U2E18 ],
-    symbols[Group2] = []
+    symbols[Group1] = [ exclam, 8, exclamdown, U2E18, U2088, U2078 ]
   }; // reversed interrobang
   key <AE12> {
-    symbols[Group1] = [ numbersign, grave, dead_grave ] ,
-    symbols[Group2] = []
+    symbols[Group1] = [ numbersign, grave, dead_grave ]
   };
 
   key <AD01> {
-    symbols[Group1] = [ semicolon, colon, dead_diaeresis ] ,
-    symbols[Group2] = []
+    symbols[Group1] = [ semicolon, colon, dead_diaeresis ]
   };
   key <AD12> {
-    symbols[Group1] = [ at, asciicircum, dead_circumflex, dead_caron ] ,
-    symbols[Group2] = []
+    symbols[Group1] = [ at, asciicircum, dead_circumflex, dead_caron ]
   };
 
   key <AB01> {
-    symbols[Group1] = [ apostrophe, quotedbl, dead_acute ] ,
-    symbols[Group2] = []
+    symbols[Group1] = [ apostrophe, quotedbl, dead_acute ]
   };
 };