xserver xkeyboard-config libX11 pixman mesa git update 2011

24 files changed, 840 insertions, 883 deletions

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/be b/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
index 9905f0ba6..1301e5596 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
@@ -1,34 +1,32 @@
-// $Xorg: be,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+be"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+be"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+be"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+be"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg b/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
index a3cb08a22..556f1146b 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
@@ -1,19 +1,18 @@
-// $Xorg: bg,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols  { 
-	include "us(pc_universal)+bg+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols { 
-	include "us(pc102)+bg+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols  { 

+	include "us(pc_universal)+bg+group(shifts_toggle)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols { 

+	include "us(pc102)+bg+group(shifts_toggle)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
index 38f489657..528b0642a 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
@@ -1,33 +1,32 @@
-// $Xorg: ca,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ca"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+ca"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
index 6970a3679..ca35be7d9 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
@@ -1,67 +1,65 @@
-// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "de_indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "de_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "de_indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "de_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
-default xkb_keymap "fr_indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "fr_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "fr_indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "fr_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "de_indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "de_indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "de_indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "de_indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+

+default xkb_keymap "fr_indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "fr_indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "fr_indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "fr_indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz b/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
index 6673b615b..8e4a0a79c 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
@@ -1,33 +1,29 @@
-// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+cz"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+cz"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
-default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+cz"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc102)+cz"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+

+default xkb_keymap "indy_qwerty" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo_qwerty" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/de b/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
index 1ad7fe7b0..c63caf9b0 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
@@ -1,34 +1,32 @@
-// $Xorg: de,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+de"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+de"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols {
-	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "en_US(pc_universal)+de"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc102)+de"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols {

+	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
index 832f01da7..017443d56 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
@@ -1,34 +1,32 @@
-// $Xorg: dk,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+dk"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc102)+dk"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
index bd594b0eb..b84bc5659 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
@@ -1,15 +1,14 @@
-// $Xorg: dvorak,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101)+dvorak"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc101)+dvorak"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US b/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
index 29f1666b7..184d4b896 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
@@ -1,4 +1,3 @@
-// $Xorg: en_US,v 1.3 2000/08/17 19:54:40 cpqbld Exp $

 default xkb_keymap "indy" {

     xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

     xkb_types		{ include "default"		};

@@ -55,4 +54,3 @@ xkb_keymap "indigo_nodeadkeys" {
     xkb_symbols 	{ include "en_US(pc102_nodeadkeys)"	};

     xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

 };

-

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/es b/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
index f1aad9a7a..96898c6e3 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
@@ -1,34 +1,32 @@
-// $Xorg: es,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+es"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+es"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+es"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+es"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
index 67af07eb7..ca99af149 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
@@ -1,34 +1,32 @@
-// $Xorg: fi,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+fi"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+fi"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
index b6aea29de..fa84b65a7 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
@@ -1,34 +1,32 @@
-// $Xorg: fr,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols  { 
-	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+fr"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols  { 

+	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+fr"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb b/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
index 6fa6d6515..90f79c194 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
@@ -1,34 +1,32 @@
-// $Xorg: gb,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+gb"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+gb"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu b/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
index 3c256846e..653236f2f 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
@@ -1,105 +1,104 @@
-// $Xorg: hu,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indy_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_ctrl_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_ctrl_alt_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_caps_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_ctrl_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_ctrl_alt_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_caps_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/it b/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
index ed92227b7..64a413d4d 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
@@ -1,34 +1,32 @@
-// $Xorg: it,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+it"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+it"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+it"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+it"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp b/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
index 74ed4243c..96280c105 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
@@ -1,8 +1,7 @@
-// $Xorg: jp,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};
-    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};

+    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/no b/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
index fd32c72c0..8fc326abe 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
@@ -1,34 +1,32 @@
-// $Xorg: no,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+no"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+no"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+no"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+no"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
index 3641a31ad..623e06f8f 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
@@ -1,29 +1,28 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)+pl"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc102)+pl"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc_universal)+pl"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc102)+pl"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
index 3ec03471a..6be76ddb9 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
@@ -1,34 +1,32 @@
-// $Xorg: pt,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+pt"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+pt"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
index fc514d87c..45ebdf76f 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
@@ -1,105 +1,104 @@
-// $Xorg: ru,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indy_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_ctrl_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_ctrl_alt_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_caps_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_ctrl_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_ctrl_alt_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_caps_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/se b/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
index 910a8cc89..7ac2fbc6b 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
@@ -1,34 +1,32 @@
-// $Xorg: se,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+se"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+se"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+se"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+se"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
index 09b6a2956..53c5ebd84 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
@@ -1,33 +1,29 @@
-// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+sk"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+sk"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
-default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+sk"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc102)+sk"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+

+default xkb_keymap "indy_qwerty" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo_qwerty" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/th b/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
index aa03c8c11..a1fb26601 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
@@ -1,17 +1,16 @@
-// $Xorg: th,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal)+th+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal)+th+group(shifts_toggle)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/us b/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
index 5850145ca..156e3684d 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
@@ -1,43 +1,42 @@
-// $Xorg: us,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
-};
-xkb_keymap "indy101_euro" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indy_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
-xkb_keymap "indigo_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101compose)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
-xkb_keymap "indigo101_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101euro)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};

+};

+xkb_keymap "indy101_euro" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc_universal)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

+};

+xkb_keymap "indy_compose" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc_universal)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc101)"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

+};

+xkb_keymap "indigo_compose" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc101compose)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

+};

+xkb_keymap "indigo101_compose" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc101euro)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

+};