Skip to content

Commit

Permalink
[updvitype] improve ofm support (#170)
Browse files Browse the repository at this point in the history
  • Loading branch information
@t-tk
t-tk committed Aug 13, 2024
1 parent 5dd3f23 commit 6a4bda4
Show file tree
Hide file tree
Showing 5 changed files with 433 additions and 11 deletions.
14 changes: 7 additions & 7 deletions source/texk/web2c/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3281,13 +3281,13 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
uptexdir/tests/gkhugeng.err uptexdir/tests/gk256g.tfm \
uptexdir/tests/gk256k.tfm uptexdir/uptrip/uptrip.diffs \
uptexdir/uptrip/texmf.cnf uptexdir/tests/up-ofm.tex \
uptexdir/tests/up-ofm.log uptexdir/tests/up-prim.tex \
uptexdir/tests/up-prim.log uptexdir/tests/lmr1.tex \
uptexdir/tests/up-lmr1.log uptexdir/tests/lmr2.tex \
uptexdir/tests/up-lmr2.log $(euptex_web_srcs) \
$(euptex_ch_srcs) euptexdir/euptex.defines euptexdir/COPYRIGHT \
euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
euptexdir/EUPTEX.txt $(euptex_tests) \
uptexdir/tests/up-ofm.log uptexdir/tests/up-ofma.typ \
uptexdir/tests/up-prim.tex uptexdir/tests/up-prim.log \
uptexdir/tests/lmr1.tex uptexdir/tests/up-lmr1.log \
uptexdir/tests/lmr2.tex uptexdir/tests/up-lmr2.log \
$(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \
euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \
euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \
euptexdir/eptrip/eptrip.log euptexdir/eptrip/eptrip.tex \
euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \
euptexdir/pdfprimitive.test \
Expand Down
3 changes: 2 additions & 1 deletion source/texk/web2c/uptexdir/am/uptex.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,8 @@ DISTCLEANFILES += uptests/xskipjfmp.*
## uptexdir/uptriptest
EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf
## uptexdir/uptex-ofm.test
EXTRA_DIST += uptexdir/tests/up-ofm.tex uptexdir/tests/up-ofm.log
EXTRA_DIST += uptexdir/tests/up-ofm.tex uptexdir/tests/up-ofm.log \
uptexdir/tests/up-ofma.typ
DISTCLEANFILES += up-ofm.*
## uptexdir/uptex-prim.test
EXTRA_DIST += uptexdir/tests/up-prim.tex uptexdir/tests/up-prim.log
Expand Down
327 changes: 327 additions & 0 deletions source/texk/web2c/uptexdir/tests/up-ofma.typ
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,327 @@
Options selected:
Starting page = *
Maximum number of pages = 1000000
Output level = 4 (the works)
Resolution = 300.00000000 pixels per inch
numerator/denominator=25400000/473628672
magnification=1000; 0.00006334 pixels per DVI unit
' TeX output 20XX.XX.XX'
Postamble starts at byte 579.
maxv=43725786, maxh=30785863, maxstackdepth=2, totalpages=1
Font 1: uctt10x (OFM level0)---loaded at size 655360 DVI units
Font 0: cmtt10---loaded at size 655360 DVI units

42: beginning of page 1
87: push
level 0:(h=0,v=0,w=0,x=0,y=0,z=0,hh=0,vv=0)
88: down3 -917504 v:=0-917504=-917504, vv:=-58
92: pop
level 0:(h=0,v=0,w=0,x=0,y=0,z=0,hh=0,vv=0)
93: down4 42152922 v:=0+42152922=42152922, vv:=2670
98: push
level 0:(h=0,v=42152922,w=0,x=0,y=0,z=0,hh=0,vv=2670)
99: down4 -41497562 v:=42152922-41497562=655360, vv:=42
104: push
level 1:(h=0,v=655360,w=0,x=0,y=0,z=0,hh=0,vv=42)
105: right3 1310720 h:=0+1310720=1310720, hh:=83
[ ]
109: fntdef1 0: cmtt10
131: fntnum0 current font is cmtt10
132: setchar33 ("21) h:=1310720+344061=1654781, hh:=105
133: setchar34 ("22) h:=1654781+344061=1998842, hh:=127
134: setchar35 ("23) h:=1998842+344061=2342903, hh:=149
135: setchar36 ("24) h:=2342903+344061=2686964, hh:=171
136: setchar37 ("25) h:=2686964+344061=3031025, hh:=193
[!"#$%]
137: pop
level 1:(h=0,v=655360,w=0,x=0,y=0,z=0,hh=0,vv=42)
138: y3 786432 v:=655360+786432=1441792, vv:=91
142: push
level 1:(h=0,v=1441792,w=0,x=0,y=786432,z=0,hh=0,vv=91)
143: right3 1310720 h:=0+1310720=1310720, hh:=83
147: setchar48 ("30) h:=1310720+344061=1654781, hh:=105
148: setchar49 ("31) h:=1654781+344061=1998842, hh:=127
149: setchar50 ("32) h:=1998842+344061=2342903, hh:=149
150: setchar51 ("33) h:=2342903+344061=2686964, hh:=171
151: setchar65 ("41) h:=2686964+344061=3031025, hh:=193
152: setchar66 ("42) h:=3031025+344061=3375086, hh:=215
153: setchar67 ("43) h:=3375086+344061=3719147, hh:=237
154: setchar100 ("64) h:=3719147+344061=4063208, hh:=259
155: setchar101 ("65) h:=4063208+344061=4407269, hh:=281
156: setchar102 ("66) h:=4407269+344061=4751330, hh:=303
[ 0123ABCdef]
157: pop
level 1:(h=0,v=1441792,w=0,x=0,y=786432,z=0,hh=0,vv=91)
158: y0 786432 v:=1441792+786432=2228224, vv:=141
159: push
level 1:(h=0,v=2228224,w=0,x=0,y=786432,z=0,hh=0,vv=141)
160: right3 1310720 h:=0+1310720=1310720, hh:=83
164: setchar48 ("30) h:=1310720+344061=1654781, hh:=105
165: setchar49 ("31) h:=1654781+344061=1998842, hh:=127
166: setchar50 ("32) h:=1998842+344061=2342903, hh:=149
167: setchar51 ("33) h:=2342903+344061=2686964, hh:=171
168: w3 344061 h:=2686964+344061=3031025, hh:=192
172: setchar65 ("41) h:=3031025+344061=3375086, hh:=214
173: setchar66 ("42) h:=3375086+344061=3719147, hh:=236
174: setchar67 ("43) h:=3719147+344061=4063208, hh:=258
175: w0 344061 h:=4063208+344061=4407269, hh:=279
176: setchar100 ("64) h:=4407269+344061=4751330, hh:=301
177: setchar101 ("65) h:=4751330+344061=5095391, hh:=323
178: setchar102 ("66) h:=5095391+344061=5439452, hh:=345
[ 0123 ABC def]
179: pop
level 1:(h=0,v=2228224,w=0,x=0,y=786432,z=0,hh=0,vv=141)
180: y0 786432 v:=2228224+786432=3014656, vv:=191
181: push
level 1:(h=0,v=3014656,w=0,x=0,y=786432,z=0,hh=0,vv=191)
182: right3 1310720 h:=0+1310720=1310720, hh:=83
[ ]
186: fntdef1 1: uctt10x
209: fntnum1 current font is uctt10x
210: setchar33 ("21) h:=1310720+344063=1654783, hh:=105
211: setchar34 ("22) h:=1654783+344063=1998846, hh:=127
212: setchar35 ("23) h:=1998846+344063=2342909, hh:=149
213: setchar36 ("24) h:=2342909+344063=2686972, hh:=171
214: setchar37 ("25) h:=2686972+344063=3031035, hh:=193
[!"#$%]
215: pop
level 1:(h=0,v=3014656,w=0,x=0,y=786432,z=0,hh=0,vv=191)
216: y0 786432 v:=3014656+786432=3801088, vv:=241
217: push
level 1:(h=0,v=3801088,w=0,x=0,y=786432,z=0,hh=0,vv=241)
218: right3 1310720 h:=0+1310720=1310720, hh:=83
222: setchar48 ("30) h:=1310720+344063=1654783, hh:=105
223: setchar49 ("31) h:=1654783+344063=1998846, hh:=127
224: setchar50 ("32) h:=1998846+344063=2342909, hh:=149
225: setchar51 ("33) h:=2342909+344063=2686972, hh:=171
226: setchar65 ("41) h:=2686972+344063=3031035, hh:=193
227: setchar66 ("42) h:=3031035+344063=3375098, hh:=215
228: setchar67 ("43) h:=3375098+344063=3719161, hh:=237
229: setchar100 ("64) h:=3719161+344063=4063224, hh:=259
230: setchar101 ("65) h:=4063224+344063=4407287, hh:=281
231: setchar102 ("66) h:=4407287+344063=4751350, hh:=303
[ 0123ABCdef]
232: pop
level 1:(h=0,v=3801088,w=0,x=0,y=786432,z=0,hh=0,vv=241)
233: y0 786432 v:=3801088+786432=4587520, vv:=291
234: push
level 1:(h=0,v=4587520,w=0,x=0,y=786432,z=0,hh=0,vv=291)
235: right3 1310720 h:=0+1310720=1310720, hh:=83
239: setchar48 ("30) h:=1310720+344063=1654783, hh:=105
240: setchar49 ("31) h:=1654783+344063=1998846, hh:=127
241: setchar50 ("32) h:=1998846+344063=2342909, hh:=149
242: setchar51 ("33) h:=2342909+344063=2686972, hh:=171
243: w3 196608 h:=2686972+196608=2883580, hh:=183
247: setchar65 ("41) h:=2883580+344063=3227643, hh:=205
248: setchar66 ("42) h:=3227643+344063=3571706, hh:=227
249: setchar67 ("43) h:=3571706+344063=3915769, hh:=249
250: w0 196608 h:=3915769+196608=4112377, hh:=260
251: setchar100 ("64) h:=4112377+344063=4456440, hh:=282
252: setchar101 ("65) h:=4456440+344063=4800503, hh:=304
253: setchar102 ("66) h:=4800503+344063=5144566, hh:=326
[ 0123 ABC def]
254: pop
level 1:(h=0,v=4587520,w=0,x=0,y=786432,z=0,hh=0,vv=291)
255: y0 786432 v:=4587520+786432=5373952, vv:=340
256: push
level 1:(h=0,v=5373952,w=0,x=0,y=786432,z=0,hh=0,vv=340)
257: right3 1310720 h:=0+1310720=1310720, hh:=83
261: set1 198("C6) h:=1310720+344063=1654783, hh:=105
263: set1 216("D8) h:=1654783+344063=1998846, hh:=127
265: set1 223("DF) h:=1998846+344063=2342909, hh:=149
267: set1 230("E6) h:=2342909+344063=2686972, hh:=171
269: set1 248("F8) h:=2686972+344063=3031035, hh:=193
[ ÆØßæø]
271: pop
level 1:(h=0,v=5373952,w=0,x=0,y=786432,z=0,hh=0,vv=340)
272: y0 786432 v:=5373952+786432=6160384, vv:=390
273: push
level 1:(h=0,v=6160384,w=0,x=0,y=786432,z=0,hh=0,vv=390)
274: right3 1310720 h:=0+1310720=1310720, hh:=83
278: set1 198("C6) h:=1310720+344063=1654783, hh:=105
280: set1 216("D8) h:=1654783+344063=1998846, hh:=127
282: set1 223("DF) h:=1998846+344063=2342909, hh:=149
284: set1 230("E6) h:=2342909+344063=2686972, hh:=171
286: set1 248("F8) h:=2686972+344063=3031035, hh:=193
[ ÆØßæø]
288: pop
level 1:(h=0,v=6160384,w=0,x=0,y=786432,z=0,hh=0,vv=390)
289: y0 786432 v:=6160384+786432=6946816, vv:=440
290: push
level 1:(h=0,v=6946816,w=0,x=0,y=786432,z=0,hh=0,vv=440)
291: right3 1310720 h:=0+1310720=1310720, hh:=83
295: set1 198("C6) h:=1310720+344063=1654783, hh:=105
297: set1 161("A1) h:=1654783+344063=1998846, hh:=127
299: set1 198("C6) h:=1998846+344063=2342909, hh:=149
301: set1 191("BF) h:=2342909+344063=2686972, hh:=171
303: set2 730("2DA) h:=2686972+344063=3031035, hh:=193
[ Æ¡Æ¿˚]
306: pop
level 1:(h=0,v=6946816,w=0,x=0,y=786432,z=0,hh=0,vv=440)
307: y0 786432 v:=6946816+786432=7733248, vv:=490
308: push
level 1:(h=0,v=7733248,w=0,x=0,y=786432,z=0,hh=0,vv=490)
309: right3 1310720 h:=0+1310720=1310720, hh:=83
313: set1 198("C6) h:=1310720+344063=1654783, hh:=105
315: set1 161("A1) h:=1654783+344063=1998846, hh:=127
317: set1 198("C6) h:=1998846+344063=2342909, hh:=149
319: set1 191("BF) h:=2342909+344063=2686972, hh:=171
[ Æ¡Æ¿]
321: pop
level 1:(h=0,v=7733248,w=0,x=0,y=786432,z=0,hh=0,vv=490)
322: y0 786432 v:=7733248+786432=8519680, vv:=540
323: push
level 1:(h=0,v=8519680,w=0,x=0,y=786432,z=0,hh=0,vv=540)
324: right3 1310720 h:=0+1310720=1310720, hh:=83
328: set1 198("C6) h:=1310720+344063=1654783, hh:=105
330: set1 161("A1) h:=1654783+344063=1998846, hh:=127
332: w3 196608 h:=1998846+196608=2195454, hh:=139
336: set1 198("C6) h:=2195454+344063=2539517, hh:=161
338: set1 161("A1) h:=2539517+344063=2883580, hh:=183
340: w0 196608 h:=2883580+196608=3080188, hh:=195
341: set2 730("2DA) h:=3080188+344063=3424251, hh:=217
344: setchar109 ("6D) h:=3424251+344063=3768314, hh:=239
345: setchar97 ("61) h:=3768314+344063=4112377, hh:=261
346: setchar99 ("63) h:=4112377+344063=4456440, hh:=283
347: setchar114 ("72) h:=4456440+344063=4800503, hh:=305
348: setchar111 ("6F) h:=4800503+344063=5144566, hh:=327
349: setchar58 ("3A) h:=5144566+344063=5488629, hh:=349
350: setchar45 ("2D) h:=5488629+344063=5832692, hh:=371
351: setchar62 ("3E) h:=5832692+344063=6176755, hh:=393
352: set1 198("C6) h:=6176755+344063=6520818, hh:=415
354: set1 161("A1) h:=6520818+344063=6864881, hh:=437
356: w0 196608 h:=6864881+196608=7061489, hh:=447
357: set1 198("C6) h:=7061489+344063=7405552, hh:=469
359: set1 161("A1) h:=7405552+344063=7749615, hh:=491
[ Æ¡ Æ¡ ˚macro:->Æ¡ Æ¡]
361: pop
level 1:(h=0,v=8519680,w=0,x=0,y=786432,z=0,hh=0,vv=540)
362: y3 957480 v:=8519680+957480=9477160, vv:=600
366: push
level 1:(h=0,v=9477160,w=0,x=0,y=957480,z=0,hh=0,vv=600)
367: right3 1310720 h:=0+1310720=1310720, hh:=83
371: set2 291("123) h:=1310720+344063=1654783, hh:=105
374: set2 305("131) h:=1654783+344063=1998846, hh:=127
377: set2 338("152) h:=1998846+344063=2342909, hh:=149
380: set2 339("153) h:=2342909+344063=2686972, hh:=171
383: set2 730("2DA) h:=2686972+344063=3031035, hh:=193
[ ģıŒœ˚]
386: pop
level 1:(h=0,v=9477160,w=0,x=0,y=957480,z=0,hh=0,vv=600)
387: y0 957480 v:=9477160+957480=10434640, vv:=661
388: push
level 1:(h=0,v=10434640,w=0,x=0,y=957480,z=0,hh=0,vv=661)
389: right3 1310720 h:=0+1310720=1310720, hh:=83
393: set2 291("123) h:=1310720+344063=1654783, hh:=105
396: set2 305("131) h:=1654783+344063=1998846, hh:=127
399: set2 338("152) h:=1998846+344063=2342909, hh:=149
402: set2 339("153) h:=2342909+344063=2686972, hh:=171
405: set2 730("2DA) h:=2686972+344063=3031035, hh:=193
[ ģıŒœ˚]
408: pop
level 1:(h=0,v=10434640,w=0,x=0,y=957480,z=0,hh=0,vv=661)
409: y3 786432 v:=10434640+786432=11221072, vv:=711
413: push
level 1:(h=0,v=11221072,w=0,x=0,y=786432,z=0,hh=0,vv=711)
414: right3 1310720 h:=0+1310720=1310720, hh:=83
418: set2 338("152) h:=1310720+344063=1654783, hh:=105
421: w3 196608 h:=1654783+196608=1851391, hh:=117
425: set2 338("152) h:=1851391+344063=2195454, hh:=139
428: w0 196608 h:=2195454+196608=2392062, hh:=152
429: set1 198("C6) h:=2392062+344063=2736125, hh:=174
431: set1 161("A1) h:=2736125+344063=3080188, hh:=196
433: w0 196608 h:=3080188+196608=3276796, hh:=208
434: set2 730("2DA) h:=3276796+344063=3620859, hh:=230
437: setchar109 ("6D) h:=3620859+344063=3964922, hh:=252
438: setchar97 ("61) h:=3964922+344063=4308985, hh:=274
439: setchar99 ("63) h:=4308985+344063=4653048, hh:=296
440: setchar114 ("72) h:=4653048+344063=4997111, hh:=318
441: setchar111 ("6F) h:=4997111+344063=5341174, hh:=340
442: setchar58 ("3A) h:=5341174+344063=5685237, hh:=362
443: setchar45 ("2D) h:=5685237+344063=6029300, hh:=384
444: setchar62 ("3E) h:=6029300+344063=6373363, hh:=406
445: set2 338("152) h:=6373363+344063=6717426, hh:=427
448: w0 196608 h:=6717426+196608=6914034, hh:=438
449: set2 338("152) h:=6914034+344063=7258097, hh:=460
452: w0 196608 h:=7258097+196608=7454705, hh:=472
453: set1 198("C6) h:=7454705+344063=7798768, hh:=494
455: set1 161("A1) h:=7798768+344063=8142831, hh:=516
457: w0 196608 h:=8142831+196608=8339439, hh:=528
458: set2 730("2DA) h:=8339439+344063=8683502, hh:=550
[ Œ Œ Æ¡ ˚macro:->Œ Œ Æ¡ ˚]
461: pop
level 1:(h=0,v=11221072,w=0,x=0,y=786432,z=0,hh=0,vv=711)
462: y0 786432 v:=11221072+786432=12007504, vv:=761
463: push
level 1:(h=0,v=12007504,w=0,x=0,y=786432,z=0,hh=0,vv=761)
464: right3 1310720 h:=0+1310720=1310720, hh:=83
468: set2 915("393) h:=1310720+344063=1654783, hh:=105
471: set2 916("394) h:=1654783+344063=1998846, hh:=127
474: set2 920("398) h:=1998846+344063=2342909, hh:=149
477: set2 923("39B) h:=2342909+344063=2686972, hh:=171
480: set2 926("39E) h:=2686972+344063=3031035, hh:=193
[ ΓΔΘΛΞ]
483: pop
level 1:(h=0,v=12007504,w=0,x=0,y=786432,z=0,hh=0,vv=761)
484: y0 786432 v:=12007504+786432=12793936, vv:=810
485: push
level 1:(h=0,v=12793936,w=0,x=0,y=786432,z=0,hh=0,vv=810)
486: right3 1310720 h:=0+1310720=1310720, hh:=83
490: set2 915("393) h:=1310720+344063=1654783, hh:=105
493: set2 916("394) h:=1654783+344063=1998846, hh:=127
496: set2 920("398) h:=1998846+344063=2342909, hh:=149
499: set2 923("39B) h:=2342909+344063=2686972, hh:=171
502: set2 926("39E) h:=2686972+344063=3031035, hh:=193
[ ΓΔΘΛΞ]
505: pop
level 1:(h=0,v=12793936,w=0,x=0,y=786432,z=0,hh=0,vv=810)
506: y0 786432 v:=12793936+786432=13580368, vv:=860
507: push
level 1:(h=0,v=13580368,w=0,x=0,y=786432,z=0,hh=0,vv=860)
508: right3 1310720 h:=0+1310720=1310720, hh:=83
512: set2 8208("2010) h:=1310720+344063=1654783, hh:=105
515: set2 8216("2018) h:=1654783+344063=1998846, hh:=127
518: set2 8217("2019) h:=1998846+344063=2342909, hh:=149
[ ‐‘’]
521: pop
level 1:(h=0,v=13580368,w=0,x=0,y=786432,z=0,hh=0,vv=860)
522: y0 786432 v:=13580368+786432=14366800, vv:=910
523: push
level 1:(h=0,v=14366800,w=0,x=0,y=786432,z=0,hh=0,vv=910)
524: right3 1310720 h:=0+1310720=1310720, hh:=83
528: set2 8208("2010) h:=1310720+344063=1654783, hh:=105
531: set2 8216("2018) h:=1654783+344063=1998846, hh:=127
534: set2 8217("2019) h:=1998846+344063=2342909, hh:=149
[ ‐‘’]
537: pop
level 1:(h=0,v=14366800,w=0,x=0,y=786432,z=0,hh=0,vv=910)
538: y0 786432 v:=14366800+786432=15153232, vv:=960
539: push
level 1:(h=0,v=15153232,w=0,x=0,y=786432,z=0,hh=0,vv=960)
540: right3 1310720 h:=0+1310720=1310720, hh:=83
544: setchar91 ("5B) h:=1310720+344063=1654783, hh:=105
545: setchar65 ("41) h:=1654783+344063=1998846, hh:=127
546: setchar69 ("45) h:=1998846+344063=2342909, hh:=149
547: setchar79 ("4F) h:=2342909+344063=2686972, hh:=171
548: setchar69 ("45) h:=2686972+344063=3031035, hh:=193
549: w3 196608 h:=3031035+196608=3227643, hh:=204
553: set1 198("C6) h:=3227643+344063=3571706, hh:=226
555: set2 338("152) h:=3571706+344063=3915769, hh:=248
558: setchar93 ("5D) h:=3915769+344063=4259832, hh:=270
559: w0 196608 h:=4259832+196608=4456440, hh:=282
560: setchar91 ("5B) h:=4456440+344063=4800503, hh:=304
561: setchar97 ("61) h:=4800503+344063=5144566, hh:=326
562: setchar101 ("65) h:=5144566+344063=5488629, hh:=348
563: setchar111 ("6F) h:=5488629+344063=5832692, hh:=370
564: setchar101 ("65) h:=5832692+344063=6176755, hh:=392
565: w0 196608 h:=6176755+196608=6373363, hh:=404
566: set1 230("E6) h:=6373363+344063=6717426, hh:=426
568: set2 339("153) h:=6717426+344063=7061489, hh:=448
571: setchar93 ("5D) h:=7061489+344063=7405552, hh:=470
[ [AEOE ÆŒ] [aeoe æœ]]
572: pop
level 1:(h=0,v=15153232,w=0,x=0,y=786432,z=0,hh=0,vv=960)
573: pop
level 0:(h=0,v=42152922,w=0,x=0,y=0,z=0,hh=0,vv=2670)
574: down3 1572864 v:=42152922+1572864=43725786, vv:=2770
578: eop
Loading

0 comments on commit 6a4bda4

Please sign in to comment.