diff options
author | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2021-09-19 08:43:57 +0000 |
---|---|---|
committer | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2021-09-19 08:43:57 +0000 |
commit | 392722d6043c2ebbecdb215ca953b477b2829d45 (patch) | |
tree | e2871ff00166d93e4890c1a2dfe5f6e5b2e15989 /Build/source/texk/makeindexk/tests | |
parent | 07310d6f9b9d530827e154620141a9c62cac5eda (diff) |
makeindex: improve detection of page number types
git-svn-id: svn://tug.org/texlive/trunk@60547 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/makeindexk/tests')
20 files changed, 345 insertions, 1 deletions
diff --git a/Build/source/texk/makeindexk/tests/makeindex.test b/Build/source/texk/makeindexk/tests/makeindex.test index 0f266aa778b..5790d8abdc4 100755 --- a/Build/source/texk/makeindexk/tests/makeindex.test +++ b/Build/source/texk/makeindexk/tests/makeindex.test @@ -7,7 +7,7 @@ TEXMFCNF=$srcdir/../kpathsea export TEXMFCNF -rm -f sample.* +rm -f sample.* range*.* pprec*.* ./makeindex $srcdir/tests/sample.idx -o sample.ind1 -t sample.ilg1 \ && diff $srcdir/tests/sample.ind sample.ind1 || exit 1 @@ -15,3 +15,36 @@ rm -f sample.* cat $srcdir/tests/sample.idx | ./makeindex >sample.ind2 2>sample.ilg2 \ && diff $srcdir/tests/sample.ind sample.ind2 || exit 1 +# test for range suffix_2p, suffix_3p, suffix_mp +./makeindex -s $srcdir/tests/range1.ist $srcdir/tests/range.idx \ + -o range1.ind1 -t range1.ilg \ + && diff $srcdir/tests/range1.ind range1.ind1 || exit 1 + +./makeindex -s $srcdir/tests/range2.ist $srcdir/tests/range.idx \ + -o range2.ind1 -t range2.ilg \ + && diff $srcdir/tests/range2.ind range2.ind1 || exit 1 + +./makeindex -s $srcdir/tests/range3.ist $srcdir/tests/range.idx \ + -o range3.ind1 -t range3.ilg \ + && diff $srcdir/tests/range3.ind range3.ind1 || exit 1 + +# test for page_precedence and suffix_3p +./makeindex -s $srcdir/tests/pprec0.ist $srcdir/tests/pprecA.idx \ + -o pprecA-0.ind1 -t pprecA-0.ilg \ + && diff $srcdir/tests/pprecA-0.ind pprecA-0.ind1 || exit 1 + +./makeindex -s $srcdir/tests/pprec1.ist $srcdir/tests/pprecA.idx \ + -o pprecA-1.ind1 -t pprecA-1.ilg \ + && diff $srcdir/tests/pprecA-1.ind pprecA-1.ind1 || exit 1 + +./makeindex -s $srcdir/tests/pprec2.ist $srcdir/tests/pprecA.idx \ + -o pprecA-2.ind1 -t pprecA-2.ilg \ + && diff $srcdir/tests/pprecA-2.ind pprecA-2.ind1 || exit 1 + +./makeindex -s $srcdir/tests/pprec3.ist $srcdir/tests/pprecB.idx \ + -o pprecB-3.ind1 -t pprecB-3.ilg \ + && diff $srcdir/tests/pprecB-3.ind pprecB-3.ind1 || exit 1 + +./makeindex -s $srcdir/tests/pprec4.ist $srcdir/tests/pprecB.idx \ + -o pprecB-4.ind1 -t pprecB-4.ilg \ + && diff $srcdir/tests/pprecB-4.ind pprecB-4.ind1 || exit 1 diff --git a/Build/source/texk/makeindexk/tests/pprec0.ist b/Build/source/texk/makeindexk/tests/pprec0.ist new file mode 100644 index 00000000000..ec1242bbbad --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprec0.ist @@ -0,0 +1,11 @@ +% -*- coding: utf-8 -*- + +%page_precedence "rnaRA" + +delim_0 "[[delim0]]" +delim_1 "[[delim1]]" +delim_2 "[[delim2]]" +delim_r "[[delimr]]" +suffix_2p "[[sfx 2p]]" +suffix_3p "[[sfx 3p]]" + diff --git a/Build/source/texk/makeindexk/tests/pprec1.ist b/Build/source/texk/makeindexk/tests/pprec1.ist new file mode 100644 index 00000000000..8f9221ebce5 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprec1.ist @@ -0,0 +1,11 @@ +% -*- coding: utf-8 -*- + +page_precedence "nrR" + +delim_0 "[[delim0]]" +delim_1 "[[delim1]]" +delim_2 "[[delim2]]" +delim_r "[[delimr]]" +suffix_2p "[[sfx 2p]]" +suffix_3p "[[sfx 3p]]" + diff --git a/Build/source/texk/makeindexk/tests/pprec2.ist b/Build/source/texk/makeindexk/tests/pprec2.ist new file mode 100644 index 00000000000..eeec1e95cfa --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprec2.ist @@ -0,0 +1,11 @@ +% -*- coding: utf-8 -*- + +page_precedence "Rnr" + +delim_0 "[[delim0]]" +delim_1 "[[delim1]]" +delim_2 "[[delim2]]" +delim_r "[[delimr]]" +suffix_2p "[[sfx 2p]]" +suffix_3p "[[sfx 3p]]" + diff --git a/Build/source/texk/makeindexk/tests/pprec3.ist b/Build/source/texk/makeindexk/tests/pprec3.ist new file mode 100644 index 00000000000..b8f33af1dd8 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprec3.ist @@ -0,0 +1,11 @@ +% -*- coding: utf-8 -*- + +page_precedence "naA" + +delim_0 "[[delim0]]" +delim_1 "[[delim1]]" +delim_2 "[[delim2]]" +delim_r "[[delimr]]" +suffix_2p "[[sfx 2p]]" +suffix_3p "[[sfx 3p]]" + diff --git a/Build/source/texk/makeindexk/tests/pprec4.ist b/Build/source/texk/makeindexk/tests/pprec4.ist new file mode 100644 index 00000000000..768fec7642b --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprec4.ist @@ -0,0 +1,11 @@ +% -*- coding: utf-8 -*- + +page_precedence "Ana" + +delim_0 "[[delim0]]" +delim_1 "[[delim1]]" +delim_2 "[[delim2]]" +delim_r "[[delimr]]" +suffix_2p "[[sfx 2p]]" +suffix_3p "[[sfx 3p]]" + diff --git a/Build/source/texk/makeindexk/tests/pprecA-0.ind b/Build/source/texk/makeindexk/tests/pprecA-0.ind new file mode 100644 index 00000000000..245eacacdd6 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprecA-0.ind @@ -0,0 +1,5 @@ +\begin{theindex} + + \item entryA[[delim0]]i[[sfx 3p]], 1[[sfx 3p]], I[[sfx 3p]] + +\end{theindex} diff --git a/Build/source/texk/makeindexk/tests/pprecA-1.ind b/Build/source/texk/makeindexk/tests/pprecA-1.ind new file mode 100644 index 00000000000..772e302d7c4 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprecA-1.ind @@ -0,0 +1,5 @@ +\begin{theindex} + + \item entryA[[delim0]]1[[sfx 3p]], i[[sfx 3p]], I[[sfx 3p]] + +\end{theindex} diff --git a/Build/source/texk/makeindexk/tests/pprecA-2.ind b/Build/source/texk/makeindexk/tests/pprecA-2.ind new file mode 100644 index 00000000000..52d35cb3d7d --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprecA-2.ind @@ -0,0 +1,5 @@ +\begin{theindex} + + \item entryA[[delim0]]I[[sfx 3p]], 1[[sfx 3p]], i[[sfx 3p]] + +\end{theindex} diff --git a/Build/source/texk/makeindexk/tests/pprecA.idx b/Build/source/texk/makeindexk/tests/pprecA.idx new file mode 100644 index 00000000000..8e770b9d0d2 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprecA.idx @@ -0,0 +1,9 @@ +\indexentry{entryA}{i} +\indexentry{entryA}{ii} +\indexentry{entryA}{iii} +\indexentry{entryA}{1} +\indexentry{entryA}{2} +\indexentry{entryA}{3} +\indexentry{entryA}{I} +\indexentry{entryA}{II} +\indexentry{entryA}{III} diff --git a/Build/source/texk/makeindexk/tests/pprecB-3.ind b/Build/source/texk/makeindexk/tests/pprecB-3.ind new file mode 100644 index 00000000000..1e23d9fb4a7 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprecB-3.ind @@ -0,0 +1,5 @@ +\begin{theindex} + + \item entryA[[delim0]]1[[sfx 3p]], a[[sfx 3p]], A[[sfx 3p]] + +\end{theindex} diff --git a/Build/source/texk/makeindexk/tests/pprecB-4.ind b/Build/source/texk/makeindexk/tests/pprecB-4.ind new file mode 100644 index 00000000000..3943ad48549 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprecB-4.ind @@ -0,0 +1,5 @@ +\begin{theindex} + + \item entryA[[delim0]]A[[sfx 3p]], 1[[sfx 3p]], a[[sfx 3p]] + +\end{theindex} diff --git a/Build/source/texk/makeindexk/tests/pprecB.idx b/Build/source/texk/makeindexk/tests/pprecB.idx new file mode 100644 index 00000000000..a1d8fc31ae2 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/pprecB.idx @@ -0,0 +1,9 @@ +\indexentry{entryA}{a} +\indexentry{entryA}{b} +\indexentry{entryA}{c} +\indexentry{entryA}{1} +\indexentry{entryA}{2} +\indexentry{entryA}{3} +\indexentry{entryA}{A} +\indexentry{entryA}{B} +\indexentry{entryA}{C} diff --git a/Build/source/texk/makeindexk/tests/range.idx b/Build/source/texk/makeindexk/tests/range.idx new file mode 100644 index 00000000000..3eccb113aa4 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/range.idx @@ -0,0 +1,126 @@ +\indexentry{entryA}{1} +\indexentry{entryA}{2} +\indexentry{entryA}{iii} +\indexentry{entryA}{iv} +\indexentry{entryA}{IX} +\indexentry{entryA}{X} + +\indexentry{entryB}{1} +\indexentry{entryB}{2} +\indexentry{entryB}{3} +\indexentry{entryB}{iii} +\indexentry{entryB}{iv} +\indexentry{entryB}{v} +\indexentry{entryB}{IX} +\indexentry{entryB}{X} +\indexentry{entryB}{XI} + +\indexentry{entryC}{1} +\indexentry{entryC}{2} +\indexentry{entryC}{3} +\indexentry{entryC}{4} +\indexentry{entryC|bold}{iii} +\indexentry{entryC|bold}{iv} +\indexentry{entryC|bold}{v} +\indexentry{entryC|bold}{vi} +\indexentry{entryC}{IX} +\indexentry{entryC|bold}{X} +\indexentry{entryC}{XI} +\indexentry{entryC}{XII} + +\indexentry{entryD}{c-1} +\indexentry{entryD}{c-2} +\indexentry{entryD}{i-iii} +\indexentry{entryD}{i-iv} +\indexentry{entryD}{d-IX} +\indexentry{entryD}{d-X} + +\indexentry{entryE}{c-1} +\indexentry{entryE}{c-2} +\indexentry{entryE}{c-3} +\indexentry{entryE}{i-iii} +\indexentry{entryE}{i-iv} +\indexentry{entryE}{i-v} +\indexentry{entryE}{d-IX} +\indexentry{entryE}{d-X} +\indexentry{entryE}{d-XI} + +\indexentry{entryF}{C-I} +\indexentry{entryF}{C-II} +\indexentry{entryF}{C-III} +\indexentry{entryF}{C-IV} +\indexentry{entryF}{V-LIII} +\indexentry{entryF}{V-LIV} +\indexentry{entryF}{V-LV} +\indexentry{entryF}{V-LVI} +\indexentry{entryF}{D-DI} +\indexentry{entryF}{D-DII} +\indexentry{entryF}{D-DIII} +\indexentry{entryF}{D-DIV} + +\indexentry{entryP}{A-a-1-VII-iii} +\indexentry{entryP}{A-a-2-VII-iii} +\indexentry{entryP}{A-a-3-VII-iii} +\indexentry{entryP}{A-a-1-VIII-iii} +\indexentry{entryP}{A-a-1-IX-iii} +\indexentry{entryP}{A-a-1-VII-iv} +\indexentry{entryP}{A-a-1-VII-v} + +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-10} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-11} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-14} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-15} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-16} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-22} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-23} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-24} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-25} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-i} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-ii} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-iii} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-iv} +\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-v} + +\indexentry{entryA1|(}{1} +\indexentry{entryA1|)}{2} +\indexentry{entryA1|(}{iii} +\indexentry{entryA1|)}{iv} +\indexentry{entryA1|(}{IX} +\indexentry{entryA1|)}{X} + +\indexentry{entryB1|(}{1} +\indexentry{entryB1|)}{3} +\indexentry{entryB1|(}{iii} +\indexentry{entryB1|)}{v} +\indexentry{entryB1|(}{IX} +\indexentry{entryB1|)}{XI} + +\indexentry{entryC1|(}{1} +\indexentry{entryC1|)}{4} +\indexentry{entryC1|(bold}{iii} +\indexentry{entryC1|)}{vi} +\indexentry{entryC1|(}{IX} +\indexentry{entryC1|bold}{X} +\indexentry{entryC1|)}{XII} + +\indexentry{entryD1|(}{c-1} +\indexentry{entryD1|)}{c-2} +\indexentry{entryD1|(}{i-iii} +\indexentry{entryD1|)}{i-iv} +\indexentry{entryD1|(}{d-IX} +\indexentry{entryD1|)}{d-X} + +\indexentry{entryE1|(}{c-1} +\indexentry{entryE1|)}{c-3} +\indexentry{entryE1|(}{i-iii} +\indexentry{entryE1|)}{i-v} +\indexentry{entryE1|(}{d-IX} +\indexentry{entryE1|)}{d-XI} + +\indexentry{entryF1|(}{C-I} +\indexentry{entryF1|)}{C-IV} +\indexentry{entryF1|(}{V-LIII} +\indexentry{entryF1|)}{V-LVI} +\indexentry{entryF1|(}{D-DI} +\indexentry{entryF1|bold}{D-DII} +\indexentry{entryF1|)}{D-DIV} diff --git a/Build/source/texk/makeindexk/tests/range1.ind b/Build/source/texk/makeindexk/tests/range1.ind new file mode 100644 index 00000000000..c5f047a55e5 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/range1.ind @@ -0,0 +1,25 @@ +\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 entryB, 1[[sfx mp]], iii[[sfx mp]], IX[[sfx mp]] + \item entryB1, 1[[sfx mp]], iii[[sfx mp]], IX[[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]] + \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]] + \item entryE1, c-1[[sfx mp]], d-IX[[sfx mp]], i-iii[[sfx mp]] + \item entryF, C-I[[sfx mp]], D-DI[[sfx mp]], V-LIII[[sfx mp]] + \item entryF1, C-I[[sfx mp]], \bold{D-DII}, D-DI[[sfx mp]], + V-LIII[[sfx mp]] + \item entryP, A-a-1-VII-iii[[sfx mp]], 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[[sfx mp]], + 1-2-3-4-5-6-7-8-9-22[[sfx mp]], + 1-2-3-4-5-6-7-8-9-i[[sfx mp]] + +\end{theindex} diff --git a/Build/source/texk/makeindexk/tests/range1.ist b/Build/source/texk/makeindexk/tests/range1.ist new file mode 100644 index 00000000000..116c2d8713b --- /dev/null +++ b/Build/source/texk/makeindexk/tests/range1.ist @@ -0,0 +1,3 @@ +page_precedence "nrRaA" +suffix_2p "[[sfx 2p]]" +suffix_mp "[[sfx mp]]" diff --git a/Build/source/texk/makeindexk/tests/range2.ind b/Build/source/texk/makeindexk/tests/range2.ind new file mode 100644 index 00000000000..789eb3f75c7 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/range2.ind @@ -0,0 +1,26 @@ +\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 entryB, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]] + \item entryB1, 1[[sfx 3p]], iii[[sfx 3p]], IX[[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 + \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]] + \item entryE1, c-1[[sfx 3p]], d-IX[[sfx 3p]], i-iii[[sfx 3p]] + \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[[sfx 3p]], 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[[sfx 3p]], + 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} diff --git a/Build/source/texk/makeindexk/tests/range2.ist b/Build/source/texk/makeindexk/tests/range2.ist new file mode 100644 index 00000000000..552e5fb6748 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/range2.ist @@ -0,0 +1,4 @@ +page_precedence "nrRaA" +delim_r "[[delim r]]" +suffix_2p "[[sfx 2p]]" +suffix_3p "[[sfx 3p]]" diff --git a/Build/source/texk/makeindexk/tests/range3.ind b/Build/source/texk/makeindexk/tests/range3.ind new file mode 100644 index 00000000000..519730a138e --- /dev/null +++ b/Build/source/texk/makeindexk/tests/range3.ind @@ -0,0 +1,25 @@ +\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 entryB, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]] + \item entryB1, 1[[sfx 3p]], iii[[sfx 3p]], IX[[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]] + \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]] + \item entryE1, c-1[[sfx 3p]], d-IX[[sfx 3p]], i-iii[[sfx 3p]] + \item entryF, C-I[[sfx mp]], D-DI[[sfx mp]], V-LIII[[sfx mp]] + \item entryF1, C-I[[sfx mp]], \bold{D-DII}, D-DI[[sfx mp]], + V-LIII[[sfx mp]] + \item entryP, A-a-1-VII-iii[[sfx 3p]], 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[[sfx 3p]], + 1-2-3-4-5-6-7-8-9-22[[sfx mp]], + 1-2-3-4-5-6-7-8-9-i[[sfx mp]] + +\end{theindex} diff --git a/Build/source/texk/makeindexk/tests/range3.ist b/Build/source/texk/makeindexk/tests/range3.ist new file mode 100644 index 00000000000..b751471b432 --- /dev/null +++ b/Build/source/texk/makeindexk/tests/range3.ist @@ -0,0 +1,4 @@ +page_precedence "nrRaA" +suffix_2p "[[sfx 2p]]" +suffix_3p "[[sfx 3p]]" +suffix_mp "[[sfx mp]]" |