Patch by Mats Peterson to fix latin1 output

1 files changed, 14 insertions, 14 deletions

diff --git a/readnfnt.c b/readnfnt.c
index aef57a4..7d7fbd0 100644
--- a/readnfnt.c
+++ b/readnfnt.c
@@ -69,39 +69,39 @@ NULL};
 static unsigned char mac2iso[] = {
  0, 208, 240, 0, 0, 0, 0, 221, 253, 0, 0, 0, 0, 0, 0, 0,
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 32, 33, 34, 35, 36, 37, 38, 0, 40, 41, 42, 43, 44, 173, 46, 47,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
  64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
  80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 0, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
  112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 0,
  196, 197, 199, 201, 209, 214, 220, 225, 224, 226, 228, 227, 229, 231, 233, 232,
  234, 235, 237, 236, 238, 239, 241, 243, 242, 244, 246, 245, 250, 249, 251, 252,
- 0, 176, 162, 163, 0, 0, 0, 223, 174, 169, 0, 180, 168, 0, 198, 216,
- 0, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 186, 0, 230, 248,
- 191, 161, 0, 0, 0, 0, 0, 171, 187, 0, 0, 192, 195, 213, 0, 0,
- 0, 0, 0, 0, 96, 39, 247, 0, 255, 0, 0, 0, 0, 0, 0, 0,
+ 0, 176, 162, 163, 167, 0, 182, 223, 174, 169, 0, 180, 168, 0, 198, 216,
+ 0, 177, 0, 0, 165, 181, 0, 0, 0, 0, 0, 170, 186, 0, 230, 248,
+ 191, 161, 172, 0, 0, 0, 0, 171, 187, 0, 32, 192, 195, 213, 0, 0,
+ 0, 0, 0, 0, 0, 0, 247, 0, 255, 0, 0, 164, 0, 0, 0, 0,
  0, 183, 0, 0, 0, 194, 202, 193, 203, 200, 205, 206, 207, 204, 211, 212,
- 0, 210, 218, 219, 217, 0, 0, 0, 0, 0, 0, 0, 184, 0, 0, 0
+ 0, 210, 218, 219, 217, 0, 0, 0, 175, 0, 0, 0, 184, 0, 0, 0
 };
 
 static unsigned char iso2mac[] = {
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 32, 33, 34, 35, 36, 37, 38, 213, 40, 41, 42, 43, 44, 0, 46, 47,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
  64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
  80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 212, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
  112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 0,
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 32, 193, 162, 163, 0, 0, 0, 0, 172, 169, 187, 199, 0, 45, 168, 0,
- 161, 177, 0, 0, 171, 0, 0, 225, 252, 0, 188, 200, 0, 0, 0, 192,
+ 32, 193, 162, 163, 219, 180, 0, 164, 172, 169, 187, 199, 194, 0, 168, 248,
+ 161, 177, 0, 0, 171, 181, 166, 225, 252, 0, 188, 200, 0, 0, 0, 192,
  203, 231, 229, 204, 128, 129, 174, 130, 233, 131, 230, 232, 237, 234, 235, 236,
- 1, 132, 241, 238, 239, 205, 133, 0, 175, 244, 242, 243, 134, 7, 0, 167,
+ 1, 132, 241, 238, 239, 205, 133, 0, 175, 244, 242, 243, 134, 0, 0, 167,
  136, 135, 137, 139, 138, 140, 190, 141, 143, 142, 144, 145, 147, 146, 148, 149,
- 2, 150, 152, 151, 153, 155, 154, 214, 191, 157, 156, 158, 159, 8, 0, 216
+ 2, 150, 152, 151, 153, 155, 154, 214, 191, 157, 156, 158, 159, 0, 0, 216
 };
 const char *styles[]= { "Bold", "Italic", "Underline", "Outline",
     "Shadow", "Condensed", "Extended", NULL };
@@ -389,7 +389,7 @@ static void DumpNFNT2BDF(FILE *bdf,struct MacFontRec *font, char *resname,
 	for ( i=0; i<=255; ++i ) {
 	    int ch = iso2mac[i];
 	    if ( FontHasChar(font,ch) )	/* character exists */
-		WriteChar(bdf,font,ch,i,size,mine,ass);
+		WriteChar(bdf,font,i,ch,size,mine,ass);
 	}
 	for ( i=font->firstChar; i<=font->lastChar; ++i )
 	    if ( (i>=256 || mac2iso[i]==0) && FontHasChar(font,i) )