summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk/color.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/color.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/color.c')
-rw-r--r--Build/source/texk/dvipsk/color.c174
1 files changed, 87 insertions, 87 deletions
diff --git a/Build/source/texk/dvipsk/color.c b/Build/source/texk/dvipsk/color.c
index 75f992d702f..a4ee12b8b19 100644
--- a/Build/source/texk/dvipsk/color.c
+++ b/Build/source/texk/dvipsk/color.c
@@ -34,12 +34,12 @@
* these.
*/
static struct colorpage {
- struct colorpage *next ;
- integer boploc ; /* we use the bop loc as a page indicator */
- char *bg ;
- char colordat[2] ;
-} *colorhash[COLORHASH] ;
-static char *cstack, *csp, *cend, *bg ;
+ struct colorpage *next;
+ integer boploc; /* we use the bop loc as a page indicator */
+ char *bg;
+ char colordat[2];
+} *colorhash[COLORHASH];
+static char *cstack, *csp, *cend, *bg;
/*
* This routine sends a color command out. If the command is a
* single `word' or starts with a double quote, we send it out
@@ -50,50 +50,50 @@ static char *cstack, *csp, *cend, *bg ;
void
colorcmdout(char *s)
{
- char *p ;
- char tempword[100] ;
+ char *p;
+ char tempword[100];
while (*s && *s <= ' ')
- s++ ;
+ s++;
if (*s == '"') {
- cmdout(s+1) ;
- return ;
+ cmdout(s+1);
+ return;
}
- for (p=s; *p && *p > ' '; p++) ;
- for (; *p && *p <= ' '; p++) ;
+ for (p=s; *p && *p > ' '; p++);
+ for (; *p && *p <= ' '; p++);
if (*p == 0) {
- cmdout(s) ;
- return ;
+ cmdout(s);
+ return;
}
- cmdout(p) ;
- strcpy(tempword, "TeXcolor") ;
+ cmdout(p);
+ strcpy(tempword, "TeXcolor");
for (p=tempword + strlen(tempword); *s && *s > ' '; p++, s++)
- *p = *s ;
- *p = 0 ;
- cmdout(tempword) ;
- return ;
+ *p = *s;
+ *p = 0;
+ cmdout(tempword);
+ return;
}
/*
* For a new dvi file, call this. Frees all allocated memory.
*/
#define DEFAULTCOLOR "Black"
void initcolor(void) {
- int i ;
- struct colorpage *p, *q ;
+ int i;
+ struct colorpage *p, *q;
for (i=0; i<COLORHASH; i++) {
for (p=colorhash[i]; p; p = q) {
- q = p->next ;
- free(p) ;
+ q = p->next;
+ free(p);
}
- colorhash[i] = 0 ;
+ colorhash[i] = 0;
}
- cstack = (char *)mymalloc(INITCOLORLEN) ;
- strcpy(cstack, "\n") ;
- strcat(cstack, DEFAULTCOLOR) ;
- csp = cstack + strlen(cstack) ;
- cend = cstack + INITCOLORLEN - 3 ; /* for conservativeness */
- bg = 0 ;
+ cstack = (char *)mymalloc(INITCOLORLEN);
+ strcpy(cstack, "\n");
+ strcat(cstack, DEFAULTCOLOR);
+ csp = cstack + strlen(cstack);
+ cend = cstack + INITCOLORLEN - 3; /* for conservativeness */
+ bg = 0;
}
/*
* This takes a call from predospecial to set the background color for
@@ -105,9 +105,9 @@ background(char *bkgrnd)
{
if (bkgrnd && *bkgrnd) {
if (strlen(bkgrnd) > MAXCOLORLEN)
- error(" color name too long; ignored") ;
+ error(" color name too long; ignored");
else
- strcpy(bg, bkgrnd) ;
+ strcpy(bg, bkgrnd);
}
}
/*
@@ -118,18 +118,18 @@ void
pushcolor(char *p, Boolean outtops)
{
while (strlen(p) + csp > cend) {
- int newlen = 3 * (cend - cstack) ;
- char *newcs = (char *)mymalloc(newlen) ;
- strcpy(newcs, cstack) ;
- csp = newcs + (csp - cstack) ;
- cend = newcs + newlen - 3 ;
- cstack = newcs ;
+ int newlen = 3 * (cend - cstack);
+ char *newcs = (char *)mymalloc(newlen);
+ strcpy(newcs, cstack);
+ csp = newcs + (csp - cstack);
+ cend = newcs + newlen - 3;
+ cstack = newcs;
}
- *csp++ = '\n' ;
- strcpy(csp, p) ;
- csp += strlen(p) ;
+ *csp++ = '\n';
+ strcpy(csp, p);
+ csp += strlen(p);
if (outtops) {
- colorcmdout(p) ;
+ colorcmdout(p);
}
}
/*
@@ -139,18 +139,18 @@ pushcolor(char *p, Boolean outtops)
void
popcolor(Boolean outtops)
{
- char *p = csp - 1 ;
+ char *p = csp - 1;
while (p >= cstack && *p != '\n')
- p-- ;
+ p--;
if (p == cstack)
- return ; /* We don't pop the last color as that is global */
- *p = 0 ;
- csp = p ;
- for (p--; p >= cstack && *p != '\n'; p--) ;
- p++ ;
+ return; /* We don't pop the last color as that is global */
+ *p = 0;
+ csp = p;
+ for (p--; p >= cstack && *p != '\n'; p--);
+ p++;
if ( outtops ) {
- colorcmdout(p) ;
+ colorcmdout(p);
}
}
/*
@@ -160,24 +160,24 @@ popcolor(Boolean outtops)
void
resetcolorstack(char * p, int outtops)
{
- char *q = csp - 1 ;
+ char *q = csp - 1;
while (q > cstack && *q != '\n')
- q-- ;
+ q--;
if (q > cstack && outtops == 0) {
#ifdef SHORTINT
- (void)fprintf(stderr, "You've mistakenly made a global color change ") ;
- (void)fprintf(stderr, "to %s within nested colors\n", p) ;
- (void)fprintf(stderr, "on page %ld. Will try to recover.\n", pagenum) ;
+ (void)fprintf(stderr, "You've mistakenly made a global color change ");
+ (void)fprintf(stderr, "to %s within nested colors\n", p);
+ (void)fprintf(stderr, "on page %ld. Will try to recover.\n", pagenum);
#else /* ~SHORTINT */
- (void)fprintf(stderr, "You've mistakenly made a global color change ") ;
- (void)fprintf(stderr, "to %s within nested colors\n", p) ;
- (void)fprintf(stderr, "on page %d. Will try to recover.\n", pagenum) ;
+ (void)fprintf(stderr, "You've mistakenly made a global color change ");
+ (void)fprintf(stderr, "to %s within nested colors\n", p);
+ (void)fprintf(stderr, "on page %d. Will try to recover.\n", pagenum);
#endif /* ~SHORTINT */
}
- csp = cstack ;
- *csp = 0 ;
- pushcolor(p, outtops) ;
+ csp = cstack;
+ *csp = 0;
+ pushcolor(p, outtops);
}
/*
* This routine is a bit magic. It looks up the page in the current
@@ -195,46 +195,46 @@ resetcolorstack(char * p, int outtops)
void
bopcolor(int outtops)
{
- integer pageloc = ftell(dvifile) ;
- int h = pageloc % COLORHASH ;
- struct colorpage *p = colorhash[h] ;
+ integer pageloc = ftell(dvifile);
+ int h = pageloc % COLORHASH;
+ struct colorpage *p = colorhash[h];
while (p) {
if (p->boploc == pageloc)
- break ;
+ break;
else
- p = p->next ;
+ p = p->next;
}
if (p) {
- strcpy(cstack, p->colordat) ;
- csp = cstack + strlen(cstack) ;
- bg = p->bg ;
+ strcpy(cstack, p->colordat);
+ csp = cstack + strlen(cstack);
+ bg = p->bg;
if (outtops && strcmp(bg, "White")!=0 && bg[0]) {
- cmdout("gsave") ;
- colorcmdout(bg) ;
- cmdout("clippath fill grestore") ;
+ cmdout("gsave");
+ colorcmdout(bg);
+ cmdout("clippath fill grestore");
}
} else {
p = (struct colorpage *)mymalloc((integer)
- (strlen(cstack) + sizeof(struct colorpage) + MAXCOLORLEN)) ;
- p->next = colorhash[h] ;
- p->boploc = pageloc ;
- strcpy(p->colordat, cstack) ;
- p->bg = p->colordat + strlen(cstack) + 1 ;
+ (strlen(cstack) + sizeof(struct colorpage) + MAXCOLORLEN));
+ p->next = colorhash[h];
+ p->boploc = pageloc;
+ strcpy(p->colordat, cstack);
+ p->bg = p->colordat + strlen(cstack) + 1;
if (bg)
- strcpy(p->bg, bg) ;
+ strcpy(p->bg, bg);
else
- *(p->bg) = 0 ;
- bg = p->bg ;
- colorhash[h] = p ;
+ *(p->bg) = 0;
+ bg = p->bg;
+ colorhash[h] = p;
}
if (outtops) {
- char *pp = csp - 1 ;
+ char *pp = csp - 1;
while (pp >= cstack && *pp != '\n')
- pp-- ;
- pp++ ;
+ pp--;
+ pp++;
if (strcmp(pp, DEFAULTCOLOR)!=0) {
- colorcmdout(pp) ;
+ colorcmdout(pp);
}
}
}