From 7ad18b307895db5a96d3a35150c5d92314231f60 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Apr 2024 20:06:11 +0000 Subject: esindex (28apr24) git-svn-id: svn://tug.org/texlive/trunk@71111 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/esindex/README.md | 4 +++ Master/texmf-dist/doc/latex/esindex/esindex.pdf | Bin 62539 -> 68921 bytes Master/texmf-dist/doc/latex/esindex/esindex.tex | 8 +++-- Master/texmf-dist/tex/latex/esindex/esindex.sty | 37 ++++++++++++++++++++---- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/Master/texmf-dist/doc/latex/esindex/README.md b/Master/texmf-dist/doc/latex/esindex/README.md index 6ebd7e4c790..b1163025c43 100644 --- a/Master/texmf-dist/doc/latex/esindex/README.md +++ b/Master/texmf-dist/doc/latex/esindex/README.md @@ -18,6 +18,10 @@ in the document. ### Recent changes ``` +1.8 2024-04-27 + - Fix - Some replacements stopped working in pdflatex with utf8 + because of a change the LaTeX LICR. + 1.7 2019-10-10 - Fix - because of a change in a macro name, it stopped working with xe/lua diff --git a/Master/texmf-dist/doc/latex/esindex/esindex.pdf b/Master/texmf-dist/doc/latex/esindex/esindex.pdf index bc78b36c15a..9272dd82910 100644 Binary files a/Master/texmf-dist/doc/latex/esindex/esindex.pdf and b/Master/texmf-dist/doc/latex/esindex/esindex.pdf differ diff --git a/Master/texmf-dist/doc/latex/esindex/esindex.tex b/Master/texmf-dist/doc/latex/esindex/esindex.tex index 03d0b243867..64a6f187358 100644 --- a/Master/texmf-dist/doc/latex/esindex/esindex.tex +++ b/Master/texmf-dist/doc/latex/esindex/esindex.tex @@ -1,5 +1,5 @@ % -% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com +% Copyright (C) 1998-2024 Javier Bezos http://www.texnia.com % % This file may be distributed and/or modified under the conditions of % the MIT License. A version can be found at the end of this file. @@ -14,7 +14,7 @@ \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} -\title{\textsf{esindex}\\\large 1.7\quad 2019-10-10} +\title{\textsf{esindex}\\\large 1.8\quad 2024-04-27} \author{Javier Bezos} @@ -46,7 +46,7 @@ {\LARGE Generating automatically sort keys for \textit{MakeIndex} with \LaTeX\par} \vspace*{1ex} -Version 1.7 (2019-10-10)\par +Version 1.8 (2024-04-27)\par \texttt{https://github.com/jbezos/esindex}\par Javier Bezos (\texttt{http://www.texnia.com}) @@ -100,6 +100,8 @@ three-level key use \verb|\esindexreplacesubsub| (with 4 arguments). With with the definitions above the key for \verb|ràpid| is \verb|rapid^^Ar1pid|.) +(Version 1.8 is just a bug fix.) + \section{Spanish} Este paquete ha sido diseñado para facilitar la escritura de índices diff --git a/Master/texmf-dist/tex/latex/esindex/esindex.sty b/Master/texmf-dist/tex/latex/esindex/esindex.sty index a63bdba6eb6..72a0937c4df 100644 --- a/Master/texmf-dist/tex/latex/esindex/esindex.sty +++ b/Master/texmf-dist/tex/latex/esindex/esindex.sty @@ -1,5 +1,5 @@ % -% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com +% Copyright (C) 1998-2024 Javier Bezos http://www.texnia.com % % This file may be distributed and/or modified under the conditions of % the MIT License. A version can be found at the end of this file. @@ -7,7 +7,7 @@ % Repository: https://github.com/jbezos/esindex % -\ProvidesPackage{esindex}[2019/10/10 v1.7 Spanish indexes (and more)] +\ProvidesPackage{esindex}[2024/04/27 v1.8 Spanish indexes (and more)] \def\esx@level{`\!} \def\esx@actual{`\@} @@ -92,15 +92,40 @@ \gdef\esx@bar@eat#1|{\def\esx@a{|#1}} } -\gdef\esindexexpandkey{% - \protected@edef\esindexkey{\esindexkey}} +\gdef\esx@tolicr#1#2{% + \@ifundefined{u8\string:\string#1\string#2}% + {\unexpanded{#1#2}}% + {\@nameuse{u8\string:\string#1\string#2}}} + +\begingroup + \catcode`\^^c2=\active + \catcode`\^^c3=\active + \gdef\esx@expandkey#1{% + \ifnum\catcode`\^^c2=\active \ifnum\catcode`\^^c3=\active + \def\esx@a{^^c2^^c3}% + \protected@edef\esx@b{\esx@a}% + \ifx\esx@a\esx@b + \let\esx@cii ^^c2% + \let\esx@ciii ^^c3% + \def ^^c2{\esx@tolicr ^^c2}% + \def ^^c3{\esx@tolicr ^^c3}% + \protected@edef#1{#1}% + \let ^^c2\esx@cii + \let ^^c3\esx@ciii + \else + \protected@edef#1{#1}% + \fi + \fi\fi} +\endgroup + +\gdef\esindexexpandkey{\esx@expandkey\esindexkey} \gdef\esindexexpandsubkey{% \ifx\esindexsubkey\relax\else - \protected@edef\esindexsubkey{\esindexsubkey}% + \esx@expandkey\esindexsubkey \fi} \gdef\esindexexpandsubsubkey{% \ifx\esindexsubsubkey\relax\else - \protected@edef\esindexsubsubkey{\esindexsubsubkey}% + \esx@expandkey\esindexsubsubkey \fi} \gdef\esindexexpandkeys{% -- cgit v1.2.3