From 35c007d48195f11757c61c71a9a0eb88420dc9d0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Sep 2019 21:15:10 +0000 Subject: testidx (29sep19) git-svn-id: svn://tug.org/texlive/trunk@52213 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/testidx/testidx-glossaries.sty | 9 +++++---- Master/texmf-dist/tex/latex/testidx/testidx.sty | 12 ++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/testidx/testidx-glossaries.sty b/Master/texmf-dist/tex/latex/testidx/testidx-glossaries.sty index 7a6787607de..6084c6d06a9 100644 --- a/Master/texmf-dist/tex/latex/testidx/testidx-glossaries.sty +++ b/Master/texmf-dist/tex/latex/testidx/testidx-glossaries.sty @@ -7,7 +7,7 @@ %% testidx.dtx (with options: `testidx-glossaries.sty,package') %% %% testidx.dtx -%% Copyright 2017 Nicola Talbot +%% Copyright 2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{testidx-glossaries}[2017/08/11 v1.1 (NLCT)] +\ProvidesPackage{testidx-glossaries}[2019/09/29 v1.2 (NLCT)] \newcommand*{\tstidx@glossariespkg}{glossaries} \@ifpackageloaded{glossaries} {% @@ -2227,9 +2227,10 @@ use the any further sub-levels. Although \tstidxapp{xindy} allows more than three levels (\tstidxapp{makeindex} doesn't), it's somewhat \tstidxword{excessive} to go below a sub-sub-level. - You'll have to add your own tests for anything deeper.% - + You'll have to add your own tests for anything deeper. + Watch out for \tstidxsubword{sub-items}{lonely} sub-items.% } + \let\@tidx@org@par@iii\@tidx@par@iii \let\@tidx@par@iii\@tidx@gls@par@iii \newcommand*{\@tidx@gls@par@iv}{% diff --git a/Master/texmf-dist/tex/latex/testidx/testidx.sty b/Master/texmf-dist/tex/latex/testidx/testidx.sty index 458f9add3af..cf2136e1065 100644 --- a/Master/texmf-dist/tex/latex/testidx/testidx.sty +++ b/Master/texmf-dist/tex/latex/testidx/testidx.sty @@ -7,7 +7,7 @@ %% testidx.dtx (with options: `testidx.sty,package') %% %% testidx.dtx -%% Copyright 2017 Nicola Talbot +%% Copyright 2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{testidx}[2017/08/11 v1.1 (NLCT)] +\ProvidesPackage{testidx}[2019/09/29 v1.2 (NLCT)] \RequirePackage{color} \RequirePackage{ifxetex} \RequirePackage{ifluatex} @@ -54,13 +54,16 @@ \fi \fi } -\newcommand*{\@tstidx@ifutfviii}[2]{% +\newcommand*{\@@tstidx@ifutfviii}[2]{% \@tstidx@ifxelua{#1} {% \ifx\inputencodingname\@tstidx@utfviii#1\else#2\fi }% } \newcommand*{\@tstidx@utfviii}{utf8} +\let\@tstidx@ifutfviii\@@tstidx@ifutfviii +\DeclareOption{ascii}{\let\@tstidx@ifutfviii\@secondoftwo} +\DeclareOption{noascii}{\let\@tstidx@ifutfviii\@@tstidx@ifutfviii} \newcommand*{\tstidxprocessasciisort}{\tstidxprocessasciisortstrip} \newcommand*{\testidxStripAccents}{% \renewcommand*{\tstidxprocessasciisort}{\tstidxprocessasciisortstrip}% @@ -2347,7 +2350,8 @@ any further sub-levels. Although \tstidxapp{xindy} allows more than three levels (\tstidxapp{makeindex} doesn't), it's somewhat \tstidxword{excessive} to go below a sub-sub-level. - You'll have to add your own tests for anything deeper.% + You'll have to add your own tests for anything deeper. + Watch out for \tstidxsubword{sub-items}{lonely} sub-items.% } \tstidxnewblock*{\@tidx@openrangepar} {% -- cgit v1.2.3