From c5561c23cf394806cbf6d70a96f2dc0253f93745 Mon Sep 17 00:00:00 2001 From: wkj Date: Sun, 16 May 2004 07:55:57 +0000 Subject: Checkpoint -- still merging with Taj's version of the world. --- src/cmd/tbl/t.h | 10 ++-- src/cmd/tbl/t0.c | 4 +- src/cmd/tbl/t1.c | 34 ++++++++------ src/cmd/tbl/t3.c | 47 ++++++++++--------- src/cmd/tbl/t4.c | 26 +++++----- src/cmd/tbl/t5.c | 2 +- src/cmd/tbl/t6.c | 110 +++++++++++++++++++++---------------------- src/cmd/tbl/t7.c | 74 ++++++++++++++--------------- src/cmd/tbl/t8.c | 141 ++++++++++++++++++++++++++++--------------------------- src/cmd/tbl/t9.c | 4 +- src/cmd/tbl/tc.c | 6 +-- src/cmd/tbl/te.c | 17 +++---- src/cmd/tbl/tf.c | 40 ++++++++-------- src/cmd/tbl/tg.c | 54 ++++++++++----------- src/cmd/tbl/tm.c | 8 ++-- src/cmd/tbl/ts.c | 2 +- src/cmd/tbl/tt.c | 6 +-- src/cmd/tbl/tu.c | 34 +++++++------- src/cmd/tbl/tv.c | 32 ++++++------- 19 files changed, 329 insertions(+), 322 deletions(-) (limited to 'src/cmd/tbl') diff --git a/src/cmd/tbl/t.h b/src/cmd/tbl/t.h index efcab373..ba9cd791 100644 --- a/src/cmd/tbl/t.h +++ b/src/cmd/tbl/t.h @@ -1,9 +1,9 @@ /* t..c : external declarations */ -#include -#include -#include -# include +#include +#include +#include +#include # define MAXLIN 250 # define MAXHEAD 44 @@ -62,7 +62,7 @@ extern char texstr[]; extern int linstart; -extern Biobuf *tabin, tabout; +extern FILE *tabin, *tabout; # define CRIGHT 2 # define CLEFT 0 # define CMID 1 diff --git a/src/cmd/tbl/t0.c b/src/cmd/tbl/t0.c index 0c0895bd..51218708 100644 --- a/src/cmd/tbl/t0.c +++ b/src/cmd/tbl/t0.c @@ -45,5 +45,5 @@ int texct = 0; char texstr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWYXZ0123456789"; int linstart; char *exstore, *exlim, *exspace; -Biobuf *tabin /*= stdin */; -Biobuf tabout /* = stdout */; +FILE *tabin; +FILE *tabout; diff --git a/src/cmd/tbl/t1.c b/src/cmd/tbl/t1.c index 1e6cbf11..aff5f3d8 100644 --- a/src/cmd/tbl/t1.c +++ b/src/cmd/tbl/t1.c @@ -8,10 +8,17 @@ # define ever (;;) -void +int main(int argc, char *argv[]) { - exits(tbl(argc, argv)? "error" : 0); + tabin = stdin; + tabout = stdout; + + if(tbl(argc, argv)){ + fprintf(stderr, "error"); + return 1; + } + return 0; } @@ -21,14 +28,14 @@ tbl(int argc, char *argv[]) char line[5120]; /*int x;*/ /*x=malloc((char *)0); uncomment when allocation breaks*/ - Binit(&tabout, 1, OWRITE); + /*Binit(&tabout, 1, OWRITE); /* tabout=stdout */ setinp(argc, argv); while (gets1(line, sizeof(line))) { - Bprint(&tabout, "%s\n", line); + fprintf(tabout, "%s\n", line); if (prefix(".TS", line)) tableput(); } - Bterm(tabin); + fclose(tabin); return(0); } @@ -45,10 +52,8 @@ setinp(int argc, char **argv) sargv++; if (sargc > 0) swapin(); - else { - tabin = (Biobuf*)getcore(sizeof(Biobuf), 1); - Binit(tabin, 0, OREAD); - } + else + tabin = stdin; } @@ -76,17 +81,16 @@ swapin(void) return(0); /* file closing is done by GCOS troff preprocessor */ if(tabin) - Bterm(tabin); + fclose(tabin); ifile = *sargv; name = ifile; if (match(ifile, "-")) { - tabin = (Biobuf*)getcore(sizeof(Biobuf), 1); - Binit(tabin, 0, OREAD); + tabin = stdin; } else - tabin = Bopen(ifile, OREAD); + tabin = fopen(ifile, "r"); iline = 1; - Bprint(&tabout, ".ds f. %s\n", ifile); - Bprint(&tabout, ".lf %d %s\n", iline, name); + fprintf(tabout, ".ds f. %s\n", ifile); + fprintf(tabout, ".lf %d %s\n", iline, name); if (tabin == 0) error("Can't open file"); sargc--; diff --git a/src/cmd/tbl/t3.c b/src/cmd/tbl/t3.c index a4dc9f9f..5429e528 100644 --- a/src/cmd/tbl/t3.c +++ b/src/cmd/tbl/t3.c @@ -4,27 +4,28 @@ struct optstr { char *optnam; int *optadd; } options [] = { - "expand", &expflg, - "EXPAND", &expflg, - "center", &ctrflg, - "CENTER", &ctrflg, - "box", &boxflg, - "BOX", &boxflg, - "allbox", &allflg, - "ALLBOX", &allflg, - "doublebox", &dboxflg, - "DOUBLEBOX", &dboxflg, - "frame", &boxflg, - "FRAME", &boxflg, - "doubleframe", &dboxflg, - "DOUBLEFRAME", &dboxflg, - "tab", &tab, - "TAB", &tab, - "linesize", &linsize, - "LINESIZE", &linsize, - "delim", &delim1, - "DELIM", &delim1, - 0, 0}; + { "expand", &expflg }, + { "EXPAND", &expflg }, + { "center", &ctrflg }, + { "CENTER", &ctrflg }, + { "box", &boxflg }, + { "BOX", &boxflg }, + { "allbox", &allflg }, + { "ALLBOX", &allflg }, + { "doublebox", &dboxflg }, + { "DOUBLEBOX", &dboxflg }, + { "frame", &boxflg }, + { "FRAME", &boxflg }, + { "doubleframe", &dboxflg }, + { "DOUBLEFRAME", &dboxflg }, + { "tab", &tab }, + { "TAB", &tab }, + { "linesize", &linsize }, + { "LINESIZE", &linsize }, + { "delim", &delim1 }, + { "DELIM", &delim1 }, + { 0, 0} +}; void @@ -38,7 +39,7 @@ getcomm(void) *(lp->optadd) = 0; texname = texstr[texct=0]; tab = '\t'; - Bprint(&tabout, ".nr %d \\n(.s\n", LSIZE); + fprintf(tabout, ".nr %d \\n(.s\n", LSIZE); gets1(line, sizeof(line)); /* see if this is a command line */ if (strchr(line, ';') == 0) { @@ -70,7 +71,7 @@ getcomm(void) *(lp->optadd) = nb[0]; } if (lp->optadd == &linsize) - Bprint(&tabout, ".nr %d %s\n", LSIZE, nb); + fprintf(tabout, ".nr %d %s\n", LSIZE, nb); if (lp->optadd == &delim1) { delim1 = nb[0]; delim2 = nb[1]; diff --git a/src/cmd/tbl/t4.c b/src/cmd/tbl/t4.c index 558d3ba3..0b60a942 100644 --- a/src/cmd/tbl/t4.c +++ b/src/cmd/tbl/t4.c @@ -28,10 +28,10 @@ getspec(void) oncol = 0; left1flg = rightl = 0; readspec(); - Bprint(&tabout, ".rm"); + fprintf(tabout, ".rm"); for (i = 0; i < ncol; i++) - Bprint(&tabout, " %2s", reg(i, CRIGHT)); - Bprint(&tabout, "\n"); + fprintf(tabout, " %2s", reg(i, CRIGHT)); + fprintf(tabout, "\n"); } @@ -42,12 +42,12 @@ readspec(void) char sn[10], *snp, *temp; sawchar = icol = 0; - while (c = get1char()) { + while ((c = get1char())) { switch (c) { default: if (c != tab) { char buf[64]; - sprint(buf, "bad table specification character %c", c); + sprintf(buf, "bad table specification character %c", c); error(buf); } case ' ': /* note this is also case tab */ @@ -108,11 +108,11 @@ readspec(void) if (c == 's' && icol <= 0) error("first column can not be S-type"); if (c == 's' && style[icol-1][nclin] == 'a') { - Bprint(&tabout, ".tm warning: can't span a-type cols, changed to l\n"); + fprintf(tabout, ".tm warning: can't span a-type cols, changed to l\n"); style[icol-1][nclin] = 'l'; } if (c == 's' && style[icol-1][nclin] == 'n') { - Bprint(&tabout, ".tm warning: can't span n-type cols, changed to c\n"); + fprintf(tabout, ".tm warning: can't span n-type cols, changed to c\n"); style[icol-1][nclin] = 'c'; } icol++; @@ -181,7 +181,7 @@ readspec(void) if (icol <= 0) continue; temp = snp = csize[icol-1][nclin]; - while (c = get1char()) { + while ((c = get1char())) { if (c == ' ' || c == tab || c == '\n') break; if (c == '-' || c == '+') @@ -206,7 +206,7 @@ readspec(void) if (icol <= 0) continue; temp = snp = vsize[icol-1][nclin]; - while (c = get1char()) { + while ((c = get1char())) { if (c == ' ' || c == tab || c == '\n') break; if (c == '-' || c == '+') @@ -231,12 +231,12 @@ readspec(void) of different widths now .... if (*snp) { - Bprint(&tabout, "Ignored second width specification"); + fprintf(tabout, "Ignored second width specification"); continue; } /* end commented out code ... */ stopc = 0; - while (c = get1char()) { + while ((c = get1char())) { if (snp == cll[icol-1] && c == '(') { stopc = ')'; continue; @@ -312,7 +312,7 @@ findcol(void) ; if (c != '\n') un1getc(c); - for (s = line; *s = c = get1char(); s++) { + for (s = line; (*s = c = get1char()); s++) { if (c == ')') inpar = 0; if (inpar) @@ -371,7 +371,7 @@ garray(int qcol) } -char * +char* getcore(int a, int b) { char *x; diff --git a/src/cmd/tbl/t5.c b/src/cmd/tbl/t5.c index 8b7a65d8..9ad6b3c3 100644 --- a/src/cmd/tbl/t5.c +++ b/src/cmd/tbl/t5.c @@ -31,7 +31,7 @@ gettbl(void) } else instead[nlin] = 0; if (nodata(nlin)) { - if (ch = oneh(nlin)) + if ((ch = oneh(nlin))) fullbot[nlin] = ch; table[nlin] = (struct colstr *) alocv((ncol + 2) * sizeof(table[0][0])); for (icol = 0; icol < ncol; icol++) { diff --git a/src/cmd/tbl/t6.c b/src/cmd/tbl/t6.c index a78368fc..e6506910 100644 --- a/src/cmd/tbl/t6.c +++ b/src/cmd/tbl/t6.c @@ -14,10 +14,10 @@ maktab(void) /* define the tab stops of the table */ for (icol = 0; icol < ncol; icol++) { doubled[icol] = acase[icol] = 0; - Bprint(&tabout, ".nr %2s 0\n", reg(icol, CRIGHT)); + fprintf(tabout, ".nr %2s 0\n", reg(icol, CRIGHT)); for (text = 0; text < 2; text++) { if (text) - Bprint(&tabout, ".%2s\n.rm %2s\n", reg(icol, CRIGHT), + fprintf(tabout, ".%2s\n.rm %2s\n", reg(icol, CRIGHT), reg(icol, CRIGHT)); for (ilin = 0; ilin < nlin; ilin++) { if (instead[ilin] || fullbot[ilin]) @@ -37,31 +37,31 @@ maktab(void) /* define the tab stops of the table */ s = table[ilin][icol].col; if ((int)s > 0 && (int)s < 128 && text) { if (doubled[icol] == 0) - Bprint(&tabout, ".nr %d 0\n.nr %d 0\n", + fprintf(tabout, ".nr %d 0\n.nr %d 0\n", S1, S2); doubled[icol] = 1; - Bprint(&tabout, ".if \\n(%c->\\n(%d .nr %d \\n(%c-\n", + fprintf(tabout, ".if \\n(%c->\\n(%d .nr %d \\n(%c-\n", (int)s, S2, S2, (int)s); } case 'n': if (table[ilin][icol].rcol != 0) { if (doubled[icol] == 0 && text == 0) - Bprint(&tabout, ".nr %d 0\n.nr %d 0\n", + fprintf(tabout, ".nr %d 0\n.nr %d 0\n", S1, S2); doubled[icol] = 1; if (real(s = table[ilin][icol].col) && !vspen(s)) { if (tx((int)s) != text) continue; - Bprint(&tabout, ".nr %d ", TMP); + fprintf(tabout, ".nr %d ", TMP); wide(s, FN(vforml, icol), SZ(vforml, icol)); - Bprint(&tabout, "\n"); - Bprint(&tabout, ".if \\n(%d<\\n(%d .nr %d \\n(%d\n", + fprintf(tabout, "\n"); + fprintf(tabout, ".if \\n(%d<\\n(%d .nr %d \\n(%d\n", S1, TMP, S1, TMP); } if (text == 0 && real(s = table[ilin][icol].rcol) && !vspen(s) && !barent(s)) { - Bprint(&tabout, ".nr %d \\w%c%s%c\n", + fprintf(tabout, ".nr %d \\w%c%s%c\n", TMP, F1, s, F1); - Bprint(&tabout, ".if \\n(%d<\\n(%d .nr %d \\n(%d\n", S2, TMP, S2, + fprintf(tabout, ".if \\n(%d<\\n(%d .nr %d \\n(%d\n", S2, TMP, S2, TMP); } continue; @@ -72,53 +72,53 @@ maktab(void) /* define the tab stops of the table */ if (real(s = table[ilin][icol].col) && !vspen(s)) { if (tx((int)s) != text) continue; - Bprint(&tabout, ".nr %d ", TMP); + fprintf(tabout, ".nr %d ", TMP); wide(s, FN(vforml, icol), SZ(vforml, icol)); - Bprint(&tabout, "\n"); - Bprint(&tabout, ".if \\n(%2s<\\n(%d .nr %2s \\n(%d\n", + fprintf(tabout, "\n"); + fprintf(tabout, ".if \\n(%2s<\\n(%d .nr %2s \\n(%d\n", reg(icol, CRIGHT), TMP, reg(icol, CRIGHT), TMP); } } } } if (acase[icol]) { - Bprint(&tabout, ".if \\n(%d>=\\n(%2s .nr %2s \\n(%du+2n\n", + fprintf(tabout, ".if \\n(%d>=\\n(%2s .nr %2s \\n(%du+2n\n", S2, reg(icol, CRIGHT), reg(icol, CRIGHT), S2); } if (doubled[icol]) { - Bprint(&tabout, ".nr %2s \\n(%d\n", reg(icol, CMID), S1); - Bprint(&tabout, ".nr %d \\n(%2s+\\n(%d\n", TMP, reg(icol, CMID), S2); - Bprint(&tabout, ".if \\n(%d>\\n(%2s .nr %2s \\n(%d\n", TMP, + fprintf(tabout, ".nr %2s \\n(%d\n", reg(icol, CMID), S1); + fprintf(tabout, ".nr %d \\n(%2s+\\n(%d\n", TMP, reg(icol, CMID), S2); + fprintf(tabout, ".if \\n(%d>\\n(%2s .nr %2s \\n(%d\n", TMP, reg(icol, CRIGHT), reg(icol, CRIGHT), TMP); - Bprint(&tabout, ".if \\n(%d<\\n(%2s .nr %2s +(\\n(%2s-\\n(%d)/2\n", + fprintf(tabout, ".if \\n(%d<\\n(%2s .nr %2s +(\\n(%2s-\\n(%d)/2\n", TMP, reg(icol, CRIGHT), reg(icol, CMID), reg(icol, CRIGHT), TMP); } if (cll[icol][0]) { - Bprint(&tabout, ".nr %d %sn\n", TMP, cll[icol]); - Bprint(&tabout, ".if \\n(%2s<\\n(%d .nr %2s \\n(%d\n", + fprintf(tabout, ".nr %d %sn\n", TMP, cll[icol]); + fprintf(tabout, ".if \\n(%2s<\\n(%d .nr %2s \\n(%d\n", reg(icol, CRIGHT), TMP, reg(icol, CRIGHT), TMP); } for (ilin = 0; ilin < nlin; ilin++) - if (k = lspan(ilin, icol)) { + if ((k = lspan(ilin, icol))) { s = table[ilin][icol-k].col; if (!real(s) || barent(s) || vspen(s) ) continue; - Bprint(&tabout, ".nr %d ", TMP); + fprintf(tabout, ".nr %d ", TMP); wide(table[ilin][icol-k].col, FN(ilin, icol - k), SZ(ilin, icol - k)); for (ik = k; ik >= 0; ik--) { - Bprint(&tabout, "-\\n(%2s", reg(icol - ik, CRIGHT)); + fprintf(tabout, "-\\n(%2s", reg(icol - ik, CRIGHT)); if (!expflg && ik > 0) - Bprint(&tabout, "-%dn", sep[icol-ik]); + fprintf(tabout, "-%dn", sep[icol-ik]); } - Bprint(&tabout, "\n"); - Bprint(&tabout, ".if \\n(%d>0 .nr %d \\n(%d/%d\n", TMP, + fprintf(tabout, "\n"); + fprintf(tabout, ".if \\n(%d>0 .nr %d \\n(%d/%d\n", TMP, TMP, TMP, k); - Bprint(&tabout, ".if \\n(%d<0 .nr %d 0\n", TMP, TMP); + fprintf(tabout, ".if \\n(%d<0 .nr %d 0\n", TMP, TMP); for (ik = 1; ik <= k; ik++) { if (doubled[icol-k+ik]) - Bprint(&tabout, ".nr %2s +\\n(%d/2\n", + fprintf(tabout, ".nr %2s +\\n(%d/2\n", reg(icol - k + ik, CMID), TMP); - Bprint(&tabout, ".nr %2s +\\n(%d\n", + fprintf(tabout, ".nr %2s +\\n(%d\n", reg(icol - k + ik, CRIGHT), TMP); } } @@ -127,11 +127,11 @@ maktab(void) /* define the tab stops of the table */ untext(); /* if even requested, make all columns widest width */ if (evenflg) { - Bprint(&tabout, ".nr %d 0\n", TMP); + fprintf(tabout, ".nr %d 0\n", TMP); for (icol = 0; icol < ncol; icol++) { if (evenup[icol] == 0) continue; - Bprint(&tabout, ".if \\n(%2s>\\n(%d .nr %d \\n(%2s\n", + fprintf(tabout, ".if \\n(%2s>\\n(%d .nr %d \\n(%2s\n", reg(icol, CRIGHT), TMP, TMP, reg(icol, CRIGHT)); } for (icol = 0; icol < ncol; icol++) { @@ -139,56 +139,56 @@ maktab(void) /* define the tab stops of the table */ /* if column not evened just retain old interval */ continue; if (doubled[icol]) - Bprint(&tabout, ".nr %2s (100*\\n(%2s/\\n(%2s)*\\n(%d/100\n", + fprintf(tabout, ".nr %2s (100*\\n(%2s/\\n(%2s)*\\n(%d/100\n", reg(icol, CMID), reg(icol, CMID), reg(icol, CRIGHT), TMP); /* that nonsense with the 100's and parens tries to avoid overflow while proportionally shifting the middle of the number */ - Bprint(&tabout, ".nr %2s \\n(%d\n", reg(icol, CRIGHT), TMP); + fprintf(tabout, ".nr %2s \\n(%d\n", reg(icol, CRIGHT), TMP); } } /* now adjust for total table width */ for (tsep = icol = 0; icol < ncol; icol++) tsep += sep[icol]; if (expflg) { - Bprint(&tabout, ".nr %d 0", TMP); + fprintf(tabout, ".nr %d 0", TMP); for (icol = 0; icol < ncol; icol++) - Bprint(&tabout, "+\\n(%2s", reg(icol, CRIGHT)); - Bprint(&tabout, "\n"); - Bprint(&tabout, ".nr %d \\n(.l-\\n(%d\n", TMP, TMP); + fprintf(tabout, "+\\n(%2s", reg(icol, CRIGHT)); + fprintf(tabout, "\n"); + fprintf(tabout, ".nr %d \\n(.l-\\n(%d\n", TMP, TMP); if (boxflg || dboxflg || allflg) - /* tsep += 1; */ {} + /* tsep += 1; */ ; else tsep -= sep[ncol-1]; - Bprint(&tabout, ".nr %d \\n(%d/%d\n", TMP, TMP, tsep); - Bprint(&tabout, ".if \\n(%d<0 .nr %d 0\n", TMP, TMP); + fprintf(tabout, ".nr %d \\n(%d/%d\n", TMP, TMP, tsep); + fprintf(tabout, ".if \\n(%d<0 .nr %d 0\n", TMP, TMP); } else - Bprint(&tabout, ".nr %d 1n\n", TMP); - Bprint(&tabout, ".nr %2s 0\n", reg(-1, CRIGHT)); + fprintf(tabout, ".nr %d 1n\n", TMP); + fprintf(tabout, ".nr %2s 0\n", reg(-1, CRIGHT)); tsep = (boxflg || allflg || dboxflg || left1flg) ? 2 : 0; if (sep[-1] >= 0) tsep = sep[-1]; for (icol = 0; icol < ncol; icol++) { - Bprint(&tabout, ".nr %2s \\n(%2s+((%d*\\n(%d)/2)\n", reg(icol, CLEFT), + fprintf(tabout, ".nr %2s \\n(%2s+((%d*\\n(%d)/2)\n", reg(icol, CLEFT), reg(icol - 1, CRIGHT), tsep, TMP); - Bprint(&tabout, ".nr %2s +\\n(%2s\n", reg(icol, CRIGHT), reg(icol, CLEFT)); + fprintf(tabout, ".nr %2s +\\n(%2s\n", reg(icol, CRIGHT), reg(icol, CLEFT)); if (doubled[icol]) { /* the next line is last-ditch effort to avoid zero field width */ - /*Bprint(&tabout, ".if \\n(%2s=0 .nr %2s 1\n",reg(icol,CMID), reg(icol,CMID));*/ - Bprint(&tabout, ".nr %2s +\\n(%2s\n", reg(icol, CMID), + /*fprintf(tabout, ".if \\n(%2s=0 .nr %2s 1\n",reg(icol,CMID), reg(icol,CMID));*/ + fprintf(tabout, ".nr %2s +\\n(%2s\n", reg(icol, CMID), reg(icol, CLEFT)); - /* Bprint(&tabout, ".if n .if \\n(%s%%24>0 .nr %s +12u\n",reg(icol,CMID), reg(icol,CMID)); */ + /* fprintf(tabout, ".if n .if \\n(%s%%24>0 .nr %s +12u\n",reg(icol,CMID), reg(icol,CMID)); */ } tsep = sep[icol] * 2; } if (rightl) - Bprint(&tabout, ".nr %s (\\n(%s+\\n(%s)/2\n", reg(ncol - 1, CRIGHT), + fprintf(tabout, ".nr %s (\\n(%s+\\n(%s)/2\n", reg(ncol - 1, CRIGHT), reg(ncol - 1, CLEFT), reg(ncol - 2, CRIGHT)); - Bprint(&tabout, ".nr TW \\n(%2s\n", reg(ncol - 1, CRIGHT)); + fprintf(tabout, ".nr TW \\n(%2s\n", reg(ncol - 1, CRIGHT)); tsep = sep[ncol-1]; if (boxflg || allflg || dboxflg) - Bprint(&tabout, ".nr TW +((%d*\\n(%d)/2)\n", tsep, TMP); - Bprint(&tabout, + fprintf(tabout, ".nr TW +((%d*\\n(%d)/2)\n", tsep, TMP); + fprintf(tabout, ".if t .if (\\n(TW+\\n(.o)>7.65i .tm Table at line %d file %s is too wide - \\n(TW units\n", iline - 1, ifile); return; } @@ -198,19 +198,19 @@ void wide(char *s, char *fn, char *size) { if (point(s)) { - Bprint(&tabout, "\\w%c", F1); + fprintf(tabout, "\\w%c", F1); if (*fn > 0) putfont(fn); if (*size) putsize(size); - Bprint(&tabout, "%s", s); + fprintf(tabout, "%s", s); if (*fn > 0) putfont("P"); if (*size) putsize("0"); - Bprint(&tabout, "%c", F1); + fprintf(tabout, "%c", F1); } else - Bprint(&tabout, "\\n(%c-", (int)s); + fprintf(tabout, "\\n(%c-", (int)s); } diff --git a/src/cmd/tbl/t7.c b/src/cmd/tbl/t7.c index 2fa9de53..0d11f0c5 100644 --- a/src/cmd/tbl/t7.c +++ b/src/cmd/tbl/t7.c @@ -10,21 +10,21 @@ runout(void) if (boxflg || allflg || dboxflg) need(); if (ctrflg) { - Bprint(&tabout, ".nr #I \\n(.i\n"); - Bprint(&tabout, ".in +(\\n(.lu-\\n(TWu-\\n(.iu)/2u\n"); + fprintf(tabout, ".nr #I \\n(.i\n"); + fprintf(tabout, ".in +(\\n(.lu-\\n(TWu-\\n(.iu)/2u\n"); } - Bprint(&tabout, ".fc %c %c\n", F1, F2); - Bprint(&tabout, ".nr #T 0-1\n"); + fprintf(tabout, ".fc %c %c\n", F1, F2); + fprintf(tabout, ".nr #T 0-1\n"); deftail(); for (i = 0; i < nlin; i++) putline(i, i); if (leftover) yetmore(); - Bprint(&tabout, ".fc\n"); - Bprint(&tabout, ".nr T. 1\n"); - Bprint(&tabout, ".T# 1\n"); + fprintf(tabout, ".fc\n"); + fprintf(tabout, ".nr T. 1\n"); + fprintf(tabout, ".T# 1\n"); if (ctrflg) - Bprint(&tabout, ".in \\n(#Iu\n"); + fprintf(tabout, ".in \\n(#Iu\n"); } @@ -33,7 +33,7 @@ runtabs(int lform, int ldata) { int c, ct, vforml, lf; - Bprint(&tabout, ".ta "); + fprintf(tabout, ".ta "); for (c = 0; c < ncol; c++) { vforml = lform; for (lf = prev(lform); lf >= 0 && vspen(table[lf][c].col); lf = prev(lf)) @@ -45,20 +45,20 @@ runtabs(int lform, int ldata) case 'a': if (table[ldata][c].rcol) if (lused[c]) /*Zero field width*/ - Bprint(&tabout, "\\n(%2su ", reg(c, CMID)); + fprintf(tabout, "\\n(%2su ", reg(c, CMID)); case 'c': case 'l': case 'r': if (realsplit ? rused[c] : (used[c] + lused[c])) - Bprint(&tabout, "\\n(%2su ", reg(c, CRIGHT)); + fprintf(tabout, "\\n(%2su ", reg(c, CRIGHT)); continue; case 's': if (lspan(lform, c)) - Bprint(&tabout, "\\n(%2su ", reg(c, CRIGHT)); + fprintf(tabout, "\\n(%2su ", reg(c, CRIGHT)); continue; } } - Bprint(&tabout, "\n"); + fprintf(tabout, "\n"); } @@ -92,7 +92,7 @@ need(void) else texlin++; } - Bprint(&tabout, ".ne %dv+%dp\n", texlin, 2 * horlin); + fprintf(tabout, ".ne %dv+%dp\n", texlin, 2 * horlin); } @@ -103,48 +103,48 @@ deftail(void) for (i = 0; i < MAXHEAD; i++) if (linestop[i]) - Bprint(&tabout, ".nr #%c 0-1\n", linestop[i] + 'a' - 1); - Bprint(&tabout, ".nr #a 0-1\n"); - Bprint(&tabout, ".eo\n"); - Bprint(&tabout, ".de T#\n"); - Bprint(&tabout, ".nr 35 1m\n"); - Bprint(&tabout, ".ds #d .d\n"); - Bprint(&tabout, ".if \\(ts\\n(.z\\(ts\\(ts .ds #d nl\n"); - Bprint(&tabout, ".mk ##\n"); - Bprint(&tabout, ".nr ## -1v\n"); - Bprint(&tabout, ".ls 1\n"); + fprintf(tabout, ".nr #%c 0-1\n", linestop[i] + 'a' - 1); + fprintf(tabout, ".nr #a 0-1\n"); + fprintf(tabout, ".eo\n"); + fprintf(tabout, ".de T#\n"); + fprintf(tabout, ".nr 35 1m\n"); + fprintf(tabout, ".ds #d .d\n"); + fprintf(tabout, ".if \\(ts\\n(.z\\(ts\\(ts .ds #d nl\n"); + fprintf(tabout, ".mk ##\n"); + fprintf(tabout, ".nr ## -1v\n"); + fprintf(tabout, ".ls 1\n"); for (i = 0; i < MAXHEAD; i++) if (linestop[i]) - Bprint(&tabout, ".if \\n(#T>=0 .nr #%c \\n(#T\n", + fprintf(tabout, ".if \\n(#T>=0 .nr #%c \\n(#T\n", linestop[i] + 'a' - 1); if (boxflg || allflg || dboxflg) /* bottom of table line */ if (fullbot[nlin-1] == 0) { if (!pr1403) - Bprint(&tabout, ".if \\n(T. .vs \\n(.vu-\\n(.sp\n"); - Bprint(&tabout, ".if \\n(T. "); + fprintf(tabout, ".if \\n(T. .vs \\n(.vu-\\n(.sp\n"); + fprintf(tabout, ".if \\n(T. "); drawline(nlin, 0, ncol, dboxflg ? '=' : '-', 1, 0); - Bprint(&tabout, "\n.if \\n(T. .vs\n"); + fprintf(tabout, "\n.if \\n(T. .vs\n"); /* T. is really an argument to a macro but because of eqn we don't dare pass it as an argument and reference by $1 */ } for (c = 0; c < ncol; c++) { if ((lf = left(nlin - 1, c, &lwid)) >= 0) { - Bprint(&tabout, ".if \\n(#%c>=0 .sp -1\n", linestop[lf] + 'a' - 1); - Bprint(&tabout, ".if \\n(#%c>=0 ", linestop[lf] + 'a' - 1); + fprintf(tabout, ".if \\n(#%c>=0 .sp -1\n", linestop[lf] + 'a' - 1); + fprintf(tabout, ".if \\n(#%c>=0 ", linestop[lf] + 'a' - 1); tohcol(c); drawvert(lf, nlin - 1, c, lwid); - Bprint(&tabout, "\\h'|\\n(TWu'\n"); + fprintf(tabout, "\\h'|\\n(TWu'\n"); } } if (boxflg || allflg || dboxflg) /* right hand line */ { - Bprint(&tabout, ".if \\n(#a>=0 .sp -1\n"); - Bprint(&tabout, ".if \\n(#a>=0 \\h'|\\n(TWu'"); + fprintf(tabout, ".if \\n(#a>=0 .sp -1\n"); + fprintf(tabout, ".if \\n(#a>=0 \\h'|\\n(TWu'"); drawvert (0, nlin - 1, ncol, dboxflg ? 2 : 1); - Bprint(&tabout, "\n"); + fprintf(tabout, "\n"); } - Bprint(&tabout, ".ls\n"); - Bprint(&tabout, "..\n"); - Bprint(&tabout, ".ec\n"); + fprintf(tabout, ".ls\n"); + fprintf(tabout, "..\n"); + fprintf(tabout, ".ec\n"); } diff --git a/src/cmd/tbl/t8.c b/src/cmd/tbl/t8.c index 92277e2a..39bc9c14 100644 --- a/src/cmd/tbl/t8.c +++ b/src/cmd/tbl/t8.c @@ -28,19 +28,19 @@ putline(int i, int nl) if (!vspen(s = table[ip][c].col)) break; if ((int)s > 0 && (int)s < 128) - Bprint(&tabout, ".ne \\n(%c|u+\\n(.Vu\n", (int)s); + fprintf(tabout, ".ne \\n(%c|u+\\n(.Vu\n", (int)s); continue; } if (point(s)) continue; - Bprint(&tabout, ".ne \\n(%c|u+\\n(.Vu\n", (int)s); + fprintf(tabout, ".ne \\n(%c|u+\\n(.Vu\n", (int)s); watchout = 1; } if (linestop[nl]) - Bprint(&tabout, ".mk #%c\n", linestop[nl] + 'a' - 1); + fprintf(tabout, ".mk #%c\n", linestop[nl] + 'a' - 1); lf = prev(nl); if (instead[nl]) { - Bprint(&tabout, "%s\n", instead[nl]); + fprintf(tabout, "%s\n", instead[nl]); return; } if (fullbot[nl]) { @@ -60,8 +60,8 @@ putline(int i, int nl) vspf = 1; } if (vspf) { - Bprint(&tabout, ".nr #^ \\n(\\*(#du\n"); - Bprint(&tabout, ".nr #- \\n(#^\n"); /* current line position relative to bottom */ + fprintf(tabout, ".nr #^ \\n(\\*(#du\n"); + fprintf(tabout, ".nr #- \\n(#^\n"); /* current line position relative to bottom */ } vspf = 0; chfont = 0; @@ -74,11 +74,11 @@ putline(int i, int nl) continue; lf = prev(nl); if (lf >= 0 && vspen(table[lf][c].col)) - Bprint(&tabout, + fprintf(tabout, ".if (\\n(%c|+\\n(^%c-1v)>\\n(#- .nr #- +(\\n(%c|+\\n(^%c-\\n(#--1v)\n", (int)s, 'a' + c, (int)s, 'a' + c); else - Bprint(&tabout, + fprintf(tabout, ".if (\\n(%c|+\\n(#^-1v)>\\n(#- .nr #- +(\\n(%c|+\\n(#^-\\n(#--1v)\n", (int)s, (int)s); } @@ -87,14 +87,14 @@ putline(int i, int nl) once = 1; runtabs(i, nl); if (allh(i) && !pr1403) { - Bprint(&tabout, ".nr %d \\n(.v\n", SVS); - Bprint(&tabout, ".vs \\n(.vu-\\n(.sp\n"); - Bprint(&tabout, ".nr 35 \\n(.vu\n"); + fprintf(tabout, ".nr %d \\n(.v\n", SVS); + fprintf(tabout, ".vs \\n(.vu-\\n(.sp\n"); + fprintf(tabout, ".nr 35 \\n(.vu\n"); } else - Bprint(&tabout, ".nr 35 1m\n"); + fprintf(tabout, ".nr 35 1m\n"); if (chfont) - Bprint(&tabout, ".nr %2d \\n(.f\n", S1); - Bprint(&tabout, "\\&"); + fprintf(tabout, ".nr %2d \\n(.f\n", S1); + fprintf(tabout, "\\&"); vct = 0; for (c = 0; c < ncol; c++) { uphalf = 0; @@ -115,7 +115,7 @@ putline(int i, int nl) rct = reg(c, CMID); if (form == 'n' && table[nl][c].rcol && lused[c] == 0) rct = reg(c, CMID); - Bprint(&tabout, "\\h'|\\n(%2su'", rct); + fprintf(tabout, "\\h'|\\n(%2su'", rct); } s = table[nl][c].col; fn = font[c][stynum[vforml]]; @@ -133,27 +133,27 @@ putline(int i, int nl) if (ip >= 0) if (vspen(table[ip][c].col)) { if (exvspen == 0) { - Bprint(&tabout, "\\v'-(\\n(\\*(#du-\\n(^%cu", c + 'a'); + fprintf(tabout, "\\v'-(\\n(\\*(#du-\\n(^%cu", c + 'a'); if (cmidx) /* code folded from here */ - Bprint(&tabout, "-((\\n(#-u-\\n(^%cu)/2u)", c + 'a'); + fprintf(tabout, "-((\\n(#-u-\\n(^%cu)/2u)", c + 'a'); /* unfolding */ vct++; if (pr1403) /* must round to whole lines */ /* code folded from here */ - Bprint(&tabout, "/1v*1v"); + fprintf(tabout, "/1v*1v"); /* unfolding */ - Bprint(&tabout, "'"); + fprintf(tabout, "'"); exvspen = 1; } } - Bprint(&tabout, "%c%c", F1, F2); + fprintf(tabout, "%c%c", F1, F2); if (uphalf) - Bprint(&tabout, "\\u"); + fprintf(tabout, "\\u"); puttext(s, fn, size); if (uphalf) - Bprint(&tabout, "\\d"); - Bprint(&tabout, "%c", F1); + fprintf(tabout, "\\d"); + fprintf(tabout, "%c", F1); } s = table[nl][c].rcol; form = 1; @@ -171,7 +171,7 @@ putline(int i, int nl) case '-': case '=': if (real(table[nl][c].col)) - fprint(2, "%s: line %d: Data ignored on table line %d\n", ifile, iline - 1, i + 1); + fprintf(stderr, "%s: line %d: Data ignored on table line %d\n", ifile, iline - 1, i + 1); makeline(i, c, ct); continue; default: @@ -184,7 +184,7 @@ putline(int i, int nl) continue; } if (filler(s)) { - Bprint(&tabout, "\\l'|\\n(%2su\\&%s'", reg(c, CRIGHT), s + 2); + fprintf(tabout, "\\l'|\\n(%2su\\&%s'", reg(c, CRIGHT), s + 2); continue; } ip = prev(nl); @@ -192,67 +192,68 @@ putline(int i, int nl) if (ip >= 0) if (vspen(table[ip][c].col)) { if (exvspen == 0) { - Bprint(&tabout, "\\v'-(\\n(\\*(#du-\\n(^%cu", c + 'a'); + fprintf(tabout, "\\v'-(\\n(\\*(#du-\\n(^%cu", c + 'a'); if (cmidx) - Bprint(&tabout, "-((\\n(#-u-\\n(^%cu)/2u)", c + 'a'); + fprintf(tabout, "-((\\n(#-u-\\n(^%cu)/2u)", c + 'a'); vct++; if (pr1403) /* round to whole lines */ - Bprint(&tabout, "/1v*1v"); - Bprint(&tabout, "'"); + fprintf(tabout, "/1v*1v"); + fprintf(tabout, "'"); } } - Bprint(&tabout, "%c", F1); + fprintf(tabout, "%c", F1); if (form != 1) - Bprint(&tabout, "%c", F2); + fprintf(tabout, "%c", F2); if (vspen(s)) vspf = 1; else { if (uphalf) - Bprint(&tabout, "\\u"); + fprintf(tabout, "\\u"); puttext(s, fn, size); if (uphalf) - Bprint(&tabout, "\\d"); + fprintf(tabout, "\\d"); } if (form != 2) - Bprint(&tabout, "%c", F2); - Bprint(&tabout, "%c", F1); + fprintf(tabout, "%c", F2); + fprintf(tabout, "%c", F1); } ip = prev(nl); - if (ip >= 0) + if (ip >= 0) { if (vspen(table[ip][c].col)) { exvspen = (c + 1 < ncol) && vspen(table[ip][c+1].col) && (topat[c] == topat[c+1]) && - (cmidx == (flags[c+1] [stynum[nl]] & (CTOP | CDOWN) == 0)) + (cmidx == ((flags[c+1] [stynum[nl]] & (CTOP | CDOWN)) == 0)) && (left(i, c + 1, &lwid) < 0); if (exvspen == 0) { - Bprint(&tabout, "\\v'(\\n(\\*(#du-\\n(^%cu", c + 'a'); + fprintf(tabout, "\\v'(\\n(\\*(#du-\\n(^%cu", c + 'a'); if (cmidx) - Bprint(&tabout, "-((\\n(#-u-\\n(^%cu)/2u)", c + 'a'); + fprintf(tabout, "-((\\n(#-u-\\n(^%cu)/2u)", c + 'a'); vct++; if (pr1403) /* round to whole lines */ - Bprint(&tabout, "/1v*1v"); - Bprint(&tabout, "'"); + fprintf(tabout, "/1v*1v"); + fprintf(tabout, "'"); } } else exvspen = 0; + } /* if lines need to be split for gcos here is the place for a backslash */ if (vct > 7 && c < ncol) { - Bprint(&tabout, "\n.sp-1\n\\&"); + fprintf(tabout, "\n.sp-1\n\\&"); vct = 0; } } - Bprint(&tabout, "\n"); + fprintf(tabout, "\n"); if (allh(i) && !pr1403) - Bprint(&tabout, ".vs \\n(%du\n", SVS); + fprintf(tabout, ".vs \\n(%du\n", SVS); if (watchout) funnies(i, nl); if (vspf) { for (c = 0; c < ncol; c++) if (vspen(table[nl][c].col) && (nl == 0 || (lf = prev(nl)) < 0 || !vspen(table[lf][c].col))) { - Bprint(&tabout, ".nr ^%c \\n(#^u\n", 'a' + c); + fprintf(tabout, ".nr ^%c \\n(#^u\n", 'a' + c); topat[c] = nl; } } @@ -265,9 +266,9 @@ puttext(char *s, char *fn, char *size) if (point(s)) { putfont(fn); putsize(size); - Bprint(&tabout, "%s", s); + fprintf(tabout, "%s", s); if (*fn > 0) - Bprint(&tabout, "\\f\\n(%2d", S1); + fprintf(tabout, "\\f\\n(%2d", S1); if (size != 0) putsize("0"); } @@ -281,8 +282,8 @@ funnies(int stl, int lin) int c, s, pl, lwid, dv, lf, ct; char *fn, *ss; - Bprint(&tabout, ".mk ##\n"); /* rmember current vertical position */ - Bprint(&tabout, ".nr %d \\n(##\n", S1); /* bottom position */ + fprintf(tabout, ".mk ##\n"); /* rmember current vertical position */ + fprintf(tabout, ".nr %d \\n(##\n", S1); /* bottom position */ for (c = 0; c < ncol; c++) { ss = table[lin][c].col; if (point(ss)) @@ -290,62 +291,62 @@ funnies(int stl, int lin) if (ss == 0) continue; s = (int)ss; - Bprint(&tabout, ".sp |\\n(##u-1v\n"); - Bprint(&tabout, ".nr %d ", SIND); + fprintf(tabout, ".sp |\\n(##u-1v\n"); + fprintf(tabout, ".nr %d ", SIND); ct = 0; for (pl = stl; pl >= 0 && !isalpha(ct = ctype(pl, c)); pl = prev(pl)) ; switch (ct) { case 'n': case 'c': - Bprint(&tabout, "(\\n(%2su+\\n(%2su-\\n(%c-u)/2u\n", reg(c, CLEFT), + fprintf(tabout, "(\\n(%2su+\\n(%2su-\\n(%c-u)/2u\n", reg(c, CLEFT), reg(c - 1 + ctspan(lin, c), CRIGHT), s); break; case 'l': - Bprint(&tabout, "\\n(%2su\n", reg(c, CLEFT)); + fprintf(tabout, "\\n(%2su\n", reg(c, CLEFT)); break; case 'a': - Bprint(&tabout, "\\n(%2su\n", reg(c, CMID)); + fprintf(tabout, "\\n(%2su\n", reg(c, CMID)); break; case 'r': - Bprint(&tabout, "\\n(%2su-\\n(%c-u\n", reg(c, CRIGHT), s); + fprintf(tabout, "\\n(%2su-\\n(%c-u\n", reg(c, CRIGHT), s); break; } - Bprint(&tabout, ".in +\\n(%du\n", SIND); + fprintf(tabout, ".in +\\n(%du\n", SIND); fn = font[c][stynum[stl]]; putfont(fn); pl = prev(stl); if (stl > 0 && pl >= 0 && vspen(table[pl][c].col)) { - Bprint(&tabout, ".sp |\\n(^%cu\n", 'a' + c); + fprintf(tabout, ".sp |\\n(^%cu\n", 'a' + c); if ((flags[c][stynum[stl]] & (CTOP | CDOWN)) == 0) { - Bprint(&tabout, ".nr %d \\n(#-u-\\n(^%c-\\n(%c|+1v\n", + fprintf(tabout, ".nr %d \\n(#-u-\\n(^%c-\\n(%c|+1v\n", TMP, 'a' + c, s); - Bprint(&tabout, ".if \\n(%d>0 .sp \\n(%du/2u", TMP, TMP); + fprintf(tabout, ".if \\n(%d>0 .sp \\n(%du/2u", TMP, TMP); if (pr1403) /* round */ - Bprint(&tabout, "/1v*1v"); - Bprint(&tabout, "\n"); + fprintf(tabout, "/1v*1v"); + fprintf(tabout, "\n"); } } - Bprint(&tabout, ".%c+\n", s); - Bprint(&tabout, ".in -\\n(%du\n", SIND); + fprintf(tabout, ".%c+\n", s); + fprintf(tabout, ".in -\\n(%du\n", SIND); if (*fn > 0) putfont("P"); - Bprint(&tabout, ".mk %d\n", S2); - Bprint(&tabout, ".if \\n(%d>\\n(%d .nr %d \\n(%d\n", S2, S1, S1, S2); + fprintf(tabout, ".mk %d\n", S2); + fprintf(tabout, ".if \\n(%d>\\n(%d .nr %d \\n(%d\n", S2, S1, S1, S2); } - Bprint(&tabout, ".sp |\\n(%du\n", S1); + fprintf(tabout, ".sp |\\n(%du\n", S1); for (c = dv = 0; c < ncol; c++) { if (stl + 1 < nlin && (lf = left(stl, c, &lwid)) >= 0) { if (dv++ == 0) - Bprint(&tabout, ".sp -1\n"); + fprintf(tabout, ".sp -1\n"); tohcol(c); dv++; drawvert(lf, stl, c, lwid); } } if (dv) - Bprint(&tabout, "\n"); + fprintf(tabout, "\n"); } @@ -353,7 +354,7 @@ void putfont(char *fn) { if (fn && *fn) - Bprint(&tabout, fn[1] ? "\\f(%.2s" : "\\f%.2s", fn); + fprintf(tabout, fn[1] ? "\\f(%.2s" : "\\f%.2s", fn); } @@ -361,7 +362,7 @@ void putsize(char *s) { if (s && *s) - Bprint(&tabout, "\\s%s", s); + fprintf(tabout, "\\s%s", s); } diff --git a/src/cmd/tbl/t9.c b/src/cmd/tbl/t9.c index bf1978a9..da96e05f 100644 --- a/src/cmd/tbl/t9.c +++ b/src/cmd/tbl/t9.c @@ -1,6 +1,6 @@ /* t9.c: write lines for tables over 200 lines */ # include "t.h" -static useln; +static int useln; void yetmore(void) @@ -30,7 +30,7 @@ domore(char *dataln) if (prefix(".TE", dataln)) return(0); if (dataln[0] == '.' && !isdigit(dataln[1])) { - Bprint(&tabout, "%s\n", dataln); + fprintf(tabout, "%s\n", dataln); return(1); } fullbot[0] = 0; diff --git a/src/cmd/tbl/tc.c b/src/cmd/tbl/tc.c index 635dbf8a..f089f4d5 100644 --- a/src/cmd/tbl/tc.c +++ b/src/cmd/tbl/tc.c @@ -4,9 +4,9 @@ void choochar(void) { - /* choose funny characters to delimit fields */ - int had[128], ilin, icol, k; - char *s; + /* choose funny characters to delimit fields */ + int had[128], ilin, icol, k; + unsigned char *s; for (icol = 0; icol < 128; icol++) had[icol] = 0; diff --git a/src/cmd/tbl/te.c b/src/cmd/tbl/te.c index 3df8d445..e6282994 100644 --- a/src/cmd/tbl/te.c +++ b/src/cmd/tbl/te.c @@ -4,9 +4,9 @@ void error(char *s) { - fprint(2, "\n%s:%d: %s\n", ifile, iline, s); - fprint(2, "tbl quits\n"); - exits(s); + fprintf(stderr, "\n%s:%d: %s\n", ifile, iline, s); + fprintf(stderr, "tbl quits\n"); + exit(1); } @@ -18,13 +18,14 @@ gets1(char *s, int size) iline++; ns = s; - p = Brdline(tabin, '\n'); + p = fgetln(tabin, &nbl); while (p == 0) { if (swapin() == 0) return(0); - p = Brdline(tabin, '\n'); + p = fgetln(tabin, &nbl); } - nbl = Blinelen(tabin)-1; + if(p != 0 && p[nbl-1] == '\n') + nbl--; if(nbl >= size) error("input buffer too small"); p[nbl] = 0; @@ -61,11 +62,11 @@ get1char(void) if (backp > backup) c = *--backp; else - c = Bgetc(tabin); + c = fgetc(tabin); if (c == 0) /* EOF */ { if (swapin() == 0) error("unexpected EOF"); - c = Bgetc(tabin); + c = fgetc(tabin); } if (c == '\n') iline++; diff --git a/src/cmd/tbl/tf.c b/src/cmd/tbl/tf.c index 3791c32f..320ba968 100644 --- a/src/cmd/tbl/tf.c +++ b/src/cmd/tbl/tf.c @@ -5,25 +5,25 @@ void savefill(void) { /* remembers various things: fill mode, vs, ps in mac 35 (SF) */ - Bprint(&tabout, ".de %d\n", SF); - Bprint(&tabout, ".ps \\n(.s\n"); - Bprint(&tabout, ".vs \\n(.vu\n"); - Bprint(&tabout, ".in \\n(.iu\n"); - Bprint(&tabout, ".if \\n(.u .fi\n"); - Bprint(&tabout, ".if \\n(.j .ad\n"); - Bprint(&tabout, ".if \\n(.j=0 .na\n"); - Bprint(&tabout, "..\n"); - Bprint(&tabout, ".nf\n"); + fprintf(tabout, ".de %d\n", SF); + fprintf(tabout, ".ps \\n(.s\n"); + fprintf(tabout, ".vs \\n(.vu\n"); + fprintf(tabout, ".in \\n(.iu\n"); + fprintf(tabout, ".if \\n(.u .fi\n"); + fprintf(tabout, ".if \\n(.j .ad\n"); + fprintf(tabout, ".if \\n(.j=0 .na\n"); + fprintf(tabout, "..\n"); + fprintf(tabout, ".nf\n"); /* set obx offset if useful */ - Bprint(&tabout, ".nr #~ 0\n"); - Bprint(&tabout, ".if \\n(.T .if n .nr #~ 0.6n\n"); + fprintf(tabout, ".nr #~ 0\n"); + fprintf(tabout, ".if \\n(.T .if n .nr #~ 0.6n\n"); } void rstofill(void) { - Bprint(&tabout, ".%d\n", SF); + fprintf(tabout, ".%d\n", SF); } @@ -34,25 +34,25 @@ endoff(void) for (i = 0; i < MAXHEAD; i++) if (linestop[i]) - Bprint(&tabout, ".nr #%c 0\n", linestop[i] + 'a' - 1); + fprintf(tabout, ".nr #%c 0\n", linestop[i] + 'a' - 1); for (i = 0; i < texct; i++) - Bprint(&tabout, ".rm %c+\n", texstr[i]); - Bprint(&tabout, "%s\n", last); + fprintf(tabout, ".rm %c+\n", texstr[i]); + fprintf(tabout, "%s\n", last); } void ifdivert(void) { - Bprint(&tabout, ".ds #d .d\n"); - Bprint(&tabout, ".if \\(ts\\n(.z\\(ts\\(ts .ds #d nl\n"); + fprintf(tabout, ".ds #d .d\n"); + fprintf(tabout, ".if \\(ts\\n(.z\\(ts\\(ts .ds #d nl\n"); } void saveline(void) { - Bprint(&tabout, ".if \\n+(b.=1 .nr d. \\n(.c-\\n(c.-1\n"); + fprintf(tabout, ".if \\n+(b.=1 .nr d. \\n(.c-\\n(c.-1\n"); linstart = iline; } @@ -60,7 +60,7 @@ saveline(void) void restline(void) { - Bprint(&tabout, ".if \\n-(b.=0 .nr c. \\n(.c-\\n(d.-%d\n", iline - linstart); + fprintf(tabout, ".if \\n-(b.=0 .nr c. \\n(.c-\\n(d.-%d\n", iline - linstart); linstart = 0; } @@ -68,7 +68,7 @@ restline(void) void cleanfc(void) { - Bprint(&tabout, ".fc\n"); + fprintf(tabout, ".fc\n"); } diff --git a/src/cmd/tbl/tg.c b/src/cmd/tbl/tg.c index 6abb1490..e12bdc4e 100644 --- a/src/cmd/tbl/tg.c +++ b/src/cmd/tbl/tg.c @@ -12,53 +12,53 @@ gettext(char *sp, int ilin, int icol, char *fn, char *sz) if (texname == 0) error("Too many text block diversions"); if (textflg == 0) { - Bprint(&tabout, ".nr %d \\n(.lu\n", SL); /* remember old line length */ + fprintf(tabout, ".nr %d \\n(.lu\n", SL); /* remember old line length */ textflg = 1; } - Bprint(&tabout, ".eo\n"); - Bprint(&tabout, ".am %s\n", reg(icol, CRIGHT)); - Bprint(&tabout, ".br\n"); - Bprint(&tabout, ".di %c+\n", texname); + fprintf(tabout, ".eo\n"); + fprintf(tabout, ".am %s\n", reg(icol, CRIGHT)); + fprintf(tabout, ".br\n"); + fprintf(tabout, ".di %c+\n", texname); rstofill(); if (fn && *fn) - Bprint(&tabout, ".nr %d \\n(.f\n.ft %s\n", S1, fn); - Bprint(&tabout, ".ft \\n(.f\n"); /* protect font */ + fprintf(tabout, ".nr %d \\n(.f\n.ft %s\n", S1, fn); + fprintf(tabout, ".ft \\n(.f\n"); /* protect font */ vs = vsize[icol][stynum[ilin]]; if ((sz && *sz) || (vs && *vs)) { - Bprint(&tabout, ".nr %d \\n(.v\n", S9); + fprintf(tabout, ".nr %d \\n(.v\n", S9); if (vs == 0 || *vs == 0) vs = "\\n(.s+2"; if (sz && *sz) - Bprint(&tabout, ".ps %s\n", sz); - Bprint(&tabout, ".vs %s\n", vs); - Bprint(&tabout, ".if \\n(%du>\\n(.vu .sp \\n(%du-\\n(.vu\n", S9, S9); + fprintf(tabout, ".ps %s\n", sz); + fprintf(tabout, ".vs %s\n", vs); + fprintf(tabout, ".if \\n(%du>\\n(.vu .sp \\n(%du-\\n(.vu\n", S9, S9); } if (cll[icol][0]) - Bprint(&tabout, ".ll %sn\n", cll[icol]); + fprintf(tabout, ".ll %sn\n", cll[icol]); else - Bprint(&tabout, ".ll \\n(%du*%du/%du\n", SL, ctspan(ilin, icol), ncol + 1); - Bprint(&tabout, ".if \\n(.l<\\n(%2s .ll \\n(%2su\n", reg(icol, CRIGHT), + fprintf(tabout, ".ll \\n(%du*%du/%du\n", SL, ctspan(ilin, icol), ncol + 1); + fprintf(tabout, ".if \\n(.l<\\n(%2s .ll \\n(%2su\n", reg(icol, CRIGHT), reg(icol, CRIGHT)); if (ctype(ilin, icol) == 'a') - Bprint(&tabout, ".ll -2n\n"); - Bprint(&tabout, ".in 0\n"); + fprintf(tabout, ".ll -2n\n"); + fprintf(tabout, ".in 0\n"); while (gets1(line, sizeof(line))) { if (line[0] == 'T' && line[1] == '}' && line[2] == tab) break; if (match("T}", line)) break; - Bprint(&tabout, "%s\n", line); + fprintf(tabout, "%s\n", line); } if (fn && *fn) - Bprint(&tabout, ".ft \\n(%d\n", S1); + fprintf(tabout, ".ft \\n(%d\n", S1); if (sz && *sz) - Bprint(&tabout, ".br\n.ps\n.vs\n"); - Bprint(&tabout, ".br\n"); - Bprint(&tabout, ".di\n"); - Bprint(&tabout, ".nr %c| \\n(dn\n", texname); - Bprint(&tabout, ".nr %c- \\n(dl\n", texname); - Bprint(&tabout, "..\n"); - Bprint(&tabout, ".ec \\\n"); + fprintf(tabout, ".br\n.ps\n.vs\n"); + fprintf(tabout, ".br\n"); + fprintf(tabout, ".di\n"); + fprintf(tabout, ".nr %c| \\n(dn\n", texname); + fprintf(tabout, ".nr %c- \\n(dl\n", texname); + fprintf(tabout, "..\n"); + fprintf(tabout, ".ec \\\n"); /* copy remainder of line */ if (line[2]) tcopy (sp, line + 3); @@ -74,8 +74,8 @@ void untext(void) { rstofill(); - Bprint(&tabout, ".nf\n"); - Bprint(&tabout, ".ll \\n(%du\n", SL); + fprintf(tabout, ".nf\n"); + fprintf(tabout, ".ll \\n(%du\n", SL); } diff --git a/src/cmd/tbl/tm.c b/src/cmd/tbl/tm.c index 8fa4e497..7bf49e53 100644 --- a/src/cmd/tbl/tm.c +++ b/src/cmd/tbl/tm.c @@ -9,14 +9,14 @@ maknew(char *str) char *p, *q, *ba; p = str; - for (ba = 0; c = *str; str++) + for (ba = 0; (c = *str); str++) if (c == '\\' && *(str + 1) == '&') ba = str; str = p; if (ba == 0) { for (dpoint = 0; *str; str++) { if (*str == '.' && !ineqn(str, p) && - (str > p && digit(*(str - 1)) || + ((str > p && digit(*(str - 1))) || digit(*(str + 1)))) dpoint = (int)str; } @@ -37,7 +37,7 @@ maknew(char *str) exlim = exstore + MAXCHS; } q = exstore; - while (*exstore++ = *str++) + while ((*exstore++ = *str++)) ; *p = 0; return(q); @@ -50,7 +50,7 @@ ineqn (char *s, char *p) /* true if s is in a eqn within p */ int ineq = 0, c; - while (c = *p) { + while ((c = *p)) { if (s == p) return(ineq); p++; diff --git a/src/cmd/tbl/ts.c b/src/cmd/tbl/ts.c index 43cc84ec..a3c5968e 100644 --- a/src/cmd/tbl/ts.c +++ b/src/cmd/tbl/ts.c @@ -64,7 +64,7 @@ max(int a, int b) void tcopy (char *s, char *t) { - while (*s++ = *t++) + while ((*s++ = *t++)) ; } diff --git a/src/cmd/tbl/tt.c b/src/cmd/tbl/tt.c index 96270b75..e70ab3da 100644 --- a/src/cmd/tbl/tt.c +++ b/src/cmd/tbl/tt.c @@ -59,9 +59,9 @@ void tohcol(int ic) { if (ic == 0) - Bprint(&tabout, "\\h'|0'"); + fprintf(tabout, "\\h'|0'"); else - Bprint(&tabout, "\\h'(|\\n(%2su+|\\n(%2su)/2u'", reg(ic, CLEFT), + fprintf(tabout, "\\h'(|\\n(%2su+|\\n(%2su)/2u'", reg(ic, CLEFT), reg(ic - 1, CRIGHT)); } @@ -119,7 +119,7 @@ thish(int i, int c) return(1); if (vspen(s)) return(1); - if (t = barent( s)) + if ((t = barent( s))) return(t); return(0); } diff --git a/src/cmd/tbl/tu.c b/src/cmd/tbl/tu.c index 217869e1..87e1602e 100644 --- a/src/cmd/tbl/tu.c +++ b/src/cmd/tbl/tu.c @@ -28,7 +28,7 @@ fullwide(int i, int lintype) int cr, cl; if (!pr1403) - Bprint(&tabout, ".nr %d \\n(.v\n.vs \\n(.vu-\\n(.sp\n", SVS); + fprintf(tabout, ".nr %d \\n(.v\n.vs \\n(.vu-\\n(.sp\n", SVS); cr = 0; while (cr < ncol) { cl = cr; @@ -40,9 +40,9 @@ fullwide(int i, int lintype) if (cl < ncol) drawline(i, cl, (cr < ncol ? cr - 1 : cr), lintype, 1, 0); } - Bprint(&tabout, "\n"); + fprintf(tabout, "\n"); if (!pr1403) - Bprint(&tabout, ".vs \\n(%du\n", SVS); + fprintf(tabout, ".vs \\n(%du\n", SVS); } @@ -69,11 +69,11 @@ drawline(int i, int cl, int cr, int lintype, int noheight, int shortl) return; nodata = cr - cl >= ncol || noheight || allh(i); if (!nodata) - Bprint(&tabout, "\\v'-.5m'"); + fprintf(tabout, "\\v'-.5m'"); for (ln = oldpos = 0; ln < lcount; ln++) { linpos = 2 * ln - lcount + 1; if (linpos != oldpos) - Bprint(&tabout, "\\v'%dp'", linpos - oldpos); + fprintf(tabout, "\\v'%dp'", linpos - oldpos); oldpos = linpos; if (shortl == 0) { tohcol(cl); @@ -90,7 +90,7 @@ drawline(int i, int cl, int cr, int lintype, int noheight, int shortl) break; } if (exhl[0]) - Bprint(&tabout, "\\h'%s'", exhl); + fprintf(tabout, "\\h'%s'", exhl); } else if (lcount == 1) { switch (interv(i, cl)) { case TOP: @@ -102,7 +102,7 @@ drawline(int i, int cl, int cr, int lintype, int noheight, int shortl) break; } if (exhl[0]) - Bprint(&tabout, "\\h'%s'", exhl); + fprintf(tabout, "\\h'%s'", exhl); } if (lcount > 1) { switch (interv(i, cr + 1)) { @@ -128,31 +128,31 @@ drawline(int i, int cl, int cr, int lintype, int noheight, int shortl) } } } else - Bprint(&tabout, "\\h'|\\n(%2su'", reg(cl, CLEFT)); - Bprint(&tabout, "\\s\\n(%d", LSIZE); + fprintf(tabout, "\\h'|\\n(%2su'", reg(cl, CLEFT)); + fprintf(tabout, "\\s\\n(%d", LSIZE); if (linsize) - Bprint(&tabout, "\\v'-\\n(%dp/6u'", LSIZE); + fprintf(tabout, "\\v'-\\n(%dp/6u'", LSIZE); if (shortl) - Bprint(&tabout, "\\l'|\\n(%2su'", reg(cr, CRIGHT)); + fprintf(tabout, "\\l'|\\n(%2su'", reg(cr, CRIGHT)); else { lnch = "\\(ul"; if (pr1403) lnch = lintype == 2 ? "=" : "\\(ru"; if (cr + 1 >= ncol) - Bprint(&tabout, "\\l'|\\n(TWu%s%s'", exhr, lnch); + fprintf(tabout, "\\l'|\\n(TWu%s%s'", exhr, lnch); else - Bprint(&tabout, "\\l'(|\\n(%2su+|\\n(%2su)/2u%s%s'", reg(cr, CRIGHT), + fprintf(tabout, "\\l'(|\\n(%2su+|\\n(%2su)/2u%s%s'", reg(cr, CRIGHT), reg(cr + 1, CLEFT), exhr, lnch); } if (linsize) - Bprint(&tabout, "\\v'\\n(%dp/6u'", LSIZE); - Bprint(&tabout, "\\s0"); + fprintf(tabout, "\\v'\\n(%dp/6u'", LSIZE); + fprintf(tabout, "\\s0"); } if (oldpos != 0) - Bprint(&tabout, "\\v'%dp'", -oldpos); + fprintf(tabout, "\\v'%dp'", -oldpos); if (!nodata) - Bprint(&tabout, "\\v'+.5m'"); + fprintf(tabout, "\\v'+.5m'"); } diff --git a/src/cmd/tbl/tv.c b/src/cmd/tbl/tv.c index 19a4b03f..adcef76f 100644 --- a/src/cmd/tbl/tv.c +++ b/src/cmd/tbl/tv.c @@ -16,7 +16,7 @@ drawvert(int start, int end, int c, int lwid) epb = ept = 0; pos = 2 * ln - lwid + 1; if (pos != tp) - Bprint(&tabout, "\\h'%dp'", pos - tp); + fprintf(tabout, "\\h'%dp'", pos - tp); tp = pos; if (end < nlin) { if (fullbot[end] || (!instead[end] && allh(end))) @@ -102,33 +102,33 @@ drawvert(int start, int end, int c, int lwid) break; } if (exb) - Bprint(&tabout, "\\v'%s'", exb); + fprintf(tabout, "\\v'%s'", exb); if (epb) - Bprint(&tabout, "\\v'%dp'", epb); - Bprint(&tabout, "\\s\\n(%d", LSIZE); + fprintf(tabout, "\\v'%dp'", epb); + fprintf(tabout, "\\s\\n(%d", LSIZE); if (linsize) - Bprint(&tabout, "\\v'-\\n(%dp/6u'", LSIZE); - Bprint(&tabout, "\\h'-\\n(#~u'"); /* adjustment for T450 nroff boxes */ - Bprint(&tabout, "\\L'|\\n(#%cu-%s", linestop[start] + 'a' - 1, + fprintf(tabout, "\\v'-\\n(%dp/6u'", LSIZE); + fprintf(tabout, "\\h'-\\n(#~u'"); /* adjustment for T450 nroff boxes */ + fprintf(tabout, "\\L'|\\n(#%cu-%s", linestop[start] + 'a' - 1, vm == 'v' ? "1v" : "\\n(35u"); if (ext) - Bprint(&tabout, "-(%s)", ext); + fprintf(tabout, "-(%s)", ext); if (exb) - Bprint(&tabout, "-(%s)", exb); + fprintf(tabout, "-(%s)", exb); pos = ept - epb; if (pos) - Bprint(&tabout, "%s%dp", pos >= 0 ? "+" : "", pos); + fprintf(tabout, "%s%dp", pos >= 0 ? "+" : "", pos); /* the string #d is either "nl" or ".d" depending on diversions; on GCOS not the same */ - Bprint(&tabout, "'\\s0\\v'\\n(\\*(#du-\\n(#%cu+%s", + fprintf(tabout, "'\\s0\\v'\\n(\\*(#du-\\n(#%cu+%s", linestop[start] + 'a' - 1, vm == 'v' ? "1v" : "\\n(35u"); if (ext) - Bprint(&tabout, "+%s", ext); + fprintf(tabout, "+%s", ext); if (ept) - Bprint(&tabout, "%s%dp", (-ept) > 0 ? "+" : "", (-ept)); - Bprint(&tabout, "'"); + fprintf(tabout, "%s%dp", (-ept) > 0 ? "+" : "", (-ept)); + fprintf(tabout, "'"); if (linsize) - Bprint(&tabout, "\\v'\\n(%dp/6u'", LSIZE); + fprintf(tabout, "\\v'\\n(%dp/6u'", LSIZE); } } @@ -154,7 +154,7 @@ midbcol(int i, int c) c--; if (ct == '-' || ct == '=') return(ct); - if (ct = barent(table[i][c].col)) + if ((ct = barent(table[i][c].col))) return(ct); return(0); } -- cgit v1.2.3