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/bbox.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/bbox.c')
-rw-r--r-- | Build/source/texk/dvipsk/bbox.c | 454 |
1 files changed, 227 insertions, 227 deletions
diff --git a/Build/source/texk/dvipsk/bbox.c b/Build/source/texk/dvipsk/bbox.c index 64973259a75..5a321890e6a 100644 --- a/Build/source/texk/dvipsk/bbox.c +++ b/Build/source/texk/dvipsk/bbox.c @@ -14,292 +14,292 @@ #include "protos_add.h" typedef struct { - integer llx, lly, urx, ury ; -} bbchardesctype ; + integer llx, lly, urx, ury; +} bbchardesctype; typedef struct { - bbchardesctype *bbchardesc ; -} bbfontdesctype ; + bbchardesctype *bbchardesc; +} bbfontdesctype; typedef struct bbtft { - integer fontnum ; - bbfontdesctype *desc ; - struct bbtft *next ; -} bbfontmaptype ; + integer fontnum; + bbfontdesctype *desc; + struct bbtft *next; +} bbfontmaptype; -static bbfontmaptype *bbffont ; +static bbfontmaptype *bbffont; void bbtfmload(register fontdesctype *curfnt) { - register integer i, j ; - register integer li, cd = 0 ; - integer scaledsize ; - integer nw, nh, nd, ns, hd ; - integer bc, ec ; - integer nco = 0, ncw = 0, npc = 0, no_repeats = 0 ; - integer *scaled ; - integer *chardat ; + register integer i, j; + register integer li, cd = 0; + integer scaledsize; + integer nw, nh, nd, ns, 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; - integer slant = 0 ; - bbchardesctype *cc ; + integer slant = 0; + bbchardesctype *cc; register bbfontdesctype *bbcurfnt = - (bbfontdesctype *)mymalloc(sizeof(bbfontdesctype)) ; + (bbfontdesctype *)mymalloc(sizeof(bbfontdesctype)); - bbffont->desc = bbcurfnt ; - tfmopen(curfnt) ; + bbffont->desc = bbcurfnt; + 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() ; nh = tfm16(); nd = tfm16(); - ns = tfm16() ; - ns += tfm16() ; - ns += tfm16() ; - ns += tfm16() ; - li = tfm16() ; + hd = tfm16(); + bc = tfm16(); ec = tfm16(); + nw = tfm16(); nh = tfm16(); nd = tfm16(); + ns = tfm16(); + ns += tfm16(); + ns += tfm16(); + ns += tfm16(); + li = tfm16(); if (hd<2 || bc>ec+1 || ec>255 || nw>256 || nh>16 || nd>16) - 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() ; nh = tfm32() ; nd = tfm32(); - ns = tfm32() ; - ns += tfm32() ; - ns += tfm32() ; - ns += tfm32() ; - li = tfm32() ; - li = tfm32() ; + li = tfm32(); + hd = tfm32(); + bc = tfm32(); ec = tfm32(); + nw = tfm32(); nh = tfm32(); nd = tfm32(); + ns = tfm32(); + ns += tfm32(); + ns += tfm32(); + ns += tfm32(); + li = tfm32(); + li = tfm32(); if (font_level>1 || hd<2 || bc<0 || ec<0 || nw<2 || nh<1 || nd<1 || ns<1 || bc>ec+1 || ec>65535 || nw>65536 || nh>256 || nd>256) - 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 = tfm32() ; + li = tfm32(); pretend_no_chars=ec+1; if (pretend_no_chars<256) pretend_no_chars=256; bbcurfnt->bbchardesc = (bbchardesctype *) xmalloc(pretend_no_chars*sizeof(bbchardesctype)); 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 = tfm32() ; - li = tfm32() ; + cd = tfm32(); + li = tfm32(); 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 = tfm16() ; - li = tfm16() ; + cd = tfm16(); + li = tfm16(); } - if (cd) chardat[i] = cd ; + if (cd) chardat[i] = cd; } if (font_level==1&&ncw!=0) { char *msg = concat ("Table size mismatch in ", curfnt->name); error(msg); free(msg); } - scaledsize = curfnt->scaledsize ; - scaled = (integer *) xmalloc((nh + nd)*sizeof(integer)) ; + scaledsize = curfnt->scaledsize; + scaled = (integer *) xmalloc((nh + nd)*sizeof(integer)); for (i=0; i<nw; i++) - tfm32() ; + tfm32(); for (i=0; i<nh + nd; i++) - scaled[i] = scalewidth(tfm32(), scaledsize) ; + scaled[i] = scalewidth(tfm32(), scaledsize); for (i=0; i<ns; i++) - tfm32() ; - slant = tfm32() ; - (void)fclose(tfmfile) ; + tfm32(); + slant = tfm32(); + (void)fclose(tfmfile); for (i=0; i<pretend_no_chars; i++) { - cc = &(bbcurfnt->bbchardesc[i]) ; + cc = &(bbcurfnt->bbchardesc[i]); if (chardat[i] != -1) { - halfword iw ; - int ih, id ; + halfword iw; + int ih, id; if (font_level>=0) { - iw = chardat[i] >> 16 ; - ih = (chardat[i] >> 8) & 255 ; - id = chardat[i] & 255 ; + iw = chardat[i] >> 16; + ih = (chardat[i] >> 8) & 255; + id = chardat[i] & 255; } else { - iw = chardat[i] >> 8 ; - ih = (chardat[i] >> 4) & 15 ; - id = chardat[i] & 15 ; + iw = chardat[i] >> 8; + ih = (chardat[i] >> 4) & 15; + id = chardat[i] & 15; } - if (iw>=nw || ih>=nh || id>=nd) badtfm("char info") ; - cc->ury = scaled[ih] ; - cc->lly = - scaled[nh + id] ; - cc->llx = 0 ; - cc->urx = curfnt->chardesc[i].TFMwidth ; + if (iw>=nw || ih>=nh || id>=nd) badtfm("char info"); + cc->ury = scaled[ih]; + cc->lly = - scaled[nh + id]; + cc->llx = 0; + cc->urx = curfnt->chardesc[i].TFMwidth; } else { - cc->llx = cc->lly = cc->urx = cc->ury = 0 ; + cc->llx = cc->lly = cc->urx = cc->ury = 0; } } if (slant) { for (i=0; i<pretend_no_chars; i++) { - cc = &(bbcurfnt->bbchardesc[i]) ; - li = scalewidth(cc->lly, slant) ; - if (slant > 0) cc->llx += li ; - else cc->urx += li ; - li = scalewidth(cc->ury, slant) ; - if (slant > 0) cc->urx += li ; - else cc->llx += li ; + cc = &(bbcurfnt->bbchardesc[i]); + li = scalewidth(cc->lly, slant); + if (slant > 0) cc->llx += li; + else cc->urx += li; + li = scalewidth(cc->ury, slant); + if (slant > 0) cc->urx += li; + else cc->llx += li; } } - free(chardat) ; - free(scaled) ; + free(chardat); + free(scaled); } -static integer llx, lly, urx, ury ; +static integer llx, lly, urx, ury; void bbspecial(integer h, integer v, int nbytes) { - float *r = bbdospecial(nbytes) ; + float *r = bbdospecial(nbytes); if (r) { /* convert from magnified PostScript units back to scaled points */ - real conv = 72.0 * (real)num / (real)den * (real)mag / 254000000.0 ; + real conv = 72.0 * (real)num / (real)den * (real)mag / 254000000.0; if (llx > h + r[0] / conv) - llx = (integer) (h + r[0] / conv) ; + llx = (integer) (h + r[0] / conv); if (lly > v - r[3] / conv) - lly = (integer) (v - r[3] / conv) ; + lly = (integer) (v - r[3] / conv); if (urx < h + r[2] / conv) - urx = (integer) (h + r[2] / conv) ; + urx = (integer) (h + r[2] / conv); if (ury < v - r[1] / conv) - ury = (integer) (v - r[1] / conv) ; + ury = (integer) (v - r[1] / conv); } } void bbdopage(void) { - register shalfword cmd ; - register bbchardesctype *bcd ; - register chardesctype *cd ; - register integer h ; - register fontmaptype *cfnt ; - bbfontmaptype *bbcfnt ; - integer fnt ; - integer mychar ; - int charmove ; - struct dvistack *sp = stack ; - integer v, w, x, y, z ; - register fontdesctype *curfnt = 0 ; - register bbfontdesctype *bbcurfnt = 0 ; + register shalfword cmd; + register bbchardesctype *bcd; + register chardesctype *cd; + register integer h; + register fontmaptype *cfnt; + bbfontmaptype *bbcfnt; + integer fnt; + integer mychar; + int charmove; + struct dvistack *sp = stack; + integer v, w, x, y, z; + register fontdesctype *curfnt = 0; + register bbfontdesctype *bbcurfnt = 0; - w = x = y = z = 0 ; - h = 0 ; v = 0 ; - llx = lly = 1000000000 ; - urx = ury = -1000000000 ; - charmove = 0 ; + w = x = y = z = 0; + h = 0; v = 0; + llx = lly = 1000000000; + urx = ury = -1000000000; + charmove = 0; while (1) { switch (cmd=dvibyte()) { -case 138: break ; +case 138: break; case 134: /* put2 */ - if (noomega) error("! synch") ; - mychar = dvibyte() ; - mychar = (mychar << 8) + dvibyte() ; - charmove = 0 ; - goto dochar ; + if (noomega) error("! synch"); + mychar = dvibyte(); + mychar = (mychar << 8) + dvibyte(); + charmove = 0; + goto dochar; case 129: /* set2 */ - if (noomega) error("! synch") ; - mychar = dvibyte() ; - mychar = (mychar << 8) + dvibyte() ; + if (noomega) error("! synch"); + mychar = dvibyte(); + mychar = (mychar << 8) + dvibyte(); charmove = 1; - goto dochar ; + goto dochar; case 133: /* put1 */ - mychar = dvibyte() ; - charmove = 0 ; - goto dochar ; -case 128: cmd = dvibyte() ; /* set1 command drops through to setchar */ + mychar = dvibyte(); + charmove = 0; + goto dochar; +case 128: cmd = dvibyte(); /* set1 command drops through to setchar */ default: /* these are commands 0 (setchar0) thru 127 (setchar127) */ - mychar = cmd ; - charmove = 1 ; + mychar = cmd; + charmove = 1; dochar: - cd = &(curfnt->chardesc[mychar]) ; - bcd = &(bbcurfnt->bbchardesc[mychar]) ; - if (h + bcd->llx < llx) llx = h + bcd->llx ; - if (h + bcd->urx > urx) urx = h + bcd->urx ; - if (v - bcd->ury < lly) lly = v - bcd->ury ; - if (v - bcd->lly > ury) ury = v - bcd->lly ; + cd = &(curfnt->chardesc[mychar]); + bcd = &(bbcurfnt->bbchardesc[mychar]); + if (h + bcd->llx < llx) llx = h + bcd->llx; + if (h + bcd->urx > urx) urx = h + bcd->urx; + if (v - bcd->ury < lly) lly = v - bcd->ury; + if (v - bcd->lly > ury) ury = v - bcd->lly; if (charmove) - h += cd->TFMwidth ; - break ; + h += cd->TFMwidth; + break; case 130: case 131: case 135: case 136: case 139: case 247: case 248: case 249: case 250: case 251: case 252: case 253: case 254: case 255: /* unimplemented or illegal commands */ - error("! synch") ; + error("! synch"); case 132: case 137: /* rules */ - { integer ry, rx ; - ry = signedquad() ; rx = signedquad() ; + { integer ry, rx; + ry = signedquad(); rx = signedquad(); if (rx>0 && ry>0) { - if (h < llx) llx = h ; - if (v - ry < lly) lly = v - ry ; - if (h + rx > urx) urx = h + rx ; - if (v > ury) ury = v ; + if (h < llx) llx = h; + if (v - ry < lly) lly = v - ry; + if (h + rx > urx) urx = h + rx; + if (v > ury) ury = v; } else - rx = 0 ; + rx = 0; if (cmd != 137) - h += rx ; - break ; + h += rx; + break; } case 141: /* push */ - sp->h = h ; sp->v = v ; - sp->w = w ; sp->x = x ; sp->y = y ; sp->z = z ; - if (++sp >= &stack[STACKSIZE]) error("! Out of stack space") ; - break ; + sp->h = h; sp->v = v; + sp->w = w; sp->x = x; sp->y = y; sp->z = z; + if (++sp >= &stack[STACKSIZE]) error("! Out of stack space"); + break; case 140: /* eop or end of virtual character */ - return ; + return; case 142: /* pop */ - if (--sp < stack) error("! More pops than pushes") ; - h = sp->h ; v = sp->v ; - w = sp->w ; x = sp->x ; y = sp->y ; z = sp->z ; - break ; -case 143: h += signedbyte() ; break ; -case 144: h += signedpair() ; break ; -case 145: h += signedtrio() ; break ; -case 146: h += signedquad() ; break ; -case 147: h += w ; break ; -case 148: h += (w = signedbyte()) ; break ; -case 149: h += (w = signedpair()) ; break ; -case 150: h += (w = signedtrio()) ; break ; -case 151: h += (w = signedquad()) ; break ; -case 152: h += x ; break ; -case 153: h += (x = signedbyte()) ; break ; -case 154: h += (x = signedpair()) ; break ; -case 155: h += (x = signedtrio()) ; break ; -case 156: h += (x = signedquad()) ; break ; -case 157: v += signedbyte() ; break ; -case 158: v += signedpair() ; break ; -case 159: v += signedtrio() ; break ; -case 160: v += signedquad() ; break ; -case 161: v += y ; break ; -case 162: v += (y = signedbyte()) ; break ; -case 163: v += (y = signedpair()) ; break ; -case 164: v += (y = signedtrio()) ; break ; -case 165: v += (y = signedquad()) ; break ; -case 166: v += z ; break ; -case 167: v += (z = signedbyte()) ; break ; -case 168: v += (z = signedpair()) ; break ; -case 169: v += (z = signedtrio()) ; break ; -case 170: v += (z = signedquad()) ; break ; + if (--sp < stack) error("! More pops than pushes"); + h = sp->h; v = sp->v; + w = sp->w; x = sp->x; y = sp->y; z = sp->z; + break; +case 143: h += signedbyte(); break; +case 144: h += signedpair(); break; +case 145: h += signedtrio(); break; +case 146: h += signedquad(); break; +case 147: h += w; break; +case 148: h += (w = signedbyte()); break; +case 149: h += (w = signedpair()); break; +case 150: h += (w = signedtrio()); break; +case 151: h += (w = signedquad()); break; +case 152: h += x; break; +case 153: h += (x = signedbyte()); break; +case 154: h += (x = signedpair()); break; +case 155: h += (x = signedtrio()); break; +case 156: h += (x = signedquad()); break; +case 157: v += signedbyte(); break; +case 158: v += signedpair(); break; +case 159: v += signedtrio(); break; +case 160: v += signedquad(); break; +case 161: v += y; break; +case 162: v += (y = signedbyte()); break; +case 163: v += (y = signedpair()); break; +case 164: v += (y = signedtrio()); break; +case 165: v += (y = signedquad()); break; +case 166: v += z; break; +case 167: v += (z = signedbyte()); break; +case 168: v += (z = signedpair()); break; +case 169: v += (z = signedtrio()); break; +case 170: v += (z = signedquad()); break; case 171: case 172: case 173: case 174: case 175: case 176: case 177: case 178: case 179: case 180: case 181: case 182: case 183: case 184: case 185: case 186: case 187: case 188: case 189: case 190: case 191: @@ -310,61 +310,61 @@ case 213: case 214: case 215: case 216: case 217: case 218: case 219: case 220: case 221: case 222: case 223: case 224: case 225: case 226: case 227: case 228: case 229: case 230: case 231: case 232: case 233: case 234: case 235: case 236: case 237: case 238: /* font selection commands */ - if (cmd < 235) fnt = cmd - 171 ; /* fntnum0 thru fntnum63 */ + if (cmd < 235) fnt = cmd - 171; /* fntnum0 thru fntnum63 */ else { - fnt = dvibyte() ; + fnt = dvibyte(); while (cmd-- > 235) - fnt = (fnt << 8) + dvibyte() ; + fnt = (fnt << 8) + dvibyte(); } for (cfnt=ffont; cfnt; cfnt = cfnt->next) - if (cfnt->fontnum == fnt) break ; - curfnt = cfnt->desc ; + if (cfnt->fontnum == fnt) break; + curfnt = cfnt->desc; for (bbcfnt=bbffont; bbcfnt; bbcfnt = bbcfnt->next) - if (bbcfnt->fontnum == fnt) goto fontfound ; - bbcfnt = (bbfontmaptype *)mymalloc(sizeof(bbfontmaptype)) ; - bbcfnt->fontnum = fnt ; - bbcfnt->next = bbffont ; - bbffont = bbcfnt ; - bbtfmload(curfnt) ; -fontfound: bbcurfnt = bbcfnt->desc ; - break ; + if (bbcfnt->fontnum == fnt) goto fontfound; + bbcfnt = (bbfontmaptype *)mymalloc(sizeof(bbfontmaptype)); + bbcfnt->fontnum = fnt; + bbcfnt->next = bbffont; + bbffont = bbcfnt; + bbtfmload(curfnt); +fontfound: bbcurfnt = bbcfnt->desc; + break; case 243: case 244: case 245: case 246: /*fntdef1 */ - skipover(cmd - 230) ; - skipover(dvibyte() + dvibyte()) ; - break ; -case 239: bbspecial(h, v, (int)dvibyte()) ; break ; -case 240: bbspecial(h, v, (int)twobytes()) ; break ; -case 241: bbspecial(h, v, (int)threebytes()) ; break ; -case 242: bbspecial(h, v, (int)signedquad()) ; break ; + skipover(cmd - 230); + skipover(dvibyte() + dvibyte()); + break; +case 239: bbspecial(h, v, (int)dvibyte()); break; +case 240: bbspecial(h, v, (int)twobytes()); break; +case 241: bbspecial(h, v, (int)threebytes()); break; +case 242: bbspecial(h, v, (int)signedquad()); break; } } } void findbb(integer bop) { - integer curpos = ftell(dvifile) ; - real conv = 72.0 * (real)num / (real)den * (real)mag / 254000000.0 ; - real off = 72.0 / conv ; - real margin = 1.0 / conv ; - real vsize = 792.0 / conv ; - real hadj = -72.0 * hoff / 4736286.72 ; - real vadj = 72.0 * voff / 4736286.72 ; + integer curpos = ftell(dvifile); + real conv = 72.0 * (real)num / (real)den * (real)mag / 254000000.0; + real off = 72.0 / conv; + real margin = 1.0 / conv; + real vsize = 792.0 / conv; + real hadj = -72.0 * hoff / 4736286.72; + real vadj = 72.0 * voff / 4736286.72; - fseek(dvifile, bop, 0) ; - bbdopage() ; - fseek(dvifile, curpos, 0) ; - lly = (int) (vsize - 2 * off - lly) ; - ury = (int) (vsize - 2 * off - ury) ; - llx = (int)floor((llx + off - margin) * conv - hadj + 0.5) ; - lly = (int)floor((lly + off + margin) * conv - vadj + 0.5) ; - urx = (int)floor((urx + off + margin) * conv - hadj + 0.5) ; - ury = (int)floor((ury + off - margin) * conv - vadj + 0.5) ; + fseek(dvifile, bop, 0); + bbdopage(); + fseek(dvifile, curpos, 0); + lly = (int) (vsize - 2 * off - lly); + ury = (int) (vsize - 2 * off - ury); + llx = (int)floor((llx + off - margin) * conv - hadj + 0.5); + lly = (int)floor((lly + off + margin) * conv - vadj + 0.5); + urx = (int)floor((urx + off + margin) * conv - hadj + 0.5); + ury = (int)floor((ury + off - margin) * conv - vadj + 0.5); /* no marks on the page? */ if (llx >= urx || lly <= ury) - llx = lly = urx = ury = 72 ; + llx = lly = urx = ury = 72; #ifdef SHORTINT - sprintf(nextstring, "%ld %ld %ld %ld", llx, ury, urx, lly) ; + sprintf(nextstring, "%ld %ld %ld %ld", llx, ury, urx, lly); #else - sprintf(nextstring, "%d %d %d %d", llx, ury, urx, lly) ; + sprintf(nextstring, "%d %d %d %d", llx, ury, urx, lly); #endif } |