# HG changeset patch
# User Fabien Ninoles <fabien@tzone.org>
# Date 1414349330 14400
# Node ID a31ea9d76d147de55e509cce3a3cae1e7066d517
# Parent  3503b6eb6a1b49e6e3373c547ac2f2b777b2fd7d
Clean up.

diff -r 3503b6eb6a1b -r a31ea9d76d14 xkb/geometry/trulyergonomic
--- a/xkb/geometry/trulyergonomic	Sat Oct 25 21:38:33 2014 -0400
+++ b/xkb/geometry/trulyergonomic	Sun Oct 26 14:48:50 2014 -0400
@@ -33,53 +33,22 @@
         key.color = "grey10";
         key.shape = "NORM";
         row {
-            keys { <ESC> };
-        };
-        row {
-            left = 25;
-            keys { <FK01>, <FK02>, <FK03>, <FK04> };
-        };
-        row {
-            left = 105;
-            keys { <FK05>, <FK06>, <FK07>, <FK08> };
-        };
-        row {
-            left = 185;
-            keys { <FK09>, <FK10>, <FK11>, <FK12> };
-        };
-        row {
-            left = 265;
-            keys { <DELE> };
+            keys { 
+              <ESC>,
+              { <FK01>, gap = 8 }, <FK02>, <FK03>, <FK04>,
+              { <FK05>, gap = 8 }, <FK06>, <FK07>, <FK08>,
+              { <FK09>, gap = 8 }, <FK10>, <FK11>, <FK12>,
+              { <DELE>, gap = 8 }
+           };
         };
         row {
             top = 17.5;
-            left = 115;
+            left = 111;
             keys { <CAPS>, 
-                   <DELE>, // modified from <I120>
+                   <DELE>, // modified from <FN>
                    <NMLK> };
         };
     };
-
-    section "LeftColumn" {
-        left = 4;
-        top  = 80;
-        key.gap = 0.5;
-        key.color = "grey20";
-        key.shape = "DBLA";
-        row { keys { <LFSH> }; };
-        row {
-          top = 17.5;
-          keys { <LCTL> };
-        };
-        row {
-          top = 35;
-          keys {
-            { <I120>, "NORM" },
-            { <LALT>, "NORM" }
-          };
-        };
-    };
-
     section "LeftAlpha" {
         left = 39;
         top  = 45;
@@ -143,6 +112,22 @@
             keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10> };
         };
    };
+    section "LeftColumn" {
+        left = 4;
+        top  = 80;
+        key.gap = 0.5;
+        key.color = "grey20";
+        key.shape = "DBLA";
+        row { 
+          vertical = true;
+          keys { <LFSH>, <LCTL> };
+        };
+        row {
+          top = 35;
+          key.shape = "NORM";
+          keys { <FN>, <LALT> };
+        };
+    };
    section "CentralColumn" {
       top = 45;
       left = 126.5;
@@ -150,19 +135,13 @@
       key.color = "grey20";
       // Central section
       row {
-          keys { <LWIN> };
-      };
-      row {
-          top = 17.5;
-          keys { <RALT> }; // modified from <DELE>
-      };
-      row {
-          top = 35;
-          keys { <TAB> };
-      };
-      row {
-          top = 52.5;
-          keys { <BKSP> };
+          vertical = true;
+          keys { 
+            <LWIN>, 
+            <RALT>, // modified from <DELE>
+            <TAB>,            
+            <BKSP>
+          };
       };
       row {
           top  = 70;
@@ -170,6 +149,22 @@
           keys { <SPCE>, <RTRN>, <SPCE> };
         };
    };
+    section "RightColumn" {
+        left = 250;
+        top  = 80;
+        key.gap = 0.5;
+        key.color = "grey20";
+        key.shape = "DBLA";
+        row { 
+          vertical = true;
+          keys { <RTSH>, <RCTL> }; 
+        };
+        row {
+          top = 35;
+          key.shape = "NORM";
+          keys { <RALT>, <FN> };
+       };
+   };
    section "LeftCross" {
         left = 39;
         top  = 115;
@@ -179,23 +174,18 @@
         // Cross section
         row {
             top  = 8;
-            left = 0;
-            keys { <AB03> }; // modified from <HOME> 
-        };
-        row {
-            top = 0;
-            left = 17.5;
-            keys { <AC06> }; // modified from <PGUP>
+            keys { 
+              <AB03>,  // modified from <HOME>
+              { <AD07>, gap = 17.5 } // modified from <END>
+            };
         };
         row {
-            top = 17.5;
             left = 17.5;
-            keys { <AD11> }; // modified from <PGDN>
-        };
-        row {
-            top = 8;
-            left = 35;
-            keys { <AD07> }; // modified from <END>
+            vertical = true;
+            keys { 
+              <AC06>, // modified from <PGUP>
+              <AD11>  // modified from <PGDN>
+            }; 
         };
    };
    section "RightCross" {
@@ -207,43 +197,12 @@
         // Cross section
         row {
             top  = 8;
-            left = 0;
-            keys { <LEFT> }; // modified from <HOME> 
-        };
-        row {
-            top = 0;
-            left = 17.5;
-            keys { <UP> }; // modified from <PGUP>
+            keys { <LEFT>, { <RGHT>, gap = 17.5 } };
         };
         row {
-            top = 17.5;
             left = 17.5;
-            keys { <DOWN> }; // modified from <PGDN>
-        };
-        row {
-            top = 8;
-            left = 35;
-            keys { <RGHT> }; // modified from <END>
+            vertical = true;
+            keys { <UP>, <DOWN> };
         };
    };
-    section "RightColumn" {
-        left = 250;
-        top  = 80;
-        key.gap = 0.5;
-        key.color = "grey20";
-        key.shape = "DBLA";
-        row { keys { <RTSH> }; };
-        row {
-          top = 17.5;
-          keys { <RCTL> };
-        };
-        row {
-          top = 35;
-          keys {
-            { <RALT>, "NORM" },
-            { <I120>, "NORM" }
-          };
-        };
-    };
-
 }; // geometry teckD209