From f324c72f61448145ec4df5f078dbd66ea55f148d Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Tue, 17 May 2022 12:10:32 +0000 Subject: bibtex-x: fix a bug on text.prefix$ git-svn-id: svn://tug.org/texlive/trunk@63317 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/bibtex-x/ChangeLog | 9 ++ Build/source/texk/bibtex-x/bibtex-4.c | 2 +- Build/source/texk/bibtex-x/bibtex.h | 2 +- Build/source/texk/bibtex-x/tests/substra.bbl | 55 ++++++++ Build/source/texk/bibtex-x/tests/substru.bbl | 165 +++++++++++++++++++++++ Build/source/texk/bibtex-x/tests/testsubstra.bib | 4 + Build/source/texk/bibtex-x/tests/testsubstru.bib | 12 ++ Build/source/texk/bibtex-x/tests/txtprfxa.bbl | 9 ++ Build/source/texk/bibtex-x/tests/txtprfxu.bbl | 27 ++++ Build/source/texk/bibtex-x/version.h | 2 +- 10 files changed, 284 insertions(+), 3 deletions(-) (limited to 'Build/source/texk/bibtex-x') 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 + + * 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 * 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__ */ -- cgit v1.2.3