7 files changed, 20 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/indextools/README b/Master/texmf-dist/doc/latex/indextools/README
index 19007a2f749..b19b327c9ae 100644
--- a/Master/texmf-dist/doc/latex/indextools/README
+++ b/Master/texmf-dist/doc/latex/indextools/README
@@ -1,10 +1,12 @@
 #License and Copyright
 
 2010-2013 Enrico Gregorio imakeidx
-2014 Maïeul Rouquette indextools
+2014-… Maïeul Rouquette indextools
 
-The LATEX Project Public Li­cense 1.3
+The LATEX Project Public License 1.3
 
 #What is it
 
-A fork of imakeidx to avoid some limits.
+This pack­age en­ables the user to pro­duce and type­set one or more in­dices si­mul­ta­ne­ously.
+The pack­age is known to work in LATEX doc­u­ments pro­cessed with pdfLATEX, X∃LATEX and LuaLATEX. If makein­dex is used for pro­cess­ing the in­dex en­tries, no par­tic­u­lar setup is needed when TEX Live is used. Us­ing xindy or other pro­grams, it is nec­es­sary to en­able shell es­cape. Shell es­cape is also needed if splitin­dex is used.
+This is a fork of imakeidx, with new fea­tures and fixed bugs.
diff --git a/Master/texmf-dist/doc/latex/indextools/indextools.pdf b/Master/texmf-dist/doc/latex/indextools/indextools.pdf
index 9f31ad6d70b..e156d192de8 100644
--- a/Master/texmf-dist/doc/latex/indextools/indextools.pdf
+++ b/Master/texmf-dist/doc/latex/indextools/indextools.pdf
diff --git a/Master/texmf-dist/doc/latex/indextools/issue4.pdf b/Master/texmf-dist/doc/latex/indextools/issue4.pdf
deleted file mode 100644
index bca8849fbd1..00000000000
--- a/Master/texmf-dist/doc/latex/indextools/issue4.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/indextools/issue5.pdf b/Master/texmf-dist/doc/latex/indextools/issue5.pdf
new file mode 100644
index 00000000000..e37ec106a5c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/indextools/issue5.pdf
diff --git a/Master/texmf-dist/doc/latex/indextools/makefile b/Master/texmf-dist/doc/latex/indextools/makefile
index c5392aa39e3..aa9536e1b71 100644
--- a/Master/texmf-dist/doc/latex/indextools/makefile
+++ b/Master/texmf-dist/doc/latex/indextools/makefile
@@ -6,9 +6,11 @@ dist: indextools.pdf indextools.sty
 	ln $(FILES) indextools
 	zip -r ../indextools.zip  indextools
 README: README.md
-	cp README.md README
-%.pdf %.sty: %.dtx
-	latexmk *dtx
+	ln README.md README
+%.sty: %.dtx
+	pdflatex $*.dtx
+%.pdf: %.dtx
+	latexmk $*.dtx
  
 clean:
 	@$(RM) *.pdf *.toc *.aux *.out *.fdb_latexmk *.log *.bbl *.bcf *.blg *run.xml *.synctex.gz*
diff --git a/Master/texmf-dist/source/latex/indextools/indextools.dtx b/Master/texmf-dist/source/latex/indextools/indextools.dtx
index 038f73234eb..b88e96682ef 100644
--- a/Master/texmf-dist/source/latex/indextools/indextools.dtx
+++ b/Master/texmf-dist/source/latex/indextools/indextools.dtx
@@ -18,7 +18,7 @@
 
 Copyright 2010--2013 Enrico Gregorio <Enrico dot Gregorio at univr dot it>
 
-Copyright 2014 Maïeul Rouquette <maieul at maieul dot it>
+Copyright 2014 Maïeul Rouquette <maieul at maieul dot net>
 
 Distributable under the LaTeX Project Public License,
 version 1.3c or higher (your choice). The latest version of
@@ -45,7 +45,7 @@ and the derived files indextools.sty and indextools.pdf.
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{indextools}%
 %<*package>
-   [2015/11/15 v1.5 Package for typesetting indices in a synchronous mode]
+   [2015/11/22 v1.5.1 Package for typesetting indices in a synchronous mode]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -80,7 +80,7 @@ and the derived files indextools.sty and indextools.pdf.
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{889}
+% \CheckSum{891}
 %
 % \changes{v1.0}{2010/07/10}{First public version}
 % \changes{v1.0a}{2010/07/12}{Small bug correction}
@@ -99,6 +99,7 @@ and the derived files indextools.sty and indextools.pdf.
 % \changes{v1.5}{2015/11/15}{New option `afterindex'}
 % \changes{v1.5}{2015/11/15}{New option `innote'}
 % \changes{v1.5}{2015/11/15}{New option `notenumber'}
+% \changes{v1.5.1}{2015/11/22}{Fix bug with options `notenumber' and `innote' when using \cs{index} without optional argument}
 %
 % \begin{abstract}
 % This package is a fork of the \pack{imakeidx} package. The original authors
@@ -1661,8 +1662,8 @@ and the derived files indextools.sty and indextools.pdf.
 %    \end{macrocode}
 %    \begin{macrocode}
 % And now, the command, defines in any case, but only at the begin of documents, because people can have defined them in the preamble.
-  \newcommand\nnumberindex[2][]{\orig@@index[#1]{#2|innotenumber{\thefootnote}}}
-  \newcommand\nindex[2][]{\orig@@index[#1]{#2|innote}}
+  \newcommand\nnumberindex[2][\indtl@jobname]{\orig@@index[#1]{#2|innotenumber{\thefootnote}}}
+  \newcommand\nindex[2][\indtl@jobname]{\orig@@index[#1]{#2|innote}}
   \providecommand{\innotenumber}[2]{#2n.~#1}
   \providecommand{\innote}[1]{#1\textit{n}}
 }
diff --git a/Master/texmf-dist/tex/latex/indextools/indextools.sty b/Master/texmf-dist/tex/latex/indextools/indextools.sty
index 85a3cde8baf..2ff27992ee7 100644
--- a/Master/texmf-dist/tex/latex/indextools/indextools.sty
+++ b/Master/texmf-dist/tex/latex/indextools/indextools.sty
@@ -15,7 +15,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{indextools}%
-   [2015/11/15 v1.5 Package for typesetting indices in a synchronous mode]
+   [2015/11/22 v1.5.1 Package for typesetting indices in a synchronous mode]
 
 
 
@@ -439,8 +439,8 @@
       \pretocmd{\@footnotetext}{\let\index\nnumberindex}{}{}
       \apptocmd{\@footnotetext}{\let\index\orig@@index}{}{}
   \fi%
-  \newcommand\nnumberindex[2][]{\orig@@index[#1]{#2|innotenumber{\thefootnote}}}
-  \newcommand\nindex[2][]{\orig@@index[#1]{#2|innote}}
+  \newcommand\nnumberindex[2][\indtl@jobname]{\orig@@index[#1]{#2|innotenumber{\thefootnote}}}
+  \newcommand\nindex[2][\indtl@jobname]{\orig@@index[#1]{#2|innote}}
   \providecommand{\innotenumber}[2]{#2n.~#1}
   \providecommand{\innote}[1]{#1\textit{n}}
 }
@@ -466,7 +466,7 @@
 %% 
 %% Copyright 2010--2013 Enrico Gregorio <Enrico dot Gregorio at univr dot it>
 %% 
-%% Copyright 2014 Maïeul Rouquette <maieul at maieul dot it>
+%% Copyright 2014 Maïeul Rouquette <maieul at maieul dot net>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of