--- ./font.c.org	2009-11-17 09:57:17.000000000 +0900
+++ ./font.c	2010-08-06 20:44:17.000000000 +0900
@@ -1128,7 +1128,7 @@
                }
                nOdd = !nOdd;
             }
-            nTotal += XTextWidth16(xfs, gpszTmpStr16, nDoubleByteIndex);
+            nTotal += xfs->per_char ? XTextWidth16(xfs, gpszTmpStr16, nDoubleByteIndex) : (xfs->max_bounds.width * nDoubleByteIndex);
          } else {
             for (psz=pszStart, nSubStrIndex=0;
                   nIndex+nSubStrIndex < nLen && ((*psz)&0x80) == 0;
@@ -1189,7 +1189,7 @@
                   Pixmap bitmap=None;
                   TextExtentsInfo stTextExtents;
 
-                  w = XTextWidth16(canvasFontPtr, &gpszTmpStr16[i], 1);
+                  w = canvasFontPtr->per_char ? XTextWidth16(canvasFontPtr, &gpszTmpStr16[i], 1) : canvasFontPtr->max_bounds.width;
                   buf[0] = pszStart[i<<1];
                   buf[1] = pszStart[(i<<1)+1];
                   buf[2] = '\0';
@@ -1220,7 +1220,7 @@
             } else {
                XDrawString16(dpy, d, gc, x+nTotal, y, gpszTmpStr16,
                      nDoubleByteIndex);
-               w = XTextWidth16(canvasFontPtr, gpszTmpStr16, nDoubleByteIndex);
+               w = canvasFontPtr->per_char ? XTextWidth16(canvasFontPtr, gpszTmpStr16, nDoubleByteIndex) : (canvasFontPtr->max_bounds.width*nDoubleByteIndex);
                nTotal += w;
             }
          } else {
--- ./Imakefile.org	2009-11-17 09:57:20.000000000 +0900
+++ ./Imakefile	2010-08-06 20:52:31.000000000 +0900
@@ -11,7 +11,7 @@
 XCOMM There should be no need to modify this file.      XCOMM
 XCOMM ------------------------------------------------- XCOMM
 
-#include <Tgif.tmpl>
+#include <Tgif.tmpl-darwin>
 #include <Target.tmpl>
 
 XCOMM 
@@ -49,6 +49,8 @@
                   -DTGIF_DISTR_VER=\"$(TGIFVERSION)\" \@@\
                   $(MOREDEFINES) -DQPL_LICENSE
 
+DEFINES += -DA4PAPER
+
 XCOMM Things to try to add to the DEFINES line above:
 XCOMM
 XCOMM    RS6000:  -D_BSD
@@ -332,6 +334,7 @@
 SRCS3 = 
 
 ComplexProgramTarget_1($(TARGET_1),$(LOCAL_LIBRARIES),NullParameter)
+ComplexProgramTarget_2(prtgif,NullParameter,NullParameter)
 /*
  * ComplexProgramTarget_2(prtgif,NullParameter,NullParameter)
  * ComplexProgramTarget_3(testdrive,$(LOCAL_LIBRARIES),NullParameter)
--- ./Tgif.tmpl-darwin.org	2009-11-17 09:57:20.000000000 +0900
+++ ./Tgif.tmpl-darwin	2010-08-06 20:44:17.000000000 +0900
@@ -28,7 +28,7 @@
 XIMPDEFINES      =
 #endif
 
-PROGRAMS	= tgif XCOMM prtgif frontend11.o testdrive
+PROGRAMS	= tgif prtgif XCOMM frontend11.o testdrive
 TGIFDIR		= $(LIBDIR)/tgif
 XCOMM CDEBUGFLAGS= -g -Wall
 XCOMM CCOPTIONS	= -Wall -Wpointer-arith -Wmissing-prototypes \@@\