Make tbl compile silently.
diff --git a/src/cmd/tbl/t7.c b/src/cmd/tbl/t7.c
index 0d11f0c..2fa9de5 100644
--- a/src/cmd/tbl/t7.c
+++ b/src/cmd/tbl/t7.c
@@ -10,21 +10,21 @@
if (boxflg || allflg || dboxflg)
need();
if (ctrflg) {
- fprintf(tabout, ".nr #I \\n(.i\n");
- fprintf(tabout, ".in +(\\n(.lu-\\n(TWu-\\n(.iu)/2u\n");
+ Bprint(&tabout, ".nr #I \\n(.i\n");
+ Bprint(&tabout, ".in +(\\n(.lu-\\n(TWu-\\n(.iu)/2u\n");
}
- fprintf(tabout, ".fc %c %c\n", F1, F2);
- fprintf(tabout, ".nr #T 0-1\n");
+ Bprint(&tabout, ".fc %c %c\n", F1, F2);
+ Bprint(&tabout, ".nr #T 0-1\n");
deftail();
for (i = 0; i < nlin; i++)
putline(i, i);
if (leftover)
yetmore();
- fprintf(tabout, ".fc\n");
- fprintf(tabout, ".nr T. 1\n");
- fprintf(tabout, ".T# 1\n");
+ Bprint(&tabout, ".fc\n");
+ Bprint(&tabout, ".nr T. 1\n");
+ Bprint(&tabout, ".T# 1\n");
if (ctrflg)
- fprintf(tabout, ".in \\n(#Iu\n");
+ Bprint(&tabout, ".in \\n(#Iu\n");
}
@@ -33,7 +33,7 @@
{
int c, ct, vforml, lf;
- fprintf(tabout, ".ta ");
+ Bprint(&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 @@
case 'a':
if (table[ldata][c].rcol)
if (lused[c]) /*Zero field width*/
- fprintf(tabout, "\\n(%2su ", reg(c, CMID));
+ Bprint(&tabout, "\\n(%2su ", reg(c, CMID));
case 'c':
case 'l':
case 'r':
if (realsplit ? rused[c] : (used[c] + lused[c]))
- fprintf(tabout, "\\n(%2su ", reg(c, CRIGHT));
+ Bprint(&tabout, "\\n(%2su ", reg(c, CRIGHT));
continue;
case 's':
if (lspan(lform, c))
- fprintf(tabout, "\\n(%2su ", reg(c, CRIGHT));
+ Bprint(&tabout, "\\n(%2su ", reg(c, CRIGHT));
continue;
}
}
- fprintf(tabout, "\n");
+ Bprint(&tabout, "\n");
}
@@ -92,7 +92,7 @@
else
texlin++;
}
- fprintf(tabout, ".ne %dv+%dp\n", texlin, 2 * horlin);
+ Bprint(&tabout, ".ne %dv+%dp\n", texlin, 2 * horlin);
}
@@ -103,48 +103,48 @@
for (i = 0; i < MAXHEAD; i++)
if (linestop[i])
- 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");
+ 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");
for (i = 0; i < MAXHEAD; i++)
if (linestop[i])
- fprintf(tabout, ".if \\n(#T>=0 .nr #%c \\n(#T\n",
+ Bprint(&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)
- fprintf(tabout, ".if \\n(T. .vs \\n(.vu-\\n(.sp\n");
- fprintf(tabout, ".if \\n(T. ");
+ Bprint(&tabout, ".if \\n(T. .vs \\n(.vu-\\n(.sp\n");
+ Bprint(&tabout, ".if \\n(T. ");
drawline(nlin, 0, ncol, dboxflg ? '=' : '-', 1, 0);
- fprintf(tabout, "\n.if \\n(T. .vs\n");
+ Bprint(&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) {
- fprintf(tabout, ".if \\n(#%c>=0 .sp -1\n", linestop[lf] + 'a' - 1);
- fprintf(tabout, ".if \\n(#%c>=0 ", linestop[lf] + 'a' - 1);
+ Bprint(&tabout, ".if \\n(#%c>=0 .sp -1\n", linestop[lf] + 'a' - 1);
+ Bprint(&tabout, ".if \\n(#%c>=0 ", linestop[lf] + 'a' - 1);
tohcol(c);
drawvert(lf, nlin - 1, c, lwid);
- fprintf(tabout, "\\h'|\\n(TWu'\n");
+ Bprint(&tabout, "\\h'|\\n(TWu'\n");
}
}
if (boxflg || allflg || dboxflg) /* right hand line */ {
- fprintf(tabout, ".if \\n(#a>=0 .sp -1\n");
- fprintf(tabout, ".if \\n(#a>=0 \\h'|\\n(TWu'");
+ Bprint(&tabout, ".if \\n(#a>=0 .sp -1\n");
+ Bprint(&tabout, ".if \\n(#a>=0 \\h'|\\n(TWu'");
drawvert (0, nlin - 1, ncol, dboxflg ? 2 : 1);
- fprintf(tabout, "\n");
+ Bprint(&tabout, "\n");
}
- fprintf(tabout, ".ls\n");
- fprintf(tabout, "..\n");
- fprintf(tabout, ".ec\n");
+ Bprint(&tabout, ".ls\n");
+ Bprint(&tabout, "..\n");
+ Bprint(&tabout, ".ec\n");
}
