summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/mfluadir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-01-30 01:42:07 +0000
committerKarl Berry <karl@freefriends.org>2021-01-30 01:42:07 +0000
commit0bf3e49d4d147727e1daf1007362a871972b214f (patch)
tree63a54dcf8830af3f1f4672589b1ebce917693e57 /Build/source/texk/web2c/mfluadir
parent62203043f467d3a24b34f2df151b65e6ea35144b (diff)
tuneup2021 from DEK, with adaptations for TL
git-svn-id: svn://tug.org/texlive/trunk@57558 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mfluadir')
-rw-r--r--Build/source/texk/web2c/mfluadir/mf-lua.ch10
-rw-r--r--Build/source/texk/web2c/mfluadir/mflua_version.h2
-rw-r--r--Build/source/texk/web2c/mfluadir/mfluaextra.h2
-rw-r--r--Build/source/texk/web2c/mfluadir/mfluatrap/mfluatrap.diffs330
4 files changed, 213 insertions, 131 deletions
diff --git a/Build/source/texk/web2c/mfluadir/mf-lua.ch b/Build/source/texk/web2c/mfluadir/mf-lua.ch
index 7cc5b5a25bd..4cb2d72e9ab 100644
--- a/Build/source/texk/web2c/mfluadir/mf-lua.ch
+++ b/Build/source/texk/web2c/mfluadir/mf-lua.ch
@@ -1,8 +1,8 @@
@x [0] MFLua
% This program is copyright (C) 1984 by D. E. Knuth; all rights are reserved.
@y
-% This program is MFLua, strictly based on the METAFONT 2.7182818 source code.
-% What follow are the original comments of METAFONT 2.7182818.
+% This program is MFLua, strictly based on the METAFONT 2.71828182 source code.
+% What follow are the original comments of METAFONT 2.71828182.
% This program is copyright (C) 1984 by D. E. Knuth; all rights are reserved.
@z
@@ -15,13 +15,13 @@
@z
@x [1.2] MFLua
-@d banner=='This is METAFONT, Version 2.7182818' {printed when \MF\ starts}
+@d banner=='This is METAFONT, Version 2.71828182' {printed when \MF\ starts}
@y
-@d METAFONT_banner=='This is METAFONT, Version 2.7182818' {printed when \MF\ starts}
+@d METAFONT_banner=='This is METAFONT, Version 2.71828182' {printed when \MF\ starts}
@#
@d MFLua_version_string=='-1.0.0-alpha'
@#
-@d MFLua_banner=='This is MFLua, Version 2.7182818', MFLua_version_string
+@d MFLua_banner=='This is MFLua, Version 2.71828182', MFLua_version_string
{printed when MFLua starts}
@#
@d banner==MFLua_banner
diff --git a/Build/source/texk/web2c/mfluadir/mflua_version.h b/Build/source/texk/web2c/mfluadir/mflua_version.h
index abf736f6eaa..45244c96c3b 100644
--- a/Build/source/texk/web2c/mfluadir/mflua_version.h
+++ b/Build/source/texk/web2c/mfluadir/mflua_version.h
@@ -1,2 +1,2 @@
#define MFLUA_VERSION "1.0.0-alpha"
-#define BANNER "This is MFLua, Version 2.7182818-" MFLUA_VERSION \ No newline at end of file
+#define BANNER "This is MFLua, Version 2.71828182-" MFLUA_VERSION
diff --git a/Build/source/texk/web2c/mfluadir/mfluaextra.h b/Build/source/texk/web2c/mfluadir/mfluaextra.h
index 4e5fb50aa2e..636c01d5d2f 100644
--- a/Build/source/texk/web2c/mfluadir/mfluaextra.h
+++ b/Build/source/texk/web2c/mfluadir/mfluaextra.h
@@ -5,7 +5,7 @@
#include <mfluadir/mflua_version.h> /* for MFLUA_VERSION and BANNER */
-/*#define BANNER "This is MFLua, Version 2.7182818-" MFLUA_VERSION*/
+/*#define BANNER "This is MFLua, Version 2.71828182-" MFLUA_VERSION*/
#define COPYRIGHT_HOLDER "L. Scarso"
#define AUTHOR NULL
#define PROGRAM_HELP MFLUAHELP
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/mfluatrap.diffs b/Build/source/texk/web2c/mfluadir/mfluatrap/mfluatrap.diffs
index a8176a88ce7..6dcf5fcb85a 100644
--- a/Build/source/texk/web2c/mfluadir/mfluatrap/mfluatrap.diffs
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/mfluatrap.diffs
@@ -1,48 +1,213 @@
+#! /bin/sh -vx
+# Copyright 2017 Karl Berry <tex-live@tug.org>
+# Copyright 2015 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+testdir=$abs_srcdir/triptrap
++ testdir=SRCDIR/triptrap
+ltestdir=$abs_srcdir/mfluadir/mfluatrap
++ ltestdir=SRCDIR/mfluadir/mfluatrap
+
+TEXMFCNF=$ltestdir
++ TEXMFCNF=SRCDIR/mfluadir/mfluatrap
+LUAINPUTS=$ltestdir
++ LUAINPUTS=SRCDIR/mfluadir/mfluatrap
+export TEXMFCNF LUAINPUTS
++ export TEXMFCNF LUAINPUTS
+
+rm -rf mfluatrapdir
++ rm -rf mfluatrapdir
+mkdir mfluatrapdir
++ mkdir mfluatrapdir
+cd mfluatrapdir
++ cd mfluatrapdir
+
+echo ">>> Running TRAP test for MFLua." >&2
++ echo '>>> Running TRAP test for MFLua.'
>>> Running TRAP test for MFLua.
+echo ">>> See $ltestdir/mfluatrap.diffs for example of acceptable diffs." >&2
++ echo '>>> See SRCDIR/mfluadir/mfluatrap/mfluatrap.diffs for example of acceptable diffs.'
>>> See SRCDIR/mfluadir/mfluatrap/mfluatrap.diffs for example of acceptable diffs.
+
+is_OK=:
++ is_OK=:
+
+set -x
++ set -x
+
+# get same filename in log
+$LN_S $testdir/trap.mf .
+ ln -s SRCDIR/triptrap/trap.mf .
+
+./mflua --progname=inimflua <$testdir/mftrap1.in >mftrapin.fot
+ ./mflua --progname=inimflua
+if test ! -s trap.base; then
+ echo "*** trap.base not created by mftrap1.in, investigate!" >&2
+ exit 1
+fi
+ test '!' -s trap.base
+mv trap.log mftrapin.log || exit 1
+ mv trap.log mftrapin.log
+diff $testdir/mftrapin.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.71828182 (INIMF) 4 JUL 1776 12:00
---
-> This is MFLua, Version 2.7182818-0.5 (TeX Live 2015) (INIMF) 17 APR 2015 11:16
+> This is MFLua, Version 2.71828182-1.0.0-alpha (INIMF) 27 JAN 2021 18:03
150c150
-< String usage 26&83 (891&11438 still untouched)
+< String usage 26&83 (892&11481 still untouched)
---
-> String usage 30&98 (6384&979377 still untouched)
+> String usage 30&98 (1047458&9979376 still untouched)
176,177c176,177
-< (preloaded base=trap 2014.1.7)
-< 1117 strings of total length 20614
+< (preloaded base=trap 1776.7.4)
+< 1116 strings of total length 20570
---
-> (preloaded base=trap 2015.4.17)
-> 1125 strings of total length 20684
+> (preloaded base=trap 2021.1.27)
+> 1125 strings of total length 20685
179c179
< 265 symbolic tokens
---
> 266 symbolic tokens
+
+./mflua --progname=inimflua <$testdir/mftrap2.in >mftrap.fot
+ ./mflua --progname=inimflua
+mv trap.log mftrap.log || exit 1
+ mv trap.log mftrap.log
+mv trap.tfm mftrap.tfm || exit 1
+ mv trap.tfm mftrap.tfm
+diff $testdir/mftrap.fot mftrap.fot
+ diff SRCDIR/triptrap/mftrap.fot mftrap.fot
-1,3c1,2
-< This is METAFONT, Version 2.7182818 (INIMF)
+1,3c1,4
+< This is METAFONT, Version 2.71828182 (INIMF)
< ** &trap trap
< (trap.mf
---
-> This is MFLua, Version 2.7182818-0.5 (TeX Live 2015) (INIMF)
+> MFLua version: 1.0.0-alpha
+> MFLua banner: This is MFLua, Version 2.71828182-1.0.0-alpha
+> This is MFLua, Version 2.71828182-1.0.0-alpha (TeX Live 2021/dev) (INIMF)
> **(trap.mf
-39c38
-< String usage 41&161 (815&7634 still untouched)
+22a24,99
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+27a105,136
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+> Warning: print_scale called with nil argument.
+>
+39c148
+< String usage 41&161 (816&7678 still untouched)
---
-> String usage 50&202 (6298&975523 still untouched)
+> String usage 50&202 (1047372&9975522 still untouched)
+59a169
+> Warning: end_program.lua not found
+diff $testdir/mftrap.log mftrap.log
+ 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.71828182 (preloaded base=trap 1776.7.4) 4 JUL 1776 12:00
---
-> This is MFLua, Version 2.7182818-0.5 (TeX Live 2015) (preloaded base=trap 2015.4.17) 17 APR 2015 11:16
+> This is MFLua, Version 2.71828182-1.0.0-alpha (preloaded base=trap 2021.1.27) 27 JAN 2021 18:03
133,134c133,134
< <scantokens> pair
< p[],';^^ff
@@ -68,115 +233,19 @@
> <scantokens> or <runscript> ...f
>
1825c1825
-< String usage 24&92 (858&11309 still untouched)
----
-> String usage 30&119 (6344&979191 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
+< String usage 24&92 (859&11353 still untouched)
+---
+> String usage 30&119 (1047418&9979190 still untouched)
4235c4235
-< String usage 41&161 (815&7634 still untouched)
+< String usage 41&161 (816&7678 still untouched)
---
-> String usage 50&202 (6298&975523 still untouched)
+> String usage 50&202 (1047372&9975522 still untouched)
4251,4252c4251,4252
-< 68 strings out of 883
-< 3752 string characters out of 11386
+< 68 strings out of 884
+< 3752 string characters out of 11430
---
-> 77 strings out of 6375
-> 3793 string characters out of 979316
+> 77 strings out of 1047449
+> 3793 string characters out of 9979315
4254,4255c4254,4255
< 289 symbolic tokens out of 2100
< 8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b
@@ -187,17 +256,30 @@
< 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 || exit 1
+ ./tftopl ./mftrap.tfm mftrap.pl
+diff $testdir/mftrap.pl mftrap.pl || is_OK=false
+ diff SRCDIR/triptrap/mftrap.pl mftrap.pl
+
+./gftype -m -i ./trap.72270gf >trap.typ || exit 1
+ ./gftype -m -i ./trap.72270gf
+diff $testdir/trap.typ trap.typ
+ diff SRCDIR/triptrap/trap.typ trap.typ
1c1
< This is GFtype, Version 3.1
---
-> This is GFtype, Version 3.1 (TeX Live 2015)
+> This is GFtype, Version 3.1 (TeX Live 2021/dev)
3c3
< ' METAFONT output 2014.01.07:1811'
---
-> ' METAFONT output 2015.04.17:1116'
+> ' METAFONT output 2021.01.27:1803'
+
+$is_OK || {
+ echo ">>> There were some errors." >&2
+ exit 1
+}
+ :
-PASS: mfluadir/mfluatraptest
+
+PASS mfluadir/mfluatraptest.test (exit status: 0)
+PASS: mfluadir/mfluatraptest.test