Skip to content

Commit

Permalink
synchronized texlive 72812.
Browse files Browse the repository at this point in the history
  • Loading branch information
clerkma committed Nov 10, 2024
1 parent db254a0 commit 6c2bfb9
Show file tree
Hide file tree
Showing 62 changed files with 1,609 additions and 555 deletions.
2 changes: 1 addition & 1 deletion texlive/libs/icu/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

2024-10-27 Karl Berry <[email protected]>

* Import 76.2.
* Import 76.1.
(version.ac): update.

2023-12-22 Karl Berry <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions texlive/texk/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$Id: README 72295 2024-09-16 12:29:16Z takuji $
$Id: README 72806 2024-11-09 10:39:33Z takuji $
Copyright 2006-2024 TeX Users Group.
You may freely use, modify and/or distribute this file.

Expand Down Expand Up @@ -106,7 +106,7 @@ ttf2pk2 - maintained here, by us

ttfdump - maintained here, by us, since Taiwan upstream apparently gone.

upmendex 1.09 - by Takuji Tanaka
upmendex 1.10 - by Takuji Tanaka
https://ctan.org/pkg/upmendex
https://github.com/t-tk/upmendex-package

Expand Down
10 changes: 10 additions & 0 deletions texlive/texk/makeindexk/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2024-11-09 TANAKA Takuji <[email protected]>

* tests/{makeindex,pprec}.test: Split test scripts.
* tests/rangeA[123].ind: Remove unused files.
* tests/nest.test, tests/nested3.{ist,idx,ind},
tests/toodeep.idx: Add new tests for nested depth.
* tests/makeindex.test, tests/tort{,W}.idx, tests/ok-tort.ind:
Add new tests for error/warning.
* Makefile.am: Adjust.

2023-08-27 TANAKA Takuji <[email protected]>

* tests/makeindex.test: Make easier to test on Windows.
Expand Down
16 changes: 13 additions & 3 deletions texlive/texk/makeindexk/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ EXTRA_DIST = CONTRIB NOTES ind-src
## Tests
##
TEST_EXTENSIONS = .pl .test
TESTS = tests/nested-range-test.pl tests/makeindex.test
TESTS = tests/nested-range-test.pl tests/makeindex.test \
tests/pprec.test \
tests/nest.test
tests/nested-range-test.log tests/makeindex.log: makeindex$(EXEEXT)
EXTRA_DIST += $(TESTS)

Expand All @@ -49,7 +51,11 @@ EXTRA_DIST += tests/nested-range.tex tests/nested-range.idx \
DISTCLEANFILES = nested-range.ilg nested-range.ind
## tests/makeindex.test
EXTRA_DIST += tests/sample.idx tests/sample.ind \
tests/range.idx tests/range2.ist tests/range2.ist tests/range3.ist \
tests/tort.idx tests/tortW.idx tests/ok-tort.ind
DISTCLEANFILES += sample.* tort*.*
## tests/pprec.test
EXTRA_DIST += tests/range.idx \
tests/range1.ist tests/range2.ist tests/range3.ist \
tests/range1.ind tests/range2.ind tests/range3.ind \
tests/pprec0.ist tests/pprec1.ist tests/pprec2.ist tests/pprec3.ist \
tests/pprec4.ist tests/pprec5.ist tests/pprec6.ist tests/pprec7.ist \
Expand All @@ -59,5 +65,9 @@ EXTRA_DIST += tests/sample.idx tests/sample.ind \
tests/romalpB.idx tests/romalpB-5.ind tests/romalpB-6.ind tests/romalpB-7.ind \
tests/romalpC.idx tests/romalpC-5.ind \
tests/romalpD.idx tests/romalpD-5.ind tests/romalpD-6.ind tests/romalpD-7.ind
DISTCLEANFILES += sample.* range*.* pprec*.* romalp*.*
DISTCLEANFILES += range*.* pprec*.* romalp*.*
## tests/nest.test
EXTRA_DIST += tests/nested3.ist tests/nested3.ind \
tests/toodeep.idx
DISTCLEANFILES += nested*.* toodeep*.*

15 changes: 10 additions & 5 deletions texlive/texk/makeindexk/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,8 @@ dist_man1_MANS = makeindex.1 mkindex.1
EXTRA_DIST = CONTRIB NOTES ind-src $(TESTS) tests/nested-range.tex \
tests/nested-range.idx tests/nested-range-bb.tex \
tests/nested-range-bb.idx tests/sample.idx tests/sample.ind \
tests/range.idx tests/range2.ist tests/range2.ist \
tests/tort.idx tests/tortW.idx tests/ok-tort.ind \
tests/range.idx tests/range1.ist tests/range2.ist \
tests/range3.ist tests/range1.ind tests/range2.ind \
tests/range3.ind tests/pprec0.ist tests/pprec1.ist \
tests/pprec2.ist tests/pprec3.ist tests/pprec4.ist \
Expand All @@ -603,11 +604,15 @@ EXTRA_DIST = CONTRIB NOTES ind-src $(TESTS) tests/nested-range.tex \
tests/romalpA-5.ind tests/romalpA-6.ind tests/romalpB.idx \
tests/romalpB-5.ind tests/romalpB-6.ind tests/romalpB-7.ind \
tests/romalpC.idx tests/romalpC-5.ind tests/romalpD.idx \
tests/romalpD-5.ind tests/romalpD-6.ind tests/romalpD-7.ind
tests/romalpD-5.ind tests/romalpD-6.ind tests/romalpD-7.ind \
tests/nested3.ist tests/nested3.ind tests/toodeep.idx
TEST_EXTENSIONS = .pl .test
TESTS = tests/nested-range-test.pl tests/makeindex.test
DISTCLEANFILES = nested-range.ilg nested-range.ind sample.* range*.* \
pprec*.* romalp*.*
TESTS = tests/nested-range-test.pl tests/makeindex.test \
tests/pprec.test \
tests/nest.test

DISTCLEANFILES = nested-range.ilg nested-range.ind sample.* tort*.* \
range*.* pprec*.* romalp*.* nested*.* toodeep*.*
all: c-auto.h
$(MAKE) $(AM_MAKEFLAGS) all-am

Expand Down
60 changes: 7 additions & 53 deletions texlive/texk/makeindexk/tests/makeindex.test
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#! /bin/sh -vx
# $Id: makeindex.test 68083 2023-08-27 14:18:16Z takuji $
# $Id: makeindex.test 72804 2024-11-09 10:39:22Z takuji $
# Copyright 2024 TANAKA Takuji <[email protected]>
# Copyright 2017 Karl Berry <[email protected]>
# Copyright 2012 Peter Breitenlohner <[email protected]>
# You may freely use, modify and/or distribute this file.
Expand All @@ -11,7 +12,7 @@ _makeindex=$BinDir/makeindex$ExeExt
TEXMFCNF=$srcdir/../kpathsea
export TEXMFCNF

rm -f sample.* range*.* pprec*.* romalp*.*
rm -f sample.* tort*.*
rc=0

$_makeindex $srcdir/tests/sample.idx -o sample.ind1 -t sample.ilg1 \
Expand All @@ -20,58 +21,11 @@ $_makeindex $srcdir/tests/sample.idx -o sample.ind1 -t sample.ilg1 \
cat $srcdir/tests/sample.idx | $_makeindex >sample.ind2 2>sample.ilg2 \
&& diff $srcdir/tests/sample.ind sample.ind2 || rc=2

$_makeindex $srcdir/tests/tort.idx -o tort.ind1 -t tort.ilg1 \
&& diff $srcdir/tests/ok-tort.ind tort.ind1 || rc=20

# test for range suffix_2p, suffix_3p, suffix_mp

for num in 1 2 3; do
$_makeindex -s $srcdir/tests/range$num.ist $srcdir/tests/range.idx \
-o range$num.ind1 -t range$num.ilg \
&& diff $srcdir/tests/range$num.ind range$num.ind1 || rc=3
done


# test for page_precedence and suffix_3p

sfx=A
for num in 0 1 2; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/pprec$sfx.idx \
-o pprec$sfx-$num.ind1 -t pprec$sfx-$num.ilg \
&& diff $srcdir/tests/pprec$sfx-$num.ind pprec$sfx-$num.ind1 || rc=4
done
sfx=B
for num in 0 3 4; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/pprec$sfx.idx \
-o pprec$sfx-$num.ind1 -t pprec$sfx-$num.ilg \
&& diff $srcdir/tests/pprec$sfx-$num.ind pprec$sfx-$num.ind1 || rc=5
done


# test for page_precedence, heuristic detection if a letter is Roman or Alpha

sfx=A
for num in 5 6; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=6
done
sfx=B
for num in 5 6 7; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=7
done
sfx=C
for num in 5; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=8
done
sfx=D
for num in 5 6 7; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=9
done
$_makeindex $srcdir/tests/tortW.idx -o tortW.ind1 -t tortW.ilg1 \
&& diff $srcdir/tests/ok-tort.ind tortW.ind1 || rc=21


exit $rc
26 changes: 26 additions & 0 deletions texlive/texk/makeindexk/tests/nest.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#! /bin/sh -vx
# $Id$
# Copyright 2024 TANAKA Takuji <[email protected]>
# Copyright 2017-2022 Karl Berry <[email protected]>
# Copyright 2013 Peter Breitenlohner <[email protected]>
# You may freely use, modify and/or distribute this file.

BinDir=${BinDir:-.}
ExeExt=${ExeExt:-}
_makeindex=$BinDir/makeindex$ExeExt

TEXMFCNF=$srcdir/../kpathsea
export TEXMFCNF

rm -f nested*.* toodeep*.*
rc=0

# test for nested items and delimiters
$_makeindex -s $srcdir/tests/nested3.ist -o nested3.ind1 -t nested3.ilg $srcdir/tests/nested3.idx \
&& diff $srcdir/tests/nested3.ind nested3.ind1 || rc=30

# test for too deep indexentry
$_makeindex $srcdir/tests/toodeep.idx -o toodeep.ind1 -t toodeep.ilg


exit $rc
19 changes: 19 additions & 0 deletions texlive/texk/makeindexk/tests/nested3.idx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
\indexentry{xa}{1}
\indexentry{xb}{1}
\indexentry{xc}{1}
\indexentry{ya!x}{1}
\indexentry{ya!y}{1}
\indexentry{ya!z}{1}
\indexentry{yb!x!x}{1}
\indexentry{yb!x!y}{1}
\indexentry{yb!x!z}{1}
\indexentry{a}{1}
\indexentry{a!a}{2}
\indexentry{a!a!a}{3}
\indexentry{ab}{6}
\indexentry{ad!a}{8}
\indexentry{ad!b}{9}
\indexentry{ae!a!a}{11}
\indexentry{ae!b!b}{12}
\indexentry{pa}{21}
\indexentry{pa!qa!ra}{22}
40 changes: 40 additions & 0 deletions texlive/texk/makeindexk/tests/nested3.ind
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
\begin{theindex}

\item_0 a(0) 1
\item_01 a(1) 2
\item_12 a(2) 3
\item_0 ab(0) 6
\item_0 ad
\item_x1 a(1) 8
\item_1 b(1) 9
\item_0 ae
\item_x1 a
\item_x2 a(2) 11
\item_1 b
\item_x2 b(2) 12

\indexspace

\item_0 pa(0) 21
\item_01 qa
\item_x2 ra(2) 22

\indexspace

\item_0 xa(0) 1
\item_0 xb(0) 1
\item_0 xc(0) 1

\indexspace

\item_0 ya
\item_x1 x(1) 1
\item_1 y(1) 1
\item_1 z(1) 1
\item_0 yb
\item_x1 x
\item_x2 x(2) 1
\item_2 y(2) 1
\item_2 z(2) 1

\end{theindex}
10 changes: 10 additions & 0 deletions texlive/texk/makeindexk/tests/nested3.ist
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
item_0 "\n \\item_0 "
item_1 "\n \\item_1 "
item_2 "\n \\item_2 "
item_01 "\n \\item_01 "
item_12 "\n \\item_12 "
item_x1 "\n \\item_x1 "
item_x2 "\n \\item_x2 "
delim_0 "(0) "
delim_1 "(1) "
delim_2 "(2) "
24 changes: 24 additions & 0 deletions texlive/texk/makeindexk/tests/ok-tort.ind
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
\begin{theindex}

\item bad-encaps, \ii{5--7}

\indexspace

\item implicit-range, 10--12
\item incons-encaps, \ii{6}, 5--7
\item incons-encaps2, \ii{5}, 5
\item incons-entries, 6, \xx{6}

\indexspace

\item missing(, 6
\item missing), 6
\item mixed-range, i, 6
\item mixed-range1, i--iv, 3--6
\item mixed-range2, \xx{ii}, i--ii, \yy{3--6}

\indexspace

\item ok-encaps, \ii{5--7}

\end{theindex}
71 changes: 71 additions & 0 deletions texlive/texk/makeindexk/tests/pprec.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#! /bin/sh -vx
# $Id: pprec.test 72804 2024-11-09 10:39:22Z takuji $
# Copyright 2021-2024 TANAKA Takuji <[email protected]>
# Copyright 2017 Karl Berry <[email protected]>
# Copyright 2012 Peter Breitenlohner <[email protected]>
# You may freely use, modify and/or distribute this file.

BinDir=${BinDir:-.}
ExeExt=${ExeExt:-}
_makeindex=$BinDir/makeindex$ExeExt

TEXMFCNF=$srcdir/../kpathsea
export TEXMFCNF

rm -f range*.* pprec*.* romalp*.*
rc=0

# test for range suffix_2p, suffix_3p, suffix_mp

for num in 1 2 3; do
$_makeindex -s $srcdir/tests/range$num.ist $srcdir/tests/range.idx \
-o range$num.ind1 -t range$num.ilg \
&& diff $srcdir/tests/range$num.ind range$num.ind1 || rc=6
done


# test for page_precedence and suffix_3p

sfx=A
for num in 0 1 2; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/pprec$sfx.idx \
-o pprec$sfx-$num.ind1 -t pprec$sfx-$num.ilg \
&& diff $srcdir/tests/pprec$sfx-$num.ind pprec$sfx-$num.ind1 || rc=7
done
sfx=B
for num in 0 3 4; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/pprec$sfx.idx \
-o pprec$sfx-$num.ind1 -t pprec$sfx-$num.ilg \
&& diff $srcdir/tests/pprec$sfx-$num.ind pprec$sfx-$num.ind1 || rc=8
done


# test for page_precedence, heuristic detection if a letter is Roman or Alpha

sfx=A
for num in 5 6; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=9
done
sfx=B
for num in 5 6 7; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=10
done
sfx=C
for num in 5; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=11
done
sfx=D
for num in 5 6 7; do
$_makeindex -s $srcdir/tests/pprec$num.ist $srcdir/tests/romalp$sfx.idx \
-o romalp$sfx-$num.ind1 -t romalp$sfx-$num.ilg \
&& diff $srcdir/tests/romalp$sfx-$num.ind romalp$sfx-$num.ind1 || rc=12
done


exit $rc
6 changes: 6 additions & 0 deletions texlive/texk/makeindexk/tests/toodeep.idx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
\indexentry{a}{1}
\indexentry{a!a}{2}
\indexentry{a!a!a}{3}
\indexentry{a!a!a!a}{4}
\indexentry{a!a!a!a!a}{5}
\indexentry{a!a!a!a!a!a}{6}
Loading

0 comments on commit 6c2bfb9

Please sign in to comment.