summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk/prescan.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/prescan.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/prescan.c')
-rw-r--r--Build/source/texk/dvipsk/prescan.c216
1 files changed, 108 insertions, 108 deletions
diff --git a/Build/source/texk/dvipsk/prescan.c b/Build/source/texk/dvipsk/prescan.c
index 14ee51829e1..facdf9d7d08 100644
--- a/Build/source/texk/dvipsk/prescan.c
+++ b/Build/source/texk/dvipsk/prescan.c
@@ -14,58 +14,58 @@
void
readpreamble(void)
{
- register int i ;
- char *p ;
+ register int i;
+ char *p;
- if (dvibyte()!=247) error("! Bad DVI file: first byte not preamble") ;
- if (dvibyte()!=2) error("! Bad DVI file: id byte not 2") ;
- num = signedquad() ;
- den = signedquad() ;
- if (overridemag > 0) (void)signedquad() ;
- else if (overridemag < 0) mag = (mag * signedquad()) / 1000.0 ;
- else mag = signedquad() ;
- conv = (real) num * DPI * mag / ( den * 254000000.0 ) ;
- vconv = (real) num * VDPI * mag / ( den * 254000000.0 ) ;
- alpha = (((real)den / 7227.0) / 0x100000) * (25400000.0 / (real) num) ;
- fsizetol = 1 + (integer)(DPI/(72270.0 * conv)) ;
+ if (dvibyte()!=247) error("! Bad DVI file: first byte not preamble");
+ if (dvibyte()!=2) error("! Bad DVI file: id byte not 2");
+ num = signedquad();
+ den = signedquad();
+ if (overridemag > 0) (void)signedquad();
+ else if (overridemag < 0) mag = (mag * signedquad()) / 1000.0;
+ else mag = signedquad();
+ conv = (real) num * DPI * mag / ( den * 254000000.0 );
+ vconv = (real) num * VDPI * mag / ( den * 254000000.0 );
+ alpha = (((real)den / 7227.0) / 0x100000) * (25400000.0 / (real) num);
+ fsizetol = 1 + (integer)(DPI/(72270.0 * conv));
if (!pprescan) {
- for (i=dvibyte(),p=preamblecomment;i>0;i--,p++) *p=dvibyte() ;
- *p='\0' ;
+ for (i=dvibyte(),p=preamblecomment;i>0;i--,p++) *p=dvibyte();
+ *p='\0';
if (!quiet) {
- (void)fprintf(stderr, "'") ;
+ (void)fprintf(stderr, "'");
#ifdef VMCMS /* IBM: VM/CMS */
- for(p=preamblecomment;*p;p++) (void)putc(ascii2ebcdic[*p], stderr) ;
+ for(p=preamblecomment;*p;p++) (void)putc(ascii2ebcdic[*p], stderr);
#else
#ifdef MVSXA /* IBM: MVS/XA */
- for(p=preamblecomment;*p;p++) (void)putc(ascii2ebcdic[*p], stderr) ;
+ for(p=preamblecomment;*p;p++) (void)putc(ascii2ebcdic[*p], stderr);
#else
- for(p=preamblecomment;*p;p++) (void)putc(*p, stderr) ;
+ for(p=preamblecomment;*p;p++) (void)putc(*p, stderr);
#endif /* IBM: VM/CMS */
#endif
- (void)fprintf(stderr, "' -> %s\n", oname) ;
+ (void)fprintf(stderr, "' -> %s\n", oname);
}
} else
- skipover(dvibyte()) ;
+ skipover(dvibyte());
}
/*
* Finally, here's our main prescan routine.
*/
-static integer firstmatch = -1, lastmatch = -1 ;
+static integer firstmatch = -1, lastmatch = -1;
void
prescanpages(void)
{
- register int cmd ;
- short ret = 0 ;
- register integer thispageloc, thissecloc ;
- register fontdesctype *f ;
- register shalfword c ;
- register long thissectionmem = 0 ;
- integer mpagenum ;
- integer pageseq = 0 ;
- int ntfirst = notfirst ;
+ register int cmd;
+ short ret = 0;
+ register integer thispageloc, thissecloc;
+ register fontdesctype *f;
+ register shalfword c;
+ register long thissectionmem = 0;
+ integer mpagenum;
+ integer pageseq = 0;
+ int ntfirst = notfirst;
- readpreamble() ;
+ readpreamble();
/*
* Now we look for the first page to process. If we get to the end of
* the file before the page, we complain (fatally).
@@ -74,38 +74,38 @@ prescanpages(void)
* header that might be in skipped pages.
*/
while (1) {
- cmd = skipnop() ;
+ cmd = skipnop();
if (cmd==248)
- error("! End of document before first specified page") ;
+ error("! End of document before first specified page");
if (cmd!=139)
- error("! Bad DVI file: expected bop") ;
- thispageloc = ftell(dvifile) ; /* the location FOLLOWING the bop */
+ error("! Bad DVI file: expected bop");
+ thispageloc = ftell(dvifile); /* the location FOLLOWING the bop */
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
- (void)fprintf(stderr,"bop at %ld\n", thispageloc) ;
+ (void)fprintf(stderr,"bop at %ld\n", thispageloc);
#else /* ~SHORTINT */
- (void)fprintf(stderr,"bop at %d\n", (int)thispageloc) ;
+ (void)fprintf(stderr,"bop at %d\n", (int)thispageloc);
#endif /* ~SHORTINT */
#endif /* DEBUG */
- pagenum = signedquad() ;
- pageseq++ ;
- mpagenum = abspage ? pageseq : pagenum ;
+ pagenum = signedquad();
+ pageseq++;
+ mpagenum = abspage ? pageseq : pagenum;
if (mpagenum == firstpage && ntfirst)
- firstmatch++ ;
+ firstmatch++;
if (mpagenum == lastpage && notlast)
- lastmatch++ ;
+ lastmatch++;
if (ntfirst && mpagenum == firstpage && firstmatch == firstseq)
- ntfirst = 0 ;
+ ntfirst = 0;
if (ntfirst ||
((evenpages && (pagenum & 1)) || (oddpages && (pagenum & 1)==0) ||
(pagelist && !InPageList(pagenum)))) {
- skipover(40) ;
- skippage() ;
+ skipover(40);
+ skippage();
} else {
if (notlast && mpagenum == lastpage)
- lastmatch-- ;
- break ;
+ lastmatch--;
+ break;
}
}
/*
@@ -114,23 +114,23 @@ prescanpages(void)
*/
while (maxpages > 0 && cmd != 248) {
for (f=fonthead; f; f=f->next) {
- f->psname = 0 ;
+ f->psname = 0;
if (f->loaded==1)
for (c=255; c>=0; c--)
- f->chardesc[c].flags &= (STATUSFLAGS) ;
+ f->chardesc[c].flags &= (STATUSFLAGS);
}
- fontmem = swmem - OVERCOST ;
+ fontmem = swmem - OVERCOST;
if (fontmem <= 1000)
- error("! Too little VM in printer") ;
+ error("! Too little VM in printer");
/* The section begins at the bop command just before thispageloc (which may
* be a page that was aborted because the previous section overflowed memory).
*/
- pagecount = 0 ;
- (void)fseek(dvifile, (long)thispageloc, 0) ;
- pagenum = signedquad() ;
- skipover(40) ;
- thissecloc = thispageloc ;
+ pagecount = 0;
+ (void)fseek(dvifile, (long)thispageloc, 0);
+ pagenum = signedquad();
+ skipover(40);
+ thissecloc = thispageloc;
/*
* Now we have the loop that actually scans the pages. The scanpage routine
* returns 1 if the page scans okay; it returns 2 if the memory ran out
@@ -139,53 +139,53 @@ prescanpages(void)
* of memory. After each page, we mark the characters seen on that page
* as seen for this section so that they will be downloaded.
*/
- ret = 0 ;
+ ret = 0;
while (maxpages>0) {
if (!(evenpages && (pagenum & 1)) &&
!(oddpages && (pagenum & 1)==0) &&
!(pagelist && !InPageList(pagenum))) {
- ret = scanpage() ;
+ ret = scanpage();
if (ret == 0)
- break ;
- pagecount++ ;
- maxpages-- ;
+ break;
+ pagecount++;
+ maxpages--;
} else
- skippage() ;
- thissectionmem = swmem - fontmem - OVERCOST ;
- mpagenum = abspage ? pageseq : pagenum ;
- pageseq++ ;
+ skippage();
+ thissectionmem = swmem - fontmem - OVERCOST;
+ mpagenum = abspage ? pageseq : pagenum;
+ pageseq++;
if (mpagenum == lastpage && notlast)
- lastmatch++ ;
+ lastmatch++;
if (notlast && mpagenum == lastpage && lastmatch == lastseq)
- maxpages = -1 ; /* we are done after this page. */
+ maxpages = -1; /* we are done after this page. */
if (reverse)
- thissecloc = thispageloc ;
+ thissecloc = thispageloc;
for (f=fonthead; f; f=f->next)
if (f->loaded==1) {
if (f->psflag & THISPAGE)
- f->psflag = PREVPAGE ;
+ f->psflag = PREVPAGE;
for (c=255; c>=0; c--)
if (f->chardesc[c].flags & THISPAGE)
f->chardesc[c].flags = PREVPAGE |
- (f->chardesc[c].flags & (STATUSFLAGS)) ;
+ (f->chardesc[c].flags & (STATUSFLAGS));
}
- cmd=skipnop() ;
- if (cmd==248) break ;
+ cmd=skipnop();
+ if (cmd==248) break;
if (cmd!=139)
- error("! Bad DVI file: expected bop") ;
- thispageloc = ftell(dvifile) ;
+ error("! Bad DVI file: expected bop");
+ thispageloc = ftell(dvifile);
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
- (void)fprintf(stderr,"bop at %ld\n", thispageloc) ;
+ (void)fprintf(stderr,"bop at %ld\n", thispageloc);
#else /* ~SHORTINT */
- (void)fprintf(stderr,"bop at %d\n", (int)thispageloc) ;
+ (void)fprintf(stderr,"bop at %d\n", (int)thispageloc);
#endif /* ~SHORTINT */
#endif /* DEBUG */
- pagenum = signedquad() ;
- skipover(40) ;
+ pagenum = signedquad();
+ skipover(40);
if (ret==2 || (maxsecsize && pagecount >= maxsecsize))
- break ;
+ break;
}
/*
* Now we have reached the end of a section for some reason.
@@ -193,32 +193,32 @@ prescanpages(void)
* and continue.
*/
if (pagecount>0) {
- register int fc = 0 ;
- register sectiontype *sp ;
- register charusetype *cp ;
+ register int fc = 0;
+ register sectiontype *sp;
+ register charusetype *cp;
- totalpages += pagecount ;
+ totalpages += pagecount;
for (f=fonthead; f; f=f->next)
if (f->loaded==1 && f->psname)
- fc++ ;
+ fc++;
sp = (sectiontype *)mymalloc((integer)(sizeof(sectiontype) +
- fc * sizeof(charusetype) + sizeof(fontdesctype *))) ;
- sp->bos = thissecloc ;
+ fc * sizeof(charusetype) + sizeof(fontdesctype *)));
+ sp->bos = thissecloc;
if (reverse) {
- sp->next = sections ;
- sections = sp ;
+ sp->next = sections;
+ sections = sp;
} else {
- register sectiontype *p ;
+ register sectiontype *p;
- sp->next = NULL ;
+ sp->next = NULL;
if (sections == NULL)
- sections = sp ;
+ sections = sp;
else {
- for (p=sections; p->next != NULL; p = p->next) ;
- p->next = sp ;
+ for (p=sections; p->next != NULL; p = p->next);
+ p->next = sp;
}
}
- sp->numpages = pagecount ;
+ sp->numpages = pagecount;
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
@@ -226,29 +226,29 @@ prescanpages(void)
#else /* ~SHORTINT */
(void)fprintf(stderr,"Have a section: %d pages at %d fontmem %d\n",
#endif /* ~SHORTINT */
- (integer)pagecount, (integer)thissecloc, (integer)thissectionmem) ;
+ (integer)pagecount, (integer)thissecloc, (integer)thissectionmem);
#endif /* DEBUG */
- cp = (charusetype *) (sp + 1) ;
- fc = 0 ;
+ cp = (charusetype *) (sp + 1);
+ fc = 0;
for (f=fonthead; f; f=f->next)
if (f->loaded==1 && f->psname) {
- register halfword b, bit ;
+ register halfword b, bit;
- cp->psfused = (f->psflag & PREVPAGE) ;
- f->psflag = 0 ;
- cp->fd = f ;
- c = 0 ;
+ cp->psfused = (f->psflag & PREVPAGE);
+ f->psflag = 0;
+ cp->fd = f;
+ c = 0;
for (b=0; b<16; b++) {
- cp->bitmap[b] = 0 ;
+ cp->bitmap[b] = 0;
for (bit=32768; bit!=0; bit>>=1) {
if (f->chardesc[c].flags & PREVPAGE)
- cp->bitmap[b] |= bit ;
- c++ ;
+ cp->bitmap[b] |= bit;
+ c++;
}
}
- cp++ ;
+ cp++;
}
- cp->fd = NULL ;
+ cp->fd = NULL;
}
}
}