*** win/tkWinFont.c.orig	Fri Apr 16 03:51:51 1999
--- win/tkWinFont.c	Sun Jan 16 17:43:06 2000
***************
*** 2202,2214 ****
      USHORT **endCountPtr,	/* Filled with malloced pointer to 
  				 * character range information. */
      int *symbolPtr)
!  {
!     int n, i, swapped, offset, cbData, segCount;
      DWORD cmapKey;
      USHORT *startCount, *endCount;
      CMAPTABLE cmapTable;
      ENCODINGTABLE encTable;
      SUBTABLE subTable;
      char *s;
  
      segCount = 0;
--- 2202,2215 ----
      USHORT **endCountPtr,	/* Filled with malloced pointer to 
  				 * character range information. */
      int *symbolPtr)
! {
!     int n, i, swapped, offset, cbData, segCount, charSet;
      DWORD cmapKey;
      USHORT *startCount, *endCount;
      CMAPTABLE cmapTable;
      ENCODINGTABLE encTable;
      SUBTABLE subTable;
+     TEXTMETRIC tm;
      char *s;
  
      segCount = 0;
***************
*** 2305,2310 ****
--- 2306,2323 ----
  		}
  	    }
  	}
+     } else if (GetTextMetrics(hdc, &tm)) {
+         charSet = tm.tmCharSet;
+         if (charSet == ANSI_CHARSET) {
+             segCount = 2;
+             cbData = segCount * sizeof(USHORT);
+             startCount = (USHORT *) ckalloc(cbData);
+             endCount = (USHORT *) ckalloc(cbData);
+             startCount[0] = 0x0020;
+             endCount[0] = 0x007f;
+             startCount[1] = 0x00a0;
+             endCount[1] = 0x00ff;
+         }
      }
      SelectObject(hdc, hFont);
  
