dox (27jan17)

git-svn-id: svn://tug.org/texlive/trunk@43060 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 22 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/dox/dox.sty b/Master/texmf-dist/tex/latex/dox/dox.sty
index c2ef47d8a8f..9fa5c0ef3db 100644
--- a/Master/texmf-dist/tex/latex/dox/dox.sty
+++ b/Master/texmf-dist/tex/latex/dox/dox.sty
@@ -8,19 +8,17 @@
 %% 
 
 
-%% Copyright (C) 2009, 2010 Didier Verna
+%% Copyright (C) 2009, 2010, 2017 Didier Verna
 
 %% This file is part of DoX.
 
-%% DoX may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.1
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.1 or later is part of all distributions of LaTeX
-%% version 1999/06/01 or later.
+%% DoX may be distributed and/or modified under the conditions of the LaTeX
+%% Project Public License, either version 1.3 of this license or (at your option)
+%% any later version.  The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+%% distributions of LaTeX version 2005/12/01 or later.
 
-%% DoX consists of the files listed in the file `README'.
+%% DoX consists of the files listed in the file `README.md'.
 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -38,7 +36,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dox}[2010/12/16 v2.2 Extensions to the doc package]
+\ProvidesPackage{dox}[2017/01/26 v2.3 Extensions to the doc package]
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{family=dox,prefix=dox@}
@@ -53,6 +51,7 @@
   \topsep\MacroTopsep%
   \trivlist%
     \edef\saved@macroname{\string#2}%
+    \@nameuse{@Save#1IndexName}{\saved@macroname}%
     \def\makelabel##1{\llap{##1}}%
     \if@inlabel%
       \let\@tempa\@empty%
@@ -106,6 +105,10 @@
       \MakePrivateLetters%
       \@@doxdescribe{#1}}
 
+\def\@doxsavemacrolikeindexname#1{%
+  \edef\saved@indexname{\expandafter\@gobble#1}}
+\def\@doxsaveindexname#1{\let\saved@indexname#1}
+
 \def\@doxcreatespecialmainindex#1#2#3{%
   \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
     \@bsphack%
@@ -162,10 +165,12 @@
 \def\SpecialMainMacroIndex#1{%
   \SpecialMainIndex{#1}\nobreak%
   \DoNotIndex{#1}}
+\let\@SaveMacroIndexName\@doxsavemacrolikeindexname
 \@doxcreateenv{Macro}{macro}
 
 \@doxcreatedescribe{Env}
 \@doxcreateenv{Env}{environment}
+\let\@SaveEnvIndexName\@doxsaveindexname
 
 \newcommand\doxitem[4][]{%
   \@nameuse{dox@macrolike\dox@macrolikedefault}%
@@ -200,8 +205,13 @@
   \fi
   \expandafter\@doxexpr\expandafter{\dox@idxtype}{#4}%
   \@doxcreatedescribe{#2}
-  \@doxcreateenv{#2}{#3}}
-
+  \@doxcreateenv{#2}{#3}
+  \ifdox@macrolike
+    \expandafter\let\csname @Save#2IndexName\endcsname%
+      \@doxsavemacrolikeindexname%
+  \else
+    \expandafter\let\csname @Save#2IndexName\endcsname\@doxsaveindexname%
+  \fi}
 \ProcessKeyvalOptions*
 \ifdox@noprint
   \def\dox@noprintdefault{true}