Attachment 126564 Details for Bug 96418 – move-indian-layouts-to-extra-xml.patch

[patch] move-indian-layouts-to-extra-xml.patch

0001-Move-Indian-keyboard-layouts-from-base.xml.in-to-bas.patch (text/plain), 27.09 KB, created by Peter Hutterer on 2016-09-15 22:32:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2016-09-15 22:32:23 UTC

Size: 27.09 KB

patch

obsolete

>From 7525770287097dae78c6f5b5d394fc7adc928dcd Mon Sep 17 00:00:00 2001
>From: Mike FABIAN <mfabian@redhat.com>
>Date: Wed, 18 May 2016 16:49:33 +0200
>Subject: [PATCH] Move Indian keyboard layouts from base.xml.in to
> base.extras.xml.in
>
>Apparently the Indian keyboard layouts in xkeyboard-config are not
>very useful because of limitations in xkb. In xkb, it is not possible
>to output several characters when one key is pressed but that seems
>sometimes necessary.
>
>For Indian languages, the input methods supplied by ibus-m17n appear
>to be more useful, having the xkb keyboard layouts show up as well in
>the gnome-control centre confuse the user because of too many useless
>choices.
>
>Therefore, Anish Patil suggested to hide these Indian keyboard layouts
>in the gnome-control-centre.
>
>The easiest way to hide them is to move them from
>/usr/share/X11/xkb/rules/base.xml to
>/usr/share/X11/xkb/rules/base.extras.xml because gnome-control-centre
>does not list the layouts from base.extras.xml.
>
>base.extras.xml seems to be for rarely used layouts, so these Indian
>layouts seem to fet better there than in base.xml.
>---
> rules/base.extras.xml.in | 355 +++++++++++++++++++++++++++++++++++++++++++++++
> rules/base.xml.in        | 345 ---------------------------------------------
> 2 files changed, 355 insertions(+), 345 deletions(-)
>
>diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
>index 4cd0a4d..f95f44d 100644
>--- a/rules/base.extras.xml.in
>+++ b/rules/base.extras.xml.in
>@@ -948,6 +948,361 @@
>         </variant>
>       </variantList>
>     </layout>
>+    <layout>
>+      <configItem>
>+        <name>bd</name>
>+        
>+        <_shortDescription>bn</_shortDescription>
>+        <_description>Bangla</_description>
>+        <languageList>
>+          <iso639Id>ben</iso639Id>
>+          
>+          <iso639Id>sat</iso639Id>
>+        </languageList>
>+      </configItem>
>+      <variantList>
>+        <variant>
>+          <configItem>
>+            <name>probhat</name>
>+            <_description>Bangla (Probhat)</_description>
>+          </configItem>
>+        </variant>
>+      </variantList>
>+    </layout>
>+    <layout>
>+      <configItem>
>+        <name>in</name>
>+        
>+        <_shortDescription>in</_shortDescription>
>+        <_description>Indian</_description>
>+      </configItem>
>+      <variantList>
>+        <variant>
>+          <configItem>
>+            <name>ben</name>
>+            
>+            <_shortDescription>bn</_shortDescription>
>+            <_description>Bangla (India)</_description>
>+            <languageList>
>+              <iso639Id>ben</iso639Id>
>+              
>+              <iso639Id>sat</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>ben_probhat</name>
>+            
>+            <_shortDescription>bn</_shortDescription>
>+            <_description>Bangla (India, Probhat)</_description>
>+            <languageList>
>+              <iso639Id>ben</iso639Id>
>+              
>+              <iso639Id>sat</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>ben_baishakhi</name>
>+            <_description>Bangla (India, Baishakhi)</_description>
>+            <languageList>
>+              <iso639Id>ben</iso639Id>
>+              
>+              <iso639Id>sat</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>ben_bornona</name>
>+            <_description>Bangla (India, Bornona)</_description>
>+            <languageList>
>+              <iso639Id>ben</iso639Id>
>+              
>+              <iso639Id>sat</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+         <variant>
>+          <configItem>
>+            <name>ben_gitanjali</name>
>+            <_description>Bangla (India, Uni Gitanjali)</_description>
>+            <languageList>
>+              <iso639Id>ben</iso639Id>
>+              
>+              <iso639Id>sat</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>ben_inscript</name>
>+            <_description>Bangla (India, Baishakhi Inscript)</_description>
>+            <languageList>
>+              <iso639Id>ben</iso639Id>
>+              
>+              <iso639Id>sat</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>eeyek</name>
>+            <_description>Manipuri (Eeyek)</_description>
>+            <languageList>
>+              <iso639Id>mni</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>guj</name>
>+            
>+            <_shortDescription>gu</_shortDescription>
>+            <_description>Gujarati</_description>
>+            <languageList>
>+              <iso639Id>guj</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>guru</name>
>+            
>+            <_shortDescription>pa</_shortDescription>
>+            <_description>Punjabi (Gurmukhi)</_description>
>+            <languageList>
>+              <iso639Id>pan</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>jhelum</name>
>+            
>+            <_shortDescription>pa</_shortDescription>
>+            <_description>Punjabi (Gurmukhi Jhelum)</_description>
>+            <languageList>
>+              <iso639Id>pan</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>kan</name>
>+            
>+            <_shortDescription>kn</_shortDescription>
>+            <_description>Kannada</_description>
>+            <languageList>
>+              <iso639Id>kan</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>kan-kagapa</name>
>+            
>+            <_shortDescription>kn</_shortDescription>
>+            <_description>Kannada (KaGaPa phonetic)</_description>
>+            <languageList>
>+              <iso639Id>kan</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>mal</name>
>+            
>+            <_shortDescription>ml</_shortDescription>
>+            <_description>Malayalam</_description>
>+            <languageList>
>+              <iso639Id>mal</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>mal_lalitha</name>
>+            
>+            <_shortDescription>ml</_shortDescription>
>+            <_description>Malayalam (Lalitha)</_description>
>+            <languageList>
>+              <iso639Id>mal</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>mal_enhanced</name>
>+            
>+            <_shortDescription>ml</_shortDescription>
>+            <_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
>+            <languageList>
>+              <iso639Id>mal</iso639Id>
>+            </languageList>
>+          </configItem>
>+         </variant>
>+         <variant>
>+           <configItem>
>+            <name>ori</name>
>+            
>+            <_shortDescription>or</_shortDescription>
>+            <_description>Oriya</_description>
>+            <languageList>
>+              <iso639Id>ori</iso639Id>
>+              
>+              <iso639Id>sat</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+           <configItem>
>+            <name>olck</name>
>+            
>+            <_shortDescription>sat</_shortDescription>
>+            <_description>Ol Chiki</_description>
>+            <languageList>
>+              
>+              <iso639Id>sat</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>tam_unicode</name>
>+            
>+            <_shortDescription>ta</_shortDescription>
>+            <_description>Tamil (Unicode)</_description>
>+            <languageList>
>+              <iso639Id>tam</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>tam_keyboard_with_numerals</name>
>+            
>+            <_shortDescription>ta</_shortDescription>
>+            <_description>Tamil (keyboard with numerals)</_description>
>+            <languageList>
>+              <iso639Id>tam</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>tam_TAB</name>
>+            
>+            <_shortDescription>ta</_shortDescription>
>+            <_description>Tamil (TAB typewriter)</_description>
>+            <languageList>
>+              <iso639Id>tam</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>tam_TSCII</name>
>+            
>+            <_shortDescription>ta</_shortDescription>
>+            <_description>Tamil (TSCII typewriter)</_description>
>+            <languageList>
>+              <iso639Id>tam</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>tam</name>
>+            
>+            <_shortDescription>ta</_shortDescription>
>+            <_description>Tamil</_description>
>+            <languageList>
>+              <iso639Id>tam</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>tel</name>
>+            
>+            <_shortDescription>te</_shortDescription>
>+            <_description>Telugu</_description>
>+            <languageList>
>+              <iso639Id>tel</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>tel-kagapa</name>
>+            
>+            <_shortDescription>te</_shortDescription>
>+            <_description>Telugu (KaGaPa phonetic)</_description>
>+            <languageList>
>+              <iso639Id>tel</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>bolnagri</name>
>+            
>+            <_shortDescription>hi</_shortDescription>
>+            <_description>Hindi (Bolnagri)</_description>
>+            <languageList>
>+              <iso639Id>hin</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>hin-wx</name>
>+            
>+            <_shortDescription>hi</_shortDescription>
>+            <_description>Hindi (Wx)</_description>
>+            <languageList>
>+              <iso639Id>hin</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>hin-kagapa</name>
>+            
>+            <_shortDescription>hi</_shortDescription>
>+            <_description>Hindi (KaGaPa phonetic)</_description>
>+            <languageList>
>+              <iso639Id>hin</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>san-kagapa</name>
>+            
>+            <_shortDescription>sa</_shortDescription>
>+            <_description>Sanskrit (KaGaPa phonetic)</_description>
>+            <languageList>
>+              <iso639Id>san</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>mar-kagapa</name>
>+            
>+            <_shortDescription>mr</_shortDescription>
>+            <_description>Marathi (KaGaPa phonetic)</_description>
>+            <languageList>
>+              <iso639Id>mar</iso639Id>
>+            </languageList>
>+          </configItem>
>+        </variant>
>+      </variantList>
>+    </layout>
>   </layoutList>
>   <optionList>
>       <group allowMultipleSelection="true">
>diff --git a/rules/base.xml.in b/rules/base.xml.in
>index 0c93975..576e7b1 100644
>--- a/rules/base.xml.in
>+++ b/rules/base.xml.in
>@@ -1805,27 +1805,6 @@
>     </layout>
>     <layout>
>       <configItem>
>-        <name>bd</name>
>-        
>-        <_shortDescription>bn</_shortDescription>
>-        <_description>Bangla</_description>
>-        <languageList>
>-          <iso639Id>ben</iso639Id>
>-          
>-          <iso639Id>sat</iso639Id>
>-        </languageList>
>-      </configItem>
>-      <variantList>
>-        <variant>
>-          <configItem>
>-            <name>probhat</name>
>-            <_description>Bangla (Probhat)</_description>
>-          </configItem>
>-        </variant>
>-      </variantList>
>-    </layout>
>-    <layout>
>-      <configItem>
>         <name>in</name>
>         
>         <_shortDescription>in</_shortDescription>
>@@ -1834,275 +1813,6 @@
>       <variantList>
>         <variant>
>           <configItem>
>-            <name>ben</name>
>-            
>-            <_shortDescription>bn</_shortDescription>
>-            <_description>Bangla (India)</_description>
>-            <languageList>
>-              <iso639Id>ben</iso639Id>
>-              
>-              <iso639Id>sat</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>ben_probhat</name>
>-            
>-            <_shortDescription>bn</_shortDescription>
>-            <_description>Bangla (India, Probhat)</_description>
>-            <languageList>
>-              <iso639Id>ben</iso639Id>
>-              
>-              <iso639Id>sat</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>ben_baishakhi</name>
>-            <_description>Bangla (India, Baishakhi)</_description>
>-            <languageList>
>-              <iso639Id>ben</iso639Id>
>-              
>-              <iso639Id>sat</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>ben_bornona</name>
>-            <_description>Bangla (India, Bornona)</_description>
>-            <languageList>
>-              <iso639Id>ben</iso639Id>
>-              
>-              <iso639Id>sat</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-         <variant>
>-          <configItem>
>-            <name>ben_gitanjali</name>
>-            <_description>Bangla (India, Uni Gitanjali)</_description>
>-            <languageList>
>-              <iso639Id>ben</iso639Id>
>-              
>-              <iso639Id>sat</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>ben_inscript</name>
>-            <_description>Bangla (India, Baishakhi Inscript)</_description>
>-            <languageList>
>-              <iso639Id>ben</iso639Id>
>-              
>-              <iso639Id>sat</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>eeyek</name>
>-            <_description>Manipuri (Eeyek)</_description>
>-            <languageList>
>-              <iso639Id>mni</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>guj</name>
>-            
>-            <_shortDescription>gu</_shortDescription>
>-            <_description>Gujarati</_description>
>-            <languageList>
>-              <iso639Id>guj</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>guru</name>
>-            
>-            <_shortDescription>pa</_shortDescription>
>-            <_description>Punjabi (Gurmukhi)</_description>
>-            <languageList>
>-              <iso639Id>pan</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>jhelum</name>
>-            
>-            <_shortDescription>pa</_shortDescription>
>-            <_description>Punjabi (Gurmukhi Jhelum)</_description>
>-            <languageList>
>-              <iso639Id>pan</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>kan</name>
>-            
>-            <_shortDescription>kn</_shortDescription>
>-            <_description>Kannada</_description>
>-            <languageList>
>-              <iso639Id>kan</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>kan-kagapa</name>
>-            
>-            <_shortDescription>kn</_shortDescription>
>-            <_description>Kannada (KaGaPa phonetic)</_description>
>-            <languageList>
>-              <iso639Id>kan</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>mal</name>
>-            
>-            <_shortDescription>ml</_shortDescription>
>-            <_description>Malayalam</_description>
>-            <languageList>
>-              <iso639Id>mal</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>mal_lalitha</name>
>-            
>-            <_shortDescription>ml</_shortDescription>
>-            <_description>Malayalam (Lalitha)</_description>
>-            <languageList>
>-              <iso639Id>mal</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>mal_enhanced</name>
>-            
>-            <_shortDescription>ml</_shortDescription>
>-            <_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
>-            <languageList>
>-              <iso639Id>mal</iso639Id>
>-            </languageList>
>-          </configItem>
>-         </variant>
>-         <variant>
>-           <configItem>
>-            <name>ori</name>
>-            
>-            <_shortDescription>or</_shortDescription>
>-            <_description>Oriya</_description>
>-            <languageList>
>-              <iso639Id>ori</iso639Id>
>-              
>-              <iso639Id>sat</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-           <configItem>
>-            <name>olck</name>
>-            
>-            <_shortDescription>sat</_shortDescription>
>-            <_description>Ol Chiki</_description>
>-            <languageList>
>-              
>-              <iso639Id>sat</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>tam_unicode</name>
>-            
>-            <_shortDescription>ta</_shortDescription>
>-            <_description>Tamil (Unicode)</_description>
>-            <languageList>
>-              <iso639Id>tam</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>tam_keyboard_with_numerals</name>
>-            
>-            <_shortDescription>ta</_shortDescription>
>-            <_description>Tamil (keyboard with numerals)</_description>
>-            <languageList>
>-              <iso639Id>tam</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>tam_TAB</name>
>-            
>-            <_shortDescription>ta</_shortDescription>
>-            <_description>Tamil (TAB typewriter)</_description>
>-            <languageList>
>-              <iso639Id>tam</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>tam_TSCII</name>
>-            
>-            <_shortDescription>ta</_shortDescription>
>-            <_description>Tamil (TSCII typewriter)</_description>
>-            <languageList>
>-              <iso639Id>tam</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>tam</name>
>-            
>-            <_shortDescription>ta</_shortDescription>
>-            <_description>Tamil</_description>
>-            <languageList>
>-              <iso639Id>tam</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>tel</name>
>-            
>-            <_shortDescription>te</_shortDescription>
>-            <_description>Telugu</_description>
>-            <languageList>
>-              <iso639Id>tel</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>tel-kagapa</name>
>-            
>-            <_shortDescription>te</_shortDescription>
>-            <_description>Telugu (KaGaPa phonetic)</_description>
>-            <languageList>
>-              <iso639Id>tel</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>             <name>urd-phonetic</name>
>             
>             <_shortDescription>ur</_shortDescription>
>@@ -2136,61 +1846,6 @@
>         </variant>
>         <variant>
>           <configItem>
>-            <name>bolnagri</name>
>-            
>-            <_shortDescription>hi</_shortDescription>
>-            <_description>Hindi (Bolnagri)</_description>
>-            <languageList>
>-              <iso639Id>hin</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>hin-wx</name>
>-            
>-            <_shortDescription>hi</_shortDescription>
>-            <_description>Hindi (Wx)</_description>
>-            <languageList>
>-              <iso639Id>hin</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>hin-kagapa</name>
>-            
>-            <_shortDescription>hi</_shortDescription>
>-            <_description>Hindi (KaGaPa phonetic)</_description>
>-            <languageList>
>-              <iso639Id>hin</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>san-kagapa</name>
>-            
>-            <_shortDescription>sa</_shortDescription>
>-            <_description>Sanskrit (KaGaPa phonetic)</_description>
>-            <languageList>
>-              <iso639Id>san</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>-            <name>mar-kagapa</name>
>-            
>-            <_shortDescription>mr</_shortDescription>
>-            <_description>Marathi (KaGaPa phonetic)</_description>
>-            <languageList>
>-              <iso639Id>mar</iso639Id>
>-            </languageList>
>-          </configItem>
>-        </variant>
>-        <variant>
>-          <configItem>
>             <name>eng</name>
>             
>             <_shortDescription>en</_shortDescription>
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 96418: 124382 | 126564

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.