aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cmd/eqn/eqnbox.c4
-rw-r--r--src/cmd/eqn/fromto.c14
-rw-r--r--src/cmd/eqn/funny.c4
-rw-r--r--src/cmd/eqn/integral.c2
-rw-r--r--src/cmd/eqn/mark.c2
-rw-r--r--src/cmd/eqn/matrix.c2
-rw-r--r--src/cmd/eqn/move.c2
-rw-r--r--src/cmd/eqn/over.c4
-rw-r--r--src/cmd/eqn/paren.c2
-rw-r--r--src/cmd/eqn/pile.c14
-rw-r--r--src/cmd/eqn/size.c4
-rw-r--r--src/cmd/eqn/sqrt.c4
-rw-r--r--src/cmd/eqn/text.c4
13 files changed, 31 insertions, 31 deletions
diff --git a/src/cmd/eqn/eqnbox.c b/src/cmd/eqn/eqnbox.c
index 1cf2579b..6ec013bb 100644
--- a/src/cmd/eqn/eqnbox.c
+++ b/src/cmd/eqn/eqnbox.c
@@ -11,13 +11,13 @@ void eqnbox(int p1, int p2, int lu)
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", yyval, p1, p2, b, h);
+ dprintf(".\tS%d <- %d %d; b=%g, h=%g\n", (int)yyval, p1, p2, b, h);
sh = pad(class[rclass[p1]][lclass[p2]]);
if (lu) {
printf(".nr %d \\w'\\*(%d%s'\n", p1, p1, sh);
printf(".ds %d \\h'|\\n(09u-\\n(%du'\\*(%d\n", p1, p1, p1);
}
- printf(".as %d \"%s\\*(%d\n", yyval, sh, p2);
+ printf(".as %d \"%s\\*(%d\n", (int)yyval, sh, p2);
rfont[p1] = rfont[p2];
rclass[p1] = rclass[p2];
sfree(p2);
diff --git a/src/cmd/eqn/fromto.c b/src/cmd/eqn/fromto.c
index 2d4d7f74..88677b22 100644
--- a/src/cmd/eqn/fromto.c
+++ b/src/cmd/eqn/fromto.c
@@ -13,32 +13,32 @@ void fromto(int p1, int p2, int p3)
subps = ps;
ps += deltaps;
nrwid(p1, ps, p1);
- printf(".nr %d \\n(%d\n", yyval, p1);
+ printf(".nr %d \\n(%d\n", (int)yyval, p1);
if (p2 > 0) {
nrwid(p2, subps, p2);
- printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", p2, yyval, yyval, p2);
+ printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", p2, (int)yyval, (int)yyval, p2);
eht[yyval] += eht[p2];
b = eht[p2];
}
if (p3 > 0) {
nrwid(p3, subps, p3);
- printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", p3, yyval, yyval, p3);
+ printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", p3, (int)yyval, (int)yyval, p3);
eht[yyval] += eht[p3];
}
- printf(".ds %d ", yyval); /* bottom of middle box */
+ 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",
- REL(t,ps), yyval, p2, DPS(ps,subps), p2, DPS(subps,ps));
+ REL(t,ps), (int)yyval, p2, DPS(ps,subps), p2, DPS(subps,ps));
printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n",
yyval, p2, REL(-t,ps));
}
printf("\\h'\\n(%du-\\n(%du/2u'\\*(%d\\h'\\n(%du-\\n(%du/2u'\\\n",
- yyval, p1, p1, yyval, p1);
+ 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",
- REL(-t,ps), yyval, p3, DPS(ps,subps), p3, DPS(subps,ps), yyval, p3, REL(t,ps));
+ 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;
diff --git a/src/cmd/eqn/funny.c b/src/cmd/eqn/funny.c
index 85955fce..3d0cef74 100644
--- a/src/cmd/eqn/funny.c
+++ b/src/cmd/eqn/funny.c
@@ -21,10 +21,10 @@ void funny(int n)
default:
ERROR "funny type %d in funny", n FATAL;
}
- printf(".ds %d %s\n", yyval, f);
+ 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",
- yyval, f, eht[yyval], ebase[yyval]);
+ (int)yyval, f, eht[yyval], ebase[yyval]);
lfont[yyval] = rfont[yyval] = ROM;
}
diff --git a/src/cmd/eqn/integral.c b/src/cmd/eqn/integral.c
index 2b1c9e3f..4bdb73d6 100644
--- a/src/cmd/eqn/integral.c
+++ b/src/cmd/eqn/integral.c
@@ -23,7 +23,7 @@ void integral(int p, int p1, int p2)
void setintegral(void)
{
yyval = salloc();
- printf(".ds %d %s\n", yyval, lookup(deftbl, "int_def")->cval);
+ printf(".ds %d %s\n", (int)yyval, lookup(deftbl, "int_def")->cval);
eht[yyval] = EM(Intht, ps+Intps);
ebase[yyval] = EM(Intbase, ps);
lfont[yyval] = rfont[yyval] = ROM;
diff --git a/src/cmd/eqn/mark.c b/src/cmd/eqn/mark.c
index f02e6779..e6bd9022 100644
--- a/src/cmd/eqn/mark.c
+++ b/src/cmd/eqn/mark.c
@@ -13,7 +13,7 @@ void lineup(int p1)
markline = 2;
if (p1 == 0) {
yyval = salloc();
- printf(".ds %d \\h'|\\n(09u'\n", yyval);
+ printf(".ds %d \\h'|\\n(09u'\n", (int)yyval);
}
dprintf(".\tlineup %d\n", p1);
}
diff --git a/src/cmd/eqn/matrix.c b/src/cmd/eqn/matrix.c
index c3eddedf..156dd175 100644
--- a/src/cmd/eqn/matrix.c
+++ b/src/cmd/eqn/matrix.c
@@ -70,7 +70,7 @@ void matrix(int oct) /* matrix is list of columns */
lfont[yyval] = rfont[yyval] = 0;
dprintf(".\tmatrix S%d: r=%d, c=%d, h=%g, b=%g\n",
yyval,nrow,ncol,eht[yyval],ebase[yyval]);
- printf(".ds %d \"", yyval);
+ printf(".ds %d \"", (int)yyval);
for( i=0; i<ncol; i++ ) {
printf("\\*(%d%s", val[i], i==ncol-1 ? "" : space);
sfree(val[i]);
diff --git a/src/cmd/eqn/move.c b/src/cmd/eqn/move.c
index a622487c..06448add 100644
--- a/src/cmd/eqn/move.c
+++ b/src/cmd/eqn/move.c
@@ -7,7 +7,7 @@ void move(int dir, int amt, int p)
yyval = p;
a = EM(amt/100.0, ps);
- printf(".ds %d ", yyval);
+ printf(".ds %d ", (int)yyval);
if (dir == FWD || dir == BACK)
printf("\\h'%s%gm'\\*(%d\n", (dir==BACK) ? "-" : "", a, p);
else if (dir == UP)
diff --git a/src/cmd/eqn/over.c b/src/cmd/eqn/over.c
index 2794a739..575d1c8e 100644
--- a/src/cmd/eqn/over.c
+++ b/src/cmd/eqn/over.c
@@ -12,7 +12,7 @@ void boverb(int p1, int p2)
h = eht[p1] + eht[p2] + d;
b = eht[p2] - d;
dprintf(".\tS%d <- %d over %d; b=%g, h=%g\n",
- yyval, p1, p2, b, h);
+ (int)yyval, p1, p2, b, h);
nrwid(p1, ps, p1);
nrwid(p2, ps, p2);
printf(".nr %d \\n(%d\n", treg, p1);
@@ -20,7 +20,7 @@ void boverb(int p1, int 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",
- yyval, REL(d2,ps), treg, p2, p2, REL(-d2,ps));
+ (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",
p2, p1, REL(-d1,ps), p1, REL(d1,ps));
diff --git a/src/cmd/eqn/paren.c b/src/cmd/eqn/paren.c
index 01941e32..4a9fea0b 100644
--- a/src/cmd/eqn/paren.c
+++ b/src/cmd/eqn/paren.c
@@ -36,7 +36,7 @@ void paren(int leftc, int p1, int rightc)
else
v = 0; /* don't shift it at all */
- printf(".ds %d \\^", yyval); /* was \| */
+ printf(".ds %d \\^", (int)yyval); /* was \| */
if (bv)
printf("\\v'%gm'", bv);
switch (leftc) {
diff --git a/src/cmd/eqn/pile.c b/src/cmd/eqn/pile.c
index a2d16239..0d2245c6 100644
--- a/src/cmd/eqn/pile.c
+++ b/src/cmd/eqn/pile.c
@@ -32,20 +32,20 @@ void pile(int oct)
ebase[yyval] = (nlist%2) ? b + ebase[lp[mid]]
: b - EM(Pilebase, ps) - gap;
if (dbg) {
- printf(".\tS%d <- %d pile of:", yyval, type);
+ printf(".\tS%d <- %d pile of:", (int)yyval, type);
for (i = p1; i < p2; i++)
printf(" S%d", lp[i]);
printf("; h=%g b=%g\n", eht[yyval], ebase[yyval]);
}
nrwid(lp[p1], ps, lp[p1]);
- printf(".nr %d \\n(%d\n", yyval, lp[p1]);
+ 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",
- lp[i], yyval, yyval, lp[i]);
+ lp[i], (int)yyval, (int)yyval, lp[i]);
}
- printf(".ds %d \\v'%gm'\\h'%du*\\n(%du'\\\n", yyval, REL(ebase[yyval],ps),
- type==RCOL ? 1 : 0, yyval);
+ 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]];
@@ -61,7 +61,7 @@ void pile(int oct)
case CCOL:
case COL:
printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d",
- REL(-bi,ps), yyval, lp[i], lp[i]);
+ REL(-bi,ps), (int)yyval, lp[i], lp[i]);
printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n",
yyval, lp[i], REL(bi,ps));
break;
@@ -69,7 +69,7 @@ void pile(int oct)
sb += eht[lp[i]] + gap;
}
printf("\\v'%gm'\\h'%du*\\n(%du'\n", REL(-ebase[yyval],ps),
- type!=RCOL ? 1 : 0, yyval);
+ type!=RCOL ? 1 : 0, (int)yyval);
for (i = p1; i < p2; i++)
sfree(lp[i]);
lfont[yyval] = rfont[yyval] = 0;
diff --git a/src/cmd/eqn/size.c b/src/cmd/eqn/size.c
index d6864312..b6bfae51 100644
--- a/src/cmd/eqn/size.c
+++ b/src/cmd/eqn/size.c
@@ -32,9 +32,9 @@ void size(int p1, int p2)
dprintf(".\tS%d <- \\s%d %d \\s%d; b=%g, h=%g\n",
yyval, ps, p2, p1, ebase[yyval], eht[yyval]);
if (szstack[nszstack] != 0) {
- printf(".ds %d %s\\*(%d\\s\\n(%d\n", yyval, ABSPS(ps), p2, 99-nszstack);
+ printf(".ds %d %s\\*(%d\\s\\n(%d\n", (int)yyval, ABSPS(ps), p2, 99-nszstack);
} else
- printf(".ds %d %s\\*(%d%s\n", yyval, DPS(p1,ps), p2, DPS(ps,p1));
+ printf(".ds %d %s\\*(%d%s\n", (int)yyval, DPS(p1,ps), p2, DPS(ps,p1));
nszstack--;
ps = p1;
}
diff --git a/src/cmd/eqn/sqrt.c b/src/cmd/eqn/sqrt.c
index 391d924e..667c3be7 100644
--- a/src/cmd/eqn/sqrt.c
+++ b/src/cmd/eqn/sqrt.c
@@ -19,13 +19,13 @@ void sqrt(int p2)
eht[yyval] = EM(1.15, nps);
dprintf(".\tS%d <- sqrt S%d;b=%g, h=%g, nps=%d\n",
yyval, p2, ebase[yyval], eht[yyval], nps);
- printf(".as %d \\|\n", yyval);
+ printf(".as %d \\|\n", (int)yyval);
nrwid(p2, ps, p2);
if (af++ == 0)
printf(".af 10 01\n"); /* make it two digits when it prints */
printf(".nr 10 %.3fu*\\n(.su/10\n", 9.2*eht[p2]); /* this nonsense */
/* guesses point size corresponding to height of stuff */
- printf(".ds %d \\v'%gm'\\s(\\n(10", yyval, REL(ebase[p2],ps));
+ printf(".ds %d \\v'%gm'\\s(\\n(10", (int)yyval, REL(ebase[p2],ps));
if (ttype == DEVCAT || ttype == DEVAPS)
printf("\\v'-.2m'\\(sr\\l'\\n(%du\\(rn'\\v'.2m'", p2);
else /* DEV202, DEVPOST so far */
diff --git a/src/cmd/eqn/text.c b/src/cmd/eqn/text.c
index eef88eea..c016cca0 100644
--- a/src/cmd/eqn/text.c
+++ b/src/cmd/eqn/text.c
@@ -108,8 +108,8 @@ void text(int t, char *p1) /* convert text string p1 of type t */
rclass[yyval] = nclass;
}
dprintf(".\t%dtext: S%d <- %s; b=%g,h=%g,lf=%c,rf=%c,ps=%d\n",
- t, yyval, p, ebase[yyval], eht[yyval], lfont[yyval], rfont[yyval], ps);
- printf(".ds %d \"%s\n", yyval, p);
+ t, (int)yyval, p, ebase[yyval], eht[yyval], lfont[yyval], rfont[yyval], ps);
+ printf(".ds %d \"%s\n", (int)yyval, p);
}
int isalpharune(int c)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 20:28:55 +0000