diff options
author | Karl Berry <karl@freefriends.org> | 2010-03-28 18:14:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-03-28 18:14:06 +0000 |
commit | 20a73306c88f8fdb131482213e9b1b6a8c5e729b (patch) | |
tree | be5857d40602520beebe30c48e31306bbc0e9d17 /Build/source/texk/dvipsk/tfmload.c | |
parent | 549a764cf19a1f244d773ab70965eadeef67d5a8 (diff) |
eliminate spaces before semicolons
git-svn-id: svn://tug.org/texlive/trunk@17592 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk/tfmload.c')
-rw-r--r-- | Build/source/texk/dvipsk/tfmload.c | 184 |
1 files changed, 92 insertions, 92 deletions
diff --git a/Build/source/texk/dvipsk/tfmload.c b/Build/source/texk/dvipsk/tfmload.c index 6bd2febb089..e951092c161 100644 --- a/Build/source/texk/dvipsk/tfmload.c +++ b/Build/source/texk/dvipsk/tfmload.c @@ -11,12 +11,12 @@ */ #include "protos.h" -FILE *tfmfile ; +FILE *tfmfile; /* * Our static variables: */ -static char name[50] ; +static char name[50]; void badtfm(const char *s) @@ -34,189 +34,189 @@ tfmopen(register fontdesctype *fd) { register char *n; #ifdef KPATHSEA - kpse_file_format_type d ; + kpse_file_format_type d; #else register char *d; #endif - n = fd->name ; + n = fd->name; if (!noomega) { #ifdef KPATHSEA d = ofmpath; #else - d = fd->area ; + d = fd->area; if (*d==0) - d = ofmpath ; + d = ofmpath; #endif #ifdef MVSXA /* IBM: MVS/XA */ - (void)sprintf(name, "ofm(%s)", n) ; + (void)sprintf(name, "ofm(%s)", n); #else - (void)sprintf(name, "%s.ofm", n) ; + (void)sprintf(name, "%s.ofm", n); #endif if ((tfmfile=search(d, name, READBIN))!=NULL) - return ; + return; } #ifdef KPATHSEA d = tfmpath; #else - d = fd->area ; + d = fd->area; if (*d==0) - d = tfmpath ; + d = tfmpath; #endif #ifdef MVSXA /* IBM: MVS/XA */ - (void)sprintf(name, "tfm(%s)", n) ; + (void)sprintf(name, "tfm(%s)", n); #else - (void)sprintf(name, "%s.tfm", n) ; + (void)sprintf(name, "%s.tfm", n); #endif if ((tfmfile=search(d, name, READBIN))!=NULL) - return ; + return; (void)sprintf(errbuf, "Can't open font metric file %s%s", - fd->area, name) ; - error(errbuf) ; - error("I will use cmr10.tfm instead, so expect bad output.") ; + fd->area, name); + error(errbuf); + error("I will use cmr10.tfm instead, so expect bad output."); #ifdef MVSXA /* IBM: MVS/XA */ if ((tfmfile=search(d, "tfm(cmr10)", READBIN))!=NULL) #else if ((tfmfile=search(d, "cmr10.tfm", READBIN))!=NULL) #endif - return ; - error("! I can't find cmr10.tfm; please reinstall me with proper paths") ; + return; + error("! I can't find cmr10.tfm; please reinstall me with proper paths"); } shalfword tfmbyte(void) { - return(getc(tfmfile)) ; + return(getc(tfmfile)); } halfword tfm16(void) { - register halfword a ; - a = tfmbyte () ; - return ( a * 256 + tfmbyte () ) ; + register halfword a; + a = tfmbyte (); + return ( a * 256 + tfmbyte () ); } integer tfm32(void) { - register integer a ; - a = tfm16 () ; - if (a > 32767) a -= 65536 ; - return ( a * 65536 + tfm16 () ) ; + register integer a; + a = tfm16 (); + if (a > 32767) a -= 65536; + return ( a * 65536 + tfm16 () ); } int tfmload(register fontdesctype *curfnt) { - register integer i, j ; - register integer li, cd=0 ; - integer scaledsize ; - integer nw, hd ; - integer bc, ec ; - integer nco=0, ncw=0, npc=0, no_repeats = 0 ; - integer *scaled ; - integer *chardat ; - int font_level ; - integer pretend_no_chars ; - int charcount = 0 ; + register integer i, j; + register integer li, cd=0; + integer scaledsize; + integer nw, hd; + integer bc, ec; + integer nco=0, ncw=0, npc=0, no_repeats = 0; + integer *scaled; + integer *chardat; + int font_level; + integer pretend_no_chars; + int charcount = 0; - tfmopen(curfnt) ; + tfmopen(curfnt); /* * Next, we read the font data from the tfm file, and store it in * our own arrays. */ - li = tfm16() ; + li = tfm16(); if (li!=0) { - font_level = -1 ; - hd = tfm16() ; - bc = tfm16() ; ec = tfm16() ; - nw = tfm16() ; - li = tfm32() ; li = tfm32() ; li = tfm32() ; li = tfm16() ; + font_level = -1; + hd = tfm16(); + bc = tfm16(); ec = tfm16(); + nw = tfm16(); + li = tfm32(); li = tfm32(); li = tfm32(); li = tfm16(); if (hd<2 || bc>ec+1 || ec>255 || nw>256) - badtfm("header") ; + badtfm("header"); } else { /* In an .ofm file */ - if (noomega) badtfm("length") ; + if (noomega) badtfm("length"); font_level = tfm16(); - li = tfm32() ; hd = tfm32() ; - bc = tfm32() ; ec = tfm32() ; - nw = tfm32() ; + li = tfm32(); hd = tfm32(); + bc = tfm32(); ec = tfm32(); + nw = tfm32(); for (i=0; i<8; i++) li=tfm32(); if (font_level>1 || hd<2 || bc<0 || ec<0 || nw<0 || bc>ec+1 || ec>65535 || nw>65536) - badtfm("header") ; + badtfm("header"); if (font_level==1) { - nco = tfm32() ; - ncw = tfm32() ; - npc = tfm32() ; + nco = tfm32(); + ncw = tfm32(); + npc = tfm32(); for (i=0; i<12; i++) li=tfm32(); } } - li = tfm32() ; + li = tfm32(); check_checksum (li, curfnt->checksum, curfnt->name); - li = (integer)(alpha * (real)tfm32()) ; + li = (integer)(alpha * (real)tfm32()); if (li > curfnt->designsize + fsizetol || li < curfnt->designsize - fsizetol) { char *msg = concat ("Design size mismatch in font ", curfnt->name); error(msg); } - pretend_no_chars=ec+1 ; - if (pretend_no_chars<256) pretend_no_chars=256 ; + pretend_no_chars=ec+1; + if (pretend_no_chars<256) pretend_no_chars=256; else { curfnt->chardesc = (chardesctype *) - xrealloc(curfnt->chardesc, sizeof(chardesctype)*pretend_no_chars) ; - curfnt->maxchars = pretend_no_chars ; + xrealloc(curfnt->chardesc, sizeof(chardesctype)*pretend_no_chars); + curfnt->maxchars = pretend_no_chars; } for (i=2; i<((font_level==1)?nco-29:hd); i++) - li = tfm32() ; - chardat = (integer *) xmalloc(pretend_no_chars*sizeof(integer)) ; + li = tfm32(); + chardat = (integer *) xmalloc(pretend_no_chars*sizeof(integer)); for (i=0; i<pretend_no_chars; i++) - chardat[i] = -1 ; + chardat[i] = -1; for (i=bc; i<=ec; i++) { if (no_repeats>0) { - no_repeats-- ; + no_repeats--; } else if (font_level>=0) { - cd = tfm16() ; - li = tfm32() ; - li = tfm16() ; + cd = tfm16(); + li = tfm32(); + li = tfm16(); if (font_level==1) { - no_repeats = tfm16() ; - for (j=0; j<(npc|1); j++) tfm16() ; - ncw -= 3 + npc/2 ; + no_repeats = tfm16(); + for (j=0; j<(npc|1); j++) tfm16(); + ncw -= 3 + npc/2; } } else { - cd = tfmbyte() ; - li = tfm16() ; - li = tfmbyte() ; + cd = tfmbyte(); + li = tfm16(); + li = tfmbyte(); } - if (cd>=nw) badtfm("char info") ; + if (cd>=nw) badtfm("char info"); if (cd) { - chardat[i] = cd ; - charcount++ ; + chardat[i] = cd; + charcount++; } } if (font_level==1&&ncw!=0) { char *msg = ("Table size mismatch in ", curfnt->name); error(errbuf); } - scaledsize = curfnt->scaledsize ; - scaled = (integer *) xmalloc(nw*sizeof(integer)) ; + scaledsize = curfnt->scaledsize; + scaled = (integer *) xmalloc(nw*sizeof(integer)); for (i=0; i<nw; i++) - scaled[i] = scalewidth(tfm32(), scaledsize) ; - (void)fclose(tfmfile) ; + scaled[i] = scalewidth(tfm32(), scaledsize); + (void)fclose(tfmfile); for (i=0; i<pretend_no_chars; i++) if (chardat[i]!= -1) { - li = scaled[chardat[i]] ; - curfnt->chardesc[i].TFMwidth = li ; + li = scaled[chardat[i]]; + curfnt->chardesc[i].TFMwidth = li; if (li >= 0) - curfnt->chardesc[i].pixelwidth = ((integer)(conv*li+0.5)) ; + curfnt->chardesc[i].pixelwidth = ((integer)(conv*li+0.5)); else - curfnt->chardesc[i].pixelwidth = -((integer)(conv*-li+0.5)) ; - curfnt->chardesc[i].flags = (curfnt->resfont ? EXISTS : 0) ; - curfnt->chardesc[i].flags2 = EXISTS ; - } else curfnt->chardesc[i].flags = curfnt->chardesc[i].flags2 = 0 ; - free(chardat) ; - free(scaled) ; - if (ec>=256) curfnt->codewidth = 2 ; /* XXX: 2byte-code can have ec<256 */ - curfnt->loaded = 1 ; - return charcount ; + curfnt->chardesc[i].pixelwidth = -((integer)(conv*-li+0.5)); + curfnt->chardesc[i].flags = (curfnt->resfont ? EXISTS : 0); + curfnt->chardesc[i].flags2 = EXISTS; + } else curfnt->chardesc[i].flags = curfnt->chardesc[i].flags2 = 0; + free(chardat); + free(scaled); + if (ec>=256) curfnt->codewidth = 2; /* XXX: 2byte-code can have ec<256 */ + curfnt->loaded = 1; + return charcount; } |