[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#382697: kbd-chooser: Greek keyboard layout selection fails (Patch #2)



On Sun, Aug 20, 2006 at 07:00:05PM -0500, Christian Perrier wrote:
> Please commit it.

Just to make sure no other charsets are left out at compile time,
I searched for the list of charsets explicitely mentioned:

zino@slurp> find /usr/share/keymaps/ -name *.gz -exec zgrep -w charset
{} \; | sort | uniq

charset "iso-8859-1"
charset "iso-8859-15"
charset "iso-8859-2"
charset "iso-8859-4"
charset "iso-8859-5"
charset "iso-8859-7"
charset "iso-8859-8"
charset "iso-8859-9"
charset "tis-620"

"iso-8859-7" is the only charset which needs to be re-enabled;
I noticed the following charsets are not being used despite being
enabled:

"mazovia"
"cp-1250"
"koi8-r"
"koi8-u"

the attached patch, besides enabling "iso-8859-7", disables those and
should make it easier to re-enable them if needed.  
Let me know if you prefere this second patch attached to a
separate whishlist bug.

regards,
Davide

Index: ksyms.c
===================================================================
--- ksyms.c	(revision 40022)
+++ ksyms.c	(working copy)
@@ -445,6 +445,7 @@
 	{ 0x02d9, "abovedot" }
 };
 
+#ifdef CHARSET_MAZOVIA
 static sym mazovia_syms[] = {
 	/* as specified by Wlodek Bzyl <matwb@univ.gda.pl> */
 	{ 0x0080, "" },
@@ -576,6 +577,7 @@
 	{ 0x00fe, "" },
 	{ 0x201e, "quotedblbase" }
 };
+#endif // CHARSET_MAZOVIA
 
 #ifdef CHARSET_ISO_8859_3
 static sym latin3_syms[] = {
@@ -1139,8 +1141,13 @@
 };
 #endif
 
+#if defined(CHARSET_KOI8)
 #include "koi8.syms.h"
+#endif
+
+#if defined(CHARSET_CP1250)
 #include "cp1250.syms.h"
+#endif
 
 #if defined(CHARSET_ETHIOPIC)
 #include "ethiopic.syms.h"
@@ -1651,10 +1658,16 @@
     { "iso-8859-10",	latin6_syms, 160 },
 #endif
     { "iso-8859-15",	iso_8859_15_syms, 160 },
+#ifdef CHARSET_MAZOVIA
     { "mazovia",	mazovia_syms, 128 },
+#endif
+#ifdef CHARSET_CP1250
     { "cp-1250",	cp1250_syms, 128 },
+#endif
+#ifdef CHARSET_KOI8
     { "koi8-r",		koi8_syms, 128 },
     { "koi8-u",		koi8_syms, 128 },
+#endif
 #ifdef CHARSET_THAI
     { "tis-620",	tis_620_syms, 160 },
 #endif
Index: config.h
===================================================================
--- config.h	(revision 40022)
+++ config.h	(working copy)
@@ -33,10 +33,13 @@
 
 // #define CHARSET_ETHIOPIC 1
 // #define CHARSET_SAMI 1
+// #define CHARSET_MAZOVIA
+// #define CHARSET_KOI8
+// #define CHARSET_CP1250
 // #define CHARSET_ISO_8859_3  1
 #define CHARSET_ISO_8859_4  1
 #define CHARSET_ISO_8859_5  1
-// #define CHARSET_ISO_8859_7  1
+#define CHARSET_ISO_8859_7  1
 
 #define CHARSET_ISO_8859_8
 #define CHARSET_ISO_8859_9

Attachment: signature.asc
Description: Digital signature


Reply to: