texlive[63257] Build/source/texk/bibtex-x: bibtex-x: set

commits+takuji at tug.org commits+takuji at tug.org
Sun May 8 15:25:05 CEST 2022


Revision: 63257
          http://tug.org/svn/texlive?view=revision&revision=63257
Author:   takuji
Date:     2022-05-08 15:25:05 +0200 (Sun, 08 May 2022)
Log Message:
-----------
bibtex-x: set LEGAL_ID_CHAR to id_class of 8bit characters

Modified Paths:
--------------
    trunk/Build/source/texk/bibtex-x/ChangeLog
    trunk/Build/source/texk/bibtex-x/Makefile.am
    trunk/Build/source/texk/bibtex-x/Makefile.in
    trunk/Build/source/texk/bibtex-x/bibtex-2.c
    trunk/Build/source/texk/bibtex-x/tests/bibtex8-char.test
    trunk/Build/source/texk/bibtex-x/tests/bibtex8.test
    trunk/Build/source/texk/bibtex-x/tests/bibtexu-sort.test
    trunk/Build/source/texk/bibtex-x/tests/bibtexu.test
    trunk/Build/source/texk/bibtex-x/tests/casea.bbl
    trunk/Build/source/texk/bibtex-x/tests/caseu.bbl
    trunk/Build/source/texk/bibtex-x/tests/chara.bbl
    trunk/Build/source/texk/bibtex-x/tests/ltnbib.bib
    trunk/Build/source/texk/bibtex-x/tests/mlgbib.bib
    trunk/Build/source/texk/bibtex-x/tests/namea.bbl
    trunk/Build/source/texk/bibtex-x/tests/nameu.bbl
    trunk/Build/source/texk/bibtex-x/tests/substra.bbl
    trunk/Build/source/texk/bibtex-x/tests/testcase.bst
    trunk/Build/source/texk/bibtex-x/tests/testcasea.bib
    trunk/Build/source/texk/bibtex-x/tests/testcaseu.bib
    trunk/Build/source/texk/bibtex-x/tests/testchar.bst
    trunk/Build/source/texk/bibtex-x/tests/testiscjk.bst
    trunk/Build/source/texk/bibtex-x/tests/testname.bst
    trunk/Build/source/texk/bibtex-x/tests/testperiod.bst
    trunk/Build/source/texk/bibtex-x/tests/testsubstr.bst
    trunk/Build/source/texk/bibtex-x/tests/testtxtprfx.bst
    trunk/Build/source/texk/bibtex-x/tests/testwidth.bst
    trunk/Build/source/texk/bibtex-x/tests/txtprfxa.bbl
    trunk/Build/source/texk/bibtex-x/tests/yannis.bbl
    trunk/Build/source/texk/bibtex-x/tests/yannis.bib
    trunk/Build/source/texk/bibtex-x/version.h

Added Paths:
-----------
    trunk/Build/source/texk/bibtex-x/tests/exampl.bbl

Modified: trunk/Build/source/texk/bibtex-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/bibtex-x/ChangeLog	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/ChangeLog	2022-05-08 13:25:05 UTC (rev 63257)
@@ -1,3 +1,18 @@
+2022-05-08  TANAKA Takuji  <ttk at 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 at t-lab.opal.ne.jp>
 
 	* version.h:

Modified: trunk/Build/source/texk/bibtex-x/Makefile.am
===================================================================
--- trunk/Build/source/texk/bibtex-x/Makefile.am	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/Makefile.am	2022-05-08 13:25:05 UTC (rev 63257)
@@ -95,6 +95,7 @@
 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
 ##

Modified: trunk/Build/source/texk/bibtex-x/Makefile.in
===================================================================
--- trunk/Build/source/texk/bibtex-x/Makefile.in	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/Makefile.in	2022-05-08 13:25:05 UTC (rev 63257)
@@ -660,8 +660,8 @@
                 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 \

Modified: trunk/Build/source/texk/bibtex-x/bibtex-2.c
===================================================================
--- trunk/Build/source/texk/bibtex-x/bibtex-2.c	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/bibtex-2.c	2022-05-08 13:25:05 UTC (rev 63257)
@@ -2548,6 +2548,31 @@
     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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
 
 /***************************************************************************

Modified: trunk/Build/source/texk/bibtex-x/tests/bibtex8-char.test
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/bibtex8-char.test	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/bibtex8-char.test	2022-05-08 13:25:05 UTC (rev 63257)
@@ -8,7 +8,7 @@
 rc=0
 
 TEXMFCNF=$srcdir/../kpathsea
-BSTINPUTS=$srcdir/tests
+BSTINPUTS=$srcdir/tests:$srcdir/csf
 BIBINPUTS=$srcdir/tests
 export TEXMFCNF BSTINPUTS BIBINPUTS
 

Modified: trunk/Build/source/texk/bibtex-x/tests/bibtex8.test
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/bibtex8.test	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/bibtex8.test	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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 @@
   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
 

Modified: trunk/Build/source/texk/bibtex-x/tests/bibtexu-sort.test
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/bibtexu-sort.test	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/bibtexu-sort.test	2022-05-08 13:25:05 UTC (rev 63257)
@@ -26,7 +26,7 @@
 
 ## 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
 
 

Modified: trunk/Build/source/texk/bibtex-x/tests/bibtexu.test
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/bibtexu.test	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/bibtexu.test	2022-05-08 13:25:05 UTC (rev 63257)
@@ -4,7 +4,14 @@
 # Copyright 2010 Peter Breitenlohner <tex-live at 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
+

Modified: trunk/Build/source/texk/bibtex-x/tests/casea.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/casea.bbl	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/casea.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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[~] \xC0\xC1\xC2 \xC6\xC7\xC8 \xD4\xD5\xD6 \xD8\xD9\xDA \xDC\xDD\xDE \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE
-\item[u] \xC0\xC1\xC2 \xC6\xC7\xC8 \xD4\xD5\xD6 \xD8\xD9\xDA \xDC\xDD\xDE \xC0\xC1\xC2 \xC6\xC7\xC8 \xD4\xD5\xD6 \xD8\xD9\xDA \xDC\xDD\xDE
-\item[l] \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE
-\item[t] \xC0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE
+\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[~] \xC0\xC1\xC2 \xC6\xC7\xC8 \xD4\xD5\xD6 \xD8\xD9\xDA \xDC\xDD\xDE \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE {\xC6\xC7\xC8} {\xE6\xE7\xE8}
+\item[u] \xC0\xC1\xC2 \xC6\xC7\xC8 \xD4\xD5\xD6 \xD8\xD9\xDA \xDC\xDD\xDE \xC0\xC1\xC2 \xC6\xC7\xC8 \xD4\xD5\xD6 \xD8\xD9\xDA \xDC\xDD\xDE {\xC6\xC7\xC8} {\xE6\xE7\xE8}
+\item[l] \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE {\xC6\xC7\xC8} {\xE6\xE7\xE8}
+\item[t] \xC0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE {\xC6\xC7\xC8} {\xE6\xE7\xE8}
 \end{itemize}
 \endinput

Modified: trunk/Build/source/texk/bibtex-x/tests/caseu.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/caseu.bbl	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/caseu.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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] ѐёђѓєѕіїјљњћќѝўџ ѐёђѓєѕіїјљњћќѝўџ

Modified: trunk/Build/source/texk/bibtex-x/tests/chara.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/chara.bbl	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/chara.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -1,20 +1,20 @@
 \section*{Test result}
 \begin{itemize}
 \item A  i2str: 65  i2chr: A
+\item \xC5  i2str: 197  i2chr: \xC5
 \item C  i2str: 67  i2chr: C
+\item \xC7  i2str: 199  i2chr: \xC7
 \item D  i2str: 68  i2chr: D
 \item E  i2str: 69  i2chr: E
+\item \xC8  i2str: 200  i2chr: \xC8
 \item i  i2str: 105  i2chr: i
+\item \xEE  i2str: 238  i2chr: \xEE
 \item o  i2str: 111  i2chr: o
 \item u  i2str: 117  i2chr: u
+\item \xFC  i2str: 252  i2chr: \xFC
 \item y  i2str: 121  i2chr: y
-\item \xC5  i2str: 197  i2chr: \xC5
-\item \xC7  i2str: 199  i2chr: \xC7
 \item \xD0  i2str: 208  i2chr: \xD0
-\item \xC8  i2str: 200  i2chr: \xC8
-\item \xEE  i2str: 238  i2chr: \xEE
 \item \xF8  i2str: 248  i2chr: \xF8
-\item \xFC  i2str: 252  i2chr: \xFC
 \item \xFD  i2str: 253  i2chr: \xFD
 \end{itemize}
 \endinput

Added: trunk/Build/source/texk/bibtex-x/tests/exampl.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/exampl.bbl	                        (rev 0)
+++ trunk/Build/source/texk/bibtex-x/tests/exampl.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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}

Modified: trunk/Build/source/texk/bibtex-x/tests/ltnbib.bib
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/ltnbib.bib	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/ltnbib.bib	2022-05-08 13:25:05 UTC (rev 63257)
@@ -2,6 +2,9 @@
 % Public domain.
 % You may freely use, modify and/or distribute this file.
 
+ at string{PH = "Prentice Hall"}
+ at string{\xC9G = {\xC9ditions 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,
 }
 
+ at book{Camus,
+ author = "Albert Camus",
+ title  = "L'\xC9tranger",
+ publisher = \xC9G,
+ year = 1942,
+}
+

Modified: trunk/Build/source/texk/bibtex-x/tests/mlgbib.bib
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/mlgbib.bib	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/mlgbib.bib	2022-05-08 13:25:05 UTC (rev 63257)
@@ -2,6 +2,10 @@
 % Public domain.
 % You may freely use, modify and/or distribute this file.
 
+ at string{PH = "Prentice Hall"}
+ at string{ÉG = {Éditions Gallimard}}
+ at 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,
 }
 
+ at book{Camus,
+ author = "Albert Camus",
+ title  = "L'Étranger",
+ publisher = ÉG,
+ year = 1942,
+}
+
 %% Cyrillic
 @book{Булгаков,
  author	= "Булгаков, Михаил Афанасьевич",

Modified: trunk/Build/source/texk/bibtex-x/tests/namea.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/namea.bbl	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/namea.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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 Lautr\xE9amont
- [1] {ff} Conte {ll} Lautr\xE9amont {vv} de {jj}
- | ContedeLautr\xE9amont | Conte de Lautr\xE9amont | de~Lautr\xE9amont, C. | C.~d.~Lautr\xE9amont
-\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 Br\xFCder Grimm
  [1] {ff} Br\xFCder {ll} Grimm {vv}  {jj}
  | Br\xFCderGrimm | Br\xFCder 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 Lautr\xE9amont
+ [1] {ff} Conte {ll} Lautr\xE9amont {vv} de {jj}
+ | ContedeLautr\xE9amont | Conte de Lautr\xE9amont | de~Lautr\xE9amont, C. | C.~d.~Lautr\xE9amont
 \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

Modified: trunk/Build/source/texk/bibtex-x/tests/nameu.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/nameu.bbl	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/nameu.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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

Modified: trunk/Build/source/texk/bibtex-x/tests/substra.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/substra.bbl	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/substra.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -55,6 +55,61 @@
 \item[-6 3]  tu
 \item[-7 2]  t
 \item[-8 1]
+\item[orig] \xC5\xC7\xC8\xCE\xD8\xDC\xDD~\xE5\xE7\xE8\xEE\xF8\xFC\xFD
+\item[1 5] \xC5\xC7\xC8\xCE\xD8
+\item[1 4] \xC5\xC7\xC8\xCE
+\item[1 3] \xC5\xC7\xC8
+\item[1 2] \xC5\xC7
+\item[1 1] \xC5
+\item[2 1] \xC7
+\item[3 1] \xC8
+\item[4 1] \xCE
+\item[5 1] \xD8
+\item[1 5] \xC5\xC7\xC8\xCE\xD8
+\item[2 5] \xC7\xC8\xCE\xD8\xDC
+\item[3 5] \xC8\xCE\xD8\xDC\xDD
+\item[4 5] \xCE\xD8\xDC\xDD~
+\item[5 5] \xD8\xDC\xDD~\xE5
+\item[1 5] \xC5\xC7\xC8\xCE\xD8
+\item[2 4] \xC7\xC8\xCE\xD8
+\item[3 3] \xC8\xCE\xD8
+\item[4 2] \xCE\xD8
+\item[5 1] \xD8
+\item[1 8] \xC5\xC7\xC8\xCE\xD8\xDC\xDD~
+\item[2 7] \xC7\xC8\xCE\xD8\xDC\xDD~
+\item[3 6] \xC8\xCE\xD8\xDC\xDD~
+\item[4 5] \xCE\xD8\xDC\xDD~
+\item[5 4] \xD8\xDC\xDD~
+\item[6 3] \xDC\xDD~
+\item[7 2] \xDD~
+\item[8 1] ~
+\item[-1 5] \xE8\xEE\xF8\xFC\xFD
+\item[-1 4] \xEE\xF8\xFC\xFD
+\item[-1 3] \xF8\xFC\xFD
+\item[-1 2] \xFC\xFD
+\item[-1 1] \xFD
+\item[-2 1] \xFC
+\item[-3 1] \xF8
+\item[-4 1] \xEE
+\item[-5 1] \xE8
+\item[-1 5] \xE8\xEE\xF8\xFC\xFD
+\item[-2 5] \xE7\xE8\xEE\xF8\xFC
+\item[-3 5] \xE5\xE7\xE8\xEE\xF8
+\item[-4 5] ~\xE5\xE7\xE8\xEE
+\item[-5 5] \xDD~\xE5\xE7\xE8
+\item[-1 5] \xE8\xEE\xF8\xFC\xFD
+\item[-2 4] \xE8\xEE\xF8\xFC
+\item[-3 3] \xE8\xEE\xF8
+\item[-4 2] \xE8\xEE
+\item[-5 1] \xE8
+\item[-1 8] ~\xE5\xE7\xE8\xEE\xF8\xFC\xFD
+\item[-2 7] ~\xE5\xE7\xE8\xEE\xF8\xFC
+\item[-3 6] ~\xE5\xE7\xE8\xEE\xF8
+\item[-4 5] ~\xE5\xE7\xE8\xEE
+\item[-5 4] ~\xE5\xE7\xE8
+\item[-6 3] ~\xE5\xE7
+\item[-7 2] ~\xE5
+\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] \xC5\xC7\xC8\xCE\xD8\xDC\xDD~\xE5\xE7\xE8\xEE\xF8\xFC\xFD
-\item[1 5] \xC5\xC7\xC8\xCE\xD8
-\item[1 4] \xC5\xC7\xC8\xCE
-\item[1 3] \xC5\xC7\xC8
-\item[1 2] \xC5\xC7
-\item[1 1] \xC5
-\item[2 1] \xC7
-\item[3 1] \xC8
-\item[4 1] \xCE
-\item[5 1] \xD8
-\item[1 5] \xC5\xC7\xC8\xCE\xD8
-\item[2 5] \xC7\xC8\xCE\xD8\xDC
-\item[3 5] \xC8\xCE\xD8\xDC\xDD
-\item[4 5] \xCE\xD8\xDC\xDD~
-\item[5 5] \xD8\xDC\xDD~\xE5
-\item[1 5] \xC5\xC7\xC8\xCE\xD8
-\item[2 4] \xC7\xC8\xCE\xD8
-\item[3 3] \xC8\xCE\xD8
-\item[4 2] \xCE\xD8
-\item[5 1] \xD8
-\item[1 8] \xC5\xC7\xC8\xCE\xD8\xDC\xDD~
-\item[2 7] \xC7\xC8\xCE\xD8\xDC\xDD~
-\item[3 6] \xC8\xCE\xD8\xDC\xDD~
-\item[4 5] \xCE\xD8\xDC\xDD~
-\item[5 4] \xD8\xDC\xDD~
-\item[6 3] \xDC\xDD~
-\item[7 2] \xDD~
-\item[8 1] ~
-\item[-1 5] \xE8\xEE\xF8\xFC\xFD
-\item[-1 4] \xEE\xF8\xFC\xFD
-\item[-1 3] \xF8\xFC\xFD
-\item[-1 2] \xFC\xFD
-\item[-1 1] \xFD
-\item[-2 1] \xFC
-\item[-3 1] \xF8
-\item[-4 1] \xEE
-\item[-5 1] \xE8
-\item[-1 5] \xE8\xEE\xF8\xFC\xFD
-\item[-2 5] \xE7\xE8\xEE\xF8\xFC
-\item[-3 5] \xE5\xE7\xE8\xEE\xF8
-\item[-4 5] ~\xE5\xE7\xE8\xEE
-\item[-5 5] \xDD~\xE5\xE7\xE8
-\item[-1 5] \xE8\xEE\xF8\xFC\xFD
-\item[-2 4] \xE8\xEE\xF8\xFC
-\item[-3 3] \xE8\xEE\xF8
-\item[-4 2] \xE8\xEE
-\item[-5 1] \xE8
-\item[-1 8] ~\xE5\xE7\xE8\xEE\xF8\xFC\xFD
-\item[-2 7] ~\xE5\xE7\xE8\xEE\xF8\xFC
-\item[-3 6] ~\xE5\xE7\xE8\xEE\xF8
-\item[-4 5] ~\xE5\xE7\xE8\xEE
-\item[-5 4] ~\xE5\xE7\xE8
-\item[-6 3] ~\xE5\xE7
-\item[-7 2] ~\xE5
-\item[-8 1] ~
 \item[orig] {{\xC5\xC7}\xC8\xCE}\xD8\xDC\xDD~\xE5\xE7\xE8{\xEE\xF8{\xFC\xFD}}
 \item[1 5] {{\xC5\xC7}
 \item[1 4] {{\xC5\xC7

Modified: trunk/Build/source/texk/bibtex-x/tests/testcase.bst
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testcase.bst	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testcase.bst	2022-05-08 13:25:05 UTC (rev 63257)
@@ -19,15 +19,15 @@
 
 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 @@
   "\endinput" write$ newline$
 }
 
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
 
 ITERATE {call.type$}
 

Modified: trunk/Build/source/texk/bibtex-x/tests/testcasea.bib
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testcasea.bib	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testcasea.bib	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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	  = {\xC0\xC1\xC2 \xC6\xC7\xC8 \xD4\xD5\xD6 \xD8\xD9\xDA \xDC\xDD\xDE \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE},
+  field	  = {\xC0\xC1\xC2 \xC6\xC7\xC8 \xD4\xD5\xD6 \xD8\xD9\xDA \xDC\xDD\xDE \xE0\xE1\xE2 \xE6\xE7\xE8 \xF4\xF5\xF6 \xF8\xF9\xFA \xFC\xFD\xFE {\xC6\xC7\xC8} {\xE6\xE7\xE8}},
 }
 

Modified: trunk/Build/source/texk/bibtex-x/tests/testcaseu.bib
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testcaseu.bib	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testcaseu.bib	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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,

Modified: trunk/Build/source/texk/bibtex-x/tests/testchar.bst
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testchar.bst	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testchar.bst	2022-05-08 13:25:05 UTC (rev 63257)
@@ -15,15 +15,15 @@
 
 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 @@
   "\endinput" write$ newline$
 }
 
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
 
 ITERATE {call.type$}
 

Modified: trunk/Build/source/texk/bibtex-x/tests/testiscjk.bst
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testiscjk.bst	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testiscjk.bst	2022-05-08 13:25:05 UTC (rev 63257)
@@ -22,15 +22,15 @@
 
 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 @@
   "\endinput" write$ newline$
 }
 
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
 
 ITERATE {call.type$}
 

Modified: trunk/Build/source/texk/bibtex-x/tests/testname.bst
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testname.bst	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testname.bst	2022-05-08 13:25:05 UTC (rev 63257)
@@ -39,15 +39,15 @@
 
 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 @@
   "\endinput" write$ newline$
 }
 
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
 
 ITERATE {call.type$}
 

Modified: trunk/Build/source/texk/bibtex-x/tests/testperiod.bst
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testperiod.bst	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testperiod.bst	2022-05-08 13:25:05 UTC (rev 63257)
@@ -15,15 +15,15 @@
 
 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 @@
   "\endinput" write$ newline$
 }
 
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
 
 ITERATE {call.type$}
 

Modified: trunk/Build/source/texk/bibtex-x/tests/testsubstr.bst
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testsubstr.bst	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testsubstr.bst	2022-05-08 13:25:05 UTC (rev 63257)
@@ -66,15 +66,15 @@
 
 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 @@
   "\endinput" write$ newline$
 }
 
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
 
 ITERATE {call.type$}
 

Modified: trunk/Build/source/texk/bibtex-x/tests/testtxtprfx.bst
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testtxtprfx.bst	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testtxtprfx.bst	2022-05-08 13:25:05 UTC (rev 63257)
@@ -20,15 +20,15 @@
 
 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 @@
   "\endinput" write$ newline$
 }
 
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
 
 ITERATE {call.type$}
 

Modified: trunk/Build/source/texk/bibtex-x/tests/testwidth.bst
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/testwidth.bst	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/testwidth.bst	2022-05-08 13:25:05 UTC (rev 63257)
@@ -13,15 +13,15 @@
 
 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 @@
   "\endinput" write$ newline$
 }
 
-EXECUTE {output_beg}
+EXECUTE {output_bgn}
 
 ITERATE {call.type$}
 

Modified: trunk/Build/source/texk/bibtex-x/tests/txtprfxa.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/txtprfxa.bbl	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/txtprfxa.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -9,6 +9,15 @@
 \item[5] ABCDE
 \item[6] ABCDEF
 \item[7] ABCDEFG
+\item[orig] \xC5\xC7\xC8\xCE\xD8\xDC\xDD~\xE5\xE7\xE8\xEE\xF8\xFC\xFD
+\item[len] 15
+\item[1] \xC5
+\item[2] \xC5\xC7
+\item[3] \xC5\xC7\xC8
+\item[4] \xC5\xC7\xC8\xCE
+\item[5] \xC5\xC7\xC8\xCE\xD8
+\item[6] \xC5\xC7\xC8\xCE\xD8\xDC
+\item[7] \xC5\xC7\xC8\xCE\xD8\xDC\xDD
 \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] \xC5\xC7\xC8\xCE\xD8\xDC\xDD~\xE5\xE7\xE8\xEE\xF8\xFC\xFD
-\item[len] 15
-\item[1] \xC5
-\item[2] \xC5\xC7
-\item[3] \xC5\xC7\xC8
-\item[4] \xC5\xC7\xC8\xCE
-\item[5] \xC5\xC7\xC8\xCE\xD8
-\item[6] \xC5\xC7\xC8\xCE\xD8\xDC
-\item[7] \xC5\xC7\xC8\xCE\xD8\xDC\xDD
 \item[orig] {{\xC5\xC7}\xC8\xCE}\xD8\xDC\xDD~\xE5\xE7\xE8{\xEE\xF8{\xFC\xFD}}
 \item[len] 15
 \item[1] {{\xC5}}

Modified: trunk/Build/source/texk/bibtex-x/tests/yannis.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/yannis.bbl	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/yannis.bbl	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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 @@
 
 \bibitem[Ἕλληνας, 2009]{cle7}
 Ἕλληνας, Μ. (2009).
-\newblock {\em Τὸ καλὸ παράδειγμα, ΑΒΓ {Δεζ} {ΗΘΙ}}.
+\newblock {\em Τὸ καλὸ παράδειγμα}.
 \newblock Ἐκδοτικὸς οἶκος «Δὲν βαριέσαι».
 
 \bibitem[Ζαχαρόπουλος, 2009]{cle5}
@@ -33,7 +33,7 @@
 
 \bibitem[Достое́вский, 1880]{cle9}
 Достое́вский, Ф.~М. (1880).
-\newblock {\em Братья Карамазовы, АБВ {Где} {ЖЗИ}}.
+\newblock {\em Братья Карамазовы}.
 \newblock Русскій Вѣстникъ.
 
 \bibitem[天堂最新的章节表, 2009]{cle3}

Modified: trunk/Build/source/texk/bibtex-x/tests/yannis.bib
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/yannis.bib	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/tests/yannis.bib	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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}}

Modified: trunk/Build/source/texk/bibtex-x/version.h
===================================================================
--- trunk/Build/source/texk/bibtex-x/version.h	2022-05-07 23:43:49 UTC (rev 63256)
+++ trunk/Build/source/texk/bibtex-x/version.h	2022-05-08 13:25:05 UTC (rev 63257)
@@ -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__ */
 



More information about the tex-live-commits mailing list.