Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013

Conflicts:
	fontconfig/src/fccache.c

13 files changed, 376 insertions, 53 deletions

diff --git a/xorg-server/xkeyboard-config/compat/level5 b/xorg-server/xkeyboard-config/compat/level5
index 8d28051c1..8e0cc9c38 100644
--- a/xorg-server/xkeyboard-config/compat/level5
+++ b/xorg-server/xkeyboard-config/compat/level5
@@ -20,6 +20,7 @@ default partial xkb_compatibility "default"  {
     };
 
     interpret ISO_Level5_Latch+Any {
+	useModMapMods= level1;
 	virtualModifier= LevelFive;
 	action= LatchMods(modifiers=LevelFive);
     };
@@ -29,6 +30,7 @@ default partial xkb_compatibility "default"  {
     };
 
     interpret ISO_Level5_Lock+Any {
+	useModMapMods= level1;
 	virtualModifier= LevelFive;
 	action= LockMods(modifiers=LevelFive);
     };
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 4647bec16..4b3c6234e 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -301,7 +301,7 @@
         </variant>
         <variant>
           <configItem>
-            <name>type6</name>
+            <name>sun_type6</name>
             <_description>Polish (Sun Type 6/7)</_description>
           </configItem>
         </variant>
@@ -333,7 +333,7 @@
         </variant>
         <variant>
           <configItem>
-            <name>type6</name>
+            <name>sun_type6</name>
             <_description>Romanian (Sun Type 6/7)</_description>
           </configItem>
         </variant>
@@ -381,7 +381,7 @@
         </variant>
         <variant>
           <configItem>
-            <name>type6</name>
+            <name>sun_type6</name>
             <_description>Russian (Sun Type 6/7)</_description>
           </configItem>
         </variant>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 450154bb5..51c4ca59e 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1414,7 +1414,7 @@
         <variant>
           <configItem>
             <name>olpc2</name>
-            <_description>English (layout toggle on multiply/divide key)</_description>
+            <_description>English (the divide/multiply keys toggle the layout)</_description>
           </configItem>
         </variant>
         <variant>
@@ -1724,7 +1724,7 @@
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>Belgian (alternative, latin-9 only)</_description>
+            <_description>Belgian (alternative, Latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
@@ -1882,6 +1882,17 @@
         </variant>
         <variant>
           <configItem>
+            <name>kan-kagapa</name>
+            <!-- Keyboard indicator for Kannada layouts -->
+            <_shortDescription>kn</_shortDescription>
+            <_description>Kannada (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>kan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>mal</name>
             <!-- Keyboard indicator for Malayalam layouts -->
             <_shortDescription>ml</_shortDescription>
@@ -1990,6 +2001,17 @@
         </variant>
         <variant>
           <configItem>
+            <name>tel-kagapa</name>
+            <!-- Keyboard indicator for Telugu layouts -->
+            <_shortDescription>te</_shortDescription>
+            <_description>Telugu (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>tel</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>urd-phonetic</name>
             <!-- Keyboard indicator for Urdu layouts -->
             <_shortDescription>ur</_shortDescription>
@@ -2045,6 +2067,39 @@
         </variant>
         <variant>
           <configItem>
+            <name>hin-kagapa</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>san-kagapa</name>
+            <!-- Keyboard indicator for Sanskrit layouts -->
+            <_shortDescription>sa</_shortDescription>
+            <_description>Sanskrit (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>san</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mar-kagapa</name>
+            <!-- Keyboard indicator for Marathi layouts -->
+            <_shortDescription>mr</_shortDescription>
+            <_description>Marathi (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>mar</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>eng</name>
             <!-- Keyboard indicator for English layouts -->
             <_shortDescription>en</_shortDescription>
@@ -2125,7 +2180,7 @@
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Portuguese (Brazil, nativo for USA keyboards)</_description>
+            <_description>Portuguese (Brazil, nativo for US keyboards)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2880,7 +2935,7 @@
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>French (alternative, latin-9 only)</_description>
+            <_description>French (alternative, Latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2922,7 +2977,7 @@
         <variant>
           <configItem>
             <name>bepo_latin9</name>
-            <_description>French (Bepo, ergonomic, Dvorak way, latin-9 only)</_description>
+            <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
@@ -4087,7 +4142,7 @@
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Portuguese (Nativo for USA keyboards)</_description>
+            <_description>Portuguese (Nativo for US keyboards)</_description>
           </configItem>
         </variant>
         <variant>
@@ -5869,7 +5924,7 @@
       <option>
         <configItem>
           <name>lv3:ralt_switch_multikey</name>
-          <_description>Right Alt, Shift+Right Alt key is Multi_Key</_description>
+          <_description>Right Alt, Shift+Right Alt key is Compose</_description>
         </configItem>
       </option>
       <option>
@@ -6086,7 +6141,7 @@
       <option>
         <configItem>
           <name>kpdl:dotoss_latin9</name>
-          <_description>Four-level key with dot, latin-9 restriction</_description>
+          <_description>Four-level key with dot, Latin-9 only</_description>
        </configItem>
       </option>
       <option>
@@ -6112,7 +6167,7 @@
       <option>
         <configItem>
           <name>kpdl:semi</name>
-          <_description>Semi-colon on third level</_description>
+          <_description>Semicolon on third level</_description>
        </configItem>
       </option>
     </group>
@@ -6193,7 +6248,7 @@
       <option>
         <configItem>
           <name>caps:shiftlock</name>
-          <_description>Caps Lock toggles Shift so all keys are affected</_description>
+          <_description>Caps Lock toggles ShiftLock (affects all keys)</_description>
         </configItem>
       </option>
       <option>
@@ -6447,25 +6502,25 @@
       <option>
         <configItem>
           <name>shift:both_capslock</name>
-          <_description>Both Shift-Keys together toggle Caps Lock</_description>
+          <_description>Both Shift keys together toggle Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>shift:both_capslock_cancel</name>
-          <_description>Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates</_description>
+          <_description>Both Shift keys together activate Caps Lock, one Shift key deactivates</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>shift:both_shiftlock</name>
-          <_description>Both Shift-Keys together toggle ShiftLock</_description>
+          <_description>Both Shift keys together toggle ShiftLock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>keypad:pointerkeys</name>
-          <_description>Toggle PointerKeys with Shift + NumLock.</_description>
+          <_description>Shift + NumLock toggles PointerKeys</_description>
         </configItem>
       </option>
       <option>
@@ -6710,18 +6765,18 @@
     <group allowMultipleSelection="false">
       <configItem>
         <name>esperanto</name>
-        <_description>Adding Esperanto circumflexes (supersigno)</_description>
+        <_description>Adding Esperanto supersigned letters</_description>
       </configItem>
       <option>
         <configItem>
           <name>esperanto:qwerty</name>
-          <_description>To the corresponding key in a Qwerty keyboard.</_description>
+          <_description>To the corresponding key in a Qwerty layout</_description>
        </configItem>
       </option>
       <option>
         <configItem>
           <name>esperanto:dvorak</name>
-          <_description>To the corresponding key in a Dvorak keyboard.</_description>
+          <_description>To the corresponding key in a Dvorak layout</_description>
        </configItem>
       </option>
     </group>
diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be
index cf8e06871..286e9289e 100644
--- a/xorg-server/xkeyboard-config/symbols/be
+++ b/xorg-server/xkeyboard-config/symbols/be
@@ -110,7 +110,7 @@ xkb_symbols "oss_latin9" {
     include "be(oss_frbe)"
     include "keypad(oss_latin9)"
 
-    name[Group1]="Belgian (alternative, latin-9 only)";
+    name[Group1]="Belgian (alternative, Latin-9 only)";
 
     // First row
     key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,                  less ] }; // ² ³ ¹ < 
diff --git a/xorg-server/xkeyboard-config/symbols/br b/xorg-server/xkeyboard-config/symbols/br
index dee718860..b75ffc98c 100644
--- a/xorg-server/xkeyboard-config/symbols/br
+++ b/xorg-server/xkeyboard-config/symbols/br
@@ -283,7 +283,7 @@ partial alphanumeric_keys
 xkb_symbols "nativo-us" {
     include "br(nativo)"
 
-    name[Group1]="Portuguese (Brazil, nativo for USA keyboards)";
+    name[Group1]="Portuguese (Brazil, nativo for US keyboards)";
 
 // Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index 20689af30..adc60ed36 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -107,8 +107,6 @@ xkb_symbols "deadacute" {
 
 partial alphanumeric_keys
 xkb_symbols "T3" {
-    include "latin(type4)"
-
     name[Group1]="German (T3)";
 
     key.type[Group1] = "EIGHT_LEVEL";
@@ -151,7 +149,7 @@ xkb_symbols "T3" {
     key <AC05> { [               g,               G,         seconds,        NoSymbol,             eng,             ENG, dead_belowmacron,       NoSymbol ] };
     key <AC06> { [               h,               H,           U1E9E,        NoSymbol,           U0272,           U019D,           U0332,        NoSymbol ] };
     key <AC07> { [               j,               J,    dead_cedilla,        NoSymbol,           U0133,           U0132,  dead_belowring,        NoSymbol ] };
-    key <AC08> { [               k,               K, dead_belowcomma,        NoSymbol,             kra, dead_belowcomma,           U0335,        NoSymbol ] };
+    key <AC08> { [               k,               K, dead_belowcomma,        NoSymbol,             kra, dead_belowcomma,     dead_stroke,        NoSymbol ] };
     key <AC09> { [               l,               L,     dead_ogonek,        NoSymbol,         lstroke,         Lstroke,           U0338,        NoSymbol ] };
     key <AC10> { [      odiaeresis,      Odiaeresis,   dead_belowdot,        NoSymbol,      dead_acute, dead_doubleacute,         degree,        NoSymbol ] };
     key <AC11> { [      adiaeresis,      Adiaeresis,     dead_stroke,        NoSymbol,           U019B,           U1E9E,         minutes,        NoSymbol ] };
@@ -176,10 +174,12 @@ xkb_symbols "T3" {
 
     include "kpdl(comma)"
 
-    // We do not support the correct level selection mechanism yet, this is
-    //just for testing:
-    include "level5(rctrl_switch)"
-    include "level3(ralt_switch)"
+    include "level5(modifier_mapping)"
+    include "level3(modifier_mapping)"
+    key.type[Group1] = "THREE_LEVEL";
+    key <LFSH> { [ Shift_L, Shift_L, ISO_Level5_Latch ] };
+    key <RTSH> { [ Shift_R, Shift_R, ISO_Level5_Latch ] };
+    key <RALT> { [ ISO_Level3_Latch, ISO_Level5_Latch, ISO_Level5_Latch ] };
  };
 
 partial alphanumeric_keys
diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es
index 5adf1a2bb..ea4a28b1f 100644
--- a/xorg-server/xkeyboard-config/symbols/es
+++ b/xorg-server/xkeyboard-config/symbols/es
@@ -200,7 +200,7 @@ xkb_symbols "olpcm" {
     // See: http://wiki.laptop.org/go/OLPC_Spanish_Non-membrane_Keyboard
 
     include "us(basic)"
-    name[Group1]="Spain";
+    name[Group1]="Spanish";
 
     key <AE00> { [    questiondown,    exclamdown, backslash      ] };
     key <AE01> { [            1,         exclam,             bar ] };
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index 0d1d13de8..418ff5200 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -200,7 +200,7 @@ xkb_symbols "oss_latin9" {
     include "fr(oss)"
     include "keypad(oss_latin9)"
 
-    name[Group1]="French (alternative, latin-9 only)";
+    name[Group1]="French (alternative, Latin-9 only)";
 
     // First row
     key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 ˇ ¸
@@ -547,7 +547,7 @@ xkb_symbols "bepo_latin9" {
     include "fr(bepo)"
     include "keypad(oss_latin9)"
 
-    name[Group1]="French (Bepo, ergonomic, Dvorak way, latin-9 only)";
+    name[Group1]="French (Bepo, ergonomic, Dvorak way, Latin-9 only)";
 
     key <TLDE> { [          dollar,   numbersign,        dollar,       paragraph ] }; // $ # $ ¶
 
diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index b995fbb98..64c3ea1dd 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -1,9 +1,10 @@
 // This layout includes all Indian layouts, including:
+//     - Devanagari (Hindi, Marathi, Sanskrit)
 //     - Bengali
-//     - Gujarati 
-//     - Kannada 
+//     - Gujarati
+//     - Kannada
 //     - Malayalam
-//     - Oriya 
+//     - Oriya
 //     - Tamil
 //     - Telugu
 //     - Urdu
@@ -1753,3 +1754,266 @@ xkb_symbols "mal_enhanced" {
 
 };
 
+
+// ---- BEGIN Hindi KaGaPa phonetic ----
+// Name:        KaGaPa phonetic
+// Brief:       Devanagari layout (Hindi, Sanskrit, Nepali, Marathi, etc.)
+// Diagram:     (Original)[http://baraha.com/help/Keyboards/dev_brhkbd.htm]
+//              (This layout)[http://bdsatish.in/lang/dev-kagapa.png]
+//
+// Description: Based on KaGaPa layout (also called Baraha layout or Nudi layout)
+//              which is a modified layout of the specification by Dr. K. P. Rao.
+//              This is a phonetic layout with the following features:
+//              [1] All letters are mapped to phonetically-similar English keys
+//                  as much as possible.
+//              [2] The independent vowel (svara) and its dependent vowel (maatra)
+//                  use the same key (depending upon SHIFT, ALTGR or ALTGR + SHIFT).
+//              [3] Consonant conjuncts are produced by explicitly invoking the
+//                  'viraama' (key f). The 'short a' maatra is implicit in all
+//                  consonants.
+//              [4] Zero width non-joiner and joiner are on keys 6 and 7
+//                  respectively. These are absolutely essential for alternative
+//                  glyph renderings of consonant half-forms.
+//              [5] Rigvedic accent marks, visarga variants.
+//
+// Author:      Satish BD <bdsatish@gmail.com>
+//
+partial alphanumeric_keys
+xkb_symbols "hin-kagapa" {
+     name[Group1] = "Hindi (KaGaPa phonetic)";
+     key.type="FOUR_LEVEL";
+
+    //Top Alphanumeric row
+    // Roman digits
+    key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
+    key <AE01>  { [   1,            exclam,       U0967          ] };
+    key <AE02>  { [   2,            at,           U0968,  U20A8  ] };  // U20A8: generic rupee sign (Rs)
+    key <AE03>  { [   3,            numbersign,   U0969          ] };
+    key <AE04>  { [   4,            dollar,       U096A,  U20B9  ] };  // U20B9: new Indian Rupee sign
+    key <AE05>  { [   5,            percent,      U096B          ] };
+    key <AE06>  { [   6,            asciicircum,  U096C,  U200C  ] };  // ZWNJ
+    key <AE07>  { [   7,            ampersand,    U096D,  U200D  ] };  // ZWJ
+    key <AE08>  { [   8,            asterisk,     U096E,  U0901  ] };  // U0901: Devanagari candrabindu
+    key <AE09>  { [   9,            parenleft,    U096F          ] };
+    key <AE10>  { [   0,            parenright,   U0966,  U0970  ] };  // U0970: Devanagari abbreviation sign
+    key <AE11>  { [   minus,        underscore,   U0952          ] };  // U0952: Devanagari stress sign anudatta
+    key <AE12>  { [   equal,        plus                         ] };
+    key <BKSL>  { [   U005C,        U007C,        U0964,  U0965  ] };  // backslash, pipe, danda, double danda
+
+    //Q Row
+    key <AD01>  { [   U091F,         U0920                       ] };  // Q: retroflex Ta, Tha
+    key <AD02>  { [   U0921,         U0922,      U095C,  U095D   ] };  // W: retroflex Da, Dha, Da-nukta, Dha-nukta
+    key <AD03>  { [   U0946,         U0947,      U090E,  U090F   ] };  // E: matras, short E, long E
+    key <AD04>  { [   U0930,         U0943,      U090B,  U0931   ] };  // R: ra, vocalic R matra, vocalic R, ra-nukta
+    key <AD05>  { [   U0924,         U0925                       ] };  // T: dental ta, tha
+    key <AD06>  { [   U092F,         U0948,      U0910,  U095F   ] };  // Y: ya, ai matra, ai, ya-nukta
+    key <AD07>  { [   U0941,         U0942,      U0909,  U090A   ] };  // U: matras, u, uu
+    key <AD08>  { [   U093F,         U0940,      U0907,  U0908   ] };  // I: matras, i, ii
+    key <AD09>  { [   U094A,         U094B,      U0912,  U0913   ] };  // O: matras, short o, long o
+    key <AD10>  { [   U092A,         U092B,      U095E           ] };  // P: pa, pha, pha-nukta
+    key <AD11>  { [   bracketleft,   braceleft                   ] };
+    key <AD12>  { [   bracketright,  braceright                  ] };
+
+    //A Row
+    key <AC01>  { [   U093E,        U0906,     U0905,    U0972   ] };  // A: aa matra, aa, short a, candra a
+    key <AC02>  { [   U0938,        U0936                        ] };  // S: sa, sha
+    key <AC03>  { [   U0926,        U0927                        ] };  // D: dental da, dha
+    key <AC04>  { [   U094D,        U0944,     U0960             ] };  // F: virama, vocalic RR matra, vocalic RR
+    key <AC05>  { [   U0917,        U0918,     U095A             ] };  // G: ga, gha, ga-nukta
+    key <AC06>  { [   U0939,        U0903,     U1CF5,    U1CF6   ] };  // H: ha, visarga, jihvamuliya, upadhmaniya
+    key <AC07>  { [   U091C,        U091D,     U095B             ] };  // J: ja, jha, ja-nukta
+    key <AC08>  { [   U0915,        U0916,     U0958,    U0959   ] };  // K: ka, kha, ka-nukta, kha-nukta
+    key <AC09>  { [   U0932,        U0933,     U0962,    U090C   ] };  // L: la, lla, vocalic L matra, vocalic L
+    key <AC10>  { [   semicolon,    colon,     U1CF2,    U1CF3   ] };  // U1CF2/3: ardhavisarga/rotated ardhavisarga
+    key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
+                                                                       // U201D: Right double quotation mark
+
+    //Z Row
+    key <AB01>  { [   U091E,   U0919                   ] };  // Z: nya, nga
+    key <AB02>  { [   U0937,   U093C,  U0934           ] };  // X: ssa, nukta below, lla-nukta
+    key <AB03>  { [   U091A,   U091B                   ] };  // C: ca, cha
+    key <AB04>  { [   U0935,   U094C,  U0914           ] };  // V: va, matra au, au
+    key <AB05>  { [   U092C,   U092D                   ] };  // B: ba, bha
+    key <AB06>  { [   U0928,   U0923,  U0929           ] };  // N: na, nna, nnna
+    key <AB07>  { [   U092E,   U0902,  U093D,  U0950   ] };  // M: ma, anusvara, avagraha, Devanagari OM
+    key <AB08>  { [   comma,   U003C,  U0945,  U090D   ] };  // comma: comma, less than, matra, candra e
+    key <AB09>  { [   period,  U003E,  U0949,  U0911   ] };  // period: period, greater than, matra, candra o
+    key <AB10>  { [   slash,   question                ] };
+
+    include "level3(ralt_switch)"
+};
+// ---- END Hindi KaGaPa ----
+
+// Sanskrit uses Devanagari layout of Hindi
+partial alphanumeric_keys
+xkb_symbols "san-kagapa" {
+  name[Group1] = "Sanskrit (KaGaPa phonetic)";
+  include "in(hin-kagapa)"
+
+};
+
+// Marathi uses Devanagari layout of Hindi
+partial alphanumeric_keys
+xkb_symbols "mar-kagapa" {
+  name[Group1] = "Marathi (KaGaPa phonetic)";
+  include "in(hin-kagapa)"
+
+};
+
+
+// ---- BEGIN Kannada KaGaPa phonetic ----
+// Name:        Kannada KaGaPa phonetic
+// Diagram:     (Original)[http://www.baraha.com/help/Keyboards/kan_brhkbd.htm]
+//              (This layout)[http://bdsatish.in/lang/kan-kagapa.png]
+//
+// Description: Based on KaGaPa layout (also called Baraha layout or Nudi layout).
+//              See the description to "hin-kagapa" above.
+//              Certain punctuation characters from Devanagari block are
+//              retained for compatibility.
+//
+// Author:      Satish BD <bdsatish@gmail.com>
+//
+partial alphanumeric_keys
+xkb_symbols "kan-kagapa" {
+    name[Group1] = "Kannada (KaGaPa phonetic)";
+    key.type="FOUR_LEVEL";
+
+    //Top Alphanumeric row
+    // Roman digits
+    key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
+    key <AE01>  { [   1,            exclam,       U0CE7          ] };
+    key <AE02>  { [   2,            at,           U0CE8,  U20A8  ] };  // U20A8: generic rupee sign (Rs)
+    key <AE03>  { [   3,            numbersign,   U0CE9          ] };
+    key <AE04>  { [   4,            dollar,       U0CEA,  U20B9  ] };  // U20B9: new Indian Rupee sign
+    key <AE05>  { [   5,            percent,      U0CEB          ] };
+    key <AE06>  { [   6,            asciicircum,  U0CEC,  U200C  ] };  // ZWNJ
+    key <AE07>  { [   7,            ampersand,    U0CED,  U200D  ] };  // ZWJ
+    key <AE08>  { [   8,            asterisk,     U0CEE,  U0901  ] };  // U0901: Devanagari candrabindu
+    key <AE09>  { [   9,            parenleft,    U0CEF          ] };
+    key <AE10>  { [   0,            parenright,   U0CE6          ] };
+    key <AE11>  { [   minus,        underscore,   U0952          ] };  // U0952: Devanagari stress sign anudatta
+    key <AE12>  { [   equal,        plus                         ] };
+    key <BKSL>  { [   U005C,        U007C,        U0964,  U0965  ] };  // backslash, pipe, danda, double danda
+
+    //Q Row
+    key <AD01>  { [   U0C9F,         U0CA0                       ] };  // Q: retroflex Ta, Tha
+    key <AD02>  { [   U0CA1,         U0CA2                       ] };  // W: retroflex Da, Dha
+    key <AD03>  { [   U0CC6,         U0CC7,      U0C8E,  U0C8F   ] };  // E: matras, short E, long E
+    key <AD04>  { [   U0CB0,         U0CC3,      U0C8B,  U0CB1   ] };  // R: ra, vocalic R matra, vocalic R, RRA
+    key <AD05>  { [   U0CA4,         U0CA5                       ] };  // T: dental ta, tha
+    key <AD06>  { [   U0CAF,         U0CC8,      U0C90           ] };  // Y: ya, ai matra, ai
+    key <AD07>  { [   U0CC1,         U0CC2,      U0C89,  U0C8A   ] };  // U: matras, u, uu
+    key <AD08>  { [   U0CBF,         U0CC0,      U0C87,  U0C88   ] };  // I: matras, i, ii
+    key <AD09>  { [   U0CCA,         U0CCB,      U0C92,  U0C93   ] };  // O: matras, short o, long o
+    key <AD10>  { [   U0CAA,         U0CAB                       ] };  // P: pa, pha
+    key <AD11>  { [   bracketleft,   braceleft                   ] };
+    key <AD12>  { [   bracketright,  braceright                  ] };
+
+    //A Row
+    key <AC01>  { [   U0CBE,        U0C86,     U0C85             ] };  // A: aa matra, aa, short a
+    key <AC02>  { [   U0CB8,        U0CB6                        ] };  // S: sa, sha
+    key <AC03>  { [   U0CA6,        U0CA7                        ] };  // D: dental da, dha
+    key <AC04>  { [   U0CCD,        U0CC4,     U0CE0             ] };  // F: virama, vocalic RR matra, vocalic RR
+    key <AC05>  { [   U0C97,        U0C98                        ] };  // G: ga, gha
+    key <AC06>  { [   U0CB9,        U0C83,     U0CF1,    U0CF2   ] };  // H: ha, visarga, jihvanuliya, upadhmaniya
+    key <AC07>  { [   U0C9C,        U0C9D                        ] };  // J: ja, jha
+    key <AC08>  { [   U0C95,        U0C96                        ] };  // K: ka, kha
+    key <AC09>  { [   U0CB2,        U0CB3,     U0CE2,    U0C8C   ] };  // L: la, lla, vocalic L matra, vocalic L
+    key <AC10>  { [   semicolon,    colon                        ] };
+    key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
+                                                                       // U201D: Right double quotation mark
+
+    //Z Row
+    key <AB01>  { [   U0C9E,   U0C99                   ] };  // Z: nya, nga
+    key <AB02>  { [   U0CB7,   U0CBC,  U0CDE           ] };  // X: ssa, nukta below, LLLA
+    key <AB03>  { [   U0C9A,   U0C9B                   ] };  // C: ca, cha
+    key <AB04>  { [   U0CB5,   U0CCC,  U0C94           ] };  // V: va, matra au, au
+    key <AB05>  { [   U0CAC,   U0CAD                   ] };  // B: ba, bha
+    key <AB06>  { [   U0CA8,   U0CA3                   ] };  // N: na, nna
+    key <AB07>  { [   U0CAE,   U0C82,  U0CBD,  U0950   ] };  // M: ma, anusvara, avagraha, Devanagari OM
+    key <AB08>  { [   comma,   U003C,  U0CB1           ] };  // comma: comma, less than, RRA
+    key <AB09>  { [   period,  U003E,  U0CDE           ] };  // period: period, greater than, LLLA
+    key <AB10>  { [   slash,   question                ] };
+
+    include "level3(ralt_switch)"
+};
+// ---- END Kannada KaGaPa ----
+
+
+// ---- BEGIN Telugu KaGaPa phonetic ----
+// Name:        Telugu KaGaPa phonetic
+// Diagram:     (Original)[http://www.baraha.com/help/Keyboards/tel_brhkbd.htm]
+//              (This layout)[http://bdsatish.in/lang/tel-kagapa.png]
+//
+// Description: Based on KaGaPa layout (also called Baraha layout or Nudi layout).
+//              See the description to "hin-kagapa" above.
+//              Certain punctuation characters from Devanagari block are
+//              retained for compatibility.
+//
+// Author:      Satish BD <bdsatish@gmail.com>
+//
+partial alphanumeric_keys
+xkb_symbols "tel-kagapa" {
+    name[Group1] = "Telugu (KaGaPa phonetic)";
+    key.type="FOUR_LEVEL";
+
+    //Top Alphanumeric row
+    // Roman digits
+    key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
+    key <AE01>  { [   1,            exclam,       U0C67          ] };
+    key <AE02>  { [   2,            at,           U0C68,  U20A8  ] };  // U20A8: generic rupee sign (Rs)
+    key <AE03>  { [   3,            numbersign,   U0C69          ] };
+    key <AE04>  { [   4,            dollar,       U0C6A,  U20B9  ] };  // U20B9: new Indian Rupee sign
+    key <AE05>  { [   5,            percent,      U0C6B          ] };
+    key <AE06>  { [   6,            asciicircum,  U0C6C,  U200C  ] };  // ZWNJ
+    key <AE07>  { [   7,            ampersand,    U0C6D,  U200D  ] };  // ZWJ
+    key <AE08>  { [   8,            asterisk,     U0C6E,  U0C01  ] };  // U0C01: Telugu arasunna
+    key <AE09>  { [   9,            parenleft,    U0C6F          ] };
+    key <AE10>  { [   0,            parenright,   U0C66          ] };
+    key <AE11>  { [   minus,        underscore,   U0952          ] };  // U0952: Devanagari stress sign anudatta
+    key <AE12>  { [   equal,        plus                         ] };
+    key <BKSL>  { [   U005C,        U007C,        U0964,  U0965  ] };  // backslash, pipe, danda, double danda
+
+    //Q Row
+    key <AD01>  { [   U0C1F,         U0C20                       ] };  // Q: retroflex Ta, Tha
+    key <AD02>  { [   U0C21,         U0C22                       ] };  // W: retroflex Da, Dha
+    key <AD03>  { [   U0C46,         U0C47,      U0C0E,  U0C0F   ] };  // E: matras, short E, long E
+    key <AD04>  { [   U0C30,         U0C43,      U0C0B,  U0C31   ] };  // R: ra, vocalic R matra, vocalic R, RRA
+    key <AD05>  { [   U0C24,         U0C25                       ] };  // T: dental ta, tha
+    key <AD06>  { [   U0C2F,         U0C48,      U0C10           ] };  // Y: ya, ai matra, ai
+    key <AD07>  { [   U0C41,         U0C42,      U0C09,  U0C0A   ] };  // U: matras, u, uu
+    key <AD08>  { [   U0C3F,         U0C40,      U0C07,  U0C08   ] };  // I: matras, i, ii
+    key <AD09>  { [   U0C4A,         U0C4B,      U0C12,  U0C13   ] };  // O: matras, short o, long o
+    key <AD10>  { [   U0C2A,         U0C2B                       ] };  // P: pa, pha
+    key <AD11>  { [   bracketleft,   braceleft                   ] };
+    key <AD12>  { [   bracketright,  braceright                  ] };
+
+    //A Row
+    key <AC01>  { [   U0C3E,        U0C06,     U0C05             ] };  // A: aa matra, aa, short a
+    key <AC02>  { [   U0C38,        U0C36                        ] };  // S: sa, sha
+    key <AC03>  { [   U0C26,        U0C27                        ] };  // D: dental da, dha
+    key <AC04>  { [   U0C4D,        U0C44,     U0C60             ] };  // F: virama, vocalic RR matra, vocalic RR
+    key <AC05>  { [   U0C17,        U0C18                        ] };  // G: ga, gha
+    key <AC06>  { [   U0C39,        U0C03                        ] };  // H: ha, visarga
+    key <AC07>  { [   U0C1C,        U0C1D                        ] };  // J: ja, jha
+    key <AC08>  { [   U0C15,        U0C16                        ] };  // K: ka, kha
+    key <AC09>  { [   U0C32,        U0C33,     U0C62,    U0C0C   ] };  // L: la, lla, vocalic L matra, vocalic L
+    key <AC10>  { [   semicolon,    colon                        ] };
+    key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
+                                                                       // U201D: Right double quotation mark
+
+    //Z Row
+    key <AB01>  { [   U0C1E,   U0C19                   ] };  // Z: nya, nga
+    key <AB02>  { [   U0C37                            ] };  // X: ssa
+    key <AB03>  { [   U0C1A,   U0C1B                   ] };  // C: ca, cha
+    key <AB04>  { [   U0C35,   U0C4C,  U0C14           ] };  // V: va, matra au, au
+    key <AB05>  { [   U0C2C,   U0C2D                   ] };  // B: ba, bha
+    key <AB06>  { [   U0C28,   U0C23                   ] };  // N: na, nna
+    key <AB07>  { [   U0C2E,   U0C02,  U0C3D,  U0950   ] };  // M: ma, anusvara, avagraha, Devanagari OM
+    key <AB08>  { [   comma,   U003C,  U0C58           ] };  // comma: comma, less than, TSA
+    key <AB09>  { [   period,  U003E,  U0C59           ] };  // period: period, greater than, DZA
+    key <AB10>  { [   slash,   question                ] };
+
+    include "level3(ralt_switch)"
+};
+// ---- END Telugu KaGaPa ----
diff --git a/xorg-server/xkeyboard-config/symbols/latin b/xorg-server/xkeyboard-config/symbols/latin
index 424768ead..8cabe73e3 100644
--- a/xorg-server/xkeyboard-config/symbols/latin
+++ b/xorg-server/xkeyboard-config/symbols/latin
@@ -105,7 +105,7 @@ xkb_symbols "type3" {
     key <AC05>	{ [         g,          G, bracketright,          ENG ]	};
     key <AC08>	{ [         k,          K,      lstroke,    ampersand ]	};
 
-    key <AB01>	{ [         y,          Y, guillemotleft,         less ]	};
+    key <AB01>	{ [         y,          Y, guillemotleft,        less ]	};
     key <AB04>	{ [         v,          V,           at,        grave ]	};
     key <AB05>	{ [         b,          B,    braceleft,   apostrophe ]	};
     key <AB06>	{ [         n,          N,   braceright,   braceright ]	};
@@ -114,9 +114,9 @@ xkb_symbols "type3" {
     key <AB09>	{ [    period,      colon,      greater,     division ]	};
 };
 
-// Another one Latin common layout
+// Another common Latin layout
 // (German, Estonian, Spanish, Icelandic, Italian, Latin American, Portuguese)
- 
+
 partial
 xkb_symbols "type4" {
 
@@ -150,7 +150,7 @@ xkb_symbols "nodeadkeys" {
 
 partial
 xkb_symbols "type2_nodeadkeys" {
- 
+
     include "latin(nodeadkeys)"
 
     key <AD11>	{ [     aring,      Aring,   diaeresis,        degree ]	};
@@ -162,13 +162,13 @@ xkb_symbols "type2_nodeadkeys" {
 
 partial
 xkb_symbols "type3_nodeadkeys" {
- 
+
     include "latin(nodeadkeys)"
 };
 
 partial
 xkb_symbols "type4_nodeadkeys" {
- 
+
     include "latin(nodeadkeys)"
 
     key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};
@@ -178,12 +178,12 @@ xkb_symbols "type4_nodeadkeys" {
 // See http://marcinwolinski.pl/keyboard/ for a description.
 // Used by pl(intl)
 //
-// ┌────┐
-// │ 2 4│   2 = Shift,  4 = Level3 + Shift
-// │ 1 3│   1 = Normal, 3 = Level3
-// └────┘
+// ┌─────┐
+// │ 2 4 │   2 = Shift,  4 = Level3 + Shift
+// │ 1 3 │   1 = Normal, 3 = Level3
+// └─────┘
 // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ~ ~ │ ! ' │ @ " │ # ˝ │ $ ¸ │ % ˇ │ ^ ^ │ & ˘ │ * ˙ │ ( ̣ │ ) ° │ _ ¯ │ + ˛ ┃ ⌫ Back  ┃
+// │ ~ ~ │ ! ' │ @ " │ # ˝ │ $ ¸ │ % ˇ │ ^ ^ │ & ˘ │ * ̇  │ ( ̣  │ ) ° │ _ ¯ │ + ˛ ┃ ⌫ Back- ┃
 // │ ` ` │ 1 ¡ │ 2 © │ 3 • │ 4 § │ 5 € │ 6 ¢ │ 7 − │ 8 × │ 9 ÷ │ 0 ° │ - – │ = — ┃  space  ┃
 // ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
 // ┃       ┃ Q   │ W   │ E   │ R   │ T   │ Y   │ U   │ I   │ O   │ P   │ { « │ } » ┃ Enter ┃
@@ -198,7 +198,7 @@ xkb_symbols "type4_nodeadkeys" {
 // ┃       ┃       ┃       ┃ ␣                               ⍽ ┃       ┃       ┃       ┃
 // ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣           Space               ⍽ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
- 
+
 partial
 xkb_symbols "intl" {
 
diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt
index e42b40808..b2e0b1255 100644
--- a/xorg-server/xkeyboard-config/symbols/pt
+++ b/xorg-server/xkeyboard-config/symbols/pt
@@ -186,7 +186,7 @@ partial alphanumeric_keys
 xkb_symbols "nativo-us" {
     include "pt(nativo)"
 
-    name[Group1]="Portuguese (Nativo for USA keyboards)";
+    name[Group1]="Portuguese (Nativo for US keyboards)";
 
 // Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index b34bedc0f..5ad2ae072 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -853,7 +853,7 @@ xkb_symbols "altgr-intl" {
 partial alphanumeric_keys
 xkb_symbols "classmate" {
     include "us(basic)"
-    name[Group1]= "USA - ClassmatePC";
+    name[Group1]= "English (US)";
 
     key <LSGT> { [ backslash,	bar,		backslash,	bar ] };
 
@@ -1052,14 +1052,14 @@ xkb_symbols "olpc" {
 partial alphanumeric_keys
 xkb_symbols "olpc2" {
    include "us(olpc)"
-   name[Group1]= "English (layout toggle on multiply/divide key)";
+   name[Group1]= "English (the divide/multiply keys toggle the layout)";
    include "group(olpc)"
 };
 
 xkb_symbols "olpcm" {
 
    include "us(basic)"
-   name[Group1]= "USA";
+   name[Group1]= "English (US)";
 
    // Mechanical (non-membrane) OLPC int'l US English keyboard layout.
    // See: http://wiki.laptop.org/go/OLPC_English_Non-membrane_Keyboard
diff --git a/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh b/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh
index 90981a939..5756d3ff2 100644
--- a/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh
+++ b/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh
@@ -13,7 +13,9 @@ F1b=${F1}base
 F1e=${F1}extras
 
 xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.xml > $F1b
-xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.extras.xml > $F1e
+xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.extras.xml | \
+  grep -v "sun_type" > $F1e
+
 cat $F1b $F1e | sort | uniq > $F1
 rm -f $F1e $F1e
 
@@ -39,7 +41,7 @@ for i in $ROOT/symbols/*; do
   } else
   {
     name=$2;
-    if (variant == "olpc" || variant == "htcdream")
+    if (variant == "olpc" || variant == "htcdream" || variant == "olpcm" || variant == "classmate")
       printf "%s:\"%s\"\n", id, name;
     else
       printf "%s(%s):\"%s\"\n", id, variant, name;