--- rxvt-unicode/src/defaultfont.C	2004/03/03 00:20:33	1.27
+++ rxvt-unicode/src/defaultfont.C	2004/03/04 00:40:06	1.31
@@ -74,7 +74,9 @@
   { CS_GB2312_1980_0,  "xft:AR PL KaitiM GB"                       },
   { CS_GB2312_1980_0,  "xft:AR PL SungtiL GB"                      },
 # endif
-  { CS_BIG5_EXT,        "-*-*-*-*-*-*-*-*-*-*-c-*-big5*-0"         },
+  { CS_BIG5,            "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0"          },
+  { CS_BIG5_PLUS,       "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0"         },
+  { CS_BIG5_EXT,        "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0"     },
   { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0"       },
   { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1"     },
   { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2"     },
@@ -96,6 +98,10 @@
   { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1"         },
   { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1"         },
 
+#if UNICODE_3 && XFT
+  { CS_UNICODE,      "xft:Code2001"                                }, // contains many plane-1 characters
+#endif
+
   { CS_UNKNOWN, 0 }
 };
 
@@ -310,8 +316,8 @@
         {
           const char *p = linedraw_cmds[t - 0x2500];
 
-          int x0 = x, x1 = x + r->TermWin.fwidth  / 2, x2 = x + r->TermWin.fwidth  - 1;
-          int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
+          int x0 = x, x1 = x + (r->TermWin.fwidth  - 1) / 2, x2 = x + r->TermWin.fwidth  - 1;
+          int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
 
           XGCValues gcv;
 
@@ -442,7 +448,7 @@
 rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
 {
   int slashes = 0;
-  const char *comp[12];
+  const char *comp[13];
 
   for (const char *c = name; *c; c++)
     if (*c == '-')