*** xc/programs/fstobdf/chars.c.ORIG	Fri Apr 25 15:33:28 1997
--- xc/programs/fstobdf/chars.c	Fri Apr 25 15:37:12 1997
***************
*** 101,108 ****
      if (glyphName)
  	fputs(glyphName, outFile);
      else
! 	fprintf(outFile, (fontHeader->char_range.min_char.low > 0 ?
! 			  "C%06o" : "C%03o"), encoding);
      fputc('\n', outFile);
      fprintf(outFile, "ENCODING %u\n", encoding);
      fprintf(outFile, "SWIDTH %ld 0\n",
--- 101,108 ----
      if (glyphName)
  	fputs(glyphName, outFile);
      else
!        fprintf(outFile, (fontHeader->char_range.max_char.high > 0 ?
!                          "%04x" : "C%03o"), encoding);
      fputc('\n', outFile);
      fprintf(outFile, "ENCODING %u\n", encoding);
      fprintf(outFile, "SWIDTH %ld 0\n",
***************
*** 183,192 ****
  
      charInfo = extents;
      /* calculate the actual number of chars */
!     for (ch = 0; ch <= (lastChar - firstChar); ch++) {
  	if ((charInfo->width != 0) || (charInfo->left != charInfo->right))
  	    nChars++;
  	charInfo++;
      }
  
      fprintf(outFile, "CHARS %u\n", nChars);
--- 183,197 ----
  
      charInfo = extents;
      /* calculate the actual number of chars */
!     {
!     int row, col;
!     int         bpr;
!     for (row = fontHeader->char_range.min_char.high; row <= fontHeader->char_range.max_char.high; row++)
!       for (col = fontHeader->char_range.min_char.low; col <= fontHeader->char_range.max_char.low; col++) {
  	if ((charInfo->width != 0) || (charInfo->left != charInfo->right))
  	    nChars++;
  	charInfo++;
+       }
      }
  
      fprintf(outFile, "CHARS %u\n", nChars);
***************
*** 197,204 ****
      charInfo = extents;
      encoding = firstChar;
      glyph = glyphs;
!     for (ch = 0; ch <= (lastChar - firstChar); ch++) {
! 	int         bpr;
  
  	bpr = GLWIDTHBYTESPADDED((charInfo->right - charInfo->left),
  				 SCANLINE_PAD_BYTES);
--- 202,213 ----
      charInfo = extents;
      encoding = firstChar;
      glyph = glyphs;
!     {
!     int row, col;
!     int         bpr;
!     for (row = fontHeader->char_range.min_char.high; row <= fontHeader->char_range.max_char.high; row++)
!       for (col = fontHeader->char_range.min_char.low; col <= fontHeader->char_range.max_char.low; col++) {
!         encoding = (row << 8) + col;
  
  	bpr = GLWIDTHBYTESPADDED((charInfo->right - charInfo->left),
  				 SCANLINE_PAD_BYTES);
***************
*** 208,213 ****
--- 217,223 ----
  
  	charInfo++;
  	encoding++;
+       }
      }
      FSFree((char *) extents);
      FSFree((char *) glyphs);