added some br and pt layouts, b.fd.o#12816

1 files changed, 14 insertions, 118 deletions

diff --git a/geometry/pc b/geometry/pc
index 2941dab7..4efe5c33 100644
--- a/geometry/pc
+++ b/geometry/pc
@@ -828,83 +828,27 @@ xkb_geometry "jp106" {
 
 // Added for brazilian ABNT2 by Ricardo Y. Igarashi(iga@that.com.br)
 xkb_geometry "abnt2" {
+    include "pc(pc105)"
 
     description= "Brazilian ABNT2";
-    width= 470;
-    height= 180;
 
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
     shape "RTRN" {
-        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
-        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "LFSH" { { [ 24,18] }, { [2,1], [ 22,17] } };
-    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [133,18] }, { [2,1], [131,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  25;
-	left= 375;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 40;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 379; };
-    indicator "Caps Lock"    { left= 404; };
-    indicator "Scroll Lock"  { left= 429; };
-    text.top= 28;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+        { [0,0],[ 28,0],[28,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 26,1],[26,36],[5,36],[5,18],[2,18] } };
+    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,16] } };
 
     section.left= 19;
     row.left= 1;
     key.shape= "NORM";
     key.gap=  1;
-    section "Function" {
-	top= 25;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
-		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
     section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
-                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
-	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
-		    { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
+	top= 91;
 	row {
 	    top= 20;
 	    keys { { <TAB>, "TABK", color="grey20" },
 		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
 		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
 	    };
 	};
 	row {
@@ -917,75 +861,27 @@ xkb_geometry "abnt2" {
 	};
 	row {
 	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" }, <LSGT>,
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 20 },
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, { <RCTL>, 17 }
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "RTSH", color="grey20" }
 	    };
 	};
     }; // End of "Alpha" section
 
-    section "Editing" {
-	top= 61;
-	left= 310;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
     section "Keypad" {
-	top= 61;
-	left= 375;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
+	top= 91;
+	left= 376;
 	row {
 	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, color="grey20" } };
 	};
 	row {
 	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
+	    keys { <KP4>, <KP5>, <KP6>, { <KPPT>, color="grey20" } };
 	};
     }; // End of "Keypad" section
 
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
 }; // End of "abnt2" geometry