summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/triptrap/mftrap.diffs
blob: 35b00ea2c2f355971600c040ca067c850cab1b9f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
>>> Running TRAP test for Metafont.
>>> See SRCDIR/triptrap/mftrap.diffs for example of acceptable diffs.
+ ln -s SRCDIR/triptrap/trap.mf .
+ ./mf --progname=inimf
+ test '!' -s trap.base
+ mv trap.log mftrapin.log
+ diff SRCDIR/triptrap/mftrapin.log mftrapin.log
1c1
< This is METAFONT, Version 2.7182818 (INIMF)  7 JAN 2014 17:51
---
> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF)  12 APR 2015 16:22
150c150
< String usage 26&83 (891&11438 still untouched)
---
> String usage 30&98 (6386&79448 still untouched)
176,177c176,177
<  (preloaded base=trap 2014.1.7)
< 1117 strings of total length 20614
---
>  (preloaded base=trap 2015.4.12)
> 1123 strings of total length 20613
+ ./mf --progname=inimf
+ mv trap.log mftrap.log
+ mv trap.tfm mftrap.tfm
+ diff SRCDIR/triptrap/mftrap.fot mftrap.fot
1,3c1,2
< This is METAFONT, Version 2.7182818 (INIMF)
< ** &trap  trap 
< (trap.mf
---
> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF)
> **(trap.mf
39c38
< String usage 41&161 (815&7634 still untouched)
---
> String usage 50&202 (6300&75594 still untouched)
+ diff SRCDIR/triptrap/mftrap.log mftrap.log
1c1
< This is METAFONT, Version 2.7182818 (preloaded base=trap 2014.1.7)  7 JAN 2014 18:11
---
> This is METAFONT, Version 2.7182818 (TeX Live 2015) (preloaded base=trap 2015.4.12)  12 APR 2015 16:22
1825c1825
< String usage 24&92 (858&11309 still untouched)
---
> String usage 30&119 (6346&79262 still untouched)
3693,3695c3693,3695
< xpart %CAPSULE1359=xx
< %CAPSULE1367=2yy-2
< %CAPSULE1375 = 3.3333xx+3.3333
---
> xpart %CAPSULE1370=xx
> %CAPSULE1378=2yy-2
> %CAPSULE1386 = 3.3333xx+3.3333
3755,3757c3755,3757
< xpart %CAPSULE1049 = 8000o2-4000o1+1000o3+9
< xpart %CAPSULE1383=xpart '
< ypart %CAPSULE1383=ypart '
---
> xpart %CAPSULE604 = 8000o2-4000o1+1000o3+9
> xpart %CAPSULE1394=xpart '
> ypart %CAPSULE1394=ypart '
3760,3761c3760,3761
< ### 4000o1 = -xpart %CAPSULE1049+8000o2+1000o3+9
< ### -4.87383o2 = -oo-0.0004xpart %CAPSULE1049+0.39673o3-17.99643
---
> ### 4000o1 = -xpart %CAPSULE604+8000o2+1000o3+9
> ### -4.87383o2 = -oo-0.0004xpart %CAPSULE604+0.39673o3-17.99643
3768c3768
< ### -alfa=-xpart %CAPSULE1494
---
> ### -alfa=-xpart %CAPSULE368
3770,3771c3770,3771
< {xpart((xpart %CAPSULE1494,0))}
< ### -xpart %CAPSULE17=-%CAPSULE1176
---
> {xpart((xpart %CAPSULE368,0))}
> ### -xpart %CAPSULE17=-%CAPSULE1376
3773,3775c3773,3775
< {(%CAPSULE382)+(%CAPSULE1176)}
< ### -%CAPSULE382=-%CAPSULE1893+%CAPSULE1176
< ### -%CAPSULE1893=-ypart %CAPSULE1049
---
> {(%CAPSULE382)+(%CAPSULE1376)}
> ### -%CAPSULE382=-%CAPSULE1364+%CAPSULE1376
> ### -%CAPSULE1364=-ypart %CAPSULE604
3780c3780
< ### p$=-ypart %CAPSULE604+1
---
> ### p$=-ypart %CAPSULE1360+1
3782,3793c3782,3793
< {(2/3)*((-ypart %CAPSULE604+1,ypart %CAPSULE604))}
< ### ypart %CAPSULE604=-xpart %CAPSULE604+1
< ### -0.66667xpart %CAPSULE604=-xpart %CAPSULE1889
< {-((xpart %CAPSULE1889,-xpart %CAPSULE1889+0.66667))}
< ### xpart %CAPSULE1889=-xpart %CAPSULE1172
< {((xpart %CAPSULE1049,ypart %CAPSULE1049))=((xpart %CAPSULE1172,-xpart %
< CAPSULE1172-0.66667))}
< ## xpart %CAPSULE1172=-ypart %CAPSULE1049-0.66667
< ## ypart %CAPSULE1049=-xpart %CAPSULE1049-0.66667
< ### -xpart %CAPSULE1049=-xpart %CAPSULE1172
< {((xpart ',ypart '))=((xpart %CAPSULE1172,-xpart %CAPSULE1172-0.66667))}
< ## xpart %CAPSULE1172=-ypart '-0.66667
---
> {(2/3)*((-ypart %CAPSULE1360+1,ypart %CAPSULE1360))}
> ### ypart %CAPSULE1360=-xpart %CAPSULE1360+1
> ### -0.66667xpart %CAPSULE1360=-xpart %CAPSULE1744
> {-((xpart %CAPSULE1744,-xpart %CAPSULE1744+0.66667))}
> ### xpart %CAPSULE1744=-xpart %CAPSULE1675
> {((xpart %CAPSULE604,ypart %CAPSULE604))=((xpart %CAPSULE1675,-xpart %CA
> PSULE1675-0.66667))}
> ## xpart %CAPSULE1675=-ypart %CAPSULE604-0.66667
> ## ypart %CAPSULE604=-xpart %CAPSULE604-0.66667
> ### -xpart %CAPSULE604=-xpart %CAPSULE1675
> {((xpart ',ypart '))=((xpart %CAPSULE1675,-xpart %CAPSULE1675-0.66667))}
> ## xpart %CAPSULE1675=-ypart '-0.66667
3799c3799
< ### -ooo=-%CAPSULE1494
---
> ### -ooo=-%CAPSULE1051
3801,3810c3801,3810
< {(%CAPSULE1494)+(1)}
< ### -%CAPSULE1494=-%CAPSULE1350+1
< {(1/2)*(%CAPSULE1350)}
< ### -0.5%CAPSULE1350=-%CAPSULE1367
< {-(%CAPSULE1367)}
< ### %CAPSULE1367=-%CAPSULE1893
< {(2)*(%CAPSULE1893)}
< ### -2%CAPSULE1893=-%CAPSULE1885
< {(-0.5%CAPSULE1885-0.5)=(%CAPSULE1885)}
< ## %CAPSULE1885=-0.33333
---
> {(%CAPSULE1051)+(1)}
> ### -%CAPSULE1051=-%CAPSULE1378+1
> {(1/2)*(%CAPSULE1378)}
> ### -0.5%CAPSULE1378=-%CAPSULE1370
> {-(%CAPSULE1370)}
> ### %CAPSULE1370=-%CAPSULE1362
> {(2)*(%CAPSULE1362)}
> ### -2%CAPSULE1362=-%CAPSULE1354
> {(-0.5%CAPSULE1354-0.5)=(%CAPSULE1354)}
> ## %CAPSULE1354=-0.33333
4235c4235
< String usage 41&161 (815&7634 still untouched)
---
> String usage 50&202 (6300&75594 still untouched)
4251,4252c4251,4252
<  68 strings out of 883
<  3752 string characters out of 11386
---
>  77 strings out of 6377
>  3793 string characters out of 79387
4254,4255c4254,4255
<  289 symbolic tokens out of 2100
<  8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b
---
>  289 symbolic tokens out of 9500
>  8i,43n,14r,8p,167b stack positions out of 300i,300n,1000r,150p,500b
4263c4263
<   out of 256w,16h,16d,64i,5000l,500k,256e,50p)
---
>   out of 256w,16h,16d,64i,15000l,2500k,256e,60p)
+ ./tftopl ./mftrap.tfm mftrap.pl
+ diff SRCDIR/triptrap/mftrap.pl mftrap.pl
+ ./gftype -m -i ./trap.72270gf
+ diff SRCDIR/triptrap/trap.typ trap.typ
1c1
< This is GFtype, Version 3.1
---
> This is GFtype, Version 3.1 (TeX Live 2015)
3c3
< ' METAFONT output 2014.01.07:1811'
---
> ' METAFONT output 2015.04.12:1622'
+ for f in mftrapin.log mftrap.fot mftrap.log trap.typ
+ sed SRCDIR/triptrap/mftrapin.log -f filter
+ sed mftrapin.log -f filter
+ diff a/mftrapin.log b/mftrapin.log
+ for f in mftrapin.log mftrap.fot mftrap.log trap.typ
+ sed SRCDIR/triptrap/mftrap.fot -f filter
+ sed mftrap.fot -f filter
+ diff a/mftrap.fot b/mftrap.fot
+ for f in mftrapin.log mftrap.fot mftrap.log trap.typ
+ sed SRCDIR/triptrap/mftrap.log -f filter
+ sed mftrap.log -f filter
+ diff a/mftrap.log b/mftrap.log
+ for f in mftrapin.log mftrap.fot mftrap.log trap.typ
+ sed SRCDIR/triptrap/trap.typ -f filter
+ sed trap.typ -f filter
+ diff a/trap.typ b/trap.typ
+ :
+ echo '>>> All differences are acceptable.'
>>> All differences are acceptable.
PASS: mftraptest