PR: 16229

Submitted by:	Keith Jang <keith@ml.tw.freebsd.org>
Fix the kcfonts problem with some X applications, like Netscape or XEmacs.
The program which generates kcfonts just doesn't follow XLFD and let the
X-app get wrong information of big5-encoding fonts.

2 files changed, 126 insertions, 7 deletions

diff --git a/chinese/kcfonts/files/patch-ab b/chinese/kcfonts/files/patch-ab
index e456109e4f0c..36c31382a1ce 100644
--- a/chinese/kcfonts/files/patch-ab
+++ b/chinese/kcfonts/files/patch-ab
@@ -1,7 +1,9 @@
---- kc_fonts.alias	Sat May  1 22:48:12 1999
-+++ kc_fonts.alias.orig	Sat May  1 22:48:10 1999
-@@ -0,0 +1,4 @@
-+-kc-fixed-medium-r-normal--16-160-72-72-c-160-big5-0 kc15f
-+-kc-fixed-medium-r-normal--24-240-72-72-c-240-big5-0 kc24f
-+taipei16 kc15f
-+taipei24 kc24f
+--- kc_fonts.alias.orig	Wed Jan 19 03:18:30 2000
++++ kc_fonts.alias	Wed Jan 19 03:33:31 2000
+@@ -0,0 +1,6 @@
++kc12x24 -kc-fixed-medium-r-normal--24-170-100-100--c-120-iso8859-1
++kc15f -kc-fixed-medium-r-normal--16-160-72-72-c-160-big5-0
++kc24f -kc-fixed-medium-r-normal--24-240-100-100-c-240-big5-0
++kc8x15 -kc-fixed-medium-r-normal--15-170-100-100-c-80-iso8859-1
++taipei16 -kc-fixed-medium-r-normal--16-160-72-72-c-160-big5-0
++taipei24 -kc-fixed-medium-r-normal--24-240-100-100-c-240-big5-0
diff --git a/chinese/kcfonts/files/patch-ac b/chinese/kcfonts/files/patch-ac
new file mode 100644
index 000000000000..7c1af27167ad
--- /dev/null
+++ b/chinese/kcfonts/files/patch-ac
@@ -0,0 +1,117 @@
+--- kc12x24.c.orig	Wed Jan 19 02:14:33 2000
++++ kc12x24.c	Wed Jan 19 03:03:44 2000
+@@ -10,12 +10,12 @@
+ char bdfhead[]=
+ "STARTFONT 2.1\n"
+ "COMMENT X\n"
+-"FONT kc12x24\n"
++"FONT -kc-fixed-medium-r-normal--24-170-100-100--c-120-iso8859-1\n"
+ "SIZE 24 100 100\n"
+ "FONTBOUNDINGBOX 12 24 0 -2\n"
+ "STARTPROPERTIES 19\n"
+ "FONTNAME_REGISTRY \"\"\n"
+-"FOUNDRY \"Kau Chauo\"\n"
++"FOUNDRY \"KC\"\n"
+ "FAMILY_NAME \"Fixed\"\n"
+ "WEIGHT_NAME \"Medium\"\n"
+ "SLANT \"R\"\n"
+--- kc15f.c.orig	Wed Jan 19 02:14:40 2000
++++ kc15f.c	Wed Jan 19 03:05:11 2000
+@@ -12,22 +12,29 @@
+ char head[]=
+ "STARTFONT 2.1\n"
+ "COMMENT 16x15 Font\n"
+-"FONT kc15f\n"
++"FONT -kc-fixed-medium-r-normal--16-160-72-72-c-160-big5-0\n"
+ "SIZE 16 100 100\n"
+ "FONTBOUNDINGBOX 16 15 0 -1\n"
+-"STARTPROPERTIES 12\n"
++"STARTPROPERTIES 19\n"
+ "FONT_ASCENT 14\n"
+ "FONT_DESCENT 1\n"
+ "DEFAULT_CHAR 41280\n"
+-"COPYRIGHT \"KC\"\n"
+-"POINT_SIZE 240\n"
+-"FONT \"kc15f\"\n"
+-"WEIGHT 10\n"
+-"RESOLUTION 103\n"
+-"RESOLUTION_X 100\n"
+-"RESOLUTION_Y 100\n"
+-"X_HEIGHT 4294967295\n"
+-"QUAD_WIDTH 16\n"
++"COPYRIGHT \"Kau Chauo Business CO.\"\n"
++"FONTNAME_REGISTRY \"\"\n"
++"FOUNDRY \"KC\"\n"
++"FAMILY_NAME \"Fixed\"\n"
++"WEIGHT_NAME \"Medium\"\n"
++"SLANT \"R\"\n"
++"SETWIDTH_NAME \"Normal\"\n"
++"ADD_STYLE_NAME \"\"\n"
++"PIXEL_SIZE 16\n"
++"POINT_SIZE 160\n"
++"RESOLUTION_X 72\n"
++"RESOLUTION_Y 72\n"
++"SPACING \"C\"\n"
++"AVERAGE_WIDTH 160\n"
++"CHARSET_REGISTRY \"BIG5\"\n"
++"CHARSET_ENCODING \"0\"\n"
+ "ENDPROPERTIES\n"
+ "CHARS 13867\n";
+ 
+--- kc24f.c.orig	Wed Jan 19 02:14:44 2000
++++ kc24f.c	Wed Jan 19 02:48:46 2000
+@@ -11,22 +11,29 @@
+ char head[]=
+ "STARTFONT 2.1\n"
+ "COMMENT 24x24 Font\n"
+-"FONT kc24f\n" 
++"FONT -kc-fixed-medium-r-normal--24-240-100-100-c-240-big5-0\n" 
+ "SIZE 24 100 100\n"
+ "FONTBOUNDINGBOX 24 24 0 -2\n"
+-"STARTPROPERTIES 12\n"
++"STARTPROPERTIES 19\n"
+ "FONT_ASCENT 22\n"
+ "FONT_DESCENT 2\n"
+ "DEFAULT_CHAR 41280\n"
+-"COPYRIGHT \"KC\"\n"
++"COPYRIGHT \"Kau Chauo Business CO.\"\n"
++"FONTNAME_REGISTRY \"\"\n"
++"FOUNDRY \"KC\"\n"
++"FAMILY_NAME \"Fixed\"\n"
++"WEIGHT_NAME \"Medium\"\n"
++"SLANT \"R\"\n"
++"SETWIDTH_NAME \"Normal\"\n"
++"ADD_STYLE_NAME \"\"\n"
++"PIXEL_SIZE 24\n"
+ "POINT_SIZE 240\n"
+-"FONT \"kc24f\"\n"
+-"WEIGHT 10\n"
+-"RESOLUTION 103\n"
+ "RESOLUTION_X 100\n"
+ "RESOLUTION_Y 100\n"
+-"X_HEIGHT 4294967295\n"
+-"QUAD_WIDTH 24\n"
++"SPACING \"C\"\n"
++"AVERAGE_WIDTH 240\n"
++"CHARSET_REGISTRY \"BIG5\"\n"
++"CHARSET_ENCODING \"0\"\n"
+ "ENDPROPERTIES\n"
+ "CHARS 13867\n";
+ 
+--- kc8x15.c.orig	Wed Jan 19 02:14:49 2000
++++ kc8x15.c	Wed Jan 19 03:03:25 2000
+@@ -10,12 +10,12 @@
+ char bdfhead[]=
+ "STARTFONT 2.1\n"
+ "COMMENT X\n"
+-"FONT kc8x15\n"
++"FONT -kc-fixed-medium-r-normal--15-170-100-100-c-80-iso8859-1\n"
+ "SIZE 15 100 100\n"
+ "FONTBOUNDINGBOX 8 15 0 -1\n"
+ "STARTPROPERTIES 19\n"
+ "FONTNAME_REGISTRY \"\"\n"
+-"FOUNDRY \"Kau Chauo\"\n"
++"FOUNDRY \"KC\"\n"
+ "FAMILY_NAME \"Fixed\"\n"
+ "WEIGHT_NAME \"Medium\"\n"
+ "SLANT \"R\"\n"