aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/eqn
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd/eqn')
-rw-r--r--src/cmd/eqn/diacrit.c2
-rw-r--r--src/cmd/eqn/eqnbox.c2
-rw-r--r--src/cmd/eqn/font.c2
-rw-r--r--src/cmd/eqn/fromto.c10
-rw-r--r--src/cmd/eqn/funny.c2
-rw-r--r--src/cmd/eqn/main.c6
-rw-r--r--src/cmd/eqn/mbwc.c1
-rw-r--r--src/cmd/eqn/move.c2
-rw-r--r--src/cmd/eqn/over.c8
-rw-r--r--src/cmd/eqn/paren.c2
-rw-r--r--src/cmd/eqn/pile.c14
-rw-r--r--src/cmd/eqn/shift.c8
-rw-r--r--src/cmd/eqn/size.c2
-rw-r--r--src/cmd/eqn/sqrt.c2
-rw-r--r--src/cmd/eqn/text.c4
15 files changed, 33 insertions, 34 deletions
diff --git a/src/cmd/eqn/diacrit.c b/src/cmd/eqn/diacrit.c
index 10dc8c75..54f48f79 100644
--- a/src/cmd/eqn/diacrit.c
+++ b/src/cmd/eqn/diacrit.c
@@ -64,7 +64,7 @@ void diacrit(int p1, int type)
nrwid(c, ps, c);
if (lfont[p1] != ITAL)
printf(".nr %d 0\n", t);
- printf(".as %d \\h'-\\n(%du-\\n(%du/2u+\\n(%du'\\v'0-\\n(10u'\\*(%d",
+ printf(".as %d \\h'-\\n(%du-\\n(%du/2u+\\n(%du'\\v'0-\\n(10u'\\*(%d",
p1, p1, c, t, c);
printf("\\v'\\n(10u'\\h'-\\n(%du+\\n(%du/2u-\\n(%du'\n", c, p1, t);
if (type != UNDER && type != UTILDE)
diff --git a/src/cmd/eqn/eqnbox.c b/src/cmd/eqn/eqnbox.c
index 6ec013bb..98006aa9 100644
--- a/src/cmd/eqn/eqnbox.c
+++ b/src/cmd/eqn/eqnbox.c
@@ -8,7 +8,7 @@ void eqnbox(int p1, int p2, int lu)
yyval = p1;
b = max(ebase[p1], ebase[p2]);
- eht[yyval] = h = b + max(eht[p1]-ebase[p1],
+ eht[yyval] = h = b + max(eht[p1]-ebase[p1],
eht[p2]-ebase[p2]);
ebase[yyval] = b;
dprintf(".\tS%d <- %d %d; b=%g, h=%g\n", (int)yyval, p1, p2, b, h);
diff --git a/src/cmd/eqn/font.c b/src/cmd/eqn/font.c
index 3fb01119..961c7bb2 100644
--- a/src/cmd/eqn/font.c
+++ b/src/cmd/eqn/font.c
@@ -51,7 +51,7 @@ void globfont(void)
} else if (strcmp(temp, "R") == 0 || strncmp(temp, "ro", 2) == 0) {
ft = ROM;
strcpy(temp, "1");
- } else {
+ } else {
ft = ROM; /* assume it's a roman style */
}
ftstack[0].ft = ft;
diff --git a/src/cmd/eqn/fromto.c b/src/cmd/eqn/fromto.c
index cf9c96e5..5dda828c 100644
--- a/src/cmd/eqn/fromto.c
+++ b/src/cmd/eqn/fromto.c
@@ -28,21 +28,21 @@ void fromto(int p1, int p2, int p3)
printf(".ds %d ", (int)yyval); /* bottom of middle box */
if (p2 > 0) {
t = eht[p2]-ebase[p2]+b1;
- printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'%s\\*(%d%s",
+ printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'%s\\*(%d%s",
REL(t,ps), (int)yyval, p2, DPS(ps,subps), p2, DPS(subps,ps));
- printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n",
+ printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n",
(int)yyval, p2, REL(-t,ps));
}
- printf("\\h'\\n(%du-\\n(%du/2u'\\*(%d\\h'\\n(%du-\\n(%du/2u'\\\n",
+ printf("\\h'\\n(%du-\\n(%du/2u'\\*(%d\\h'\\n(%du-\\n(%du/2u'\\\n",
(int)yyval, p1, p1, (int)yyval, p1);
if (p3 >0) {
t = h1-b1+ebase[p3];
- printf("\\v'%gm'\\h'-\\n(%du-\\n(%du/2u'%s\\*(%d%s\\h'\\n(%du-\\n(%du/2u'\\v'%gm'\\\n",
+ printf("\\v'%gm'\\h'-\\n(%du-\\n(%du/2u'%s\\*(%d%s\\h'\\n(%du-\\n(%du/2u'\\v'%gm'\\\n",
REL(-t,ps), (int)yyval, p3, DPS(ps,subps), p3, DPS(subps,ps), (int)yyval, p3, REL(t,ps));
}
printf("\n");
ebase[yyval] = b + b1;
- dprintf(".\tS%d <- %d from %d to %d; h=%g b=%g\n",
+ dprintf(".\tS%d <- %d from %d to %d; h=%g b=%g\n",
(int)yyval, p1, p2, p3, eht[yyval], ebase[yyval]);
sfree(p1);
if (p2 > 0)
diff --git a/src/cmd/eqn/funny.c b/src/cmd/eqn/funny.c
index 3d0cef74..f5e42758 100644
--- a/src/cmd/eqn/funny.c
+++ b/src/cmd/eqn/funny.c
@@ -24,7 +24,7 @@ void funny(int n)
printf(".ds %d %s\n", (int)yyval, f);
eht[yyval] = EM(1.0, ps+Funnyps) - EM(Funnyht, ps);
ebase[yyval] = EM(Funnybase, ps);
- dprintf(".\tS%d <- %s; h=%g b=%g\n",
+ dprintf(".\tS%d <- %s; h=%g b=%g\n",
(int)yyval, f, eht[yyval], ebase[yyval]);
lfont[yyval] = rfont[yyval] = ROM;
}
diff --git a/src/cmd/eqn/main.c b/src/cmd/eqn/main.c
index 25f7eee3..816218c0 100644
--- a/src/cmd/eqn/main.c
+++ b/src/cmd/eqn/main.c
@@ -188,7 +188,7 @@ void inline(void)
printf(".lf %d\n", curfile->lineno+1);
if (curfile->lineno > n+3)
fprintf(stderr, "eqn warning: multi-line %c...%c, file %s:%d,%d\n",
- lefteq, righteq, curfile->fname, n, curfile->lineno);
+ lefteq, righteq, curfile->fname, n, curfile->lineno);
sfree(ds);
if (sz1) sfree(sz1);
}
@@ -276,7 +276,7 @@ char *ABSPS(int dn) /* absolute size dn in printable form \sd or \s(dd (dd >= 40
} else {
*lb++ = dn + '0';
}
- *lb++ = '\0';
+ *lb++ = '\0';
return p;
}
@@ -307,7 +307,7 @@ char *DPS(int f, int t) /* delta ps (t-f) in printable form \s+d or \s-d or \s+-
} else {
*lb++ = dn + '0';
}
- *lb++ = '\0';
+ *lb++ = '\0';
return p;
}
diff --git a/src/cmd/eqn/mbwc.c b/src/cmd/eqn/mbwc.c
index c97b036c..39763508 100644
--- a/src/cmd/eqn/mbwc.c
+++ b/src/cmd/eqn/mbwc.c
@@ -162,4 +162,3 @@ wcstombs(char *s, const wchar_t *pwcs, size_t n)
}
return p-s;
}
-
diff --git a/src/cmd/eqn/move.c b/src/cmd/eqn/move.c
index 06448add..b6462c78 100644
--- a/src/cmd/eqn/move.c
+++ b/src/cmd/eqn/move.c
@@ -14,6 +14,6 @@ void move(int dir, int amt, int p)
printf("\\v'-%gm'\\*(%d\\v'%gm'\n", a, p, a);
else if (dir == DOWN)
printf("\\v'%gm'\\*(%d\\v'-%gm'\n", a, p, a);
- dprintf(".\tmove %d dir %d amt %g; h=%g b=%g\n",
+ dprintf(".\tmove %d dir %d amt %g; h=%g b=%g\n",
p, dir, a, eht[yyval], ebase[yyval]);
}
diff --git a/src/cmd/eqn/over.c b/src/cmd/eqn/over.c
index 575d1c8e..0d519dd5 100644
--- a/src/cmd/eqn/over.c
+++ b/src/cmd/eqn/over.c
@@ -11,7 +11,7 @@ void boverb(int p1, int p2)
d = EM(Overgap, ps);
h = eht[p1] + eht[p2] + d;
b = eht[p2] - d;
- dprintf(".\tS%d <- %d over %d; b=%g, h=%g\n",
+ dprintf(".\tS%d <- %d over %d; b=%g, h=%g\n",
(int)yyval, p1, p2, b, h);
nrwid(p1, ps, p1);
nrwid(p2, ps, p2);
@@ -19,12 +19,12 @@ void boverb(int p1, int p2)
printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", p2, treg, treg, p2);
printf(".nr %d \\n(%d+%gm\n", treg, treg, Overwid);
d2 = eht[p2]-ebase[p2]-d; /* denom */
- printf(".ds %d \\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d\\v'%gm'\\\n",
+ printf(".ds %d \\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d\\v'%gm'\\\n",
(int)yyval, REL(d2,ps), treg, p2, p2, REL(-d2,ps));
d1 = 2 * d + ebase[p1]; /* num */
- printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\*(%d\\v'%gm'\\\n",
+ printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\*(%d\\v'%gm'\\\n",
p2, p1, REL(-d1,ps), p1, REL(d1,ps));
- printf("\\h'-\\n(%du-\\n(%du/2u+%gm'\\v'%gm'\\l'\\n(%du-%gm'\\h'%gm'\\v'%gm'\n",
+ printf("\\h'-\\n(%du-\\n(%du/2u+%gm'\\v'%gm'\\l'\\n(%du-%gm'\\h'%gm'\\v'%gm'\n",
treg, p1, Overline, REL(-d,ps),
treg, 2*Overline, Overline, REL(d,ps));
ebase[yyval] = b;
diff --git a/src/cmd/eqn/paren.c b/src/cmd/eqn/paren.c
index 4a9fea0b..e7d7d7ce 100644
--- a/src/cmd/eqn/paren.c
+++ b/src/cmd/eqn/paren.c
@@ -121,7 +121,7 @@ void paren(int leftc, int p1, int rightc)
printf("\\v'%gm'", -bv);
}
printf("\n");
- dprintf(".\tcurly: h=%g b=%g n=%d v=%g l=%c, r=%c\n",
+ dprintf(".\tcurly: h=%g b=%g n=%d v=%g l=%c, r=%c\n",
eht[yyval], ebase[yyval], n, v, leftc, rightc);
}
diff --git a/src/cmd/eqn/pile.c b/src/cmd/eqn/pile.c
index a8901721..8052e5c4 100644
--- a/src/cmd/eqn/pile.c
+++ b/src/cmd/eqn/pile.c
@@ -41,34 +41,34 @@ void pile(int oct)
printf(".nr %d \\n(%d\n", (int)yyval, lp[p1]);
for (i = p1+1; i < p2; i++) {
nrwid(lp[i], ps, lp[i]);
- printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n",
+ printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n",
lp[i], (int)yyval, (int)yyval, lp[i]);
}
- printf(".ds %d \\v'%gm'\\h'%du*\\n(%du'\\\n", (int)yyval, REL(ebase[yyval],ps),
+ printf(".ds %d \\v'%gm'\\h'%du*\\n(%du'\\\n", (int)yyval, REL(ebase[yyval],ps),
type==RCOL ? 1 : 0, (int)yyval);
sb = 0; /* sum of box hts */
for (i = p2-1; i >= p1; i--) {
bi = sb + ebase[lp[i]];
switch (type) {
case LCOL:
- printf("\\v'%gm'\\*(%d\\h'-\\n(%du'\\v'%gm'\\\n",
+ printf("\\v'%gm'\\*(%d\\h'-\\n(%du'\\v'%gm'\\\n",
REL(-bi,ps), lp[i], lp[i], REL(bi,ps));
break;
case RCOL:
- printf("\\v'%gm'\\h'-\\n(%du'\\*(%d\\v'%gm'\\\n",
+ printf("\\v'%gm'\\h'-\\n(%du'\\*(%d\\v'%gm'\\\n",
REL(-bi,ps), lp[i], lp[i], REL(bi,ps));
break;
case CCOL:
case COL:
- printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d",
+ printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d",
REL(-bi,ps), (int)yyval, lp[i], lp[i]);
- printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n",
+ printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n",
(int)yyval, lp[i], REL(bi,ps));
break;
}
sb += eht[lp[i]] + gap;
}
- printf("\\v'%gm'\\h'%du*\\n(%du'\n", REL(-ebase[yyval],ps),
+ printf("\\v'%gm'\\h'%du*\\n(%du'\n", REL(-ebase[yyval],ps),
type!=RCOL ? 1 : 0, (int)yyval);
for (i = p1; i < p2; i++)
sfree(lp[i]);
diff --git a/src/cmd/eqn/shift.c b/src/cmd/eqn/shift.c
index 970c13e7..34f04080 100644
--- a/src/cmd/eqn/shift.c
+++ b/src/cmd/eqn/shift.c
@@ -56,10 +56,10 @@ void bshiftb(int p1, int dir, int p2)
sh1 = pad(n);
rclass[p1] = rclass[p2]; /* OTHER leaves too much after sup */
}
- dprintf(".\tS%d <- %d shift %g %d; b=%g, h=%g, ps=%d, subps=%d\n",
+ dprintf(".\tS%d <- %d shift %g %d; b=%g, h=%g, ps=%d, subps=%d\n",
(int)yyval, p1, shval, p2, ebase[yyval], eht[yyval], ps, subps);
sh2 = Sub2space; /* was Sub2space; */
- printf(".as %d \\v'%gm'%s%s\\*(%d%s%s\\v'%gm'\n",
+ printf(".as %d \\v'%gm'%s%s\\*(%d%s%s\\v'%gm'\n",
(int)yyval, REL(shval,ps), DPS(ps,subps), sh1, p2,
DPS(subps,ps), sh2, REL(-shval,ps));
rfont[p1] = 0;
@@ -105,9 +105,9 @@ void shift2(int p1, int p2, int p3)
nrwid(p3, subps, p3);
printf(".nr %d \\n(%d\n", treg, p3);
printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", p2, treg, treg, p2);
- printf(".as %d %s\\v'%gm'\\*(%d\\v'%gm'\\h'-\\n(%du'\\\n",
+ printf(".as %d %s\\v'%gm'\\*(%d\\v'%gm'\\h'-\\n(%du'\\\n",
p1, DPS(ps,subps), REL(subsh,subps), p2, REL(-subsh,subps), p2);
- printf("\\v'%gm'\\*(%d\\v'%gm'\\h'-\\n(%du+\\n(%du'%s%s\n",
+ printf("\\v'%gm'\\*(%d\\v'%gm'\\h'-\\n(%du+\\n(%du'%s%s\n",
REL(supsh,subps), p3, REL(-supsh,subps), p3, treg, DPS(subps,ps), Sub2space);
if (rfont[p2] == ITAL)
rfont[yyval] = 0; /* lie */
diff --git a/src/cmd/eqn/size.c b/src/cmd/eqn/size.c
index 01837e14..3e57b4de 100644
--- a/src/cmd/eqn/size.c
+++ b/src/cmd/eqn/size.c
@@ -29,7 +29,7 @@ void size(int p1, int p2)
{
/* old size in p1, new in ps */
yyval = p2;
- dprintf(".\tS%d <- \\s%d %d \\s%d; b=%g, h=%g\n",
+ dprintf(".\tS%d <- \\s%d %d \\s%d; b=%g, h=%g\n",
(int)yyval, ps, p2, p1, ebase[yyval], eht[yyval]);
if (szstack[nszstack] != 0) {
printf(".ds %d %s\\*(%d\\s\\n(%d\n", (int)yyval, ABSPS(ps), p2, 99-nszstack);
diff --git a/src/cmd/eqn/sqrt.c b/src/cmd/eqn/sqrt.c
index 69359b67..0963fe45 100644
--- a/src/cmd/eqn/sqrt.c
+++ b/src/cmd/eqn/sqrt.c
@@ -17,7 +17,7 @@ void sqrt(int p2)
eht[yyval] = EM(1.15, nps);
else /* DEV202, DEVPOST */
eht[yyval] = EM(1.15, nps);
- dprintf(".\tS%d <- sqrt S%d;b=%g, h=%g, nps=%d\n",
+ dprintf(".\tS%d <- sqrt S%d;b=%g, h=%g, nps=%d\n",
(int)yyval, p2, ebase[yyval], eht[yyval], nps);
printf(".as %d \\|\n", (int)yyval);
nrwid(p2, ps, p2);
diff --git a/src/cmd/eqn/text.c b/src/cmd/eqn/text.c
index c016cca0..4ca0bbd9 100644
--- a/src/cmd/eqn/text.c
+++ b/src/cmd/eqn/text.c
@@ -193,7 +193,7 @@ trans(int c, char *p1)
cadd(c);
psp++;
} else {
- cadd(c);
+ cadd(c);
}
return f;
case '-':
@@ -263,7 +263,7 @@ char *pad(int n) /* return the padding as a string */
if (n < 0) {
sprintf(buf, "\\h'-%du*\\w'\\^'u'", -n);
return buf;
- }
+ }
for ( ; n > 1; n -= 2)
strcat(buf, "\\|");
if (n > 0)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 23:33:35 +0000