summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/bibtex-x/ChangeLog15
-rw-r--r--Build/source/texk/bibtex-x/Makefile.am1
-rw-r--r--Build/source/texk/bibtex-x/Makefile.in4
-rw-r--r--Build/source/texk/bibtex-x/bibtex-2.c25
-rwxr-xr-xBuild/source/texk/bibtex-x/tests/bibtex8-char.test2
-rwxr-xr-xBuild/source/texk/bibtex-x/tests/bibtex8.test2
-rwxr-xr-xBuild/source/texk/bibtex-x/tests/bibtexu-sort.test2
-rwxr-xr-xBuild/source/texk/bibtex-x/tests/bibtexu.test11
-rw-r--r--Build/source/texk/bibtex-x/tests/casea.bbl16
-rw-r--r--Build/source/texk/bibtex-x/tests/caseu.bbl32
-rw-r--r--Build/source/texk/bibtex-x/tests/chara.bbl10
-rw-r--r--Build/source/texk/bibtex-x/tests/exampl.bbl212
-rw-r--r--Build/source/texk/bibtex-x/tests/ltnbib.bib12
-rw-r--r--Build/source/texk/bibtex-x/tests/mlgbib.bib15
-rw-r--r--Build/source/texk/bibtex-x/tests/namea.bbl27
-rw-r--r--Build/source/texk/bibtex-x/tests/nameu.bbl3
-rw-r--r--Build/source/texk/bibtex-x/tests/substra.bbl110
-rw-r--r--Build/source/texk/bibtex-x/tests/testcase.bst8
-rw-r--r--Build/source/texk/bibtex-x/tests/testcasea.bib4
-rw-r--r--Build/source/texk/bibtex-x/tests/testcaseu.bib8
-rw-r--r--Build/source/texk/bibtex-x/tests/testchar.bst8
-rw-r--r--Build/source/texk/bibtex-x/tests/testiscjk.bst8
-rw-r--r--Build/source/texk/bibtex-x/tests/testname.bst8
-rw-r--r--Build/source/texk/bibtex-x/tests/testperiod.bst8
-rw-r--r--Build/source/texk/bibtex-x/tests/testsubstr.bst8
-rw-r--r--Build/source/texk/bibtex-x/tests/testtxtprfx.bst8
-rw-r--r--Build/source/texk/bibtex-x/tests/testwidth.bst8
-rw-r--r--Build/source/texk/bibtex-x/tests/txtprfxa.bbl18
-rw-r--r--Build/source/texk/bibtex-x/tests/yannis.bbl6
-rw-r--r--Build/source/texk/bibtex-x/tests/yannis.bib6
-rw-r--r--Build/source/texk/bibtex-x/version.h2
31 files changed, 448 insertions, 159 deletions
diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog
index 1faaddf7efc..9941164fdc4 100644
--- a/Build/source/texk/bibtex-x/ChangeLog
+++ b/Build/source/texk/bibtex-x/ChangeLog
@@ -1,3 +1,18 @@
+2022-05-08 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version.h:
+ Bump version to 4.00 (8 may 2022).
+ * bibtex-2.c:
+ Set LEGAL_ID_CHAR to id_class of 8bit characters.
+ * Makefile.am, tests/bibtex[8u].test,
+ tests/bibtex8-char.test, tests/bibtexu-sort.test,
+ tests/test{case,char,name,period,substr,txtprfx,width,iscjk}.bst,
+ tests/case[au].bbl, tests/chara.bbl, tests/name[au].bbl,
+ tests/substra.bbl, tests/txtprfxa.bbl, tests/yannis.bbl,
+ tests/exampl.bbl, tests/ltnbib.bib, tests/mlgbib.bib,
+ tests/testcase[au].bib, tests/yannis.bib:
+ Update tests.
+
2022-05-02 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* version.h:
diff --git a/Build/source/texk/bibtex-x/Makefile.am b/Build/source/texk/bibtex-x/Makefile.am
index d11ea8bb789..210472f105d 100644
--- a/Build/source/texk/bibtex-x/Makefile.am
+++ b/Build/source/texk/bibtex-x/Makefile.am
@@ -95,6 +95,7 @@ tests/bibtexu.log tests/bibtexu-basic.log tests/bibtexu-range.log \
EXTRA_DIST = $(bibtex8_tests) $(bibtexu_tests)
DISTCLEANFILES =
## tests/bibtex8.test
+EXTRA_DIST += tests/exampl.bbl
DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
## tests/bibtexu.test
##
diff --git a/Build/source/texk/bibtex-x/Makefile.in b/Build/source/texk/bibtex-x/Makefile.in
index f5c9e571ee8..d05fe12b8fc 100644
--- a/Build/source/texk/bibtex-x/Makefile.in
+++ b/Build/source/texk/bibtex-x/Makefile.in
@@ -660,8 +660,8 @@ bibtexu_tests = tests/bibtexu.test tests/bibtexu-basic.test \
tests/bibtexu-sort.test tests/bibtexu-char.test
TESTS = $(am__append_3) $(am__append_4)
-EXTRA_DIST = $(bibtex8_tests) $(bibtexu_tests) tests/sort.aux \
- tests/sort1.bbl tests/sort2.bbl tests/sort3.bbl \
+EXTRA_DIST = $(bibtex8_tests) $(bibtexu_tests) tests/exampl.bbl \
+ tests/sort.aux tests/sort1.bbl tests/sort2.bbl tests/sort3.bbl \
tests/sort1.csf tests/sort2.csf tests/sort3.csf \
tests/testdata.bib tests/teststyle.bst tests/sort1.bbl \
tests/sort2.bbl tests/sort3.bbl tests/casea.aux \
diff --git a/Build/source/texk/bibtex-x/bibtex-2.c b/Build/source/texk/bibtex-x/bibtex-2.c
index 53b615691ee..0bf69400ee1 100644
--- a/Build/source/texk/bibtex-x/bibtex-2.c
+++ b/Build/source/texk/bibtex-x/bibtex-2.c
@@ -2548,6 +2548,31 @@ BEGIN
id_class[EQUALS_SIGN] = ILLEGAL_ID_CHAR;
id_class[LEFT_BRACE] = ILLEGAL_ID_CHAR;
id_class[RIGHT_BRACE] = ILLEGAL_ID_CHAR;
+#ifdef SUPPORT_8BIT
+#ifdef UTF_8
+ for (i=0x80; i<=0xBF; i++)
+ BEGIN
+ id_class[i] = LEGAL_ID_CHAR;
+ END
+ for (i=0xC2; i<=0xF4; i++)
+ BEGIN
+ id_class[i] = LEGAL_ID_CHAR;
+ END
+#else
+ for (i=0xC0; i<=0xD6; i++)
+ BEGIN
+ id_class[i] = LEGAL_ID_CHAR;
+ END
+ for (i=0xD8; i<=0xF6; i++)
+ BEGIN
+ id_class[i] = LEGAL_ID_CHAR;
+ END
+ for (i=0xF8; i<=0xFF; i++)
+ BEGIN
+ id_class[i] = LEGAL_ID_CHAR;
+ END
+#endif
+#endif
/*^^^^^^^^^^^^^^^^^^^^^^^^^^ END OF SECTION 33 ^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
/***************************************************************************
diff --git a/Build/source/texk/bibtex-x/tests/bibtex8-char.test b/Build/source/texk/bibtex-x/tests/bibtex8-char.test
index d6c125e82f6..06d5e41af3c 100755
--- a/Build/source/texk/bibtex-x/tests/bibtex8-char.test
+++ b/Build/source/texk/bibtex-x/tests/bibtex8-char.test
@@ -8,7 +8,7 @@ test -d tests || mkdir -p tests
rc=0
TEXMFCNF=$srcdir/../kpathsea
-BSTINPUTS=$srcdir/tests
+BSTINPUTS=$srcdir/tests:$srcdir/csf
BIBINPUTS=$srcdir/tests
export TEXMFCNF BSTINPUTS BIBINPUTS
diff --git a/Build/source/texk/bibtex-x/tests/bibtex8.test b/Build/source/texk/bibtex-x/tests/bibtex8.test
index 472705f7157..f23159f1424 100755
--- a/Build/source/texk/bibtex-x/tests/bibtex8.test
+++ b/Build/source/texk/bibtex-x/tests/bibtex8.test
@@ -5,6 +5,7 @@
# You may freely use, modify and/or distribute this file.
test -d tests || mkdir -p tests
+rm -f tests/xexampl.*
cp $srcdir/../web2c/tests/exampl.aux tests/xexampl.aux
@@ -12,4 +13,5 @@ TEXMFCNF=$srcdir/../kpathsea \
BSTINPUTS=$srcdir/../web2c/tests \
BIBINPUTS=$srcdir/../web2c/tests \
./bibtex8 -7 tests/xexampl || test $? = 1 || exit 1
+diff $srcdir/tests/exampl.bbl tests/xexampl.bbl || exit 2
diff --git a/Build/source/texk/bibtex-x/tests/bibtexu-sort.test b/Build/source/texk/bibtex-x/tests/bibtexu-sort.test
index 8dc6d02078f..624d7fb48a1 100755
--- a/Build/source/texk/bibtex-x/tests/bibtexu-sort.test
+++ b/Build/source/texk/bibtex-x/tests/bibtexu-sort.test
@@ -26,7 +26,7 @@ done
## test for change.case$
cp $srcdir/tests/caseu.aux tests/xcaseu.aux
-./bibtexu tests/xcaseu || rc=3
+max_print_line=99 ./bibtexu tests/xcaseu || rc=3
diff $srcdir/tests/caseu.bbl tests/xcaseu.bbl || rc=4
diff --git a/Build/source/texk/bibtex-x/tests/bibtexu.test b/Build/source/texk/bibtex-x/tests/bibtexu.test
index d2e4370d551..4e5bf709208 100755
--- a/Build/source/texk/bibtex-x/tests/bibtexu.test
+++ b/Build/source/texk/bibtex-x/tests/bibtexu.test
@@ -4,7 +4,14 @@
# Copyright 2010 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-# Not really a test, just making sure the program executes.
+test -d tests || mkdir -p tests
+rm -f tests/xexampl.*
-./bibtexu -version || exit 1
+cp $srcdir/../web2c/tests/exampl.aux tests/xexampl.aux
+
+TEXMFCNF=$srcdir/../kpathsea \
+ BSTINPUTS=$srcdir/../web2c/tests \
+ BIBINPUTS=$srcdir/../web2c/tests \
+ ./bibtexu tests/xexampl || test $? = 1 || exit 1
+diff $srcdir/tests/exampl.bbl tests/xexampl.bbl || exit 2
diff --git a/Build/source/texk/bibtex-x/tests/casea.bbl b/Build/source/texk/bibtex-x/tests/casea.bbl
index 38573a40cc2..8283ec00978 100644
--- a/Build/source/texk/bibtex-x/tests/casea.bbl
+++ b/Build/source/texk/bibtex-x/tests/casea.bbl
@@ -1,12 +1,12 @@
\section*{Test result}
\begin{itemize}
-\item[~] ABC HIJ XYZ abc hij xyz
-\item[u] ABC HIJ XYZ ABC HIJ XYZ
-\item[l] abc hij xyz abc hij xyz
-\item[t] Abc hij xyz abc hij xyz
-\item[~]
-\item[u]
-\item[l]
-\item[t]
+\item[~] ABC HIJ XYZ abc hij xyz {ACE} {ace}
+\item[u] ABC HIJ XYZ ABC HIJ XYZ {ACE} {ace}
+\item[l] abc hij xyz abc hij xyz {ACE} {ace}
+\item[t] Abc hij xyz abc hij xyz {ACE} {ace}
+\item[~] {} {}
+\item[u] {} {}
+\item[l] {} {}
+\item[t] {} {}
\end{itemize}
\endinput
diff --git a/Build/source/texk/bibtex-x/tests/caseu.bbl b/Build/source/texk/bibtex-x/tests/caseu.bbl
index 0a0cf14263c..2391fbf5afc 100644
--- a/Build/source/texk/bibtex-x/tests/caseu.bbl
+++ b/Build/source/texk/bibtex-x/tests/caseu.bbl
@@ -1,17 +1,17 @@
\section*{Test result}
\begin{itemize}
-\item[~] ÀÁÂ ÆÇÈ ÔÕÖ ØÙÚ ÜÝÞ àáâ æçè ôõö øùú üýþ
-\item[u] ÀÁÂ ÆÇÈ ÔÕÖ ØÙÚ ÜÝÞ ÀÁÂ ÆÇÈ ÔÕÖ ØÙÚ ÜÝÞ
-\item[l] àáâ æçè ôõö øùú üýþ àáâ æçè ôõö øùú üýþ
-\item[t] Àáâ æçè ôõö øùú üýþ àáâ æçè ôõö øùú üýþ
+\item[~] ÀÁÂ ÆÇÈ ÔÕÖ ØÙÚ ÜÝÞ àáâ æçè ôõö øùú üýþ {ÆÇÈ} {æçè}
+\item[u] ÀÁÂ ÆÇÈ ÔÕÖ ØÙÚ ÜÝÞ ÀÁÂ ÆÇÈ ÔÕÖ ØÙÚ ÜÝÞ {ÆÇÈ} {æçè}
+\item[l] àáâ æçè ôõö øùú üýþ àáâ æçè ôõö øùú üýþ {ÆÇÈ} {æçè}
+\item[t] Àáâ æçè ôõö øùú üýþ àáâ æçè ôõö øùú üýþ {ÆÇÈ} {æçè}
\item[~] ĀĂĄ IJĴĶ ĹĻĽ ŃŅŇ āăą ijĵķ ĺļľ ńņň
\item[u] ĀĂĄ IJĴĶ ĹĻĽ ŃŅŇ ĀĂĄ IJĴĶ ĹĻĽ ŃŅŇ
\item[l] āăą ijĵķ ĺļľ ńņň āăą ijĵķ ĺļľ ńņň
\item[t] Āăą ijĵķ ĺļľ ńņň āăą ijĵķ ĺļľ ńņň
-\item[~] ABC HIJ XYZ abc hij xyz
-\item[u] ABC HIJ XYZ ABC HIJ XYZ
-\item[l] abc hij xyz abc hij xyz
-\item[t] Abc hij xyz abc hij xyz
+\item[~] ABC HIJ XYZ abc hij xyz {ACE} {ace}
+\item[u] ABC HIJ XYZ ABC HIJ XYZ {ACE} {ace}
+\item[l] abc hij xyz abc hij xyz {ACE} {ace}
+\item[t] Abc hij xyz abc hij xyz {ACE} {ace}
\item[~] SS S ß s
\item[u] SS S SS S
\item[l] ss s ß s
@@ -20,10 +20,10 @@
\item[u] ŊŌŎ ŲŴŶ Ÿ ŹŻŽ ŊŌŎ ŲŴŶ Ÿ ŹŻŽ
\item[l] ŋōŏ ųŵŷ ÿ źżž ŋōŏ ųŵŷ ÿ źżž
\item[t] Ŋōŏ ųŵŷ ÿ źżž ŋōŏ ųŵŷ ÿ źżž
-\item[~] ΑΒΓ ΠΡ ΣΤ ΧΨΩΪ αβγ πρ στ χψωϊ
-\item[u] ΑΒΓ ΠΡ ΣΤ ΧΨΩΪ ΑΒΓ ΠΡ ΣΤ ΧΨΩΪ
-\item[l] αβγ πρ στ χψωϊ αβγ πρ στ χψωϊ
-\item[t] Αβγ πρ στ χψωϊ αβγ πρ στ χψωϊ
+\item[~] ΑΒΓ ΠΡ ΣΤ ΧΨΩΪ αβγ πρ στ χψωϊ {ΑΠΣ} {απσ}
+\item[u] ΑΒΓ ΠΡ ΣΤ ΧΨΩΪ ΑΒΓ ΠΡ ΣΤ ΧΨΩΪ {ΑΠΣ} {απσ}
+\item[l] αβγ πρ στ χψωϊ αβγ πρ στ χψωϊ {ΑΠΣ} {απσ}
+\item[t] Αβγ πρ στ χψωϊ αβγ πρ στ χψωϊ {ΑΠΣ} {απσ}
\item[~] ͰͲͶ ϘϚϜ ϪϬϮ Ϸ Ϻ ͱͳͷ ϙϛϝ ϫϭϯ ϸ ϻ
\item[u] ͰͲͶ ϘϚϜ ϪϬϮ Ϸ Ϻ ͰͲͶ ϘϚϜ ϪϬϮ Ϸ Ϻ
\item[l] ͱͳͷ ϙϛϝ ϫϭϯ ϸ ϻ ͱͳͷ ϙϛϝ ϫϭϯ ϸ ϻ
@@ -32,10 +32,10 @@
\item[u] ӐӒӔ ӺӼӾ ԀԂԄ ԪԬԮ ӐӒӔ ӺӼӾ ԀԂԄ ԪԬԮ
\item[l] ӑӓӕ ӻӽӿ ԁԃԅ ԫԭԯ ӑӓӕ ӻӽӿ ԁԃԅ ԫԭԯ
\item[t] Ӑӓӕ ӻӽӿ ԁԃԅ ԫԭԯ ӑӓӕ ӻӽӿ ԁԃԅ ԫԭԯ
-\item[~] АБВ ОП РС ЭЮЯ абв оп рс эюя
-\item[u] АБВ ОП РС ЭЮЯ АБВ ОП РС ЭЮЯ
-\item[l] абв оп рс эюя абв оп рс эюя
-\item[t] Абв оп рс эюя абв оп рс эюя
+\item[~] АБВ ОП РС ЭЮЯ абв оп рс эюя {АРЯ} {апя}
+\item[u] АБВ ОП РС ЭЮЯ АБВ ОП РС ЭЮЯ {АРЯ} {апя}
+\item[l] абв оп рс эюя абв оп рс эюя {АРЯ} {апя}
+\item[t] Абв оп рс эюя абв оп рс эюя {АРЯ} {апя}
\item[~] ЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏ ѐёђѓєѕіїјљњћќѝўџ
\item[u] ЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏ ЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏ
\item[l] ѐёђѓєѕіїјљњћќѝўџ ѐёђѓєѕіїјљњћќѝўџ
diff --git a/Build/source/texk/bibtex-x/tests/chara.bbl b/Build/source/texk/bibtex-x/tests/chara.bbl
index f9702804425..292ab638817 100644
--- a/Build/source/texk/bibtex-x/tests/chara.bbl
+++ b/Build/source/texk/bibtex-x/tests/chara.bbl
@@ -1,20 +1,20 @@
\section*{Test result}
\begin{itemize}
\item A i2str: 65 i2chr: A
+\item i2str: 197 i2chr:
\item C i2str: 67 i2chr: C
+\item i2str: 199 i2chr:
\item D i2str: 68 i2chr: D
\item E i2str: 69 i2chr: E
+\item i2str: 200 i2chr:
\item i i2str: 105 i2chr: i
+\item i2str: 238 i2chr:
\item o i2str: 111 i2chr: o
\item u i2str: 117 i2chr: u
+\item i2str: 252 i2chr:
\item y i2str: 121 i2chr: y
-\item i2str: 197 i2chr:
-\item i2str: 199 i2chr:
\item i2str: 208 i2chr:
-\item i2str: 200 i2chr:
-\item i2str: 238 i2chr:
\item i2str: 248 i2chr:
-\item i2str: 252 i2chr:
\item i2str: 253 i2chr:
\end{itemize}
\endinput
diff --git a/Build/source/texk/bibtex-x/tests/exampl.bbl b/Build/source/texk/bibtex-x/tests/exampl.bbl
new file mode 100644
index 00000000000..442298f7635
--- /dev/null
+++ b/Build/source/texk/bibtex-x/tests/exampl.bbl
@@ -0,0 +1,212 @@
+\newcommand{\noopsort}[1]{} \newcommand{\printfirst}[2]{#1}
+ \newcommand{\singleletter}[1]{#1} \newcommand{\switchargs}[2]{#2#1}
+\begin{thebibliography}{}
+
+\bibitem[Aamport, 1986a]{article-minimal}
+Aamport, L.~A. (1986a).
+\newblock The gnats and gnus document preparation system.
+\newblock {\em \mbox{G-Animal's} Journal}.
+
+\bibitem[Aamport, 1986b]{article-full}
+Aamport, L.~A. (1986b).
+\newblock The gnats and gnus document preparation system.
+\newblock {\em \mbox{G-Animal's} Journal}, 41(7):73+.
+\newblock This is a full ARTICLE entry.
+
+\bibitem[Aamport, 1986c]{article-crossref}
+Aamport, L.~A. (1986c).
+\newblock The gnats and gnus document preparation system.
+\newblock In \cite{whole-journal}, pages 73+.
+\newblock This is a cross-referencing ARTICLE entry.
+
+\bibitem[GAJ, 1986]{whole-journal}
+GAJ (1986).
+\newblock {\em \mbox{G-Animal's} Journal}, 41(7).
+\newblock The entire issue is devoted to gnats and gnus (this entry is a
+ cross-referenced ARTICLE (journal)).
+
+\bibitem[Knuth, 1968]{whole-set}
+Knuth, D.~E. ({\noopsort{1973a}}{\switchargs{--90}{1968}}).
+\newblock {\em The Art of Computer Programming}.
+\newblock Four volumes. Addison-Wesley.
+\newblock Seven volumes planned (this is a cross-referenced set of BOOKs).
+
+\bibitem[Knuth, 1973a]{inbook-minimal}
+Knuth, D.~E. ({\noopsort{1973b}}1973a).
+\newblock {\em Fundamental Algorithms}, chapter 1.2.
+\newblock Addison-Wesley.
+
+\bibitem[Knuth, 1973b]{inbook-full}
+Knuth, D.~E. ({\noopsort{1973b}}1973b).
+\newblock {\em Fundamental Algorithms}, volume~1 of {\em The Art of Computer
+ Programming}, section 1.2, pages 10--119.
+\newblock Addison-Wesley, Reading, Massachusetts, second edition.
+\newblock This is a full INBOOK entry.
+
+\bibitem[Knuth, 1973c]{inbook-crossref}
+Knuth, D.~E. ({\noopsort{1973b}}1973c).
+\newblock {\em Fundamental Algorithms}, section 1.2.
+\newblock Volume~1 of \cite{whole-set}, second edition.
+\newblock This is a cross-referencing INBOOK entry.
+
+\bibitem[Knuth, 1981a]{book-full}
+Knuth, D.~E. ({\noopsort{1973c}}1981a).
+\newblock {\em Seminumerical Algorithms}, volume~2 of {\em The Art of Computer
+ Programming}.
+\newblock Addison-Wesley, Reading, Massachusetts, second edition.
+\newblock This is a full BOOK entry.
+
+\bibitem[Knuth, 1981b]{book-minimal}
+Knuth, D.~E. ({\noopsort{1973c}}1981b).
+\newblock {\em Seminumerical Algorithms}.
+\newblock Addison-Wesley.
+
+\bibitem[Knuth, 1981c]{book-crossref}
+Knuth, D.~E. ({\noopsort{1973c}}1981c).
+\newblock {\em Seminumerical Algorithms}.
+\newblock Volume~2 of \cite{whole-set}, second edition.
+\newblock This is a cross-referencing BOOK entry.
+
+\bibitem[Kn{\printfirst{v}{1987}}, ]{booklet-minimal}
+Kn{\printfirst{v}{1987}}.
+\newblock The programming of computer art.
+
+\bibitem[Knvth, 1988]{booklet-full}
+Knvth, J.~C. (1988).
+\newblock The programming of computer art.
+\newblock Vernier Art Center, Stanford, California.
+\newblock This is a full BOOKLET entry.
+
+\bibitem[Lincoll, 1977a]{incollection-minimal}
+Lincoll, D.~D. (1977a).
+\newblock Semigroups of recurrences.
+\newblock In {\em High Speed Computer and Algorithm Organization}. Academic
+ Press.
+
+\bibitem[Lincoll, 1977b]{incollection-full}
+Lincoll, D.~D. (1977b).
+\newblock Semigroups of recurrences.
+\newblock In Lipcoll, D.~J., Lawrie, D.~H., and Sameh, A.~H., editors, {\em
+ High Speed Computer and Algorithm Organization}, number~23 in Fast Computers,
+ part~3, pages 179--183. Academic Press, New York, third edition.
+\newblock This is a full INCOLLECTION entry.
+
+\bibitem[Lincoll, 1977c]{incollection-crossref}
+Lincoll, D.~D. (1977c).
+\newblock Semigroups of recurrences.
+\newblock In \cite{whole-collection}, pages 179--183.
+\newblock This is a cross-referencing INCOLLECTION entry.
+
+\bibitem[Lipcoll et~al., 1977]{whole-collection}
+Lipcoll, D.~J., Lawrie, D.~H., and Sameh, A.~H., editors (1977).
+\newblock {\em High Speed Computer and Algorithm Organization}.
+\newblock Number~23 in Fast Computers. Academic Press, New York, third edition.
+\newblock This is a cross-referenced BOOK (collection) entry.
+
+\bibitem[Manmaker, ]{manual-minimal}
+Manmaker.
+\newblock {\em The Definitive Computer Manual}.
+
+\bibitem[Manmaker, 1986]{manual-full}
+Manmaker, L. (1986).
+\newblock {\em The Definitive Computer Manual}.
+\newblock Chips-R-Us, Silicon Valley, silver edition.
+\newblock This is a full MANUAL entry.
+
+\bibitem[Masterly, 1988a]{mastersthesis-minimal}
+Masterly, {\'{E}}. (1988a).
+\newblock Mastering thesis writing.
+\newblock Master's thesis, Stanford University.
+
+\bibitem[Masterly, 1988b]{mastersthesis-full}
+Masterly, {\'{E}}. (1988b).
+\newblock Mastering thesis writing.
+\newblock Master's project, Stanford University, English Department.
+\newblock This is a full MASTERSTHESIS entry.
+
+\bibitem[Missilany, ]{misc-minimal}
+Missilany.
+\newblock This is a minimal MISC entry.
+
+\bibitem[Missilany, 1984]{misc-full}
+Missilany, J.-B. (1984).
+\newblock Handing out random pamphlets in airports.
+\newblock Handed out at O'Hare.
+\newblock This is a full MISC entry.
+
+\bibitem[Oaho et~al., 1983a]{inproceedings-minimal}
+Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983a).
+\newblock On notions of information transfer in {VLSI} circuits.
+\newblock In {\em Proc. Fifteenth Annual ACM Symposium on the Theory of
+ Computing}.
+
+\bibitem[Oaho et~al., 1983b]{inproceedings-full}
+Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983b).
+\newblock On notions of information transfer in {VLSI} circuits.
+\newblock In Oz, W.~V. and Yannakakis, M., editors, {\em Proc. Fifteenth Annual
+ ACM Symposium on the Theory of Computing}, number~17 in All ACM Conferences,
+ pages 133--139, Boston. The OX Association for Computing Machinery, Academic
+ Press.
+\newblock This is a full INPROCEDINGS entry.
+
+\bibitem[Oaho et~al., 1983c]{inproceedings-crossref}
+Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983c).
+\newblock On notions of information transfer in {VLSI} circuits.
+\newblock In \cite{whole-proceedings}, pages 133--139.
+\newblock This is a cross-referencing INPROCEEDINGS entry.
+
+\bibitem[OX{\singleletter{stoc}}, 1983a]{whole-proceedings}
+OX{\singleletter{stoc}} (1983a).
+\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing},
+ Boston. The OX Association for Computing Machinery.
+\newblock This is a cross-referenced PROCEEDINGS.
+
+\bibitem[OX{\singleletter{stoc}}, 1983b]{proceedings-minimal}
+OX{\singleletter{stoc}} (1983b).
+\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing}.
+
+\bibitem[Oz and Yannakakis, 1983]{proceedings-full}
+Oz, W.~V. and Yannakakis, M., editors (1983).
+\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing},
+ number~17 in All ACM Conferences, Boston. The OX Association for Computing
+ Machinery, Academic Press.
+\newblock This is a full PROCEEDINGS entry.
+
+\bibitem[Phony-Baloney, 1988a]{phdthesis-minimal}
+Phony-Baloney, F.~P. (1988a).
+\newblock {\em Fighting Fire with Fire: Festooning {F}rench Phrases}.
+\newblock PhD thesis, Fanstord University.
+
+\bibitem[Phony-Baloney, 1988b]{phdthesis-full}
+Phony-Baloney, F.~P. (1988b).
+\newblock {\em Fighting Fire with Fire: Festooning {F}rench Phrases}.
+\newblock {PhD} dissertation, Fanstord University, Department of French.
+\newblock This is a full PHDTHESIS entry.
+
+\bibitem[Terrific, 1988]{techreport-minimal}
+Terrific, T. (1988).
+\newblock An {$O(n \log n / \! \log\log n)$} sorting algorithm.
+\newblock Technical report, Fanstord University.
+
+\bibitem[T{\'{e}}rrific, 1988]{techreport-full}
+T{\'{e}}rrific, T. (1988).
+\newblock An {$O(n \log n / \! \log\log n)$} sorting algorithm.
+\newblock Wishful Research Result~7, Fanstord University, Computer Science
+ Department, Fanstord, California.
+\newblock This is a full TECHREPORT entry.
+
+\bibitem[{\"{U}}nderwood et~al., ]{unpublished-minimal}
+{\"{U}}nderwood, U., {\~N}et, N., and {\={P}}ot, P.
+\newblock Lower bounds for wishful research results.
+\newblock Talk at Fanstord University (this is a minimal UNPUBLISHED entry).
+
+\bibitem[{\"{U}}nderwood et~al., 1988]{unpublished-full}
+{\"{U}}nderwood, U., {\~N}et, N., and {\={P}}ot, P. (1988).
+\newblock Lower bounds for wishful research results.
+\newblock Talk at Fanstord University (this is a full UNPUBLISHED entry).
+
+\bibitem[Volume-2, ]{random-note-crossref}
+Volume-2.
+\newblock Volume~2 is listed under Knuth \cite{book-full}.
+
+\end{thebibliography}
diff --git a/Build/source/texk/bibtex-x/tests/ltnbib.bib b/Build/source/texk/bibtex-x/tests/ltnbib.bib
index c47fac0f222..a31f62838f4 100644
--- a/Build/source/texk/bibtex-x/tests/ltnbib.bib
+++ b/Build/source/texk/bibtex-x/tests/ltnbib.bib
@@ -2,6 +2,9 @@
% Public domain.
% You may freely use, modify and/or distribute this file.
+@string{PH = "Prentice Hall"}
+@string{G = {ditions Gallimard}}
+
%% ASCII only
%% author: Given_name Middle_name Family_name
@book{kernighan78,
@@ -15,7 +18,7 @@
@book{kernighan88,
author = "Kernighan, Brian W. AND Ritchie, Dennis M.",
title = "The C Programming Language, 2nd edition",
- publisher = "Prentice Hall",
+ publisher = PH,
year = 1988,
}
@@ -55,3 +58,10 @@
year = 1812,
}
+@book{Camus,
+ author = "Albert Camus",
+ title = "L'tranger",
+ publisher = G,
+ year = 1942,
+}
+
diff --git a/Build/source/texk/bibtex-x/tests/mlgbib.bib b/Build/source/texk/bibtex-x/tests/mlgbib.bib
index 3dc9fed54b9..c8d415850c6 100644
--- a/Build/source/texk/bibtex-x/tests/mlgbib.bib
+++ b/Build/source/texk/bibtex-x/tests/mlgbib.bib
@@ -2,6 +2,10 @@
% Public domain.
% You may freely use, modify and/or distribute this file.
+@string{PH = "Prentice Hall"}
+@string{ÉG = {Éditions Gallimard}}
+@string{技評 = {技術評論社}}
+
%% ASCII only
%% author: Given_name Middle_name Family_name
@book{kernighan78,
@@ -15,7 +19,7 @@
@book{kernighan88,
author = "Kernighan, Brian W. AND Ritchie, Dennis M.",
title = "The C Programming Language, 2nd edition",
- publisher = "Prentice Hall",
+ publisher = PH,
year = 1988,
}
@@ -38,7 +42,7 @@
author = {奥村  晴彦、黒木  裕介},
title = {[改訂第8版] LaTeX2ε美文書作成入門},
year = 2020,
- publisher = {技術評論社},
+ publisher = 技評,
language = {ja},
yomi = {okumura}
}
@@ -126,6 +130,13 @@
year = 1812,
}
+@book{Camus,
+ author = "Albert Camus",
+ title = "L'Étranger",
+ publisher = ÉG,
+ year = 1942,
+}
+
%% Cyrillic
@book{Булгаков,
author = "Булгаков, Михаил Афанасьевич",
diff --git a/Build/source/texk/bibtex-x/tests/namea.bbl b/Build/source/texk/bibtex-x/tests/namea.bbl
index de688a23f93..401c5adc0d9 100644
--- a/Build/source/texk/bibtex-x/tests/namea.bbl
+++ b/Build/source/texk/bibtex-x/tests/namea.bbl
@@ -1,14 +1,8 @@
\section*{Test result}
\begin{itemize}
-\item Carl Maria von Weber
- [1] {ff} Carl~Maria {ll} Weber {vv} von {jj}
- | Carl~MariavonWeber | Carl~Maria von Weber | von Weber, C.~M. | C.~M. v.~Weber
-\item Conte de Lautramont
- [1] {ff} Conte {ll} Lautramont {vv} de {jj}
- | ContedeLautramont | Conte de Lautramont | de~Lautramont, C. | C.~d.~Lautramont
-\item King, Jr., Martin Luther
- [1] {ff} Martin~Luther {ll} King {vv} {jj} Jr.
- | Martin~LutherKingJr. | Martin~Luther King Jr. | King, Jr., M.~L. | M.~L. King, Jr.
+\item Albert Camus
+ [1] {ff} Albert {ll} Camus {vv} {jj}
+ | AlbertCamus | Albert Camus | Camus, A. | A.~Camus
\item Brian Wilson Kernighan and Dennis MacAlistair Ritchie
[1] {ff} Brian~Wilson {ll} Kernighan {vv} {jj}
| Brian~WilsonKernighan | Brian~Wilson Kernighan | Kernighan, B.~W. | B.~W. Kernighan
@@ -17,13 +11,22 @@
\item Brder Grimm
[1] {ff} Brder {ll} Grimm {vv} {jj}
| BrderGrimm | Brder Grimm | Grimm, B. | B.~Grimm
-\item Marcel Proust
- [1] {ff} Marcel {ll} Proust {vv} {jj}
- | MarcelProust | Marcel Proust | Proust, M. | M.~Proust
+\item Carl Maria von Weber
+ [1] {ff} Carl~Maria {ll} Weber {vv} von {jj}
+ | Carl~MariavonWeber | Carl~Maria von Weber | von Weber, C.~M. | C.~M. v.~Weber
+\item Conte de Lautramont
+ [1] {ff} Conte {ll} Lautramont {vv} de {jj}
+ | ContedeLautramont | Conte de Lautramont | de~Lautramont, C. | C.~d.~Lautramont
\item Kernighan, Brian W. AND Ritchie, Dennis M.
[1] {ff} Brian~W. {ll} Kernighan {vv} {jj}
| Brian~W.Kernighan | Brian~W. Kernighan | Kernighan, B.~W. | B.~W. Kernighan
[2] {ff} Dennis~M. {ll} Ritchie {vv} {jj}
| Dennis~M.Ritchie | Dennis~M. Ritchie | Ritchie, D.~M. | D.~M. Ritchie
+\item King, Jr., Martin Luther
+ [1] {ff} Martin~Luther {ll} King {vv} {jj} Jr.
+ | Martin~LutherKingJr. | Martin~Luther King Jr. | King, Jr., M.~L. | M.~L. King, Jr.
+\item Marcel Proust
+ [1] {ff} Marcel {ll} Proust {vv} {jj}
+ | MarcelProust | Marcel Proust | Proust, M. | M.~Proust
\end{itemize}
\endinput
diff --git a/Build/source/texk/bibtex-x/tests/nameu.bbl b/Build/source/texk/bibtex-x/tests/nameu.bbl
index 6206cab8c3c..7115360ff7d 100644
--- a/Build/source/texk/bibtex-x/tests/nameu.bbl
+++ b/Build/source/texk/bibtex-x/tests/nameu.bbl
@@ -1,5 +1,8 @@
\section*{Test result}
\begin{itemize}
+\item Albert Camus
+ [1] {ff} Albert {ll} Camus {vv} {jj}
+ | AlbertCamus | Albert Camus | Camus, A. | A.~Camus
\item Brian Wilson Kernighan and Dennis MacAlistair Ritchie
[1] {ff} Brian~Wilson {ll} Kernighan {vv} {jj}
| Brian~WilsonKernighan | Brian~Wilson Kernighan | Kernighan, B.~W. | B.~W. Kernighan
diff --git a/Build/source/texk/bibtex-x/tests/substra.bbl b/Build/source/texk/bibtex-x/tests/substra.bbl
index 0f96fa6b736..55d1f971775 100644
--- a/Build/source/texk/bibtex-x/tests/substra.bbl
+++ b/Build/source/texk/bibtex-x/tests/substra.bbl
@@ -55,6 +55,61 @@
\item[-6 3] tu
\item[-7 2] t
\item[-8 1]
+\item[orig] ~
+\item[1 5]
+\item[1 4]
+\item[1 3]
+\item[1 2]
+\item[1 1]
+\item[2 1]
+\item[3 1]
+\item[4 1]
+\item[5 1]
+\item[1 5]
+\item[2 5]
+\item[3 5]
+\item[4 5] ~
+\item[5 5] ~
+\item[1 5]
+\item[2 4]
+\item[3 3]
+\item[4 2]
+\item[5 1]
+\item[1 8] ~
+\item[2 7] ~
+\item[3 6] ~
+\item[4 5] ~
+\item[5 4] ~
+\item[6 3] ~
+\item[7 2] ~
+\item[8 1] ~
+\item[-1 5]
+\item[-1 4]
+\item[-1 3]
+\item[-1 2]
+\item[-1 1]
+\item[-2 1]
+\item[-3 1]
+\item[-4 1]
+\item[-5 1]
+\item[-1 5]
+\item[-2 5]
+\item[-3 5]
+\item[-4 5] ~
+\item[-5 5] ~
+\item[-1 5]
+\item[-2 4]
+\item[-3 3]
+\item[-4 2]
+\item[-5 1]
+\item[-1 8] ~
+\item[-2 7] ~
+\item[-3 6] ~
+\item[-4 5] ~
+\item[-5 4] ~
+\item[-6 3] ~
+\item[-7 2] ~
+\item[-8 1] ~
\item[orig] {AB}CDEFG tuvwx{yz}
\item[1 5] {AB}C
\item[1 4] {AB}
@@ -165,61 +220,6 @@
\item[-6 3] {wx
\item[-7 2] {w
\item[-8 1] {
-\item[orig] ~
-\item[1 5]
-\item[1 4]
-\item[1 3]
-\item[1 2]
-\item[1 1]
-\item[2 1]
-\item[3 1]
-\item[4 1]
-\item[5 1]
-\item[1 5]
-\item[2 5]
-\item[3 5]
-\item[4 5] ~
-\item[5 5] ~
-\item[1 5]
-\item[2 4]
-\item[3 3]
-\item[4 2]
-\item[5 1]
-\item[1 8] ~
-\item[2 7] ~
-\item[3 6] ~
-\item[4 5] ~
-\item[5 4] ~
-\item[6 3] ~
-\item[7 2] ~
-\item[8 1] ~
-\item[-1 5]
-\item[-1 4]
-\item[-1 3]
-\item[-1 2]
-\item[-1 1]
-\item[-2 1]
-\item[-3 1]
-\item[-4 1]
-\item[-5 1]
-\item[-1 5]
-\item[-2 5]
-\item[-3 5]
-\item[-4 5] ~
-\item[-5 5] ~
-\item[-1 5]
-\item[-2 4]
-\item[-3 3]
-\item[-4 2]
-\item[-5 1]
-\item[-1 8] ~
-\item[-2 7] ~
-\item[-3 6] ~
-\item[-4 5] ~
-\item[-5 4] ~
-\item[-6 3] ~
-\item[-7 2] ~
-\item[-8 1] ~
\item[orig] {{}}~{{}}
\item[1 5] {{}
\item[1 4] {{
diff --git a/Build/source/texk/bibtex-x/tests/testcase.bst b/Build/source/texk/bibtex-x/tests/testcase.bst
index 7336420f134..deb8ab4b5c2 100644
--- a/Build/source/texk/bibtex-x/tests/testcase.bst
+++ b/Build/source/texk/bibtex-x/tests/testcase.bst
@@ -19,15 +19,15 @@ FUNCTION {type} {output_entry}
READ
-FUNCTION {set_sortkey} {
+FUNCTION {set_sort_key} {
field 'sort.key$ :=
}
-ITERATE {set_sortkey}
+ITERATE {set_sort_key}
SORT
-FUNCTION {output_beg} {
+FUNCTION {output_bgn} {
"\section*{Test result}" write$ newline$
"\begin{itemize}" write$ newline$
}
@@ -37,7 +37,7 @@ FUNCTION {output_end} {
"\endinput" write$ newline$
}
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
ITERATE {call.type$}
diff --git a/Build/source/texk/bibtex-x/tests/testcasea.bib b/Build/source/texk/bibtex-x/tests/testcasea.bib
index 0892d7daa8f..3fd3dcdb798 100644
--- a/Build/source/texk/bibtex-x/tests/testcasea.bib
+++ b/Build/source/texk/bibtex-x/tests/testcasea.bib
@@ -1,8 +1,8 @@
@Type{ascii,
- field = {ABC HIJ XYZ abc hij xyz},
+ field = {ABC HIJ XYZ abc hij xyz {ACE} {ace}},
}
@Type{latin1,
- field = { },
+ field = { {} {}},
}
diff --git a/Build/source/texk/bibtex-x/tests/testcaseu.bib b/Build/source/texk/bibtex-x/tests/testcaseu.bib
index 5fba9ca43bc..961f159553a 100644
--- a/Build/source/texk/bibtex-x/tests/testcaseu.bib
+++ b/Build/source/texk/bibtex-x/tests/testcaseu.bib
@@ -1,9 +1,9 @@
@Type{ascii,
- field = {ABC HIJ XYZ abc hij xyz},
+ field = {ABC HIJ XYZ abc hij xyz {ACE} {ace}},
}
@Type{latin1,
- field = {ÀÁÂ ÆÇÈ ÔÕÖ ØÙÚ ÜÝÞ àáâ æçè ôõö øùú üýþ},
+ field = {ÀÁÂ ÆÇÈ ÔÕÖ ØÙÚ ÜÝÞ àáâ æçè ôõö øùú üýþ {ÆÇÈ} {æçè}},
}
@Type{latin-extA1,
@@ -19,7 +19,7 @@
}
@Type{greek1,
- field = {ΑΒΓ ΠΡ ΣΤ ΧΨΩΪ αβγ πρ στ χψωϊ},
+ field = {ΑΒΓ ΠΡ ΣΤ ΧΨΩΪ αβγ πρ στ χψωϊ {ΑΠΣ} {απσ}},
}
@Type{greek2,
@@ -27,7 +27,7 @@
}
@Type{cyrillic1,
- field = {АБВ ОП РС ЭЮЯ абв оп рс эюя},
+ field = {АБВ ОП РС ЭЮЯ абв оп рс эюя {АРЯ} {апя}},
}
@Type{cyrillic2,
diff --git a/Build/source/texk/bibtex-x/tests/testchar.bst b/Build/source/texk/bibtex-x/tests/testchar.bst
index 45ff0bdd701..d9c778fca90 100644
--- a/Build/source/texk/bibtex-x/tests/testchar.bst
+++ b/Build/source/texk/bibtex-x/tests/testchar.bst
@@ -15,15 +15,15 @@ FUNCTION {type} {output_entry}
READ
-FUNCTION {set_sortkey} {
+FUNCTION {set_sort_key} {
field 'sort.key$ :=
}
-ITERATE {set_sortkey}
+ITERATE {set_sort_key}
SORT
-FUNCTION {output_beg} {
+FUNCTION {output_bgn} {
"\section*{Test result}" write$ newline$
"\begin{itemize}" write$ newline$
}
@@ -33,7 +33,7 @@ FUNCTION {output_end} {
"\endinput" write$ newline$
}
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
ITERATE {call.type$}
diff --git a/Build/source/texk/bibtex-x/tests/testiscjk.bst b/Build/source/texk/bibtex-x/tests/testiscjk.bst
index 1836581cd2d..c744b6548cb 100644
--- a/Build/source/texk/bibtex-x/tests/testiscjk.bst
+++ b/Build/source/texk/bibtex-x/tests/testiscjk.bst
@@ -22,15 +22,15 @@ FUNCTION {type} {output_entry}
READ
-FUNCTION {set_sortkey} {
+FUNCTION {set_sort_key} {
field 'sort.key$ :=
}
-ITERATE {set_sortkey}
+ITERATE {set_sort_key}
SORT
-FUNCTION {output_beg} {
+FUNCTION {output_bgn} {
"\section*{Test result}" write$ newline$
"\begin{itemize}" write$ newline$
}
@@ -40,7 +40,7 @@ FUNCTION {output_end} {
"\endinput" write$ newline$
}
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
ITERATE {call.type$}
diff --git a/Build/source/texk/bibtex-x/tests/testname.bst b/Build/source/texk/bibtex-x/tests/testname.bst
index 648048bda7a..d9addb41d03 100644
--- a/Build/source/texk/bibtex-x/tests/testname.bst
+++ b/Build/source/texk/bibtex-x/tests/testname.bst
@@ -39,15 +39,15 @@ FUNCTION {book} {output_entry}
READ
-FUNCTION {set_sortkey} {
+FUNCTION {set_sort_key} {
author 'sort.key$ :=
}
-ITERATE {set_sortkey}
+ITERATE {set_sort_key}
SORT
-FUNCTION {output_beg} {
+FUNCTION {output_bgn} {
"\section*{Test result}" write$ newline$
"\begin{itemize}" write$ newline$
}
@@ -57,7 +57,7 @@ FUNCTION {output_end} {
"\endinput" write$ newline$
}
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
ITERATE {call.type$}
diff --git a/Build/source/texk/bibtex-x/tests/testperiod.bst b/Build/source/texk/bibtex-x/tests/testperiod.bst
index 736caa09353..b597eb00c9b 100644
--- a/Build/source/texk/bibtex-x/tests/testperiod.bst
+++ b/Build/source/texk/bibtex-x/tests/testperiod.bst
@@ -15,15 +15,15 @@ FUNCTION {type} {output_entry}
READ
-FUNCTION {set_sortkey} {
+FUNCTION {set_sort_key} {
field 'sort.key$ :=
}
-ITERATE {set_sortkey}
+ITERATE {set_sort_key}
SORT
-FUNCTION {output_beg} {
+FUNCTION {output_bgn} {
"\section*{Test result}" write$ newline$
"\begin{itemize}" write$ newline$
}
@@ -33,7 +33,7 @@ FUNCTION {output_end} {
"\endinput" write$ newline$
}
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
ITERATE {call.type$}
diff --git a/Build/source/texk/bibtex-x/tests/testsubstr.bst b/Build/source/texk/bibtex-x/tests/testsubstr.bst
index 7da2e11b9e3..a332f82a000 100644
--- a/Build/source/texk/bibtex-x/tests/testsubstr.bst
+++ b/Build/source/texk/bibtex-x/tests/testsubstr.bst
@@ -66,15 +66,15 @@ FUNCTION {type} {output_entry}
READ
-FUNCTION {set_sortkey} {
+FUNCTION {set_sort_key} {
field 'sort.key$ :=
}
-ITERATE {set_sortkey}
+ITERATE {set_sort_key}
SORT
-FUNCTION {output_beg} {
+FUNCTION {output_bgn} {
"\section*{Test result}" write$ newline$
"\begin{itemize}" write$ newline$
}
@@ -84,7 +84,7 @@ FUNCTION {output_end} {
"\endinput" write$ newline$
}
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
ITERATE {call.type$}
diff --git a/Build/source/texk/bibtex-x/tests/testtxtprfx.bst b/Build/source/texk/bibtex-x/tests/testtxtprfx.bst
index 2d501059949..20383dc2c11 100644
--- a/Build/source/texk/bibtex-x/tests/testtxtprfx.bst
+++ b/Build/source/texk/bibtex-x/tests/testtxtprfx.bst
@@ -20,15 +20,15 @@ FUNCTION {type} {output_entry}
READ
-FUNCTION {set_sortkey} {
+FUNCTION {set_sort_key} {
field 'sort.key$ :=
}
-ITERATE {set_sortkey}
+ITERATE {set_sort_key}
SORT
-FUNCTION {output_beg} {
+FUNCTION {output_bgn} {
"\section*{Test result}" write$ newline$
"\begin{itemize}" write$ newline$
}
@@ -38,7 +38,7 @@ FUNCTION {output_end} {
"\endinput" write$ newline$
}
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
ITERATE {call.type$}
diff --git a/Build/source/texk/bibtex-x/tests/testwidth.bst b/Build/source/texk/bibtex-x/tests/testwidth.bst
index e8bb929bd0a..2af9d8c3883 100644
--- a/Build/source/texk/bibtex-x/tests/testwidth.bst
+++ b/Build/source/texk/bibtex-x/tests/testwidth.bst
@@ -13,15 +13,15 @@ FUNCTION {type} {output_entry}
READ
-FUNCTION {set_sortkey} {
+FUNCTION {set_sort_key} {
field 'sort.key$ :=
}
-ITERATE {set_sortkey}
+ITERATE {set_sort_key}
SORT
-FUNCTION {output_beg} {
+FUNCTION {output_bgn} {
"\section*{Test result}" write$ newline$
"\begin{itemize}" write$ newline$
}
@@ -31,7 +31,7 @@ FUNCTION {output_end} {
"\endinput" write$ newline$
}
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
ITERATE {call.type$}
diff --git a/Build/source/texk/bibtex-x/tests/txtprfxa.bbl b/Build/source/texk/bibtex-x/tests/txtprfxa.bbl
index c50f2c955ff..4f1b9cea92b 100644
--- a/Build/source/texk/bibtex-x/tests/txtprfxa.bbl
+++ b/Build/source/texk/bibtex-x/tests/txtprfxa.bbl
@@ -9,6 +9,15 @@
\item[5] ABCDE
\item[6] ABCDEF
\item[7] ABCDEFG
+\item[orig] ~
+\item[len] 15
+\item[1]
+\item[2]
+\item[3]
+\item[4]
+\item[5]
+\item[6]
+\item[7]
\item[orig] {AB}CDEFG tuvwx{yz}
\item[len] 15
\item[1] {A}
@@ -27,15 +36,6 @@
\item[5] {{AB}CD}E
\item[6] {{AB}CD}EF
\item[7] {{AB}CD}EFG
-\item[orig] ~
-\item[len] 15
-\item[1]
-\item[2]
-\item[3]
-\item[4]
-\item[5]
-\item[6]
-\item[7]
\item[orig] {{}}~{{}}
\item[len] 15
\item[1] {{}}
diff --git a/Build/source/texk/bibtex-x/tests/yannis.bbl b/Build/source/texk/bibtex-x/tests/yannis.bbl
index eceb47f7891..ac5294fe769 100644
--- a/Build/source/texk/bibtex-x/tests/yannis.bbl
+++ b/Build/source/texk/bibtex-x/tests/yannis.bbl
@@ -7,7 +7,7 @@
\bibitem[Œtingen, 2009]{cle8}
Œtingen, N. (2009).
-\newblock {\em Un livre, ABC Def {GHI} {Jkl} ÀÁÂ Ñæß {ÀÁÂ} {Ñæß}}.
+\newblock {\em Un livre}.
\newblock Les Éditions du désastre.
\bibitem[Tarantin, 2009]{cle4}
@@ -22,7 +22,7 @@ Tarantin, N. (2009).
\bibitem[Ἕλληνας, 2009]{cle7}
Ἕλληνας, Μ. (2009).
-\newblock {\em Τὸ καλὸ παράδειγμα, ΑΒΓ {Δεζ} {ΗΘΙ}}.
+\newblock {\em Τὸ καλὸ παράδειγμα}.
\newblock Ἐκδοτικὸς οἶκος «Δὲν βαριέσαι».
\bibitem[Ζαχαρόπουλος, 2009]{cle5}
@@ -33,7 +33,7 @@ Tarantin, N. (2009).
\bibitem[Достое́вский, 1880]{cle9}
Достое́вский, Ф.~М. (1880).
-\newblock {\em Братья Карамазовы, АБВ {Где} {ЖЗИ}}.
+\newblock {\em Братья Карамазовы}.
\newblock Русскій Вѣстникъ.
\bibitem[天堂最新的章节表, 2009]{cle3}
diff --git a/Build/source/texk/bibtex-x/tests/yannis.bib b/Build/source/texk/bibtex-x/tests/yannis.bib
index 99ae411fdc9..e02d612b275 100644
--- a/Build/source/texk/bibtex-x/tests/yannis.bib
+++ b/Build/source/texk/bibtex-x/tests/yannis.bib
@@ -40,17 +40,17 @@
@book{cle7,
Author = {Ἕλληνας, Μῆτσος},
Publisher = {Ἐκδοτικὸς οἶκος «Δὲν βαριέσαι»},
- Title = {Τὸ καλὸ παράδειγμα, ΑΒΓ {Δεζ} {ΗΘΙ}},
+ Title = {Τὸ καλὸ παράδειγμα},
Year = {2009}}
@book{cle8,
Author = {Œtingen, Nicolas},
Publisher = {Les Éditions du désastre},
- Title = {Un livre, ABC Def {GHI} {Jkl} ÀÁÂ Ñæß {ÀÁÂ} {Ñæß}},
+ Title = {Un livre},
Year = {2009}}
@book{cle9,
Author = {Фёдор Миха́йлович Достое́вский},
Publisher = {Русскій Вѣстникъ},
- Title = {Братья Карамазовы, АБВ {Где} {ЖЗИ}},
+ Title = {Братья Карамазовы},
Year = {1880}}
diff --git a/Build/source/texk/bibtex-x/version.h b/Build/source/texk/bibtex-x/version.h
index 43f3e2714c9..1aea5c6803d 100644
--- a/Build/source/texk/bibtex-x/version.h
+++ b/Build/source/texk/bibtex-x/version.h
@@ -89,7 +89,7 @@
*/
#ifndef __VERSION_H__
# define __VERSION_H__ 1
-# define PACKAGE_DATE "(2 may 2022)"
+# define PACKAGE_DATE "(8 may 2022)"
# define VERSION PACKAGE_VERSION " " PACKAGE_DATE
#endif /* __VERSION_H__ */