texlive[76023] Build/source/texk/makeindexk: makeindex: Add tests for
commits+takuji at tug.org
commits+takuji at tug.org
Mon Aug 11 04:00:32 CEST 2025
Revision: 76023
https://tug.org/svn/texlive?view=revision&revision=76023
Author: takuji
Date: 2025-08-11 04:00:32 +0200 (Mon, 11 Aug 2025)
Log Message:
-----------
makeindex: Add tests for page range
Modified Paths:
--------------
trunk/Build/source/texk/makeindexk/ChangeLog
trunk/Build/source/texk/makeindexk/Makefile.am
trunk/Build/source/texk/makeindexk/Makefile.in
trunk/Build/source/texk/makeindexk/configure
trunk/Build/source/texk/makeindexk/tests/pprec.test
trunk/Build/source/texk/makeindexk/tests/range.idx
trunk/Build/source/texk/makeindexk/tests/range1.ind
trunk/Build/source/texk/makeindexk/tests/range2.ind
trunk/Build/source/texk/makeindexk/tests/range3.ind
Added Paths:
-----------
trunk/Build/source/texk/makeindexk/tests/range4.ind
trunk/Build/source/texk/makeindexk/tests/range4.ist
Modified: trunk/Build/source/texk/makeindexk/ChangeLog
===================================================================
--- trunk/Build/source/texk/makeindexk/ChangeLog 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/ChangeLog 2025-08-11 02:00:32 UTC (rev 76023)
@@ -1,3 +1,10 @@
+2025-08-11 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * tests/pprec.test, tests/range.idx,
+ tests/range4.ist, tests/range{1,2,3,4}.ind:
+ Add tests for page range.
+ * Makefile.am: Adjust.
+
2025-02-10 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* tests/makeindex.test, tests/head1.ist,
Modified: trunk/Build/source/texk/makeindexk/Makefile.am
===================================================================
--- trunk/Build/source/texk/makeindexk/Makefile.am 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/Makefile.am 2025-08-11 02:00:32 UTC (rev 76023)
@@ -56,8 +56,8 @@
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/range1.ist tests/range2.ist tests/range3.ist tests/range4.ist \
+ tests/range1.ind tests/range2.ind tests/range3.ind tests/range4.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 \
tests/pprecA.idx tests/pprecA-0.ind tests/pprecA-1.ind tests/pprecA-2.ind \
Modified: trunk/Build/source/texk/makeindexk/Makefile.in
===================================================================
--- trunk/Build/source/texk/makeindexk/Makefile.in 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/Makefile.in 2025-08-11 02:00:32 UTC (rev 76023)
@@ -595,18 +595,19 @@
tests/tort.idx tests/tortW.idx tests/head1.ist \
tests/ok-tort.ind tests/ok-tort2.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 tests/pprec5.ist \
- tests/pprec6.ist tests/pprec7.ist tests/pprecA.idx \
- tests/pprecA-0.ind tests/pprecA-1.ind tests/pprecA-2.ind \
- tests/pprecB.idx tests/pprecB-0.ind tests/pprecB-3.ind \
- tests/pprecB-4.ind tests/romalpA.idx 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/nested3.ist \
- tests/nested3.ind tests/toodeep.idx
+ tests/range4.ist tests/range1.ind tests/range2.ind \
+ tests/range3.ind tests/range4.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 tests/pprecA.idx tests/pprecA-0.ind \
+ tests/pprecA-1.ind tests/pprecA-2.ind tests/pprecB.idx \
+ tests/pprecB-0.ind tests/pprecB-3.ind tests/pprecB-4.ind \
+ tests/romalpA.idx 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/nested3.ist tests/nested3.ind \
+ tests/toodeep.idx
TEST_EXTENSIONS = .pl .test
TESTS = tests/nested-range-test.pl tests/makeindex.test \
tests/pprec.test \
Modified: trunk/Build/source/texk/makeindexk/configure
===================================================================
--- trunk/Build/source/texk/makeindexk/configure 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/configure 2025-08-11 02:00:32 UTC (rev 76023)
@@ -17141,10 +17141,6 @@
cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
-
-
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5
printf %s "checking if libkpathsea supports debugging... " >&6; }
if test ${kpse_cv_kpse_debug+y}
Modified: trunk/Build/source/texk/makeindexk/tests/pprec.test
===================================================================
--- trunk/Build/source/texk/makeindexk/tests/pprec.test 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/tests/pprec.test 2025-08-11 02:00:32 UTC (rev 76023)
@@ -17,7 +17,7 @@
# test for range suffix_2p, suffix_3p, suffix_mp
-for num in 1 2 3; do
+for num in 1 2 3 4; 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
Modified: trunk/Build/source/texk/makeindexk/tests/range.idx
===================================================================
--- trunk/Build/source/texk/makeindexk/tests/range.idx 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/tests/range.idx 2025-08-11 02:00:32 UTC (rev 76023)
@@ -87,6 +87,10 @@
\indexentry{entryA1|)}{iv}
\indexentry{entryA1|(}{IX}
\indexentry{entryA1|)}{X}
+\indexentry{entryA1|(textbf}{XX}
+\indexentry{entryA1|)textbf}{XXI}
+\indexentry{entryA2|(textbf}{XX}
+\indexentry{entryA2|)textbf}{XX}
\indexentry{entryB1|(}{1}
\indexentry{entryB1|)}{3}
@@ -94,6 +98,8 @@
\indexentry{entryB1|)}{v}
\indexentry{entryB1|(}{IX}
\indexentry{entryB1|)}{XI}
+\indexentry{entryB1|(textbf}{XX}
+\indexentry{entryB1|)textbf}{XXII}
\indexentry{entryC1|(}{1}
\indexentry{entryC1|)}{4}
@@ -102,6 +108,8 @@
\indexentry{entryC1|(}{IX}
\indexentry{entryC1|bold}{X}
\indexentry{entryC1|)}{XII}
+\indexentry{entryC1|(textbf}{XX}
+\indexentry{entryC1|)textbf}{XXIII}
\indexentry{entryD1|(}{c-1}
\indexentry{entryD1|)}{c-2}
Modified: trunk/Build/source/texk/makeindexk/tests/range1.ind
===================================================================
--- trunk/Build/source/texk/makeindexk/tests/range1.ind 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/tests/range1.ind 2025-08-11 02:00:32 UTC (rev 76023)
@@ -1,13 +1,16 @@
\begin{theindex}
\item entryA, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
- \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]],
+ \textbf{XX[[sfx 2p]]}
+ \item entryA2, \textbf{XX}
\item entryB, 1[[sfx mp]], iii[[sfx mp]], IX[[sfx mp]]
- \item entryB1, 1[[sfx mp]], iii[[sfx mp]], IX[[sfx mp]]
+ \item entryB1, 1[[sfx mp]], iii[[sfx mp]], IX[[sfx mp]],
+ \textbf{XX[[sfx mp]]}
\item entryC, 1[[sfx mp]], \bold{iii[[sfx mp]]}, IX, \bold{X},
XI[[sfx 2p]]
\item entryC1, 1[[sfx mp]], \bold{iii[[sfx mp]]}, \bold{X},
- IX[[sfx mp]]
+ IX[[sfx mp]], \textbf{XX[[sfx mp]]}
\item entryD, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
\item entryD1, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
\item entryE, c-1[[sfx mp]], d-IX[[sfx mp]], i-iii[[sfx mp]]
Modified: trunk/Build/source/texk/makeindexk/tests/range2.ind
===================================================================
--- trunk/Build/source/texk/makeindexk/tests/range2.ind 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/tests/range2.ind 2025-08-11 02:00:32 UTC (rev 76023)
@@ -1,13 +1,16 @@
\begin{theindex}
\item entryA, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
- \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]],
+ \textbf{XX[[sfx 2p]]}
+ \item entryA2, \textbf{XX}
\item entryB, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]]
- \item entryB1, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]]
+ \item entryB1, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]],
+ \textbf{XX[[sfx 3p]]}
\item entryC, 1[[delim r]]4, \bold{iii[[delim r]]vi}, IX, \bold{X},
XI[[sfx 2p]]
\item entryC1, 1[[delim r]]4, \bold{iii[[delim r]]vi}, \bold{X},
- IX[[delim r]]XII
+ IX[[delim r]]XII, \textbf{XX[[delim r]]XXIII}
\item entryD, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
\item entryD1, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
\item entryE, c-1[[sfx 3p]], d-IX[[sfx 3p]], i-iii[[sfx 3p]]
Modified: trunk/Build/source/texk/makeindexk/tests/range3.ind
===================================================================
--- trunk/Build/source/texk/makeindexk/tests/range3.ind 2025-08-10 23:41:50 UTC (rev 76022)
+++ trunk/Build/source/texk/makeindexk/tests/range3.ind 2025-08-11 02:00:32 UTC (rev 76023)
@@ -1,13 +1,16 @@
\begin{theindex}
\item entryA, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
- \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]],
+ \textbf{XX[[sfx 2p]]}
+ \item entryA2, \textbf{XX}
\item entryB, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]]
- \item entryB1, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]]
+ \item entryB1, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]],
+ \textbf{XX[[sfx 3p]]}
\item entryC, 1[[sfx mp]], \bold{iii[[sfx mp]]}, IX, \bold{X},
XI[[sfx 2p]]
\item entryC1, 1[[sfx mp]], \bold{iii[[sfx mp]]}, \bold{X},
- IX[[sfx mp]]
+ IX[[sfx mp]], \textbf{XX[[sfx mp]]}
\item entryD, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
\item entryD1, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
\item entryE, c-1[[sfx 3p]], d-IX[[sfx 3p]], i-iii[[sfx 3p]]
Copied: trunk/Build/source/texk/makeindexk/tests/range4.ind (from rev 76017, trunk/Build/source/texk/makeindexk/tests/range2.ind)
===================================================================
--- trunk/Build/source/texk/makeindexk/tests/range4.ind (rev 0)
+++ trunk/Build/source/texk/makeindexk/tests/range4.ind 2025-08-11 02:00:32 UTC (rev 76023)
@@ -0,0 +1,31 @@
+\begin{theindex}
+
+ \item entryA, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]],
+ \textbf{XX[[sfx 2p]]}
+ \item entryA2, \textbf{XX}
+ \item entryB, 1[[delim r]]3, iii[[delim r]]v, IX[[delim r]]XI
+ \item entryB1, 1[[delim r]]3, iii[[delim r]]v, IX[[delim r]]XI,
+ \textbf{XX[[delim r]]XXII}
+ \item entryC, 1[[delim r]]4, \bold{iii[[delim r]]vi}, IX, \bold{X},
+ XI[[sfx 2p]]
+ \item entryC1, 1[[delim r]]4, \bold{iii[[delim r]]vi}, \bold{X},
+ IX[[delim r]]XII, \textbf{XX[[delim r]]XXIII}
+ \item entryD, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
+ \item entryD1, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
+ \item entryE, c-1[[delim r]]c-3, d-IX[[delim r]]d-XI,
+ i-iii[[delim r]]i-v
+ \item entryE1, c-1[[delim r]]c-3, d-IX[[delim r]]d-XI,
+ i-iii[[delim r]]i-v
+ \item entryF, C-I[[delim r]]C-IV, D-DI[[delim r]]D-DIV,
+ V-LIII[[delim r]]V-LVI
+ \item entryF1, C-I[[delim r]]C-IV, \bold{D-DII}, D-DI[[delim r]]D-DIV,
+ V-LIII[[delim r]]V-LVI
+ \item entryP, A-a-1-VII-iii[[delim r]]A-a-1-VII-v, A-a-1-VIII-iii,
+ A-a-1-IX-iii, A-a-2-VII-iii, A-a-3-VII-iii
+ \item entryQ, 1-2-3-4-5-6-7-8-9-10[[sfx 2p]],
+ 1-2-3-4-5-6-7-8-9-14[[delim r]]1-2-3-4-5-6-7-8-9-16,
+ 1-2-3-4-5-6-7-8-9-22[[delim r]]1-2-3-4-5-6-7-8-9-25,
+ 1-2-3-4-5-6-7-8-9-i[[delim r]]1-2-3-4-5-6-7-8-9-v
+
+\end{theindex}
Added: trunk/Build/source/texk/makeindexk/tests/range4.ist
===================================================================
--- trunk/Build/source/texk/makeindexk/tests/range4.ist (rev 0)
+++ trunk/Build/source/texk/makeindexk/tests/range4.ist 2025-08-11 02:00:32 UTC (rev 76023)
@@ -0,0 +1,3 @@
+page_precedence "nrRaA"
+delim_r "[[delim r]]"
+suffix_2p "[[sfx 2p]]"
More information about the tex-live-commits
mailing list.