Bell 32V development

[unix-history] / usr / src / cmd / deroff.c

diff --git a/usr/src/cmd/deroff.c b/usr/src/cmd/deroff.c
index 2d7c3e0..e3732c3 100644 (file)
--- a/usr/src/cmd/deroff.c
+++ b/usr/src/cmd/deroff.c
@@ -116,7 +116,7 @@ while((c = getc(infile)) != rdelim)
                        else if(c == '\\')
                                if((c = getc(infile)) == EOF)
                                        c = eof();
                        else if(c == '\\')
                                if((c = getc(infile)) == EOF)
                                        c = eof();

-return(c = ' ');
+return(C);

 }
 
 
 }
 
 


@@ -313,10 +313,13 @@ while(C==' ' || c=='\t')
        ;
 if( (c1=c) == '\n')
        return;
        ;
 if( (c1=c) == '\n')
        return;

-c2 = C;
-if(c1=='.' && c2!='.')
+if(c1 == '.')
+       {

        inmacro = NO;
        inmacro = NO;

-if(c2 == '\n')
+       SKIP;
+       return;
+       }
+if( (c2=C) == '\n')

        return;
 
 if(c1=='E' && c2=='Q' && filesp==files)
        return;
 
 if(c1=='E' && c2=='Q' && filesp==files)


@@ -349,9 +352,6 @@ else if(c1=='h' && c2=='w')
        { SKIP; }
 else
        {
        { SKIP; }
 else
        {

-       if(c1=='.' && c2=='.')
-               while(C == '.')
-                       ;

        ++inmacro;
        regline(YES);
        --inmacro;
        ++inmacro;
        regline(YES);
        --inmacro;


@@ -364,7 +364,7 @@ macro()
 {
 /*
 do { SKIP; }
 {
 /*
 do { SKIP; }

-       while(C!='.' || C!='.' || C=='.');      /* look for  .. */
+       while(C!='.' || C!='.');        /* look for  .EN */

 SKIP;
 inmacro = YES;
 }
 SKIP;
 inmacro = YES;
 }