cd ~/src/lout-3.21/ diff -c /home/uwe/src/lout-3.21/z37.c\~ /home/uwe/src/lout-3.21/z37.c *** /home/uwe/src/lout-3.21/z37.c~ Wed May 10 14:04:39 2000 --- /home/uwe/src/lout-3.21/z37.c Sun Jun 4 19:04:53 2000 *************** *** 959,964 **** --- 959,965 ---- Error(37, 38, "EndFontMetrics missing from font file %s", FATAL, &fpos(AFMfilename), FileName(fnum)); fclose(fp); + fp = NULL; /* complete the initialization of first_size */ font_xheight2(first_size) = *************** *** 983,989 **** &fpos(Extrafilename), FileName(extra_fnum)); lnum = 0; ! while( StringFGets(buff, MAX_BUFF, fp) != (char *) NULL ) { debug1(DFT, D, " Extra: %s", buff); lnum++; --- 984,990 ---- &fpos(Extrafilename), FileName(extra_fnum)); lnum = 0; ! while( StringFGets(buff, MAX_BUFF, extra_fp) != (char *) NULL ) { debug1(DFT, D, " Extra: %s", buff); lnum++; *************** *** 995,1001 **** /* get extra character metrics, just like the others */ debug0(DFT, D, " StartExtraCharMetrics calling ReadCharMetrics"); ReadCharMetrics(face, fixed_pitch, xheight2, lig, &ligtop, ! extra_fnum, fnt, &lnum, fp); } else if( StringEqual(command, AsciiToFull("StartBuildComposites")) ) { --- 996,1002 ---- /* get extra character metrics, just like the others */ debug0(DFT, D, " StartExtraCharMetrics calling ReadCharMetrics"); ReadCharMetrics(face, fixed_pitch, xheight2, lig, &ligtop, ! extra_fnum, fnt, &lnum, extra_fp); } else if( StringEqual(command, AsciiToFull("StartBuildComposites")) ) { *************** *** 1002,1008 **** /* build composites */ debug0(DFT, D, " StartBuildComposites"); ReadCompositeMetrics(face, Extrafilename, extra_fnum, &lnum, ! composite, cmp, &cmptop, fp); } } } --- 1003,1009 ---- /* build composites */ debug0(DFT, D, " StartBuildComposites"); ReadCompositeMetrics(face, Extrafilename, extra_fnum, &lnum, ! composite, cmp, &cmptop, extra_fp); } } } Diff finished at Sun Jun 4 19:06:17