8 files changed, 43 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/dox/NEWS b/Master/texmf-dist/doc/latex/dox/NEWS
index d82292187cd..044d924154e 100644
--- a/Master/texmf-dist/doc/latex/dox/NEWS
+++ b/Master/texmf-dist/doc/latex/dox/NEWS
@@ -16,6 +16,11 @@ distributions of LaTeX version 2005/12/01 or later.
 DoX consists of the files listed in the file `README.md'.
 
 
+*Version 2.4
+** Improve AUCTeX support
+** Fix spurious spaces in index entries
+reported by Eric Domenjoud.
+
 * Version 2.3
 ** Support Doc's internal \saved@indexname command
 thanks to Falk Hanisch.
@@ -26,7 +31,7 @@ allowing to create control sequence based documentation items.
 
 * Version 2.1
 ** New lisp functions doxitem[s]
-to register new documentation environments with AUC-TeX.
+to register new documentation environments with AUCTeX.
 
 * Version 2.0
 ** Optional argument to \doxitem
diff --git a/Master/texmf-dist/doc/latex/dox/README.md b/Master/texmf-dist/doc/latex/dox/README.md
index 52d29fadd8b..9c0fe8e123c 100644
--- a/Master/texmf-dist/doc/latex/dox/README.md
+++ b/Master/texmf-dist/doc/latex/dox/README.md
@@ -31,7 +31,7 @@ the definition of new commands and environments. However, there is no simple
 way to extend this functionality to other items (options or counters for
 instance). DoX is designed to circumvent this limitation, and provides some
 improvements over the existing functionality as well. Dox also comes with
-support for [AUC-TeX](https://www.gnu.org/software/auctex/).
+support for [AUCTeX](https://www.gnu.org/software/auctex/).
 
 DoX homepage: http://www.lrde.epita.fr/~didier/software/latex.php#dox
 
@@ -52,5 +52,5 @@ following locations are suggested:
 	[TEXMF]/tex/latex/dox/dox.sty
 	[TEXMF]/doc/latex/dox/dox.[pdf|dvi]
 
-If you're an AUC-TeX user, you may also install the file `dox.el` in a
-suitable AUC-TeX style directory.
+If you're an AUCTeX user, you may also install the file `dox.el` in a
+suitable AUCTeX style directory.
diff --git a/Master/texmf-dist/doc/latex/dox/THANKS b/Master/texmf-dist/doc/latex/dox/THANKS
index 3ad89320f00..cb7f9d1d005 100644
--- a/Master/texmf-dist/doc/latex/dox/THANKS
+++ b/Master/texmf-dist/doc/latex/dox/THANKS
@@ -21,7 +21,7 @@ DoX consists of the files listed in the file `README.md'.
 ** The following persons have contributed code, bug reports, localization,
 ** suggestions etc.:
 
-Falk Hanisch.
+Eric Domenjoud, Falk Hanisch.
 
 
 
diff --git a/Master/texmf-dist/doc/latex/dox/dox.el b/Master/texmf-dist/doc/latex/dox/dox.el
index 7187c71fc43..2de037d5ed7 100644
--- a/Master/texmf-dist/doc/latex/dox/dox.el
+++ b/Master/texmf-dist/doc/latex/dox/dox.el
@@ -1,4 +1,4 @@
-;;; dox.el --- AUC-TeX style file for DoX
+;;; dox.el --- AUCTeX style file for DoX
 
 ;; Copyright (C) 2009, 2010, 2017 Didier Verna
 
@@ -22,21 +22,23 @@
 ;;; Code:
 
 (TeX-add-style-hook "dox"
-  (function
-   (lambda ()
-     (TeX-add-symbols
-      '("doxitem" [ "Options" ]
-	"Function name" "Environment name" "Index category name")))))
+  (lambda ()
+    (TeX-add-symbols
+     '("doxitem" [ TeX-arg-key-val (("idxtype") ("macrolike")) ]
+       "Function name" "Environment name" "Index category name"))
+    (when (and (featurep 'font-latex)
+	       (eq TeX-install-font-lock 'font-latex-setup))
+      (font-latex-add-keywords '(("doxitem" "[{{{")) 'function)))
+  LaTeX-dialect)
 
 (defun doxitem (envname)
-  "Register a new environment ENVNAME with AUC-TeX.
+  "Register a new environment ENVNAME with AUCTeX.
+The effect is to make docTeX mode treat this new environment just
+like the macro and environment ones.  Currently, this means
+avoiding inner indentation.
 
-The effect is to make docTeX mode treat this new environment just like
-the macro and environment ones. Currently, this means avoiding inner
-indentation.
-
-ENVNAME is actually a regexp appearing in a logical group.
-This means that you can register several environments simultaneously
+ENVNAME is actually a regexp appearing in a logical group.  This
+means that you can register several environments simultaneously
 by means or regexp combination."
   (make-local-variable 'docTeX-indent-inner-fixed)
   (push (list
@@ -48,7 +50,7 @@ by means or regexp combination."
 	docTeX-indent-inner-fixed))
 
 (defun doxitems (&rest envnames)
-  "Register environments ENVNAMES with AUC-TeX.
+  "Register environments ENVNAMES with AUCTeX.
 See the function `doxitem' for more information."
   (mapc #'doxitem envnames))
 
diff --git a/Master/texmf-dist/doc/latex/dox/dox.pdf b/Master/texmf-dist/doc/latex/dox/dox.pdf
index 3044171158b..924eee05797 100644
--- a/Master/texmf-dist/doc/latex/dox/dox.pdf
+++ b/Master/texmf-dist/doc/latex/dox/dox.pdf
diff --git a/Master/texmf-dist/doc/latex/dox/header.inc b/Master/texmf-dist/doc/latex/dox/header.inc
index cc2f2d78c37..bf6e015003b 100644
--- a/Master/texmf-dist/doc/latex/dox/header.inc
+++ b/Master/texmf-dist/doc/latex/dox/header.inc
@@ -35,7 +35,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{dox}[2017/01/26 v2.3 Extensions to the doc package]
+\ProvidesPackage{dox}[2017/12/06 v2.4 Extensions to the doc package]
 
 \endinput
 %%
diff --git a/Master/texmf-dist/source/latex/dox/dox.dtx b/Master/texmf-dist/source/latex/dox/dox.dtx
index 887b816d7f7..212b343189f 100644
--- a/Master/texmf-dist/source/latex/dox/dox.dtx
+++ b/Master/texmf-dist/source/latex/dox/dox.dtx
@@ -74,7 +74,7 @@
 %   Copyright \copyright{} 2009, 2010, 2017 Didier Verna}
 %
 % \newcommand\emacs{\textsf{[X]Emacs}\xspace}
-% \newcommand\auctex{AUC-\TeX\xspace}
+% \newcommand\auctex{AUC\TeX\xspace}
 % \newcommand\api{\textsc{api}\xspace}
 %
 % \pagestyle{mystyle}
@@ -332,6 +332,8 @@
 %
 % \section{History}
 % \begin{itemize}
+% \item[v2.4] Improve \auctex support.\\
+%   Fix spurious spaces in index entries, reported by Eric Domenjoud.
 % \item[v2.3] Support \texttt{doc}'s \cs{saved@indexname} internal command,
 %   thanks to Falk Hanisch.
 % \item[v2.2] New \texttt{macrolike} option allowing to create control
@@ -345,7 +347,7 @@
 %   \texttt{noindex} to avoid indexing).\\
 %   Extend \cs{DescribeMacro}, \cs{DescribeEnv} and their corresponding
 %   environments with the same features.
-% \item[v1.0] First public version
+% \item[v1.0] First public version.
 % \end{itemize}
 %
 % \StopEventually{\vfill\hfill\small \packagecopyright{}}
@@ -355,7 +357,7 @@
 %    \begin{macrocode}
 %<dox>\NeedsTeXFormat{LaTeX2e}
 %<*header>
-\ProvidesPackage{dox}[2017/01/26 v2.3 Extensions to the doc package]
+\ProvidesPackage{dox}[2017/12/06 v2.4 Extensions to the doc package]
 
 %</header>
 %<*dox>
@@ -522,9 +524,9 @@
 \def\@doxcreatespecialmainindex#1#2#3{%
   \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
     \@bsphack%
-    \special@index{##1\actualchar{\string\ttfamily\space##1} (#2)
+    \special@index{##1\actualchar{\string\ttfamily\space##1} (#2)%
       \encapchar main}%
-    \special@index{#3:\levelchar##1\actualchar{\string\ttfamily\space##1}
+    \special@index{#3:\levelchar##1\actualchar{\string\ttfamily\space##1}%
       \encapchar main}%
     \@esphack}}
 \def\@doxcreatespecialmainmacrolikeindex#1#2#3{%
@@ -535,7 +537,7 @@
       \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
       \space(#2)\encapchar main}%
     \special@index{#3:\levelchar\@gtempa\actualchar%
-      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar%
       \encapchar main}%
     \@esphack}}
 
@@ -552,7 +554,7 @@
   \expandafter\def\csname Special#1Index\endcsname##1{%
     \@bsphack%
     \index{##1\actualchar{\protect\ttfamily##1} (#2)\encapchar usage}%
-    \index{#3:\levelchar##1\actualchar{\protect\ttfamily##1}
+    \index{#3:\levelchar##1\actualchar{\protect\ttfamily##1}%
       \encapchar usage}%
     \@esphack}}
 \def\@doxcreatespecialmacrolikeindex#1#2#3{%
@@ -563,7 +565,7 @@
       \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
       \space(#2)\encapchar usage}%
     \index{#3:\levelchar\@gtempa\actualchar
-      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar%
       \encapchar usage}%
     \@esphack}}
 
diff --git a/Master/texmf-dist/tex/latex/dox/dox.sty b/Master/texmf-dist/tex/latex/dox/dox.sty
index 9fa5c0ef3db..5417fe0ae0a 100644
--- a/Master/texmf-dist/tex/latex/dox/dox.sty
+++ b/Master/texmf-dist/tex/latex/dox/dox.sty
@@ -36,7 +36,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dox}[2017/01/26 v2.3 Extensions to the doc package]
+\ProvidesPackage{dox}[2017/12/06 v2.4 Extensions to the doc package]
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{family=dox,prefix=dox@}
@@ -112,9 +112,9 @@
 \def\@doxcreatespecialmainindex#1#2#3{%
   \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
     \@bsphack%
-    \special@index{##1\actualchar{\string\ttfamily\space##1} (#2)
+    \special@index{##1\actualchar{\string\ttfamily\space##1} (#2)%
       \encapchar main}%
-    \special@index{#3:\levelchar##1\actualchar{\string\ttfamily\space##1}
+    \special@index{#3:\levelchar##1\actualchar{\string\ttfamily\space##1}%
       \encapchar main}%
     \@esphack}}
 \def\@doxcreatespecialmainmacrolikeindex#1#2#3{%
@@ -125,7 +125,7 @@
       \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
       \space(#2)\encapchar main}%
     \special@index{#3:\levelchar\@gtempa\actualchar%
-      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar%
       \encapchar main}%
     \@esphack}}
 
@@ -133,7 +133,7 @@
   \expandafter\def\csname Special#1Index\endcsname##1{%
     \@bsphack%
     \index{##1\actualchar{\protect\ttfamily##1} (#2)\encapchar usage}%
-    \index{#3:\levelchar##1\actualchar{\protect\ttfamily##1}
+    \index{#3:\levelchar##1\actualchar{\protect\ttfamily##1}%
       \encapchar usage}%
     \@esphack}}
 \def\@doxcreatespecialmacrolikeindex#1#2#3{%
@@ -144,7 +144,7 @@
       \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
       \space(#2)\encapchar usage}%
     \index{#3:\levelchar\@gtempa\actualchar
-      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar%
       \encapchar usage}%
     \@esphack}}