Merge branch 'master' into build/work000 r67993 #158

texjporg · Aug 20, 2023 · f0b9358 · f0b9358
2 parents 35ba8c0 + d9daaf9
commit f0b9358
Show file tree

Hide file tree

Showing 136 changed files with 1,677 additions and 916 deletions.
diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2023-07-27.21}
+\def\texinfoversion{2023-08-13.14}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -5655,8 +5655,8 @@
       % Determine how far we can stretch into the margin.
       % This allows, e.g., "Appendix H  GNU Free Documentation License" to
       % fit on one line in @letterpaper format.
-      \ifdim\entryrightmargin>2.1em
-        \dimen@i=2.1em
+      \ifdim\entryrightmargin>1.5em
+        \dimen@i=1.5em
       \else
         \dimen@i=0em
       \fi
@@ -5714,12 +5714,11 @@
 \newskip\thinshrinkable
 \skip\thinshrinkable=.15em minus .15em
 
-% Like plain.tex's \dotfill, except uses up at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 0.5 em.
 % The filll stretch here overpowers both the fil and fill stretch to push
 % the page number to the right.
 \def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1filll}
-
+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 0.5em plus 1filll}
 
 \def\primary #1{\line{#1\hfil}}
 
@@ -7709,9 +7708,13 @@
 \def\deflineheader#1 #2 #3\endheader{%
   \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
 }
+
 \def\deftypeline{%
   \doingtypefntrue
-  \parseargusing\activeparens{\printdefunline\deflineheader}%
+  \parseargusing\activeparens{\printdefunline\deftypelineheader}%
+}
+\def\deftypelineheader#1 #2 #3 #4\endheader{%
+  \printdefname{#1}{#2}{#3}\magicamp\defunargs{#4\unskip}%
 }
 
 % \makedefun{deffoo} (\deffooheader parameters) { (\deffooheader expansion) }
@@ -8846,6 +8849,11 @@
   \fi
 }
 
+% @nodedescription, @nodedescriptionblock - do nothing for TeX
+\parseargdef\nodedescription{}
+\def\nodedescriptionblock{\doignore{nodedescriptionblock}}
+
+
 % @anchor{NAME} -- define xref target at arbitrary point.
 %
 \newcount\savesfregister

diff --git a/source/texk/.gitattributes b/source/texk/.gitattributes
@@ -14,6 +14,8 @@
 *.opl text eol=lf
 *.ovp text eol=lf
 *.out text eol=lf
+*.log text eol=lf
+*.typ text eol=lf
 
 # for dvi2tty
 *.tty text eol=lf

diff --git a/source/texk/bibtex-x/ChangeLog b/source/texk/bibtex-x/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-20  TANAKA Takuji  <[email protected]>
+
+	* bibtex.c, sysdep.h: Avoid compiler warnings on Windows.
+	* tests/bibtex8u-mem.test: Tweak.
+
 2023-08-11  TANAKA Takuji  <[email protected]>
 
 	* tests/bibtex{8,u}.test, tests/bibtex8-{char,sort}.test,

diff --git a/source/texk/bibtex-x/bibtex.c b/source/texk/bibtex-x/bibtex.c
@@ -100,12 +100,6 @@
 #include <config.h>
 #endif
 
-#ifdef KPATHSEA
-#include <kpathsea/config.h>
-#include <kpathsea/progname.h>
-#include <kpathsea/variable.h>
-#endif
-
 #include "sysdep.h"
 #include "bibtex.h"
 #include "datatype.h"

diff --git a/source/texk/bibtex-x/sysdep.h b/source/texk/bibtex-x/sysdep.h
@@ -111,6 +111,11 @@
 #include <string.h>
 #include <ctype.h>
 
+#ifdef KPATHSEA
+#include <kpathsea/config.h>
+#include <kpathsea/progname.h>
+#include <kpathsea/variable.h>
+#endif
 
 /*-
 **============================================================================

diff --git a/source/texk/bibtex-x/tests/bibtex8u-mem.test b/source/texk/bibtex-x/tests/bibtex8u-mem.test
@@ -69,14 +69,14 @@ for t in 1 2 3; do
     TEXMFCNF=$srcdir/../kpathsea \
     BSTINPUTS=$srcdir/../web2c/tests'\;'$srcdir/csf \
     BIBINPUTS=./tests \
-    $_bibtex8 -s tests/memtest$t || exit 1
+    $_bibtex8 -s tests/memtest$t || exit $((10 + t))
 
   cp -p tests/memtest$t.aux tests/memtestu$t.aux
   eval $env \
     TEXMFCNF=$srcdir/../kpathsea \
     BSTINPUTS=$srcdir/../web2c/tests \
     BIBINPUTS=./tests \
-    $_bibtexu -s tests/memtestu$t || exit 2
+    $_bibtexu -s tests/memtestu$t || exit $((20 + t))
 
 done
 
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
@@ -1,3 +1,16 @@
+2023-08-20  TANAKA Takuji  <[email protected]>
+
+	* {mftraptest,triptest}.test:
+	Filter Web2C year in banner.
+	* {mftraptest,triptest,bibtex}.test,
+	tests/{bibtex-{auxinclude,bibauth,mem},tex-closeout}.test:
+	Make easier to test on Windows.
+	* Makefile.in: Add tests {,e}uptexdir/wcfname0.test.
+
+2023-08-19  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctangleboot.cin: CWEB 4.10 release.
+
 2023-06-28  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctangleboot.cin,

diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
@@ -3548,21 +3548,21 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	tests/xptmr*.vpl badvpl.* tests/yptmr*.* pooltype.tex ctie.c \
 	cweave.c ctwill.c ctwill-refsort.c ctwill-twinx.c tie.c \
 	ctie.outc ctie.outm ham.aux ham.idx ham.scn ham.sref ham.tex \
-	ham-sorted.tex common.tex common.scn common.idx tie.outc \
-	tie.outm $(nodist_tex_SOURCES) tex-final.ch tex-web2c tex.p \
-	tex.pool tex-tangle trip.diffs write18-quote.log mftrap.diffs \
-	$(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c mf.p mf.pool \
-	mf-tangle mfluatrap.diffs $(nodist_libmflua_a_SOURCES) \
-	mflua.web mflua.ch mflua-web2c mflua.p mflua.pool mflua-tangle \
-	mfluatrap.diffs mfluajittrap.diffs \
-	$(nodist_libmfluajit_a_SOURCES) mfluajit.web mfluajit.ch \
-	mfluajit-web2c mfluajit.p mfluajit.pool mfluajit-tangle \
-	mfluajittrap.diffs $(nodist_mpost_SOURCES) mpxout-tangle \
-	mptrap.diffs ptmr.mpx tests/xptmr.mpx tests/xstory.mpx \
-	$(nodist_pmpost_SOURCES) pmp.w pmpost.w pmpxout.w ppsout.w \
-	psvgout.w ptfmin.w pmp-tangle pmpxout-tangle ppsout-tangle \
-	psvgout-tangle pmpsamp.* upmpsamp.* \
-	$(nodist_libmplibcore_a_SOURCES) \
+	ham-sorted.tex index.tex common.tex common.scn common.idx \
+	tie.outc tie.outm $(nodist_tex_SOURCES) tex-final.ch tex-web2c \
+	tex.p tex.pool tex-tangle trip.diffs write18-quote.log \
+	mftrap.diffs $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c \
+	mf.p mf.pool mf-tangle mfluatrap.diffs \
+	$(nodist_libmflua_a_SOURCES) mflua.web mflua.ch mflua-web2c \
+	mflua.p mflua.pool mflua-tangle mfluatrap.diffs \
+	mfluajittrap.diffs $(nodist_libmfluajit_a_SOURCES) \
+	mfluajit.web mfluajit.ch mfluajit-web2c mfluajit.p \
+	mfluajit.pool mfluajit-tangle mfluajittrap.diffs \
+	$(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs ptmr.mpx \
+	tests/xptmr.mpx tests/xstory.mpx $(nodist_pmpost_SOURCES) \
+	pmp.w pmpost.w pmpxout.w ppsout.w psvgout.w ptfmin.w \
+	pmp-tangle pmpxout-tangle ppsout-tangle psvgout-tangle \
+	pmpsamp.* upmpsamp.* $(nodist_libmplibcore_a_SOURCES) \
 	$(nodist_libmplibextramath_a_SOURCES) \
 	$(nodist_libmplibbackends_a_SOURCES) mp-tangle mpmath-tangle \
 	mpmathdecimal-tangle mpmathdouble-tangle mpstrings-tangle \
@@ -4508,7 +4508,7 @@ uptftopl_LDADD = $(uptex_ldadd)
 uptftopl_DEPENDENCIES = $(uptex_dependencies)
 
 # upTeX Tests
-uptex_tests = uptexdir/uptriptest.test uptexdir/ptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.test
+uptex_tests = uptexdir/uptriptest.test uptexdir/ptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.test uptexdir/wcfname0.test
 # uppPLtoTF/upTFtoPL
 upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
 	uptexdir/uppltotf.test uptexdir/uptftopl.test \
@@ -4566,7 +4566,7 @@ euptex_ch_srcs = \
 
 # e-upTeX Tests
 #
-euptex_tests = euptexdir/euptriptest.test euptexdir/eptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test euptexdir/wcfname.test
+euptex_tests = euptexdir/euptriptest.test euptexdir/eptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test euptexdir/wcfname.test euptexdir/wcfname0.test
 
 # At the moment, these are the only man pages handled in the
 # conglomerated web2c/Makefile[.am]. (All the others are in man/.)
@@ -22068,7 +22068,7 @@ uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch
 uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
 	$(tie_m) tftopl.web tftopl.ch
 uptexdir/uptriptest.log uptexdir/ptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-uptexdir/upver.log uptexdir/upkcat.log uptexdir/wcfname.log: uptex$(EXEEXT)
+uptexdir/upver.log uptexdir/upkcat.log uptexdir/wcfname.log uptexdir/wcfname0.log: uptex$(EXEEXT)
 uptexdir/upbibtex.log: upbibtex$(EXEEXT)
 uptexdir/updvitype.log: updvitype$(EXEEXT)
 uptexdir/uppltotf.log: uppltotf$(EXEEXT)
@@ -22110,7 +22110,7 @@ euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
 	$(tie_c) euptex.web $(euptex_ch_srcs)
 euptexdir/euptriptest.log euptexdir/eptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 euptexdir/pdfprimitive.log: euptex$(EXEEXT)
-euptexdir/eupver.log euptexdir/wcfname.log: euptex$(EXEEXT)
+euptexdir/eupver.log euptexdir/wcfname.log euptexdir/wcfname0.log: euptex$(EXEEXT)
 euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: euptrip-clean

diff --git a/source/texk/web2c/bibtex.test b/source/texk/web2c/bibtex.test
@@ -4,16 +4,20 @@
 # Copyright 2009 Peter Breitenlohner <[email protected]>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_bibtex=$BinDir/bibtex$ExeExt
+
 test -d tests || mkdir -p tests
 rm -f tests/xexampl.*
 
-./bibtex -version || exit 100
+$_bibtex -version || exit 100
 
 cp $srcdir/tests/exampl.aux tests/xexampl.aux
 
 TEXMFCNF=$srcdir/../kpathsea \
   BSTINPUTS=$srcdir/tests \
   BIBINPUTS=$srcdir/tests \
-  ./bibtex tests/xexampl || exit 1
+  $_bibtex tests/xexampl || exit 1
 diff $srcdir/tests/exampl.bbl tests/xexampl.bbl || exit 2
 
diff --git a/source/texk/web2c/ctangleboot.cin b/source/texk/web2c/ctangleboot.cin
@@ -28,7 +28,7 @@
 /*:5*/
 #line 67 "cwebdir/ctangle.w"
 
-#define banner "This is CTANGLE, Version 4.9" \
+#define banner "This is CTANGLE, Version 4.10" \
  \
 
 #define _(s) gettext(s)  \