Added Crimean Tatar (Crimean Turkish) layouts again, based on layouts released with...

Minor tweaks have been made in comparison to code that was unjustifiably and abusively reverted by Sergey in February. In particular, crh.po is not checked in this time, because it was one of Sergey's reasons for reverting, so until it's pulled from TP, something like `cp po/tr.po po/crh.po` is required prior to building from source.

diff --git a/ChangeLog b/ChangeLog
index a48550e..a6c06f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-11  Reşat SABIQ
+
+       * configure.in (new locale), rules/base.xml.in,
+       symbols/ro, symbols/tr, symbols/ua, symbols/uz:
+       Added Crimean Tatar (Crimean Turkish) layouts;
+       http://bugs.freedesktop.org/show_bug.cgi?id=19730
+
 2009-05-07 Sergey Udaltsov
 
        * symbols/ru: fixed Kalmyk variant

diff --git a/configure.in b/configure.in
index 94a925f..b55f8cd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -46,7 +46,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 
 AM_GLIB_GNU_GETTEXT
 
-ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg crh cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
 
 AC_SUBST(xkb_base)
 AC_SUBST(xkb_rules_symlink)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 6e77ee8..9629bd7 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3300,6 +3300,34 @@
             <_description>Winkeys</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>crh_f</name>
+            <_description>Crimean Tatar (Turkish F)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_alt</name>
+            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_dobruca1</name>
+            <_description>Crimean Tatar (Dobruca-1 Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_dobruca2</name>
+            <_description>Crimean Tatar (Dobruca-2 Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3831,6 +3859,27 @@
             <_description>International (with dead keys)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>crh</name>
+            <_description>Crimean Tatar (Turkish Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_f</name>
+            <_description>Crimean Tatar (Turkish F)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_alt</name>
+            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3885,6 +3934,27 @@
             <_description>Homophonic</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>crh</name>
+            <_description>Crimean Tatar (Turkish Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_f</name>
+            <_description>Crimean Tatar (Turkish F)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_alt</name>
+            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3947,6 +4017,27 @@
             <_description>Latin</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>crh</name>
+            <_description>Crimean Tatar (Turkish Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_f</name>
+            <_description>Crimean Tatar (Turkish F)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crh_alt</name>
+            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+            <languageList><iso639Id>crh</iso639Id></languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>

diff --git a/symbols/ro b/symbols/ro
index e4ed705..b2842bd 100644 (file)
--- a/symbols/ro
+++ b/symbols/ro
@@ -193,3 +193,43 @@ xkb_symbols "winkeys" {
     include "level3(ralt_switch)"
 
 };
+
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh_f" {
+    include "tr(crh_f)"
+
+    name[Group1]="Romania - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+    include "tr(crh_alt)"
+
+    name[Group1]="Romania - Crimean Tatar (Turkish Alt-Q)";
+};
+
+partial
+xkb_symbols "crh_dobruca1" {
+    include "tr(crh)"
+
+    name[Group1]="Romania - Crimean Tatar (Dobruca-1 Q)";
+
+    key <AD05> { [         t,          T,       tcedilla,       Tcedilla ]     };
+    key <AD10> { [         p,          P,         abreve,         Abreve ]     };
+
+    key <AC04> { [         f,          F,         ibreve,         Ibreve ]     };
+    key <AC07> { [    iacute,     Iacute,              j,              J ]     };
+
+    key <AB07> { [         m,          M,      trademark,      masculine ]     };
+};
+
+partial
+xkb_symbols "crh_dobruca2" {
+    include "ro(crh_dobruca1)"
+
+    name[Group1]="Romania - Crimean Tatar (Dobruca-2 Q)";
+
+    key <AC04> { [         f,          F,          iacute,          Iacute ]   };
+    key <AC07> { [    ibreve,     Ibreve,               j,               J ]   };
+};

diff --git a/symbols/tr b/symbols/tr
index 83e82f1..2c71913 100644 (file)
--- a/symbols/tr
+++ b/symbols/tr
@@ -268,8 +268,7 @@ xkb_symbols "intl" {
     key <BKSL> { type[group1] = "FOUR_LEVEL",[     comma,  semicolon,   dead_grave, dead_grave ]       };
     key <LSGT> { type[group1] = "FOUR_LEVEL",[     less,     greater,   bar,    brokenbar ]    };
     key <AB08> { [odiaeresis, Odiaeresis,     multiply,   VoidSymbol ] };
-    key <AB09> { [  ccedilla,   Ccedilla, periodcentered,     division ] 
-};
+    key <AB09> { [  ccedilla,   Ccedilla, periodcentered,   division ] };
     key <AB10> { type[group1] = "FOUR_LEVEL",[    period,      colon, dead_abovedot, dead_abovedot ] };
 
     include "nbsp(level3)"
@@ -298,3 +297,58 @@ xkb_symbols "olpc" {
     key <I219> { [  less,  greater, VoidSymbol, VoidSymbol ] };
 
 };
+
+// Crimean Tatar (Crimean Turkish) layouts. 
+// These layouts are currently experimental. In particular, the mapping of letter 'x', 
+// included for foreign words and shortcuts, might change in the future...
+// Reşat SABIQ <tilde.birlik@gmail.com>, 2009
+
+// Crimean Tatar (Crimean Turkish) Q Layout
+default partial
+xkb_symbols "crh" {
+
+    include "tr(basic)"
+
+    name[Group1]="Turkey - Crimean Tatar (Turkish Q)";
+
+    key <AE11> { [         x,          X,          asterisk,      question ]   };
+
+    key <AC04> { [         f,          F,          iacute,          Iacute ]   };
+    key <AC07> { [         j,          J,          ibreve,          Ibreve ]   };
+    key <TLDE> { [  quotedbl,  backslash,            less,          degree ]   };
+
+    key <AB02> { [    ntilde,     Ntilde,  guillemotright,         greater ]   };
+};
+
+// Crimean Tatar (Crimean Turkish) F Layout
+default partial
+xkb_symbols "crh_f" {
+
+    include "tr(f)"
+
+    name[Group1]="Turkey - Crimean Tatar (Turkish F)";
+
+    key <AE11> { [         x,          X,           slash,        question ]   };
+
+    key <AD04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",
+                  [  idotless,          I,          iacute,          Iacute ]  };
+
+    key <AC07> { [         k,          K,          ibreve,          Ibreve ]   };
+    key <TLDE> { [      plus,   asterisk,       backslash,       plusminus ]   };
+
+    key <BKSL> { [    ntilde,     Ntilde,           grave,      dead_grave ]   };
+};
+
+// Crimean Tatar (Crimean Turkish) Alt-Q Layout
+partial
+xkb_symbols "crh_alt" {
+
+    include "tr(alt)"
+
+    name[Group1]="Turkey - Crimean Tatar (Turkish Alt-Q)";
+
+    key <AC04> { [         f,          F,          iacute,          Iacute ]   };
+    key <AC07> { [         j,          J,          ibreve,          Ibreve ]   };
+
+    key <AB06> { [         n,          N,          ntilde,          Ntilde ]   };
+};

diff --git a/symbols/ua b/symbols/ua
index 673d327..9ed98fe 100644 (file)
--- a/symbols/ua
+++ b/symbols/ua
@@ -311,3 +311,24 @@ xkb_symbols "homophonic" {
   key <AB10> {   [ slash,             question            ]    };
 };
 
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh" {
+    include "tr(crh)"
+
+    name[Group1]="Ukraine - Crimean Tatar (Turkish Q)";
+};
+
+partial
+xkb_symbols "crh_f" {
+    include "tr(crh_f)"
+
+    name[Group1]="Ukraine - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+    include "tr(crh_alt)"
+
+    name[Group1]="Ukraine - Crimean Tatar (Turkish Alt-Q)";
+};

diff --git a/symbols/uz b/symbols/uz
index c651ff0..b37a6ca 100644 (file)
--- a/symbols/uz
+++ b/symbols/uz
@@ -99,3 +99,24 @@ xkb_symbols "latin" {
     key <AC11>  { [0x010002BB, quotedbl] };
 };
 
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh" {
+    include "tr(crh)"
+
+    name[Group1]="Uzbekistan - Crimean Tatar (Turkish Q)";
+};
+
+partial
+xkb_symbols "crh_f" {
+    include "tr(crh_f)"
+
+    name[Group1]="Uzbekistan - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+    include "tr(crh_alt)"
+
+    name[Group1]="Uzbekistan - Crimean Tatar (Turkish Alt-Q)";
+};