new \get@expanded@bibentry. use minted2 for nowHEADmaster

2 files changed, 7 insertions, 5 deletions

diff --git a/icite.dtx b/icite.dtx
index 9e8ec63..0ee6863 100644
--- a/icite.dtx
+++ b/icite.dtx
@@ -25,7 +25,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{icite}
 %<*package>
-    [2024/06/17 v1.4-dev Make Indices locorum citatorum]
+    [2024/10/07 v1.4-dev Make Indices locorum citatorum]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -298,7 +298,7 @@
 \usepackage{hologo,metalogox}
 \usepackage{relsize}
 \usepackage{units}
-\usepackage{minted}
+\usepackage{minted2}
 \usepackage[contents]{colordoc}
 \newcommand{\pkg}[1]{\textsf{#1}\index{#1=#1 (package)}}
 \usepackage{tikz}
@@ -685,7 +685,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 % option.\footnote{See above, \vref{ref:citecmd}.}
 %
 % \paragraph{List of References} \newfeature[v1.4]
-% \changes{v1.4}{2024/06/17}{\textsf{icite} now indexes separately
+% \changes{v1.4}{2024/10/07}{\textsf{icite} now indexes separately
 % lists of references} The references inserted in the \meta{post}
 % argument of \cs{icite} may consist of single numbers\---as in |25|,
 % |vii| or |XIV|\---ranges of numbers\---as in |34--38| or
@@ -1127,6 +1127,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 %    \begin{macrocode}
 \def\get@bibentry#1#2{\@ifundefined{reuse@#1@#2}{}
   {\expandonce{\@nameuse{reuse@#1@#2}}}}
+\def\get@expanded@bibentry#1#2{\@ifundefined{reuse@#1@#2}{}
+  {\@nameuse{reuse@#1@#2}}}
 %    \end{macrocode}
 % Create a new database which \pkg{icite} will use to connect
 % Bib\LaTeX\ \enquote*{subtypes} to indices.
@@ -1230,7 +1232,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   \edef\ic@null{ic@nullcmd}%
   \ifno@bibengine\let\ic@argiv\ic@null\else\fi%
   \edef\@shorthand{\get@bibentry{#3}{shorthand}}%
-  \edef\@subtype{\get@bibentry{#3}{entrysubtype}}%
+  \edef\@subtype{\get@expanded@bibentry{#3}{entrysubtype}}%
   \edef\@author{\get@bibentry{#3}{author}}%
   \edef\@indexauthor{\get@bibentry{#3}{indexauthor}}%
   \edef\@sortname{\get@bibentry{#3}{sortname}}%
diff --git a/samples/icite-minimal.tex b/samples/icite-minimal.tex
index 32bb4a2..2ceafd2 100644
--- a/samples/icite-minimal.tex
+++ b/samples/icite-minimal.tex
@@ -4,7 +4,7 @@
 \usepackage[small]{titlesec}
 
 \usepackage{latexcolors}
-\usepackage[outputdir=TMP/]{minted}
+\usepackage[outputdir=TMP/]{minted2}
 \setminted{bgcolor=lavendermist}
 
 \usepackage{ccicons}