From 679415ca8ea07f6d0840b5f88d7437649048732e Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 16 Apr 2022 10:00:56 +0000 Subject: bibtex-x: tweak test files. git-svn-id: svn://tug.org/texlive/trunk@63039 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/bibtex-x/ChangeLog | 8 +-- Build/source/texk/bibtex-x/Makefile.am | 2 +- Build/source/texk/bibtex-x/Makefile.in | 2 +- Build/source/texk/bibtex-x/configure | 2 +- Build/source/texk/bibtex-x/tests/bibtex8-mem.test | 70 ----------------------- Build/source/texk/bibtex-x/tests/sort.test | 25 -------- Build/source/texk/bibtex-x/tests/sortu-az.bbl | 12 ++++ Build/source/texk/bibtex-x/tests/sortu-da.bbl | 12 ++++ Build/source/texk/bibtex-x/tests/sortu-en.bbl | 12 ++++ Build/source/texk/bibtex-x/tests/sortu-fi.bbl | 12 ++++ Build/source/texk/bibtex-x/tests/sortu-tr.bbl | 12 ++++ Build/source/texk/bibtex-x/tests/sortu.aux | 2 +- Build/source/texk/bibtex-x/tests/testdatau.bib | 43 -------------- Build/source/texk/bibtex-x/tests/testsortu.bib | 27 +++++++++ 14 files changed, 95 insertions(+), 146 deletions(-) delete mode 100755 Build/source/texk/bibtex-x/tests/bibtex8-mem.test delete mode 100755 Build/source/texk/bibtex-x/tests/sort.test delete mode 100644 Build/source/texk/bibtex-x/tests/testdatau.bib create mode 100644 Build/source/texk/bibtex-x/tests/testsortu.bib (limited to 'Build') diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog index 2c9a33e3adb..26286635cf1 100644 --- a/Build/source/texk/bibtex-x/ChangeLog +++ b/Build/source/texk/bibtex-x/ChangeLog @@ -11,16 +11,16 @@ * bibtex-3.c: Ignore add.period$ after Unicode punctuation marks ‼⁇⁈⁉‽!?。 . in bibtexu. * bibtex-4.c: - Accept characters over ASCII by int.to.char$ in bibtex8 & bibtexu. - Accept multibyte characters by char.to.int$ in bibtexu. + Accept characters over ASCII by int.to.chr$ in bibtex8 & bibtexu. + Accept multibyte characters by chr.to.int$ in bibtexu. * Makefile.am, tests/bibtex8u-mem.test, tests/bibtex[8u]-{sort,char}.test, - tests/sortu.aux, tests/sortu-{az,da,en,fi,tr}.bbl, tests/testdatau.bib, - tests/txtprfx[au].{aux,bbl}, tests/testtxtprfx.bst, + tests/sortu.aux, tests/sortu-{az,da,en,fi,tr}.bbl, tests/testsortu.bib, tests/case[au].{aux,bbl}, tests/testcase[au].bib, tests/testcase.bst, tests/char[au].{aux,bbl}, tests/testchar[au].bib, tests/testchar.bst, tests/period[au].{aux,bbl}, tests/testperiod[au].bib, tests/testperiod.bst, tests/substr[au].{aux,bbl}, tests/testsubstr[au].bib, tests/testsubstr.bst, + tests/txtprfx[au].{aux,bbl}, tests/testtxtprfx.bst, tests/width[au].{aux,bbl}, tests/testwidth[au].bib, tests/testwidth.bst: Add new tests. diff --git a/Build/source/texk/bibtex-x/Makefile.am b/Build/source/texk/bibtex-x/Makefile.am index 67e46b95377..16bb0010e49 100644 --- a/Build/source/texk/bibtex-x/Makefile.am +++ b/Build/source/texk/bibtex-x/Makefile.am @@ -137,7 +137,7 @@ DISTCLEANFILES += tests/xyannis.aux tests/xyannis.bbl tests/xyannis.blg ## tests/bibtexu-sort.test EXTRA_DIST += tests/sortu.aux \ tests/sortu-az.bbl tests/sortu-da.bbl tests/sortu-en.bbl \ - tests/sortu-fi.bbl tests/sortu-tr.bbl tests/testdatau.bib \ + tests/sortu-fi.bbl tests/sortu-tr.bbl tests/testsortu.bib \ tests/caseu.aux tests/caseu.bbl tests/testcaseu.bib DISTCLEANFILES += tests/xsortu-*.aux tests/xsortu-*.bbl tests/xsortu-*.blg \ tests/xcaseu.aux tests/xcaseu.bbl tests/xcaseu.blg diff --git a/Build/source/texk/bibtex-x/Makefile.in b/Build/source/texk/bibtex-x/Makefile.in index 47768b284c7..4b68a465f2a 100644 --- a/Build/source/texk/bibtex-x/Makefile.in +++ b/Build/source/texk/bibtex-x/Makefile.in @@ -677,7 +677,7 @@ EXTRA_DIST = $(bibtex8_tests) $(bibtexu_tests) tests/sort.aux \ tests/urange.bib tests/yannis.aux tests/yannis.bbl \ tests/yannis.bib tests/sortu.aux tests/sortu-az.bbl \ tests/sortu-da.bbl tests/sortu-en.bbl tests/sortu-fi.bbl \ - tests/sortu-tr.bbl tests/testdatau.bib tests/caseu.aux \ + tests/sortu-tr.bbl tests/testsortu.bib tests/caseu.aux \ tests/caseu.bbl tests/testcaseu.bib tests/periodu.aux \ tests/periodu.bbl tests/testperiodu.bib tests/substru.aux \ tests/substru.bbl tests/testsubstru.bib tests/txtprfxu.aux \ diff --git a/Build/source/texk/bibtex-x/configure b/Build/source/texk/bibtex-x/configure index 3afa900d763..4f8b82a5c5e 100755 --- a/Build/source/texk/bibtex-x/configure +++ b/Build/source/texk/bibtex-x/configure @@ -14550,7 +14550,7 @@ ac_config_headers="$ac_config_headers config.h" -printf "%s\n" "#define TL_VERSION \"TeX Live 2022\"" >>confdefs.h +printf "%s\n" "#define TL_VERSION \"TeX Live 2023/dev\"" >>confdefs.h diff --git a/Build/source/texk/bibtex-x/tests/bibtex8-mem.test b/Build/source/texk/bibtex-x/tests/bibtex8-mem.test deleted file mode 100755 index 50424af632d..00000000000 --- a/Build/source/texk/bibtex-x/tests/bibtex8-mem.test +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh -vx -# $Id$ -# Copyright 2017 Karl Berry -# Copyright 2010 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -# Using test data from Philipp Lehman - -test -d tests || mkdir -p tests - -# Create bib data -mk_bib () { - for i - do - for j in 0 1 2 3 4 5 6 7 8 9; do - for k in 0 1 2 3 4 5 6 7 8 9; do - for l in 0 1 2 3 4 5 6 7 8 9; do - cat <tests/memtest$t.aux - - env= - - case $t in - 1) mk_bib 0 >tests/memtest.bib;; - 2) mk_bib 1 >>tests/memtest.bib;; - 3) env='ent_str_size=2000 glob_str_size=2000';; - esac - - echo "Running memtest$t ..." - - eval $env \ - TEXMFCNF=$srcdir/../kpathsea \ - BSTINPUTS=$srcdir/../web2c/tests:$srcdir/csf \ - BIBINPUTS=./tests \ - ./bibtex8 tests/memtest$t || exit 1 - -done - diff --git a/Build/source/texk/bibtex-x/tests/sort.test b/Build/source/texk/bibtex-x/tests/sort.test deleted file mode 100755 index ed4ffe6ffad..00000000000 --- a/Build/source/texk/bibtex-x/tests/sort.test +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh -vx -# $Id$ -# Copyright 2017 Karl Berry -# Copyright 2010 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -# Using test data from Philipp Lehman - -test -d tests || mkdir -p tests - -cp $srcdir/tests/sort.aux tests/xsort.aux - -for i in 1 2 3; do - -rm -f xsort.bbl - -TEXMFCNF=$srcdir/../kpathsea \ - BSTINPUTS=$srcdir/tests \ - BIBINPUTS=$srcdir/tests \ - ./bibtex8 --csfile sort$i.csf tests/xsort || exit 1 - -diff $srcdir/tests/sort$i.bbl tests/xsort.bbl || exit 1 - -done - diff --git a/Build/source/texk/bibtex-x/tests/sortu-az.bbl b/Build/source/texk/bibtex-x/tests/sortu-az.bbl index 58a526aecbb..c9cb3ea758d 100644 --- a/Build/source/texk/bibtex-x/tests/sortu-az.bbl +++ b/Build/source/texk/bibtex-x/tests/sortu-az.bbl @@ -11,5 +11,17 @@ \item Öö ÖÖ öö \item Yy YY yy \item Zz ZZ zz +\item Аа АА аа +\item Бб ББ бб +\item Вв ВВ вв +\item Ээ ЭЭ ээ +\item Юю ЮЮ юю +\item Яя ЯЯ яя +\item Αα ΑΑ αα +\item Ββ ΒΒ ββ +\item Γγ ΓΓ γγ +\item Χχ ΧΧ χχ +\item Ψψ ΨΨ ψψ +\item Ωω ΩΩ ωω \end{itemize} \endinput diff --git a/Build/source/texk/bibtex-x/tests/sortu-da.bbl b/Build/source/texk/bibtex-x/tests/sortu-da.bbl index faa1b9f351c..c9f0485addf 100644 --- a/Build/source/texk/bibtex-x/tests/sortu-da.bbl +++ b/Build/source/texk/bibtex-x/tests/sortu-da.bbl @@ -11,5 +11,17 @@ \item Öö ÖÖ öö \item Aa AA aa \item Åå ÅÅ åå +\item Αα ΑΑ αα +\item Ββ ΒΒ ββ +\item Γγ ΓΓ γγ +\item Χχ ΧΧ χχ +\item Ψψ ΨΨ ψψ +\item Ωω ΩΩ ωω +\item Аа АА аа +\item Бб ББ бб +\item Вв ВВ вв +\item Ээ ЭЭ ээ +\item Юю ЮЮ юю +\item Яя ЯЯ яя \end{itemize} \endinput diff --git a/Build/source/texk/bibtex-x/tests/sortu-en.bbl b/Build/source/texk/bibtex-x/tests/sortu-en.bbl index 68d35c1a1e6..53f24ba70d5 100644 --- a/Build/source/texk/bibtex-x/tests/sortu-en.bbl +++ b/Build/source/texk/bibtex-x/tests/sortu-en.bbl @@ -11,5 +11,17 @@ \item Xx XX xx \item Yy YY yy \item Zz ZZ zz +\item Αα ΑΑ αα +\item Ββ ΒΒ ββ +\item Γγ ΓΓ γγ +\item Χχ ΧΧ χχ +\item Ψψ ΨΨ ψψ +\item Ωω ΩΩ ωω +\item Аа АА аа +\item Бб ББ бб +\item Вв ВВ вв +\item Ээ ЭЭ ээ +\item Юю ЮЮ юю +\item Яя ЯЯ яя \end{itemize} \endinput diff --git a/Build/source/texk/bibtex-x/tests/sortu-fi.bbl b/Build/source/texk/bibtex-x/tests/sortu-fi.bbl index 40adb287ce0..db180ee186e 100644 --- a/Build/source/texk/bibtex-x/tests/sortu-fi.bbl +++ b/Build/source/texk/bibtex-x/tests/sortu-fi.bbl @@ -11,5 +11,17 @@ \item Ää ÄÄ ää \item Öö ÖÖ öö \item Øø ØØ øø +\item Αα ΑΑ αα +\item Ββ ΒΒ ββ +\item Γγ ΓΓ γγ +\item Χχ ΧΧ χχ +\item Ψψ ΨΨ ψψ +\item Ωω ΩΩ ωω +\item Аа АА аа +\item Бб ББ бб +\item Вв ВВ вв +\item Ээ ЭЭ ээ +\item Юю ЮЮ юю +\item Яя ЯЯ яя \end{itemize} \endinput diff --git a/Build/source/texk/bibtex-x/tests/sortu-tr.bbl b/Build/source/texk/bibtex-x/tests/sortu-tr.bbl index 4d874b184e0..3497df87255 100644 --- a/Build/source/texk/bibtex-x/tests/sortu-tr.bbl +++ b/Build/source/texk/bibtex-x/tests/sortu-tr.bbl @@ -11,5 +11,17 @@ \item Xx XX xx \item Yy YY yy \item Zz ZZ zz +\item Αα ΑΑ αα +\item Ββ ΒΒ ββ +\item Γγ ΓΓ γγ +\item Χχ ΧΧ χχ +\item Ψψ ΨΨ ψψ +\item Ωω ΩΩ ωω +\item Аа АА аа +\item Бб ББ бб +\item Вв ВВ вв +\item Ээ ЭЭ ээ +\item Юю ЮЮ юю +\item Яя ЯЯ яя \end{itemize} \endinput diff --git a/Build/source/texk/bibtex-x/tests/sortu.aux b/Build/source/texk/bibtex-x/tests/sortu.aux index 24dd5d4b090..6d541f02535 100644 --- a/Build/source/texk/bibtex-x/tests/sortu.aux +++ b/Build/source/texk/bibtex-x/tests/sortu.aux @@ -1,4 +1,4 @@ \relax \citation{*} \bibstyle{teststyle} -\bibdata{testdatau} +\bibdata{testsortu} diff --git a/Build/source/texk/bibtex-x/tests/testdatau.bib b/Build/source/texk/bibtex-x/tests/testdatau.bib deleted file mode 100644 index d31a115bb7a..00000000000 --- a/Build/source/texk/bibtex-x/tests/testdatau.bib +++ /dev/null @@ -1,43 +0,0 @@ -@Type{8bit-1, - field = {Øø}, -} - -@Type{8bit-2, - field = {Åå}, -} - -@Type{8bit-3, - field = {Ää}, -} - -@Type{8bit-4, - field = {Öö}, -} - -@Type{aa, - field = {Aa}, -} - -@Type{bb, - field = {Bb}, -} - -@Type{cc, - field = {Cc}, -} - -@Type{oo, - field = {Oo}, -} - -@Type{xx, - field = {Xx}, -} - -@Type{yy, - field = {Yy}, -} - -@Type{zz, - field = {Zz}, -} diff --git a/Build/source/texk/bibtex-x/tests/testsortu.bib b/Build/source/texk/bibtex-x/tests/testsortu.bib new file mode 100644 index 00000000000..0d7b6253aef --- /dev/null +++ b/Build/source/texk/bibtex-x/tests/testsortu.bib @@ -0,0 +1,27 @@ +@Type{8bit-1, field = {Øø}, } +@Type{8bit-2, field = {Åå}, } +@Type{8bit-3, field = {Ää}, } +@Type{8bit-4, field = {Öö}, } + +@Type{aa, field = {Aa}, } +@Type{bb, field = {Bb}, } +@Type{cc, field = {Cc}, } +@Type{oo, field = {Oo}, } +@Type{xx, field = {Xx}, } +@Type{yy, field = {Yy}, } +@Type{zz, field = {Zz}, } + +@Type{greek1, field = {Αα}, } +@Type{greek2, field = {Ββ}, } +@Type{greek3, field = {Γγ}, } +@Type{greek4, field = {Χχ}, } +@Type{greek5, field = {Ψψ}, } +@Type{greek6, field = {Ωω}, } + +@Type{cyrillic1, field = {Аа}, } +@Type{cyrillic2, field = {Бб}, } +@Type{cyrillic3, field = {Вв}, } +@Type{cyrillic4, field = {Ээ}, } +@Type{cyrillic5, field = {Юю}, } +@Type{cyrillic6, field = {Яя}, } + -- cgit v1.2.3