summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk/dopage.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-28 18:14:06 +0000
committerKarl Berry <karl@freefriends.org>2010-03-28 18:14:06 +0000
commit20a73306c88f8fdb131482213e9b1b6a8c5e729b (patch)
treebe5857d40602520beebe30c48e31306bbc0e9d17 /Build/source/texk/dvipsk/dopage.c
parent549a764cf19a1f244d773ab70965eadeef67d5a8 (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/dopage.c')
-rw-r--r--Build/source/texk/dvipsk/dopage.c384
1 files changed, 192 insertions, 192 deletions
diff --git a/Build/source/texk/dvipsk/dopage.c b/Build/source/texk/dvipsk/dopage.c
index d2ca326ac9c..436508db76b 100644
--- a/Build/source/texk/dvipsk/dopage.c
+++ b/Build/source/texk/dvipsk/dopage.c
@@ -26,275 +26,275 @@
* Most error checking is suppressed because the prescan has already
* verified that the DVI data is OK....except for stack over/underflow.
*/
-struct dvistack stack[STACKSIZE] ;
+struct dvistack stack[STACKSIZE];
#ifdef HPS
-integer hhmem, vvmem ;
-integer pushcount = 0 ;
-Boolean PAGEUS_INTERUPPTUS = 0 ;
-Boolean NEED_NEW_BOX = 0 ;
-integer H_BREAK ; /* An empirical parameter for guessing line breaks; needs
+integer hhmem, vvmem;
+integer pushcount = 0;
+Boolean PAGEUS_INTERUPPTUS = 0;
+Boolean NEED_NEW_BOX = 0;
+integer H_BREAK; /* An empirical parameter for guessing line breaks; needs
dpi dependence */
#endif
void
dopage(void)
{
- register shalfword cmd ;
- register integer p ;
- register chardesctype *cd ;
- register integer h ;
- register fontmaptype *cfnt ;
- register frametype *frp = frames ;
- integer fnt ;
+ register shalfword cmd;
+ register integer p;
+ register chardesctype *cd;
+ register integer h;
+ register fontmaptype *cfnt;
+ register frametype *frp = frames;
+ integer fnt;
integer mychar;
- int charmove ;
- struct dvistack *sp = stack ;
- integer v, w, x, y, z ;
- integer roundpos ;
- integer thinspace ;
- integer vertsmallspace ;
+ int charmove;
+ struct dvistack *sp = stack;
+ integer v, w, x, y, z;
+ integer roundpos;
+ integer thinspace;
+ integer vertsmallspace;
#ifdef XENIX
- integer iconv ;
- integer viconv ;
+ integer iconv;
+ integer viconv;
- iconv = (integer)(1.0 / conv + 0.5) ;
- viconv = (integer)(1.0 / vconv + 0.5) ;
+ iconv = (integer)(1.0 / conv + 0.5);
+ viconv = (integer)(1.0 / vconv + 0.5);
#else
#ifdef __THINK__
- integer iconv ;
- integer viconv ;
+ integer iconv;
+ integer viconv;
- iconv = (integer)(1.0 / conv + 0.5) ;
- viconv = (integer)(1.0 / vconv + 0.5) ;
+ iconv = (integer)(1.0 / conv + 0.5);
+ viconv = (integer)(1.0 / vconv + 0.5);
#endif
#endif
#ifdef EMTEX
- emclear() ;
+ emclear();
#endif
- pageinit() ;
+ pageinit();
- bopcolor(1) ;
- thinspace = (integer)(0.025*DPI/conv) ; /* 0.025 inches */
- vertsmallspace = (integer)(0.025*VDPI/vconv) ; /* 0.025 inches */
+ bopcolor(1);
+ thinspace = (integer)(0.025*DPI/conv); /* 0.025 inches */
+ vertsmallspace = (integer)(0.025*VDPI/vconv); /* 0.025 inches */
#ifdef HPS
- if (HPS_FLAG) pagecounter++ ;
- H_BREAK = (30 * DPI / 400 ) ; /* 30 seems to have worked well at 400 dpi */
+ if (HPS_FLAG) pagecounter++;
+ H_BREAK = (30 * DPI / 400 ); /* 30 seems to have worked well at 400 dpi */
#endif
- w = x = y = z = 0 ;
- h = (integer) (DPI / conv * hoff / 4736286.72) ;
- v = (integer) (DPI / conv * voff / 4736286.72) ;
- hh = PixRound(h) ;
- vv = PixRound(v) ;
- curfnt = NULL ;
- curpos = NULL ;
- charmove = 0 ;
+ w = x = y = z = 0;
+ h = (integer) (DPI / conv * hoff / 4736286.72);
+ v = (integer) (DPI / conv * voff / 4736286.72);
+ hh = PixRound(h);
+ vv = PixRound(v);
+ curfnt = NULL;
+ curpos = NULL;
+ charmove = 0;
beginloop:
switch (cmd=dvibyte()) {
-case 138: goto beginloop ; /* nop command does nuttin */
+case 138: goto beginloop; /* nop command does nuttin */
/*
* For put1 commands, we subtract the width of the character before
* dropping through to the normal character setting routines. This
*/
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() ;
- charmove = 1 ;
- goto dochar ;
+ if (noomega) error("! synch");
+ mychar = dvibyte();
+ mychar = (mychar << 8) + dvibyte();
+ charmove = 1;
+ 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:
#ifdef HPS
if (HPS_FLAG && PAGEUS_INTERUPPTUS) {
- HREF_COUNT-- ;
- start_new_box() ;
- PAGEUS_INTERUPPTUS = 0 ;
+ HREF_COUNT--;
+ start_new_box();
+ PAGEUS_INTERUPPTUS = 0;
}
if (HPS_FLAG && NEED_NEW_BOX) {
vertical_in_hps();
NEED_NEW_BOX = 0;
}
#endif
- cd = &(curfnt->chardesc[mychar]) ;
+ cd = &(curfnt->chardesc[mychar]);
if (cd->flags & EXISTS) {
if (curfnt->loaded == 2) { /* virtual character being typeset */
if (charmove) {
- sp->hh = hh + cd->pixelwidth ;
- sp->h = h + cd->TFMwidth ;
+ sp->hh = hh + cd->pixelwidth;
+ sp->h = h + cd->TFMwidth;
} else {
- sp->hh = hh ; sp->h = h ;
+ sp->hh = hh; sp->h = h;
}
- sp->vv = vv ; sp-> v = v ;
- sp->w = w ; sp->x = x ; sp->y = y ; sp->z = z ;
- if (++sp >= &stack[STACKSIZE]) error("! Out of stack space") ;
- w = x = y = z = 0 ; /* will be in relative units at new stack level */
- frp->curp = curpos ;
- frp->curl = curlim ;
- frp->ff = ffont ;
- frp->curf = curfnt ;
+ sp->vv = vv; sp-> v = v;
+ sp->w = w; sp->x = x; sp->y = y; sp->z = z;
+ if (++sp >= &stack[STACKSIZE]) error("! Out of stack space");
+ w = x = y = z = 0; /* will be in relative units at new stack level */
+ frp->curp = curpos;
+ frp->curl = curlim;
+ frp->ff = ffont;
+ frp->curf = curfnt;
if (++frp == &frames[MAXFRAME] )
- error("! virtual recursion stack overflow") ;
- curpos = cd->packptr + 2 ;
- curlim = curpos + (256*(long)(*cd->packptr)+(*(cd->packptr+1))) ;
- ffont = curfnt->localfonts ;
+ error("! virtual recursion stack overflow");
+ curpos = cd->packptr + 2;
+ curlim = curpos + (256*(long)(*cd->packptr)+(*(cd->packptr+1)));
+ ffont = curfnt->localfonts;
if (ffont) {
- curfnt = ffont->desc ;
- thinspace = curfnt->thinspace ;
+ curfnt = ffont->desc;
+ thinspace = curfnt->thinspace;
} else {
- curfnt = NULL ;
- thinspace = vertsmallspace ;
+ curfnt = NULL;
+ thinspace = vertsmallspace;
}
- goto beginloop ;
+ goto beginloop;
}
- drawchar(cd, mychar) ;
+ drawchar(cd, mychar);
}
if (charmove) {
- h += cd->TFMwidth ;
- hh += cd->pixelwidth ;
+ h += cd->TFMwidth;
+ hh += cd->pixelwidth;
}
- goto setmotion ;
+ goto setmotion;
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 , rxx, ryy ;
- ry = signedquad() ; rx = signedquad() ;
+ { integer ry, rx , rxx, ryy;
+ ry = signedquad(); rx = signedquad();
if (rx>0 && ry>0) {
if (curpos) {
- rx = scalewidth(rx, (frp-1)->curf->scaledsize) ;
- ry = scalewidth(ry, (frp-1)->curf->scaledsize) ;
+ rx = scalewidth(rx, (frp-1)->curf->scaledsize);
+ ry = scalewidth(ry, (frp-1)->curf->scaledsize);
}
- rxx = (int)(conv * rx + 0.9999999) ;
- ryy = (int)(vconv * ry + 0.9999999) ;
- drawrule(rxx, ryy) ;
+ rxx = (int)(conv * rx + 0.9999999);
+ ryy = (int)(vconv * ry + 0.9999999);
+ drawrule(rxx, ryy);
} else
- rxx = 0 ;
- if (cmd == 137) goto beginloop ;
- h += rx ; hh += rxx ;
- goto setmotion ;
+ rxx = 0;
+ if (cmd == 137) goto beginloop;
+ h += rx; hh += rxx;
+ goto setmotion;
}
case 141: /* push */
#ifdef HPS
- if (HPS_FLAG) pushcount++ ;
+ if (HPS_FLAG) pushcount++;
/* if (HPS_FLAG && PAGEUS_INTERUPPTUS) {
- HREF_COUNT-- ;
- start_new_box() ;
- PAGEUS_INTERUPPTUS = 0 ;
+ HREF_COUNT--;
+ start_new_box();
+ PAGEUS_INTERUPPTUS = 0;
} */
if (HPS_FLAG && NEED_NEW_BOX) {
vertical_in_hps();
NEED_NEW_BOX = 0;
}
- /* printf("push %i, %i\n", pushcount, inHTMLregion) ; */
+ /* printf("push %i, %i\n", pushcount, inHTMLregion); */
#endif
- sp->hh = hh ; sp->vv = vv ; 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") ;
- goto beginloop ;
+ sp->hh = hh; sp->vv = vv; 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");
+ goto beginloop;
case 140: /* eop or end of virtual character */
if (curpos == NULL) { /* eop */
#ifdef HPS
- if (HPS_FLAG && inHTMLregion) PAGEUS_INTERUPPTUS = 1 ;
+ if (HPS_FLAG && inHTMLregion) PAGEUS_INTERUPPTUS = 1;
/* printf("Page interrupted"); */
#endif
break;
}
- --frp ;
- curfnt = frp->curf ;
- thinspace = (curfnt) ? curfnt->thinspace : vertsmallspace ;
- ffont = frp->ff ;
- curlim = frp->curl ;
- curpos = frp->curp ;
+ --frp;
+ curfnt = frp->curf;
+ thinspace = (curfnt) ? curfnt->thinspace : vertsmallspace;
+ ffont = frp->ff;
+ curlim = frp->curl;
+ curpos = frp->curp;
if (hh < (sp-1)->hh+2 && hh > (sp-1)->hh-2)
(sp-1)->hh = hh; /* retain `intelligence' of pixel width, if close */
/* falls through */
case 142: /* pop */
#ifdef HPS
- pushcount-- ;
- /* printf("pop %i\n", pushcount) ; */
+ pushcount--;
+ /* printf("pop %i\n", pushcount); */
#endif
- if (--sp < stack) error("! More pops than pushes") ;
+ if (--sp < stack) error("! More pops than pushes");
#ifdef HPS
if (HPS_FLAG) {
- hhmem = hh ; vvmem = vv ;
+ hhmem = hh; vvmem = vv;
}
#endif
- hh = sp->hh ; vv = sp->vv ; h = sp->h ; v = sp->v ;
- w = sp->w ; x = sp->x ; y = sp->y ; z = sp->z ;
+ hh = sp->hh; vv = sp->vv; h = sp->h; v = sp->v;
+ w = sp->w; x = sp->x; y = sp->y; z = sp->z;
#ifdef HPS
if (HPS_FLAG && inHTMLregion && (hhmem - hh > H_BREAK) && (pushcount > 0) &&
(pushcount < current_pushcount))
- end_current_box() ;
+ end_current_box();
#endif
- goto beginloop ;
+ goto beginloop;
case 143: /* right1 */
- p = signedbyte() ; goto horizontalmotion ;
+ p = signedbyte(); goto horizontalmotion;
case 144: /* right2 */
- p = signedpair() ; goto horizontalmotion ;
+ p = signedpair(); goto horizontalmotion;
case 145: /* right3 */
- p = signedtrio() ; goto horizontalmotion ;
+ p = signedtrio(); goto horizontalmotion;
case 146: /* right4 */
- p = signedquad() ; goto horizontalmotion ;
+ p = signedquad(); goto horizontalmotion;
case 147: /* w0 */
- p = w ; goto horizontalmotion ;
+ p = w; goto horizontalmotion;
case 148: /* w1 */
- p = w = signedbyte() ; goto horizontalmotion ;
+ p = w = signedbyte(); goto horizontalmotion;
case 149: /* w2 */
- p = w = signedpair() ; goto horizontalmotion ;
+ p = w = signedpair(); goto horizontalmotion;
case 150: /* w3 */
- p = w = signedtrio() ; goto horizontalmotion ;
+ p = w = signedtrio(); goto horizontalmotion;
case 151: /* w4 */
- p = w = signedquad() ; goto horizontalmotion ;
+ p = w = signedquad(); goto horizontalmotion;
case 152: /* x0 */
- p = x ; goto horizontalmotion ;
+ p = x; goto horizontalmotion;
case 153: /* x1 */
- p = x = signedbyte() ; goto horizontalmotion ;
+ p = x = signedbyte(); goto horizontalmotion;
case 154: /* x2 */
- p = x = signedpair() ; goto horizontalmotion ;
+ p = x = signedpair(); goto horizontalmotion;
case 155: /* x3 */
- p = x = signedtrio() ; goto horizontalmotion ;
+ p = x = signedtrio(); goto horizontalmotion;
case 156: /* x4 */
- p = x = signedquad() ; goto horizontalmotion ;
+ p = x = signedquad(); goto horizontalmotion;
case 157: /* down1 */
- p = signedbyte() ; goto verticalmotion ;
+ p = signedbyte(); goto verticalmotion;
case 158: /* down2 */
- p = signedpair() ; goto verticalmotion ;
+ p = signedpair(); goto verticalmotion;
case 159: /* down3 */
- p = signedtrio() ; goto verticalmotion ;
+ p = signedtrio(); goto verticalmotion;
case 160: /* down4 */
- p = signedquad() ; goto verticalmotion ;
+ p = signedquad(); goto verticalmotion;
case 161: /* y0 */
- p = y ; goto verticalmotion ;
+ p = y; goto verticalmotion;
case 162: /* y1 */
- p = y = signedbyte() ; goto verticalmotion ;
+ p = y = signedbyte(); goto verticalmotion;
case 163: /* y2 */
- p = y = signedpair() ; goto verticalmotion ;
+ p = y = signedpair(); goto verticalmotion;
case 164: /* y3 */
- p = y = signedtrio() ; goto verticalmotion ;
+ p = y = signedtrio(); goto verticalmotion;
case 165: /* y4 */
- p = y = signedquad() ; goto verticalmotion ;
+ p = y = signedquad(); goto verticalmotion;
case 166: /* z0 */
- p = z ; goto verticalmotion ;
+ p = z; goto verticalmotion;
case 167: /* z1 */
- p = z = signedbyte() ; goto verticalmotion ;
+ p = z = signedbyte(); goto verticalmotion;
case 168: /* z2 */
- p = z = signedpair() ; goto verticalmotion ;
+ p = z = signedpair(); goto verticalmotion;
case 169: /* z3 */
- p = z = signedtrio() ; goto verticalmotion ;
+ p = z = signedtrio(); goto verticalmotion;
case 170: /* z4 */
- p = z = signedquad() ; goto verticalmotion ;
+ p = z = signedquad(); goto verticalmotion;
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:
@@ -305,37 +305,37 @@ 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 ;
- thinspace = curfnt->thinspace ;
- goto beginloop ;
+ if (cfnt->fontnum == fnt) break;
+ curfnt = cfnt->desc;
+ thinspace = curfnt->thinspace;
+ goto beginloop;
case 243: case 244: case 245: case 246: /*fntdef1 */
- skipover(cmd - 230) ;
- skipover(dvibyte() + dvibyte()) ;
- goto beginloop ;
+ skipover(cmd - 230);
+ skipover(dvibyte() + dvibyte());
+ goto beginloop;
case 239: /* xxx1 */
- p = dvibyte() ;
- dospecial(p) ;
- goto beginloop ;
+ p = dvibyte();
+ dospecial(p);
+ goto beginloop;
case 240: /* xxx2 */
- p = twobytes() ;
- dospecial(p) ;
- goto beginloop ;
+ p = twobytes();
+ dospecial(p);
+ goto beginloop;
case 241: /* xxx3 */
- p = threebytes() ;
- dospecial(p) ;
- goto beginloop ;
+ p = threebytes();
+ dospecial(p);
+ goto beginloop;
case 242: /* xxx4 */
- p = signedquad() ;
- dospecial(p) ;
- goto beginloop ;
+ p = signedquad();
+ dospecial(p);
+ goto beginloop;
/*
* The calculations here are crucial to the appearance of the document.
@@ -347,22 +347,22 @@ case 242: /* xxx4 */
verticalmotion:
/* vertical motion cases */
if (curpos)
- p = scalewidth(p, (frp-1)->curf->scaledsize) ;
- v += p ;
- if (p >= vertsmallspace) vv = VPixRound(v) ;
- else if (p <= -vertsmallspace) vv = VPixRound(v) ;
+ p = scalewidth(p, (frp-1)->curf->scaledsize);
+ v += p;
+ if (p >= vertsmallspace) vv = VPixRound(v);
+ else if (p <= -vertsmallspace) vv = VPixRound(v);
else
- { vv += VPixRound(p) ;
- roundpos = VPixRound(v) ;
- if (roundpos - vv > vmaxdrift) vv = roundpos - vmaxdrift ;
- else if (vv - roundpos > vmaxdrift) vv = roundpos + vmaxdrift ;
+ { vv += VPixRound(p);
+ roundpos = VPixRound(v);
+ if (roundpos - vv > vmaxdrift) vv = roundpos - vmaxdrift;
+ else if (vv - roundpos > vmaxdrift) vv = roundpos + vmaxdrift;
}
#ifdef HPS
/* printf("Doing vertical motion: p = %i, v = %i, vv = %i\n",p,v,vv); */
- /* printf("inHTMLregion %i\n", inHTMLregion) ; */
+ /* printf("inHTMLregion %i\n", inHTMLregion); */
if (HPS_FLAG && inHTMLregion) NEED_NEW_BOX = 1 /* vertical_in_hps() */;
#endif
- goto beginloop ;
+ goto beginloop;
/*
* Horizontal motion is analogous. We know the exact width of each
* character in pixels. Kerning is distinguished from space between
@@ -372,21 +372,21 @@ verticalmotion:
horizontalmotion:
/* horizontal motion cases */
if (curpos)
- p = scalewidth(p, (frp-1)->curf->scaledsize) ;
- h += p ;
+ p = scalewidth(p, (frp-1)->curf->scaledsize);
+ h += p;
if (p >= thinspace || p <= -6 * thinspace) {
- hh = PixRound(h) ; goto beginloop ;
+ hh = PixRound(h); goto beginloop;
}
- else hh += PixRound(p) ;
+ else hh += PixRound(p);
#ifdef HPS
/* printf("Doing horizontal motion: p = %i, h = %i, hh = %i\n",p,h,hh); */
#endif
setmotion:
- roundpos = PixRound(h) ;
- if (roundpos - hh > maxdrift) { hh = roundpos - maxdrift ; }
- else if (hh - roundpos > maxdrift) { hh = roundpos + maxdrift ; }
-goto beginloop ;
+ roundpos = PixRound(h);
+ if (roundpos - hh > maxdrift) { hh = roundpos - maxdrift; }
+ else if (hh - roundpos > maxdrift) { hh = roundpos + maxdrift; }
+goto beginloop;
} /* end of the big switch */
- pageend() ;
+ pageend();
}