summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2022-05-17 12:10:32 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2022-05-17 12:10:32 +0000
commitf324c72f61448145ec4df5f078dbd66ea55f148d (patch)
tree63553862cf50e4a3e8ee81fad73c5623815dc4f5 /Build
parent0e8aba91c6749977039b3aa3c202783600cd664f (diff)
bibtex-x: fix a bug on text.prefix$
git-svn-id: svn://tug.org/texlive/trunk@63317 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/bibtex-x/ChangeLog9
-rw-r--r--Build/source/texk/bibtex-x/bibtex-4.c2
-rw-r--r--Build/source/texk/bibtex-x/bibtex.h2
-rw-r--r--Build/source/texk/bibtex-x/tests/substra.bbl55
-rw-r--r--Build/source/texk/bibtex-x/tests/substru.bbl165
-rw-r--r--Build/source/texk/bibtex-x/tests/testsubstra.bib4
-rw-r--r--Build/source/texk/bibtex-x/tests/testsubstru.bib12
-rw-r--r--Build/source/texk/bibtex-x/tests/txtprfxa.bbl9
-rw-r--r--Build/source/texk/bibtex-x/tests/txtprfxu.bbl27
-rw-r--r--Build/source/texk/bibtex-x/version.h2
10 files changed, 284 insertions, 3 deletions
diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog
index 9941164fdc4..80058592123 100644
--- a/Build/source/texk/bibtex-x/ChangeLog
+++ b/Build/source/texk/bibtex-x/ChangeLog
@@ -1,3 +1,12 @@
+2022-05-17 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version.h:
+ Bump version to 4.00 (17 may 2022).
+ * bibtex-4.c, bibtex.h:
+ Fix a bug of text.prefix$ in bibtexu.
+ * tests/testsubstr[au].bib, substr[au].bbl, txtprfx[au].bbl:
+ Update tests.
+
2022-05-08 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* version.h:
diff --git a/Build/source/texk/bibtex-x/bibtex-4.c b/Build/source/texk/bibtex-x/bibtex-4.c
index e088331719d..cd2b5811cc5 100644
--- a/Build/source/texk/bibtex-x/bibtex-4.c
+++ b/Build/source/texk/bibtex-x/bibtex-4.c
@@ -2387,7 +2387,7 @@ BEGIN
/*
The same for the length of character UTF-8. 23/sep/2009
*/
- DO_UTF8(str_pool[sp_xptr1], , sp_xptr1++, sp_xptr1 += 2, sp_xptr1 += 3);
+ DO_UTF8(str_pool[sp_xptr1-1], , sp_xptr1++, sp_xptr1 += 2, sp_xptr1 += 3);
#endif
INCR (num_text_chars);
END
diff --git a/Build/source/texk/bibtex-x/bibtex.h b/Build/source/texk/bibtex-x/bibtex.h
index b9f6ae87ca7..8f1e6ddf39d 100644
--- a/Build/source/texk/bibtex-x/bibtex.h
+++ b/Build/source/texk/bibtex-x/bibtex.h
@@ -1485,7 +1485,7 @@
else if ((ch >= 0xC2) && (ch <= 0xDF)) { do_2; } \
else if ((ch >= 0xE0) && (ch <= 0xEF)) { do_3; } \
else if ((ch >= 0xF0) && (ch <= 0xF4)) { do_4; } \
- else printf("this isn't a right UTF-8 char!\n")
+ else printf("this (%x) isn't a right UTF-8 char!\n", ch)
/***************************************************************************
diff --git a/Build/source/texk/bibtex-x/tests/substra.bbl b/Build/source/texk/bibtex-x/tests/substra.bbl
index 55d1f971775..9b182f7f23b 100644
--- a/Build/source/texk/bibtex-x/tests/substra.bbl
+++ b/Build/source/texk/bibtex-x/tests/substra.bbl
@@ -275,5 +275,60 @@
\item[-6 3] {
\item[-7 2] {
\item[-8 1] {
+\item[orig] {\a}{\b}{\c}
+\item[1 5] {\a}
+\item[1 4] {\a}
+\item[1 3] {\a
+\item[1 2] {\
+\item[1 1] {
+\item[2 1] \
+\item[3 1] a
+\item[4 1] }
+\item[5 1]
+\item[1 5] {\a}
+\item[2 5] \a}
+\item[3 5] a}{
+\item[4 5] }{\
+\item[5 5] {\b
+\item[1 5] {\a}
+\item[2 4] \a}
+\item[3 3] a}
+\item[4 2] }
+\item[5 1]
+\item[1 8] {\a}{\
+\item[2 7] \a}{\
+\item[3 6] a}{\
+\item[4 5] }{\
+\item[5 4] {\
+\item[6 3] {\
+\item[7 2] {\
+\item[8 1] \
+\item[-1 5] \c}
+\item[-1 4] c}
+\item[-1 3] }
+\item[-1 2]
+\item[-1 1]
+\item[-2 1]
+\item[-3 1] }
+\item[-4 1] c
+\item[-5 1] \
+\item[-1 5] \c}
+\item[-2 5] {\c}
+\item[-3 5] {\c}
+\item[-4 5] {\c
+\item[-5 5] }{\
+\item[-1 5] \c}
+\item[-2 4] \c}
+\item[-3 3] \c}
+\item[-4 2] \c
+\item[-5 1] \
+\item[-1 8] {\c}
+\item[-2 7] {\c}
+\item[-3 6] {\c}
+\item[-4 5] {\c
+\item[-5 4] {\
+\item[-6 3] {
+\item[-7 2]
+\item[-8 1]
\end{itemize}
\endinput
diff --git a/Build/source/texk/bibtex-x/tests/substru.bbl b/Build/source/texk/bibtex-x/tests/substru.bbl
index bb1e9ab2903..48e2601b8e5 100644
--- a/Build/source/texk/bibtex-x/tests/substru.bbl
+++ b/Build/source/texk/bibtex-x/tests/substru.bbl
@@ -220,6 +220,171 @@
\item[-6 3] uvw
\item[-7 2] uv
\item[-8 1] u
+\item[orig] {\a}Åå{\b}Ææ{\c}Çç
+\item[1 5] {\a}Å
+\item[1 4] {\a}
+\item[1 3] {\a
+\item[1 2] {\
+\item[1 1] {
+\item[2 1] \
+\item[3 1] a
+\item[4 1] }
+\item[5 1] Å
+\item[1 5] {\a}Å
+\item[2 5] \a}Åå
+\item[3 5] a}Åå{
+\item[4 5] }Åå{\
+\item[5 5] Åå{\b
+\item[1 5] {\a}Å
+\item[2 4] \a}Å
+\item[3 3] a}Å
+\item[4 2] }Å
+\item[5 1] Å
+\item[1 8] {\a}Åå{\
+\item[2 7] \a}Åå{\
+\item[3 6] a}Åå{\
+\item[4 5] }Åå{\
+\item[5 4] Åå{\
+\item[6 3] å{\
+\item[7 2] {\
+\item[8 1] \
+\item[-1 5] \c}Çç
+\item[-1 4] c}Çç
+\item[-1 3] }Çç
+\item[-1 2] Çç
+\item[-1 1] ç
+\item[-2 1] Ç
+\item[-3 1] }
+\item[-4 1] c
+\item[-5 1] \
+\item[-1 5] \c}Çç
+\item[-2 5] {\c}Ç
+\item[-3 5] æ{\c}
+\item[-4 5] Ææ{\c
+\item[-5 5] }Ææ{\
+\item[-1 5] \c}Çç
+\item[-2 4] \c}Ç
+\item[-3 3] \c}
+\item[-4 2] \c
+\item[-5 1] \
+\item[-1 8] Ææ{\c}Çç
+\item[-2 7] Ææ{\c}Ç
+\item[-3 6] Ææ{\c}
+\item[-4 5] Ææ{\c
+\item[-5 4] Ææ{\
+\item[-6 3] Ææ{
+\item[-7 2] Ææ
+\item[-8 1] Æ
+\item[orig] {\a}αあ{\b}βい{\c}γう
+\item[1 5] {\a}α
+\item[1 4] {\a}
+\item[1 3] {\a
+\item[1 2] {\
+\item[1 1] {
+\item[2 1] \
+\item[3 1] a
+\item[4 1] }
+\item[5 1] α
+\item[1 5] {\a}α
+\item[2 5] \a}αあ
+\item[3 5] a}αあ{
+\item[4 5] }αあ{\
+\item[5 5] αあ{\b
+\item[1 5] {\a}α
+\item[2 4] \a}α
+\item[3 3] a}α
+\item[4 2] }α
+\item[5 1] α
+\item[1 8] {\a}αあ{\
+\item[2 7] \a}αあ{\
+\item[3 6] a}αあ{\
+\item[4 5] }αあ{\
+\item[5 4] αあ{\
+\item[6 3] あ{\
+\item[7 2] {\
+\item[8 1] \
+\item[-1 5] \c}γう
+\item[-1 4] c}γう
+\item[-1 3] }γう
+\item[-1 2] γう
+\item[-1 1] う
+\item[-2 1] γ
+\item[-3 1] }
+\item[-4 1] c
+\item[-5 1] \
+\item[-1 5] \c}γう
+\item[-2 5] {\c}γ
+\item[-3 5] い{\c}
+\item[-4 5] βい{\c
+\item[-5 5] }βい{\
+\item[-1 5] \c}γう
+\item[-2 4] \c}γ
+\item[-3 3] \c}
+\item[-4 2] \c
+\item[-5 1] \
+\item[-1 8] βい{\c}γう
+\item[-2 7] βい{\c}γ
+\item[-3 6] βい{\c}
+\item[-4 5] βい{\c
+\item[-5 4] βい{\
+\item[-6 3] βい{
+\item[-7 2] βい
+\item[-8 1] β
+\item[orig] {\a}あα{\b}いβ{\c}うγ
+\item[1 5] {\a}あ
+\item[1 4] {\a}
+\item[1 3] {\a
+\item[1 2] {\
+\item[1 1] {
+\item[2 1] \
+\item[3 1] a
+\item[4 1] }
+\item[5 1] あ
+\item[1 5] {\a}あ
+\item[2 5] \a}あα
+\item[3 5] a}あα{
+\item[4 5] }あα{\
+\item[5 5] あα{\b
+\item[1 5] {\a}あ
+\item[2 4] \a}あ
+\item[3 3] a}あ
+\item[4 2] }あ
+\item[5 1] あ
+\item[1 8] {\a}あα{\
+\item[2 7] \a}あα{\
+\item[3 6] a}あα{\
+\item[4 5] }あα{\
+\item[5 4] あα{\
+\item[6 3] α{\
+\item[7 2] {\
+\item[8 1] \
+\item[-1 5] \c}うγ
+\item[-1 4] c}うγ
+\item[-1 3] }うγ
+\item[-1 2] うγ
+\item[-1 1] γ
+\item[-2 1] う
+\item[-3 1] }
+\item[-4 1] c
+\item[-5 1] \
+\item[-1 5] \c}うγ
+\item[-2 5] {\c}う
+\item[-3 5] β{\c}
+\item[-4 5] いβ{\c
+\item[-5 5] }いβ{\
+\item[-1 5] \c}うγ
+\item[-2 4] \c}う
+\item[-3 3] \c}
+\item[-4 2] \c
+\item[-5 1] \
+\item[-1 8] いβ{\c}うγ
+\item[-2 7] いβ{\c}う
+\item[-3 6] いβ{\c}
+\item[-4 5] いβ{\c
+\item[-5 4] いβ{\
+\item[-6 3] いβ{
+\item[-7 2] いβ
+\item[-8 1] い
\item[orig] {{AB}CD}EFG tuv{wx{yz}}
\item[1 5] {{AB}
\item[1 4] {{AB
diff --git a/Build/source/texk/bibtex-x/tests/testsubstra.bib b/Build/source/texk/bibtex-x/tests/testsubstra.bib
index ab1b6b9b227..4ceeccac636 100644
--- a/Build/source/texk/bibtex-x/tests/testsubstra.bib
+++ b/Build/source/texk/bibtex-x/tests/testsubstra.bib
@@ -15,3 +15,7 @@
field = {{{}}~{{}}},
}
+@Type{brace-backslash1,
+ field = "{\a}{\b}{\c}",
+}
+
diff --git a/Build/source/texk/bibtex-x/tests/testsubstru.bib b/Build/source/texk/bibtex-x/tests/testsubstru.bib
index c4919faad5c..a77db5354f6 100644
--- a/Build/source/texk/bibtex-x/tests/testsubstru.bib
+++ b/Build/source/texk/bibtex-x/tests/testsubstru.bib
@@ -45,3 +45,15 @@
field = {AÇう冤EÜЖ~tçユ漆𡚴xюω},
}
+@Type{brace-backslash1,
+ field = "{\a}Åå{\b}Ææ{\c}Çç",
+}
+
+@Type{brace-backslash2,
+ field = "{\a}αあ{\b}βい{\c}γう",
+}
+
+@Type{brace-backslash3,
+ field = "{\a}あα{\b}いβ{\c}うγ",
+}
+
diff --git a/Build/source/texk/bibtex-x/tests/txtprfxa.bbl b/Build/source/texk/bibtex-x/tests/txtprfxa.bbl
index 4f1b9cea92b..ac481447694 100644
--- a/Build/source/texk/bibtex-x/tests/txtprfxa.bbl
+++ b/Build/source/texk/bibtex-x/tests/txtprfxa.bbl
@@ -45,5 +45,14 @@
\item[5] {{}}
\item[6] {{}}
\item[7] {{}}
+\item[orig] {\a}{\b}{\c}
+\item[len] 9
+\item[1] {\a}
+\item[2] {\a}
+\item[3] {\a}
+\item[4] {\a}{\b}
+\item[5] {\a}{\b}
+\item[6] {\a}{\b}
+\item[7] {\a}{\b}{\c}
\end{itemize}
\endinput
diff --git a/Build/source/texk/bibtex-x/tests/txtprfxu.bbl b/Build/source/texk/bibtex-x/tests/txtprfxu.bbl
index 502400ae128..59e7b222618 100644
--- a/Build/source/texk/bibtex-x/tests/txtprfxu.bbl
+++ b/Build/source/texk/bibtex-x/tests/txtprfxu.bbl
@@ -36,6 +36,33 @@
\item[5] {AB}CDE
\item[6] {AB}CDEF
\item[7] {AB}CDEFG
+\item[orig] {\a}Åå{\b}Ææ{\c}Çç
+\item[len] 9
+\item[1] {\a}
+\item[2] {\a}Å
+\item[3] {\a}Åå
+\item[4] {\a}Åå{\b}
+\item[5] {\a}Åå{\b}Æ
+\item[6] {\a}Åå{\b}Ææ
+\item[7] {\a}Åå{\b}Ææ{\c}
+\item[orig] {\a}αあ{\b}βい{\c}γう
+\item[len] 9
+\item[1] {\a}
+\item[2] {\a}α
+\item[3] {\a}αあ
+\item[4] {\a}αあ{\b}
+\item[5] {\a}αあ{\b}β
+\item[6] {\a}αあ{\b}βい
+\item[7] {\a}αあ{\b}βい{\c}
+\item[orig] {\a}あα{\b}いβ{\c}うγ
+\item[len] 9
+\item[1] {\a}
+\item[2] {\a}あ
+\item[3] {\a}あα
+\item[4] {\a}あα{\b}
+\item[5] {\a}あα{\b}い
+\item[6] {\a}あα{\b}いβ
+\item[7] {\a}あα{\b}いβ{\c}
\item[orig] {{AB}CD}EFG tuv{wx{yz}}
\item[len] 15
\item[1] {{A}}
diff --git a/Build/source/texk/bibtex-x/version.h b/Build/source/texk/bibtex-x/version.h
index 1aea5c6803d..83f8cde3791 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 "(8 may 2022)"
+# define PACKAGE_DATE "(17 may 2022)"
# define VERSION PACKAGE_VERSION " " PACKAGE_DATE
#endif /* __VERSION_H__ */