Test commit rights. Incidentially, discard spaces at the end of

lines in files that I will change anyhow.


git-svn-id: svn://tug.org/texlive/trunk@4522 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 202 insertions, 202 deletions

diff --git a/Build/source/texk/dviljk/config.h b/Build/source/texk/dviljk/config.h
index 3b60b73bca4..2c7f7498939 100644
--- a/Build/source/texk/dviljk/config.h
+++ b/Build/source/texk/dviljk/config.h
@@ -218,7 +218,7 @@ typedef SCHAR_TYPE signed_char;
 #ifndef KPATHSEA
 extern bool findfile(
 #if NeedFunctionPrototypes
-char path[], char n[], long4 fontmag, char name[], 
+char path[], char n[], long4 fontmag, char name[],
 	      bool tfm, int level
 #endif
     );
diff --git a/Build/source/texk/dviljk/dvi2xx.c b/Build/source/texk/dviljk/dvi2xx.c
index 42b6801e05a..730d616afdb 100644
--- a/Build/source/texk/dviljk/dvi2xx.c
+++ b/Build/source/texk/dviljk/dvi2xx.c
@@ -165,7 +165,7 @@ char    *argv[];
 # endif
 #endif
 
-  /* Initialize pixel_files */   
+  /* Initialize pixel_files */
   for (i = 0; i <= MAXOPEN; i++)
     pixel_files[i].pixel_file_id = FPNULL;
 
@@ -275,7 +275,7 @@ char    *argv[];
   EMIT1("@PJL SET PAGEPROTECT=OFF\012");
   EMIT1("@PJL ENTER LANGUAGE=PCL\012");
   if (econoMode && LJ6)
-      EMIT1("@PJL SET ECONOMODE=ON\012");  
+      EMIT1("@PJL SET ECONOMODE=ON\012");
   EMIT3("\033&u%dD\033*t%dR",RESOLUTION,RESOLUTION);
   if (econoMode && !LJ6)
     EMIT1("\033*v1T");
@@ -431,8 +431,8 @@ char    *argv[];
           /*
             fprintf(ERR_STREAM,"FirstPart\n count %d, mod %d, pp %d\n",(int)count[0],(int)count[0]%2,PageParity);
             */
-          SkipMode = 
-            (bool)(PageParity != (short)((count[0]<0 ? 
+          SkipMode =
+            (bool)(PageParity != (short)((count[0]<0 ?
                                           labs(count[0])+1 : count[0])%2));
           if (count[0] == 0) SkipMode = (bool)!SkipMode;
         }
@@ -641,7 +641,7 @@ char    *argv[];
    is not buffered. */
 
 /* read a buffered byte */
-char 
+char
 #if NeedFunctionPrototypes
 b_read(FILEPTR spfp)
 #else
@@ -661,7 +661,7 @@ FILEPTR spfp;
 }
 
 #ifdef RISC_BUFFER
-void 
+void
 #if NeedFunctionPrototypes
 b_write(FILEPTR spfp, char c) /* write a buffered byte */
 #else
@@ -677,7 +677,7 @@ char c;
   buffout[boact++] = c;
 }
 
-void 
+void
 #if NeedFunctionPrototypes
 b_wrtmult(FILEPTR spfp, char *buf, int len) /* write a sequence of bytes to the output buffer */
 #else
@@ -693,22 +693,22 @@ int len;
     write_multi(buffout,1,boact,spfp);
     /* Copy only small blocks; large ones are written directly */
     if (len < (BUFFSIZE/4)) {
-      for (i = 0; i<len; i++) 
+      for (i = 0; i<len; i++)
         buffout[i] = buf[i];
       boact = len;
     } else {
-      write_multi(buf,1,len,spfp); 
+      write_multi(buf,1,len,spfp);
       boact = 0;
     }
   }
   else {
-    for (i = 0; i<len; i++) 
+    for (i = 0; i<len; i++)
       buffout[boact++] = buf[i];
   }
 }
 
 /* flush the output buffer */
-void 
+void
 #if NeedFunctionPrototypes
 b_oflush(FILEPTR spfp)
 #else
@@ -762,9 +762,9 @@ char    *str;
 /***************************** CopyHPFile ******************************/
 /*********************************************************************/
 #if NeedFunctionPrototypes
-int getnum(FILEPTR spfp, char *t, char *numstr) 
+int getnum(FILEPTR spfp, char *t, char *numstr)
 #else
-int getnum(spfp, t, numstr) 
+int getnum(spfp, t, numstr)
 FILEPTR spfp;
 char *t, *numstr;
 #endif
@@ -777,30 +777,30 @@ char *t, *numstr;
 }
 
 #if NeedFunctionPrototypes
-void setOffset(char dir, char sign, int pos) 
+void setOffset(char dir, char sign, int pos)
 #else
-void setOffset(dir, sign, pos, first) 
+void setOffset(dir, sign, pos, first)
 char dir, sign;
 int pos;
 #endif
 {
   if ((sign == '+' || sign == '-') && pos > 0 ) {
     EMIT4("\033*p%c%d%c",sign,pos,dir);
-#ifdef DEBUGGS   
+#ifdef DEBUGGS
     fprintf(stderr, "relative: *p%c%d%c\n", sign, pos, dir);
 #endif
   } else if (pos>0) {
     EMIT3("\033*p%d%c",pos,dir);
-#ifdef DEBUGGS   
+#ifdef DEBUGGS
     fprintf(stderr, "absolute: *p%d%c\n", pos, dir);
 #endif
-    if (dir == 'X') 
+    if (dir == 'X')
       last_rx = pos;
-    else 
+    else
       last_ry = pos;
   } else {
     /*EMIT3("\033*p%d%c",pos,dir);*/
-#ifdef DEBUGGS   
+#ifdef DEBUGGS
     fprintf(stderr, "Relative: *p%d%c\n", pos, dir);
 #endif
   }
@@ -832,7 +832,7 @@ char    *str;
      unwanted commands from the input file and outputs the rest */
 
   /* reset the input buffer */
-  binumber = 0; 
+  binumber = 0;
   biact = 0;
 
   qfprintf(ERR_STREAM," [%s", str);
@@ -853,16 +853,16 @@ char    *str;
           /* of the commands (x first, y first) */
 
           if (t=='Y' || t=='y') {
-            if (numstr[0]!='+' && numstr[0]!='-' && num<miny) 
+            if (numstr[0]!='+' && numstr[0]!='-' && num<miny)
               miny = num;
             if (t=='y') {
               num = getnum(spfp, &t, numstr);
-              if (numstr[0]!='+' && numstr[0]!='-' && num<minx) 
+              if (numstr[0]!='+' && numstr[0]!='-' && num<minx)
                 minx = num;
             }
           }
           if (t=='X' || t=='x') {
-            if (numstr[0]!='+' && numstr[0]!='-' && num<minx) 
+            if (numstr[0]!='+' && numstr[0]!='-' && num<minx)
               minx = num;
 
             if (t=='x') {
@@ -920,16 +920,16 @@ char    *str;
   }
   qfprintf(ERR_STREAM," [%s", str);
   /* reset input buffer again */
-  binumber = 0; 
+  binumber = 0;
   biact = 0;
 
 
   /* Pass through the input file again but this time output the */
   /* retained PCL commands */
-#ifdef DEBUGGS   
-  fprintf(stderr,"\nminx=%d, miny=%d, xg=%d, yg=%d\n", 
+#ifdef DEBUGGS
+  fprintf(stderr,"\nminx=%d, miny=%d, xg=%d, yg=%d\n",
           minx, miny, x_goffset, y_goffset);
-#endif  
+#endif
   do {
     t = (char)b_read(spfp);
     if (t==0x1B) {
@@ -948,7 +948,7 @@ char    *str;
             } else {
               setOffset('Y',numstr[0], num);
             }
-            
+
             if (t == 'y') {
               num = getnum(spfp, &t,numstr);
               if (numstr[0]!='+' && numstr[0]!='-') {
@@ -960,16 +960,16 @@ char    *str;
               }
             }
           }
-            
+
           if (t=='X' || t=='x') {
             if (numstr[0]!='+' && numstr[0]!='-') {
               /*Add in the correct horizontal offset*/
               setOffset('X',numstr[0],
                         num - minx + (int)PIXROUND(h,hconv) + x_goffset);
-            } else { 
+            } else {
               setOffset('X',numstr[0], num);
             }
-            
+
             if (t=='x') {
               num = getnum(spfp, &t,numstr);
               if (numstr[0]!='+' && numstr[0]!='-') {
@@ -1027,7 +1027,7 @@ char    *str;
         case(0x63):
           /* Rectangular draw commands */
           EMIT1("\033*c");
-          for (t = (char)b_read(spfp); t<0x40 || t>0x60; 
+          for (t = (char)b_read(spfp); t<0x40 || t>0x60;
                t = (char)b_read(spfp))
             EMITC(t);
           EMITC(t);
@@ -1110,7 +1110,7 @@ register int    n;      /* number of bytes */
   long4 x = 0;      /* number being constructed */
   unsigned char h;
   while (n--) {
-    x <<= 8; 
+    x <<= 8;
     read_byte(fp,h);
     x |= h;
   }
@@ -1143,7 +1143,7 @@ register int     n;   /* number of bytes */
 #ifdef SIGN_DEBUG
   long4    x0;      /* copy of x  */
 #endif
-  read_byte(fp,h); 
+  read_byte(fp,h);
   x = h; /* get first (high-order) byte */
   n1 = n--;
   while (n--) {
@@ -1296,7 +1296,7 @@ FILEPTR f;
                                         /* ---> result in DX       */
 
   if (  (regs.h.dl & 0x80)              /* file handle points to a device */
-        && !(regs.h.dl & 0x07) ) {      /* neither console i/o or null    */ 
+        && !(regs.h.dl & 0x07) ) {      /* neither console i/o or null    */
 
     regs.h.dl  |= 0x20;                 /* set BINARY bit in device info  */
     regs.h.ah = (unsigned char) 0x44;   /* IOCTL                  */
@@ -1501,20 +1501,20 @@ printf("Emit character %c(%d) id=%d, yoff=%d[%d], w=%d[%d], h=%d[%d]\n",
     /* For COMPRESSED CHARS */
     if (PrevSize < nbpl) {
       PrevSize = nbpl;
-      if (PrevLine != NULL) 
+      if (PrevLine != NULL)
         free(PrevLine);
-      if ((PrevLine = (unsigned char*)malloc(PrevSize*sizeof(char))) 
+      if ((PrevLine = (unsigned char*)malloc(PrevSize*sizeof(char)))
           == NULL) {
-        PrevSize = 0; 
+        PrevSize = 0;
         Fatal("EmitChar: Out of memory error!\n");
       }
     }
     /* Clear seed line */
-    for (i = 0; i<nbpl; i++) 
+    for (i = 0; i<nbpl; i++)
       PrevLine[i] = 0;
-    CChar_Off = 0; 
+    CChar_Off = 0;
     CChar_Last = -1;
-    
+
     /* This bit copied from below... */
 #  ifdef USEPXL
     if (fontptr->id == pk89)
@@ -1530,11 +1530,11 @@ printf("Emit character %c(%d) id=%d, yoff=%d[%d], w=%d[%d], h=%d[%d]\n",
         CompressedCharLine(ce,nbpl,sl);
       }
 #  else
-    for (i = num_rows; i > 0; i--) 
+    for (i = num_rows; i > 0; i--)
       CompressedCharLine(ce,nbpl,(bits + (i-1)*nbpl));
 #  endif /* USEPXL */
   }
-  else 
+  else
     CChar_Off = -1;
 # endif /* LJ4 */
 
@@ -1544,10 +1544,10 @@ printf("Emit character %c(%d) id=%d, yoff=%d[%d], w=%d[%d], h=%d[%d]\n",
 # ifdef LJ4
   /* printf("raw: %d (%d * %d), comp: %d\n",
      total,ce->width,ce->height,CChar_Off); */
-  /* Characters that don't compress well are usually rather small so 
-     reading them again and writing them uncompressed won't take 
+  /* Characters that don't compress well are usually rather small so
+     reading them again and writing them uncompressed won't take
      much time anyway. */
-  if (CChar_Off > total) 
+  if (CChar_Off > total)
     CChar_Off = -1;
   if (CChar_Off >= 0) {
     EMIT4("\033*c%sd%dE\033(s%ldW", cnv_buffer,
@@ -1606,7 +1606,7 @@ printf("Emit character %c(%d) id=%d, yoff=%d[%d], w=%d[%d], h=%d[%d]\n",
       }
 #endif
     }
-    
+
 #ifdef IBM3812
 #ifdef USEPXL
   used_fontstorage += (long4)ce->height * ((ce->width + 15) >> 4) * 2 + 14;
@@ -1652,7 +1652,7 @@ unsigned char   *pkloc;
 int     repeatcount;
 
 void             /* <Read and translate raster description@>*/
-#if NeedFunctionPrototypes 
+#if NeedFunctionPrototypes
 PkRaster(struct char_entry *ce, int raster)
 #else
 PkRaster(ce, raster)
@@ -1735,7 +1735,7 @@ int raster;
       if (wordweight < 31) {
 #ifdef COMMENT
 # ifdef DRAWGLYPH
-        { 
+        {
           int k;
           for (k = 15; k>=0; k--) {
             if ((power[k] & word)!=0) printf("Z");
@@ -1749,7 +1749,7 @@ int raster;
         for (j = 3; j >= (wordwidth * 4 - (long4)nbpl); j--) {
           OUTCHAR(((word >> (j << 3)) & 0xff));
 #ifdef DRAWGLYPH
-          { 
+          {
             int k;
             for (k = 7; k>=0; k--) {
               if ((power[k] & ((word >> (j << 3)) & 0xff))!=0) printf("M");
@@ -1760,9 +1760,9 @@ int raster;
         }
 
       }
-        
+
       switch (raster) {
-      case 1: 
+      case 1:
         RasterLine(ce, nbpl, current_line, raster_line_buf);
         current_line++;
         break;
@@ -1826,7 +1826,7 @@ int raster;
             OUTCHAR((tl       & 0xFF));
 
 #ifdef DRAWGLYPH
-            { 
+            {
               int k;
               for (k = 31; k>=0; k--) {
                 if ((power[k] & row[ii])!=0) printf("M");
@@ -1839,7 +1839,7 @@ int raster;
           for (j = 3; j >= (wordwidth *4 - (long4)nbpl); j--) {
             OUTCHAR(((tl >> (j << 3)) & 0xff));
 #ifdef DRAWGLYPH
-            { 
+            {
               int k;
               for (k = 7; k>=0; k--) {
                 if ((power[k] & ((tl >> (j << 3)) & 0xff))!=0) printf("M");
@@ -1850,7 +1850,7 @@ int raster;
           }
 
           switch (raster) {
-          case 1: 
+          case 1:
             RasterLine(ce, (unsigned int)nbpl, current_line, raster_line_buf);
             current_line++;
             break;
@@ -1969,7 +1969,7 @@ int n;
 
 #ifdef LJ4
 /* Compress a raster line in compression mode 2 */
-int 
+int
 #if NeedFunctionPrototypes
 CompressLine2(unsigned char *buffer, unsigned char *buffout, int emitbytes)
 #else
@@ -1984,13 +1984,13 @@ int emitbytes;
   char last,c;
 
   /* trap empty lines (otherwise problems with Packbits) */
-  if (emitbytes == 0) 
+  if (emitbytes == 0)
     return(0);
   /* Use Packbits compression (mode 2) on raster line */
-  pos = buffer; 
-  litpos = buffer; 
-  pack = 1; 
-  ppos = buffout; 
+  pos = buffer;
+  litpos = buffer;
+  pack = 1;
+  ppos = buffout;
   last = *pos++;
   upper = buffer + emitbytes;
   while (pos < upper) {
@@ -2000,14 +2000,14 @@ int emitbytes;
       /* At least three equal bytes ==> write out preceding literal sequence */
       if ((pack == 3) && ((lit = (int)(pos - litpos - 3)) != 0)) {
         while (lit >= 128) {
-          *ppos++ = 127; 
-          for (i = 1; i<=128; i++) 
+          *ppos++ = 127;
+          for (i = 1; i<=128; i++)
             *ppos++ = *litpos++;
           lit -= 128;
         }
         if (lit != 0) {
-          *ppos++ = lit-1; 
-          while ((lit--) > 0) 
+          *ppos++ = lit-1;
+          while ((lit--) > 0)
             *ppos++ = *litpos++;
           /* litpos is now pos-3 (i.e. first of the sequence) */
         }
@@ -2015,19 +2015,19 @@ int emitbytes;
     }
     else {
       while (pack >= 128) {
-        *ppos++ = 129; 
-        *ppos++ = last; 
-        litpos += 128; 
+        *ppos++ = 129;
+        *ppos++ = last;
+        litpos += 128;
         pack -= 128;
       }
       /* At least 3 equal bytes or 2 that don't break a literal sequence
          ==> write out packed sequence */
       if ((pack >= 3) || ((pack == 2) && (litpos == pos-3))) {
-        *ppos++ = 257 - pack; 
-        *ppos++ = last; 
+        *ppos++ = 257 - pack;
+        *ppos++ = last;
         litpos += pack;
       }
-      pack = 1; 
+      pack = 1;
       last = c;
     }
     if (ppos > (buffout + BUFFSIZE/2 - 129)) {
@@ -2036,28 +2036,28 @@ int emitbytes;
       return(0);
     }
   }
-  
+
   while (pack >= 128) {
-    *ppos++ = 129; 
-    *ppos++ = last; 
-    litpos += 128; 
+    *ppos++ = 129;
+    *ppos++ = last;
+    litpos += 128;
     pack -= 128;
   }
   if ((pack >= 3) || ((pack == 2) && (litpos == pos-3))) {
-    *ppos++ = 257 - pack; 
-    *ppos++ = last; 
+    *ppos++ = 257 - pack;
+    *ppos++ = last;
     litpos += pack;
   }
   else if ((lit = (int)(pos - litpos)) != 0) {
     while (lit >= 128) {
-      *ppos++ = 127; 
-      for (i = 1; i<=128; i++) 
+      *ppos++ = 127;
+      for (i = 1; i<=128; i++)
         *ppos++ = *litpos++;
       lit -= 128;
     }
     if (lit != 0) {
-      *ppos++ = lit-1; 
-      while ((lit--) > 0) 
+      *ppos++ = lit-1;
+      while ((lit--) > 0)
         *ppos++ = *litpos++;
     }
   }
@@ -2079,24 +2079,24 @@ int emitbytes;
   int lit,i,pack;
 
   /* Use compression mode 3 */
-  pos = buffer; 
-  ppos = buffout; 
-  upper = buffer + emitbytes; 
+  pos = buffer;
+  ppos = buffout;
+  upper = buffer + emitbytes;
   prev = PrevLine;
   while(pos < upper) {
     litpos = pos;
     while ((*prev == *pos) && (pos < upper)) {
-      prev++; 
+      prev++;
       pos++;
     }
     if (pos < upper) {
-      pack = (int)(pos - litpos); 
+      pack = (int)(pos - litpos);
       litpos = pos;
-      i = upper - pos; 
-      if (i > 8) 
+      i = upper - pos;
+      if (i > 8)
         i = 8;
       while ((*pos != *prev) && (i > 0)) {
-        *prev++ = *pos++; 
+        *prev++ = *pos++;
         i--;
       }
       i = (int)(pos - litpos - 1);
@@ -2105,16 +2105,16 @@ int emitbytes;
         *ppos++ = lit + pack;
       }
       else {
-        *ppos++ = lit + 31; 
+        *ppos++ = lit + 31;
         pack -= 31;
         while (pack >= 255) {
-          *ppos++ = 255; 
+          *ppos++ = 255;
           pack -= 255;
         }
         *ppos++ = pack;
       }
       while (i >= 0) {
-        *ppos++ = *litpos++; 
+        *ppos++ = *litpos++;
         i--;
       }
     }
@@ -2134,7 +2134,7 @@ int emitbytes;
 /**********************************************************************/
 void
 #if NeedFunctionPrototypes
-RasterLine(struct char_entry *ce, unsigned int nbpl, 
+RasterLine(struct char_entry *ce, unsigned int nbpl,
            unsigned int current_line, unsigned char *buffer)
 #else
 RasterLine(ce, nbpl, current_line, buffer)
@@ -2208,21 +2208,21 @@ char *buffer;
     EMIT2("\033*b%dW", emitbytes);
     EMITL(emitbytes, buffer);
     break;
- 
+
   case 2:
     i = CompressLine2(buffer,buffin,emitbytes);
     EMIT2("\033*b%dW", i);
     EMITL(i,buffin);
     break;
- 
+
   case 3:
     i = CompressLine3(buffer,buffin + BUFFSIZE/2,(int)nbpl);
     EMIT2("\033*b%dW", i);
     EMITL(i,buffin + BUFFSIZE/2);
     break;
- 
-  default: 
-    fprintf(ERR_STREAM,"Unsupported compression mode!\n"); 
+
+  default:
+    fprintf(ERR_STREAM,"Unsupported compression mode!\n");
   }
 # else
   EMIT2("\033*b%dW", emitbytes);
@@ -2280,10 +2280,10 @@ struct char_entry *ce;
   if (CompressCharMode == 3) {
     /* Check if PrevLine big enough; claim more space if not */
     if (((int)nbpl) > PrevSize) {
-      if (PrevLine != NULL) 
+      if (PrevLine != NULL)
         free(PrevLine);
       if ((PrevLine = (unsigned char *)malloc(nbpl*sizeof(char))) == NULL) {
-        PrevSize = 0; 
+        PrevSize = 0;
         Fatal("RasterChar: out of memory!\n");
       }
       PrevSize = (int)nbpl;
@@ -2419,7 +2419,7 @@ register struct char_entry *ptr;
   if (bytes > 0) {
     /* do NOT load Huge characters */
     if ((bytes > HUGE_CHAR_PATTERN) && (fontptr->id != pk89)) {
-      qfprintf(ERR_STREAM,"Huge Character <%c> (%ld Bytes)\n", 
+      qfprintf(ERR_STREAM,"Huge Character <%c> (%ld Bytes)\n",
                (char)c, bytes);
       ptr->charsize = HUGE_SIZE;
       ptr->where.isloaded = _FALSE;
@@ -2505,7 +2505,7 @@ bool do_posn,in_string;
     SetPosn(h, v);
   }
 
-  /*  
+  /*
     fprintf(ERR_STREAM,
             "(%d) hh=%ld (+%ld/+%ld), h=%ld, xh=%ld,xhh=%ld, [%ld|%ld] ->%d\n",
             (int)do_posn,hh,(long4)ptr->cw,(long4)ptr->cw*(long4)hconv,h,
@@ -2553,7 +2553,7 @@ bool do_posn,in_string;
       int     tmp;
       char    sign;
 
-      if (!do_posn) 
+      if (!do_posn)
         SetPosn(h, v);
 
 #ifdef USEPXL
@@ -2563,7 +2563,7 @@ bool do_posn,in_string;
 #endif
       if (tmp != 0) {
         if (tmp < 0) {
-          sign = '-'; 
+          sign = '-';
           tmp = -tmp;
         } else
           sign = '+';
@@ -2576,7 +2576,7 @@ bool do_posn,in_string;
 #endif
       if (tmp != 0) {
         if (tmp < 0) {
-          sign = '-'; 
+          sign = '-';
           tmp = -tmp;
         } else
           sign = '+';
@@ -2644,7 +2644,7 @@ bool do_posn,in_string;
     fprintf(stderr,"--> hh(%ld) += cw(%ld) * hconv(%ld)",
             (long)hh, (long)ptr->cw, (long) hconv);
             */
-#ifdef LJ    
+#ifdef LJ
     /* the guessed position must be a multiple of pixels */
     if (RESOLUTION == 300)
       hh += (long4) ((ptr->cw)/4)*4*hconv;
@@ -2661,7 +2661,7 @@ bool do_posn,in_string;
   if (command <= SET4)
     h += ptr->tfmw;
 
-  if (pos_after) 
+  if (pos_after)
     SetPosn(h, v);
   else
     last_rx = (int)PIXROUND(h, hconv) + x_goffset;
@@ -2682,7 +2682,7 @@ void DoBop()
   }
   fonts_used_on_this_page = 0;
 #endif
-  for (p = hfontptr; p; p = p->next) 
+  for (p = hfontptr; p; p = p->next)
     p->used_on_this_page = _FALSE;
 }
 
@@ -2740,7 +2740,7 @@ long4    x, y;
   rx = (int)PIXROUND(x, hconv) + x_goffset;
   ry = (int)PIXROUND(y, vconv) + y_goffset;
 
-  /*  
+  /*
   fprintf(ERR_STREAM,
 	  "setposn to %ld/%ld, %d/%d, last: %d/%d\n",
 	  (long)x,(long)y,
@@ -2804,13 +2804,13 @@ long4    x, y;
    offset in the buffer, CChar_Last is the first byte of the last
    compacted row (line repeat count).  Updates the previous line
    (PrevLine) if necessary. */
-void 
+void
 #if NeedFunctionPrototypes
 CompressedCharLine(struct char_entry *ce, int nbpl, unsigned char *buffer)
 #else
 CompressedCharLine(ce, nbpl, buffer)
 struct char_entry *ce;
-int nbpl; 
+int nbpl;
 unsigned char *buffer;
 #endif
 {
@@ -2821,31 +2821,31 @@ unsigned char *buffer;
     int t,mode,max;
     register int x,y,i;
 
-    prev = PrevLine; 
-    obuf = buffer; 
-    end = buffer + nbpl; 
+    prev = PrevLine;
+    obuf = buffer;
+    end = buffer + nbpl;
     x = 0;
     while (obuf < end) {
       if (*obuf != *prev) {
-        *prev = *obuf; 
+        *prev = *obuf;
         x = 1;
       }
-      obuf++; 
+      obuf++;
       prev++;
     }
     if (x == 0 && CChar_Last >= 0) {
-      (buffin[CChar_Last])++; 
+      (buffin[CChar_Last])++;
       return; /* line repeat count +1 */
     }
 
-    end = buffin + BUFFSIZE - 16; 
-    obuf = buffin + CChar_Off; 
+    end = buffin + BUFFSIZE - 16;
+    obuf = buffin + CChar_Off;
     buff = buffer;
     *obuf++ = 0; /* Line repeat count = 0 */
     t = 0;
     CChar_Last = CChar_Off; /* Next line */
-    mode = 0; 
-    y = *buff++; 
+    mode = 0;
+    y = *buff++;
     i = 7; /* i = current bit */
     while ((t < ce->width) && (obuf < end)) {
       max = ce->width - t; /* maximum pixels left to do */
@@ -2853,13 +2853,13 @@ unsigned char *buffer;
       if (mode == 0) {
         /* white run */
         while ((y & (1<<i)) == 0 && x < max) {
-          x++; 
-          i--; 
+          x++;
+          i--;
           if (i < 0) {
-            i = 7; 
-            y = *buff++; 
+            i = 7;
+            y = *buff++;
             while (y == 0 && x < max) {
-              x += 8; 
+              x += 8;
               y = *buff++;
             }
           }
@@ -2869,26 +2869,26 @@ unsigned char *buffer;
       else {
         /* black run */
         while ((y & (1<<i)) != 0 && x < max) {
-          x++; 
-          i--; 
+          x++;
+          i--;
           if (i < 0) {
-            i = 7; 
-            y = *buff++; 
+            i = 7;
+            y = *buff++;
             while (y == 0xff && x < max) {
-              x += 8; 
+              x += 8;
               y = *buff++;
             }
           }
         }
         mode = 0;
       }
-      if (x > max) 
+      if (x > max)
         x = max;
       t += x;
       /* make precautions for very long runs */
       while (x > 0xff) {
-        *obuf++ = 0xff; 
-        *obuf++ = 0; 
+        *obuf++ = 0xff;
+        *obuf++ = 0;
         x -= 0xff;
       }
       *obuf++ = x;
@@ -2998,7 +2998,7 @@ under the terms of the GNU General Public License.\n\
 For more information about these matters, see the files\n\
 named COPYING and dvi2xx.c.\n\
 Primary author of Dvi2xx: Gustaf Neumann; -k maintainer: K. Berry.");
-    exit (0); 
+    exit (0);
   }
 
 #ifdef LJ4
@@ -3048,9 +3048,9 @@ Primary author of Dvi2xx: Gustaf Neumann; -k maintainer: K. Berry.");
 #ifdef LJ2P
       case 'd':       /* d selects DUPLEX mode  */
         tcp++;
-        if (*tcp == '1' ) 
+        if (*tcp == '1' )
           DuplexMode = 1;
-        else if (*tcp == '2') 
+        else if (*tcp == '2')
           DuplexMode = 2;
         else {
           Warning("Invalid DUPLEX mode, assuming DUPLEX=1, Long-Edge Binding");
@@ -3062,13 +3062,13 @@ Primary author of Dvi2xx: Gustaf Neumann; -k maintainer: K. Berry.");
         DoublePage = _TRUE;
         tcp++;
         if (*tcp == '1' || *tcp == '2') {
-          if (*tcp == '2') 
+          if (*tcp == '2')
             PrintFirstPart = _FALSE;
-          else             
+          else
             PrintSecondPart = _FALSE;
           tcp++;
         }
-        if (*tcp == '-') 
+        if (*tcp == '-')
           PrintEmptyPages = _FALSE;
         break;
 #ifdef LJ4
@@ -3256,14 +3256,14 @@ Primary author of Dvi2xx: Gustaf Neumann; -k maintainer: K. Berry.");
 #ifdef LJ
       case 'V':   /* bugfixes for various vendor's PCL emulations */
         tcp++;
-        if (*tcp == 'K' || *tcp == 'k') 
+        if (*tcp == 'K' || *tcp == 'k')
           kyocera_mode = _TRUE;
         else
-          if (*tcp == 'B' || *tcp == 'b') 
+          if (*tcp == 'B' || *tcp == 'b')
             brother_mode = _TRUE;
 # ifdef LJ4
 	else
-        if (*tcp == '6' || *tcp == '6') 
+        if (*tcp == '6' || *tcp == '6')
 	    LJ6 = _TRUE;
 # endif
         break;
@@ -3306,7 +3306,7 @@ Primary author of Dvi2xx: Gustaf Neumann; -k maintainer: K. Berry.");
 #endif
 #ifdef __riscos
       case 'i': /* name of directory to store diagrams in */
-        tcp++; 
+        tcp++;
         ddi = 0;
         while (*tcp != ' ' && *tcp != '\0' && ddi < DIAGDIRSIZE-1) {
           diagdir[ddi++] = *tcp++;
@@ -3668,7 +3668,7 @@ bool PFlag;
   if (PrintTestPage) EMIT1("\033z");
 #ifdef vms
   /* last record is not flushed to file, unless it is completely filled */
-  for (kk = (int)((*outfp)->_cnt); kk > 0; --kk) 
+  for (kk = (int)((*outfp)->_cnt); kk > 0; --kk)
     putc('\0',outfp);
   fflush(outfp);
 #endif
@@ -3764,15 +3764,15 @@ char **end;
 #endif
 {
   char *a,*b;
-  
-  a = s1; 
+
+  a = s1;
   b = s2;
   while (*a != '\0') {
     if (tolower(*a) != tolower(*b)) return(_FALSE);
-    a++; 
+    a++;
     b++;
   }
-  *end = b; 
+  *end = b;
   return(_TRUE);
 }
 
@@ -3791,18 +3791,18 @@ char **end;
 {
   char *s;
   int count = 0;
-  
+
   s = str;
   while ((*s != '\0') && (count < number)) {
-    while ((*s == ' ') || (*s == ',') || (*s == '=')) 
+    while ((*s == ' ') || (*s == ',') || (*s == '='))
       s++;
     if (*s != '\0') {
       result[count++] = strtod(s,&s);
     }
   }
-  while ((*s == ' ') || (*s == ',') || (*s == '=')) 
+  while ((*s == ' ') || (*s == ',') || (*s == '='))
     s++;
-  *end = s; 
+  *end = s;
   return(count);
 }
 
@@ -3822,22 +3822,22 @@ char *str;
   int results[4],no;
 
   s = str;
-  while (*s == ' ') 
+  while (*s == ' ')
     s++;
   if ((StrCompare("drawfile",s,&s)) || (StrCompare("DVIview_diagram",s,&s))) {
 
-    if (printdiag == _FALSE) 
+    if (printdiag == _FALSE)
       return(_TRUE); /* it's a diagram, but don't print */
 
-    while ((*s == ' ') || (*s == '=')) 
+    while ((*s == ' ') || (*s == '='))
       s++; /* space or '=' separates keyword/keyval */
 
     if (*s == '\0') {
-      fprintf(ERR_STREAM,"No filename given for \\special-diagram!\n"); 
+      fprintf(ERR_STREAM,"No filename given for \\special-diagram!\n");
       return(_TRUE);
     }
     sh = diagname;
-    while ((*s != ' ') && (*s != ',') && (*s != '\0')) 
+    while ((*s != ' ') && (*s != ',') && (*s != '\0'))
       *sh++ = *s++;
     *sh = '\0';
 
@@ -3845,7 +3845,7 @@ char *str;
     dt.scalex = dt.scaley = 100;
     dt.cropl = dt.cropb = dt.cropr = dt.cropt = 0;
     while (*s != '\0') {
-      while ((*s == ' ') || (*s == ',')) 
+      while ((*s == ' ') || (*s == ','))
         s++;
       if (*s != '\0') {
         if (StrCompare("scale",s,&s)) {
@@ -3853,7 +3853,7 @@ char *str;
             fprintf(ERR_STREAM,
                    "Too few arguments (%d) given for <scale> - ignored.\n",no);
           }
-          dt.scalex = results[0]; 
+          dt.scalex = results[0];
           dt.scaley = results[1];
         }
         else if (StrCompare("crop",s,&s)) {
@@ -3861,15 +3861,15 @@ char *str;
             fprintf(ERR_STREAM,
                    "Too few arguments (%d) given for <crop> - ignored.\n",no);
           }
-          dt.cropl = results[0]; 
+          dt.cropl = results[0];
           dt.cropr = results[1];
-          dt.cropt = results[2]; 
+          dt.cropt = results[2];
           dt.cropb = results[3];
         }
         else {
           fprintf(ERR_STREAM,"Bad \\special keyword - <%s> ignored\n",s);
           /* skip over this word */
-          while ((*s != ' ') && (*s != ',') && (*s != '=') && (*s != '\0')) 
+          while ((*s != ' ') && (*s != ',') && (*s != '=') && (*s != '\0'))
             s++;
         }
       }
@@ -3879,7 +3879,7 @@ char *str;
     diagram(diagname,&dt);
     return(_TRUE);
   }
-  else 
+  else
     return(_FALSE);
 }
 # endif /* LJ */
@@ -3915,11 +3915,11 @@ int  n;
   SetPosn(h, v);
 #ifdef __riscos
 #ifdef LJ
-  if (ParseDiagram(str)) 
+  if (ParseDiagram(str))
     return;
 #endif
 #endif
- 
+
   while ( (str = GetKeyStr(str, &k)) != NULL ) {
     /* get all keyword-value pairs */
     /* for compatibility, single words are taken as file names */
@@ -3950,7 +3950,7 @@ int  n;
           for (j=1; ((sf[j]=='/' ? sf[j]='\\':sf[j]) != '\0'); j++);
           */
         break;
-        
+
       case HPFILE:
         if (sf)
             Warning("More than one \\special file name given. %s ignored", sf);
@@ -3994,7 +3994,7 @@ int  n;
         (void) strcpy(spbuf, k.Val);
         i = sscanf(spbuf,"%d(%[^,],%s)",&j,xs,ys);
         if (i>0) {
-          x_pos = h; 
+          x_pos = h;
           y_pos = v;
           if (i>1) {
             if (sscanf(xs,"%fpt",&x)>0) {
@@ -4075,7 +4075,7 @@ int  n;
         Warning("Can't handle %s=%s command; ignored.", k.Key, k.Val);
         break;
       }
-      
+
     else
 #ifdef KPATHSEA
            if (!kpse_tex_hush ("special"))
@@ -4089,9 +4089,9 @@ int  n;
     PMPflush;
 #endif
     if (sf) {
-      if (i == HPFILE) 
+      if (i == HPFILE)
         CopyHPFile( sf );
-      else 
+      else
         CopyFile( sf );
     }
     else
@@ -4109,14 +4109,14 @@ int  n;
 
         char scale_file_name[255];
         char *scale_file = tmpnam(scale_file_name);
-        char *pcl_file = tmpnam(NULL);  
+        char *pcl_file = tmpnam(NULL);
         FILEPTR scalef;
 
         if ( (scalef = BOUTOPEN(scale_file)) == FPNULL ) {
           Warning("Unable to open file %s for writing", scale_file );
           return;
         }
-        fprintf(scalef, "%.2f %.2f scale\n%d %d translate\n",  
+        fprintf(scalef, "%.2f %.2f scale\n%d %d translate\n",
                 300.0/scale_factor, 300.0/scale_factor,
                 0, adjusted_height == height ? 0 : ury);
         BCLOSE( scalef );
@@ -4131,7 +4131,7 @@ int  n;
         sprintf(cmd,"gs -q -dSIMPLE -dSAFER -dNOPAUSE -sDEVICE=%s -sOutputFile=%s %s %s showpage.ps -c quit",
                 printer, pcl_file, scale_file, psfile);
 #endif
-#ifdef DEBUGGS   
+#ifdef DEBUGGS
         fprintf(stderr,
           "PS-file '%s' w=%d, h=%d, urx=%d, ury=%d, llx=%d, lly=%d, rwi=%d\n",
                 psfile, urx - llx, height, urx,ury,llx,lly, rwi);
@@ -4140,19 +4140,19 @@ int  n;
         if (system(cmd)) {
           Warning("execution of '%s' returned an error", cmd);
         } else {
-#ifdef DEBUGGS   
-          fprintf(stderr, "o=%d, h=%d, so=%d, sh=%d\n", 
+#ifdef DEBUGGS
+          fprintf(stderr, "o=%d, h=%d, so=%d, sh=%d\n",
                   llx, height, adjusted_llx, adjusted_height);
-          
-          fprintf(stderr, "OLD x=%d, y=%d\n", 
+
+          fprintf(stderr, "OLD x=%d, y=%d\n",
                   (int)PIXROUND(h, hconv) + x_goffset,
                   (int)PIXROUND(v, vconv) + y_goffset);
-#endif  
+#endif
           v -= 65536l*adjusted_height; /**300/scale_factor;*/
           h -= 65536l*adjusted_llx; /* *300/scale_factor;*/
           SetPosn(h, v);
-#ifdef DEBUGGS   
-          fprintf(stderr, "NEW x=%d, y=%d\n", 
+#ifdef DEBUGGS
+          fprintf(stderr, "NEW x=%d, y=%d\n",
                   (int)PIXROUND(h, hconv) + x_goffset,
                   (int)PIXROUND(v, vconv) + y_goffset);
 #endif
@@ -4281,7 +4281,7 @@ char    *a, *b;
 #endif
 {
   char *x, *y;
-  
+
   for (x = a, y = b; *a; a++, b++)
     if ( tolower(*a) != tolower(*b) )
       return( _FALSE );
@@ -4469,10 +4469,10 @@ int     Set;
        *   process for simplicity always horizontally
        */
 
-      /* 
+      /*
          fprintf(ERR_STREAM,"large box: w=%d,x=%d,y=%d\n",(int)yy,(int)xx,0);
          */
-      
+
       hor_offset  = HOR_HALF(30);
       MoveHor(hor_offset);
       vert_offset = VERT_HALF(30);
@@ -4547,7 +4547,7 @@ int     Set;
       yy += (long4)pgsiz_dots - (long4)last_ry;
 
     if ((yy>0) && (xx>0))
-      EMIT4("\033*p-%ldY\033*c%lda%ldbP", 
+      EMIT4("\033*p-%ldY\033*c%lda%ldbP",
             (long)yy - 1, (long)xx, (long)yy);
 #endif
     last_rx = last_ry = UNKNOWN;       /* next time full positioning */
@@ -4708,7 +4708,7 @@ void OpenFontFile()
       if ((fid = pixel_files[least_used].pixel_file_id) != NO_FILE) {
         /* mark file as being closed in the entry */
         fp = hfontptr;
-        while (fp != NULL && fp->font_file_id != fid) 
+        while (fp != NULL && fp->font_file_id != fid)
           fp = fp->next;
         if (fp == NULL)
           Fatal("Open file %x not found in font entry list.\n", fid);
@@ -4763,9 +4763,9 @@ void OpenFontFile()
       while ((fp != NULL) && (fp->font_file_id != f))
         fp = fp->next;
 
-      if (fp == NULL) 
+      if (fp == NULL)
         Fatal("Open file %x not found in font entry list.\n",f);
-      else 
+      else
         fp->font_file_id = FPNULL;
     }
     BCLOSE(f);
@@ -5005,7 +5005,7 @@ long4    k;
   GetBytes(dvifp, tfontptr->n, tfontptr->a + tfontptr->l);
   tfontptr->n[tfontptr->a+tfontptr->l] = '\0';
 
-  tfontptr->font_mag = 
+  tfontptr->font_mag =
     (long4)((ActualFactor((long4)(1000.0*tfontptr->s/(double)tfontptr->d+0.5))
              * ActualFactor(mag)
 #ifdef USEPXL
@@ -5042,14 +5042,14 @@ printf("[%ld]=%lf * %lf * %lf + 0.5 = %ld\n",
         = kpse_magstep_fix ((unsigned) (tfontptr->font_mag / 5.0 + .5),
                             RESOLUTION, NULL);
       tfontptr->font_mag = dpi * 5; /* save correct dpi */
-      
+
       name = kpse_find_pk (tfontptr->n, dpi, &font_ret);
       if (name)
         {
           font_found = _TRUE;
           strcpy (tfontptr->name, name);
           free (name);
-          
+
           if (!FILESTRCASEEQ (tfontptr->n, font_ret.name)) {
               fprintf (stderr,
                        "dvilj: Font %s not found, using %s at %d instead.\n",
@@ -5107,7 +5107,7 @@ printf("[%ld]=%lf * %lf * %lf + 0.5 = %ld\n",
           HANDLE_MAX_FONTS);
 #endif
   if (tfontptr != pfontptr) {
-    if (font_found) 
+    if (font_found)
       OpenFontFile();
     else
       pxlfp = NO_FILE;
@@ -5146,7 +5146,7 @@ printf("[%ld]=%lf * %lf * %lf + 0.5 = %ld\n",
     if (t == PK_PRE) {
       unsigned char   temp_byte;
       temp_byte = (unsigned char) NoSignExtend(pxlfp, 1);
-      if (temp_byte != PK_ID) 
+      if (temp_byte != PK_ID)
         Fatal( "Wrong Version of pk file!  (%d should be 89)\n",
                (int)temp_byte);
       else
@@ -5163,7 +5163,7 @@ printf("[%ld]=%lf * %lf * %lf + 0.5 = %ld\n",
 
     tfontptr->magnification = NoSignExtend(pxlfp, 4);
     tfontptr->designsize    = NoSignExtend(pxlfp, 4);
-        
+
     if (tfontptr->id == id1001)
       FSEEK(pxlfp, (long)(NoSignExtend(pxlfp, 4) * 4), SEEK_SET);
     else
@@ -5232,7 +5232,7 @@ printf("[%ld]=%lf * %lf * %lf + 0.5 = %ld\n",
     hppp = NoSignExtend(pxlfp, 4);
     vppp = NoSignExtend(pxlfp, 4);
     if (hppp != vppp)
-      Warning("aspect ratio is %ld:%ld (should be 1:1)!", 
+      Warning("aspect ratio is %ld:%ld (should be 1:1)!",
               (long)hppp, (long)vppp);
     tfontptr->magnification = (long4)(hppp * 72.27 * 5 / 65536l + 0.5);
 
@@ -5515,7 +5515,7 @@ void SkipFontDef()
 {
   int     a, l;
   char    n[STRSIZE];
-  
+
   (void) NoSignExtend(dvifp, 4);
   (void) NoSignExtend(dvifp, 4);
   (void) NoSignExtend(dvifp, 4);
@@ -5524,7 +5524,7 @@ void SkipFontDef()
   GetBytes(dvifp, n, a + l);
 }
 
-    
+
 
 /*------------------------ end dvifont.c -------------------------------*/
 
@@ -5598,7 +5598,7 @@ Warning(va_alist)
 #endif
   if ( G_nowarn || G_quiet )
     return;
-  
+
   fprintf(ERR_STREAM, "%s: warning: ", G_progname);
   vfprintf(ERR_STREAM, fmt, args);
   fprintf(ERR_STREAM, "\n");
diff --git a/Build/source/texk/dviljk/dvi2xx.h b/Build/source/texk/dviljk/dvi2xx.h
index 17ec1eecd30..0f052495104 100644
--- a/Build/source/texk/dviljk/dvi2xx.h
+++ b/Build/source/texk/dviljk/dvi2xx.h
@@ -487,8 +487,8 @@ void    LoadAChar DVIPROTO((long4, register struct char_entry *));
 long4   NoSignExtend DVIPROTO((FILEPTR, int));
 void    OpenFontFile DVIPROTO((void));
 long4   PixRound DVIPROTO((long4, long4));
-void    PkRaster DVIPROTO((struct char_entry *, int)); 
-void    RasterLine DVIPROTO((struct char_entry *, unsigned int, 
+void    PkRaster DVIPROTO((struct char_entry *, int));
+void    RasterLine DVIPROTO((struct char_entry *, unsigned int,
 			     unsigned int, unsigned char *));
 void    RasterChar DVIPROTO((struct char_entry *));
 void    ReadFontDef DVIPROTO((long4));