denisbdoc (30oct16)

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

6 files changed, 52 insertions, 33 deletions

diff --git a/Master/texmf-dist/doc/latex/denisbdoc/README.md b/Master/texmf-dist/doc/latex/denisbdoc/README.md
index 0409ddcd9d6..de7bc8d9b96 100644
--- a/Master/texmf-dist/doc/latex/denisbdoc/README.md
+++ b/Master/texmf-dist/doc/latex/denisbdoc/README.md
@@ -1,4 +1,4 @@
-denisbdoc - A personal package for documenting classes and packages, v. 0.4
+denisbdoc - A personal package for documenting classes and packages, v. 0.5
 ===========================================================================
 
 **The (quick 'n dirty) `denisbdoc` package is just for documenting the classes
diff --git a/Master/texmf-dist/doc/latex/denisbdoc/denisbdoc-chng.xdy b/Master/texmf-dist/doc/latex/denisbdoc/denisbdoc-chng.xdy
index a689e585248..25cf2a49b62 100644
--- a/Master/texmf-dist/doc/latex/denisbdoc/denisbdoc-chng.xdy
+++ b/Master/texmf-dist/doc/latex/denisbdoc/denisbdoc-chng.xdy
@@ -5,7 +5,10 @@
 (markup-locref :open "\hyperpage{" :close "}")
 
 (markup-locref-list :sep ", ")
-(markup-locclass-list :open "\dotfill " :close "" )
+(markup-locclass-list :open "\hfill\nobreakspace" :close "" )
+
+(define-attributes (("gobble" "default")))
+(markup-locref  :open "\makeatletter\@gobble{" :close "}\makeatother" :attr "gobble")
 
 
 (markup-index :open  "~n
diff --git a/Master/texmf-dist/doc/latex/denisbdoc/denisbdoc.xdy b/Master/texmf-dist/doc/latex/denisbdoc/denisbdoc.xdy
index 2f7314afd0f..92ff9339744 100644
--- a/Master/texmf-dist/doc/latex/denisbdoc/denisbdoc.xdy
+++ b/Master/texmf-dist/doc/latex/denisbdoc/denisbdoc.xdy
@@ -24,8 +24,6 @@
 (markup-keyword-list :open "\targetindexentryii{" :close "}" :depth 2)
 
 (markup-index :open  "~n
-\clearpage
-\phantomsection
 \begin{theindex}
   \providecommand*\lettergroupDefault[1]{}
   \providecommand*\lettergroup[1]{%
diff --git a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx
index abef7d72867..cdea0232bf3 100644
--- a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx
+++ b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx
@@ -3,7 +3,7 @@
 \iffalse
 %</internal>
 %<*readme>
-denisbdoc - A personal package for documenting classes and packages, v. 0.4
+denisbdoc - A personal package for documenting classes and packages, v. 0.5
 ===========================================================================
 
 **The (quick 'n dirty) `denisbdoc` package is just for documenting the classes
@@ -30,7 +30,7 @@ This package is currently not documented.
 \askforoverwritefalse
 \preamble
 -----------------------------------------------------------------------------
-denisbdoc --- A personal dirty package for documenting packages, version 0.4
+denisbdoc --- A personal dirty package for documenting packages, version 0.5
 
 Maintained by Denis Bitouz'e
 E-mail: denis.bitouze@lmpa.univ-littoral.fr
@@ -118,7 +118,8 @@ This work consists of the file  denisbdoc.dtx
 %\changes{v0.1}{2015/03/15}{First CTAN version}
 %\changes{v0.2}{2016/04/04}{Second CTAN version}
 %\changes{v0.3}{2016/06/10}{Third CTAN version}
-%\changes{v0.4}{2016/10/24}{Fourth CTAN version}
+%\changes{v0.5}{2016/10/24}{Fourth CTAN version}
+%\changes{v0.5}{2016/10/30}{Fifth CTAN version}
 %
 %\begin{abstract}
 % ...
@@ -189,7 +190,7 @@ This work consists of the file  denisbdoc.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {denisbdoc} {2016/10/24} {0.4}
+\ProvidesExplPackage {denisbdoc} {2016/10/30} {0.5}
   {A personal package for documenting packages}
 %    \end{macrocode}
 %
@@ -369,7 +370,7 @@ This work consists of the file  denisbdoc.dtx
 \@ifpackageloaded{glossaries}{%
 }{%
   % \RequirePackage{glossaries}%
-  \RequirePackage[hyperfirst=false,toc=false]{glossaries-extra}%
+  \RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}%
   \makeglossaries%
   \setglossarystyle{indexhypergroup}%
   \setabbreviationstyle[acronym]{long-short-sc}%
@@ -597,12 +598,19 @@ This work consists of the file  denisbdoc.dtx
 \attachfilesetup{color=Hyperlink}
 %    \end{macrocode}
 %
+% In order to get \pkg{titleps}' header in index to include current index entry,
+% we define the following |\indexmark| command
+% (cf. \url{http://tex.stackexchange.com/q/335522/18401}) that will be inserted
+% inside the (level 0) |\targetindexentry| command below.
+%    \begin{macrocode}
+\newcommand{\indexmark}[1]{\hypertarget{index:#1}{#1}\markboth{#1}{#1}}
+%    \end{macrocode}
+%
 % In order to get \pkg{hyperref} and \pkg{xindy} work nicely together
 % (cf. \url{http://geekographie.maieul.net/172}).
 %    \begin{macrocode}
-% \newcounter{target}
-% \newcommand{\targetindexentry}[1]{\hypertarget{\thetarget:index:#1}{#1}}
-\newcommand{\targetindexentry}[1]{\hypertarget{index:#1}{#1}}
+% \newcommand{\targetindexentry}[1]{\hypertarget{index:#1}{#1}}
+\newcommand{\targetindexentry}[1]{\indexmark{#1}}
 \newcounter{targeti}
 \newcommand{\targetindexentryi}[1]{\stepcounter{targeti}\hypertarget{\thetargeti:index:#1}{#1}}
 \newcounter{targetii}
@@ -1372,7 +1380,7 @@ Nouv.~:}~#1}
 {
   \_@@_alert:n {#1}
 }%
-\makeindex[name=\jobname-changes,title=Historique~des~changements,options=-M~denisbdoc-chng.xdy]
+\makeindex[name=\jobname-changes,title=Historique~des~changements,options=-L~french~-M~denisbdoc-chng.xdy]
 \DeclareDocumentCommand \changes { smmm } {
   \IfBooleanTF {#1}
   {
@@ -1380,9 +1388,13 @@ Nouv.~:}~#1}
   }{
     \tl_set:Nn \l_tmpa_tl {#4}
   }
+  \ifx\@onlypreamble\@notprerr
   \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl}
+  \else
+  \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble}
+  \fi
 }
-\DeclareDocumentCommand \PrintChanges { o } {
+\DeclareDocumentCommand \PrintChanges { O{} } {
   \indexprologue{#1}
 %    \end{macrocode}
 %
@@ -1511,8 +1523,8 @@ Nouv.~:}~#1}
     \_@@_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7}
   }{}%
   \IfLanguageName{english}{%
-    \_@@_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7}
-    ~class
+    \_@@_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7}~%
+    class
   }{}%
 }
 %
@@ -1571,11 +1583,11 @@ Nouv.~:}~#1}
 }
 \NewDocumentCommand{\texlive}{ }
 {
-  \TeX{}\space{}Live\xspace
+  \href{http://www.tug.org/texlive/}{\TeX{}\space{}Live}\xspace
 }
 \NewDocumentCommand{\miktex}{ }
 {
-  MiK\TeX\xspace
+  \href{http://www.tug.org/texlive/}{MiK\TeX}\xspace
 }
 \NewDocumentCommand{\linux}{ }
 {
@@ -2189,8 +2201,6 @@ Nouv.~:}~#1}
 
 (markup-index :open  "~n
 % \bookmarksetup{open}
-\clearpage
-\phantomsection
 \begin{theindex}
   \providecommand*\lettergroupDefault[1]{}
   \providecommand*\lettergroup[1]{%
@@ -2218,9 +2228,12 @@ Nouv.~:}~#1}
 
 (markup-locref :open "\hyperpage{" :close "}")
 
-
 (markup-locref-list :sep ", ")
-(markup-locclass-list :open "\dotfill " :close "" )
+(markup-locclass-list :open "\hfill\nobreakspace" :close "" )
+
+(define-attributes (("gobble" "default")))
+(markup-locref  :open "\makeatletter\@gobble{" :close "}\makeatother" :attr "gobble")
+% (markup-locclass-list :open "" :sep "")
 
 % (markup-keyword-list :open "{\small " :close "}" )
 % (markup-keyword-list :open "{\small " :close "}" :depth 1)
diff --git a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins
index 921a63ec9ca..6bfe8c7e372 100644
--- a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins
+++ b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins
@@ -2,7 +2,7 @@
 \askforoverwritefalse
 \preamble
 -----------------------------------------------------------------------------
-denisbdoc --- A personal dirty package for documenting packages, version 0.4
+denisbdoc --- A personal dirty package for documenting packages, version 0.5
 
 Maintained by Denis Bitouz'e
 E-mail: denis.bitouze@lmpa.univ-littoral.fr
diff --git a/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty b/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty
index 9f37a061af7..b2e0a167616 100644
--- a/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty
+++ b/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty
@@ -6,7 +6,7 @@
 %%
 %% denisbdoc.dtx  (with options: `package')
 %% -----------------------------------------------------------------------------
-%% denisbdoc --- A personal dirty package for documenting packages, version 0.4
+%% denisbdoc --- A personal dirty package for documenting packages, version 0.5
 %% 
 %% Maintained by Denis Bitouz'e
 %% E-mail: denis.bitouze@lmpa.univ-littoral.fr
@@ -15,7 +15,7 @@
 %% -----------------------------------------------------------------------------
 %% 
 \RequirePackage{expl3,l3keys2e,xparse}
-\ProvidesExplPackage {denisbdoc} {2016/10/24} {0.4}
+\ProvidesExplPackage {denisbdoc} {2016/10/30} {0.5}
   {A personal package for documenting packages}
 \@ifpackagelater { expl3 } { 2012/11/21 }
   { }
@@ -129,7 +129,7 @@
 \@ifpackageloaded{glossaries}{%
 }{%
   % \RequirePackage{glossaries}%
-  \RequirePackage[hyperfirst=false,toc=false]{glossaries-extra}%
+  \RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}%
   \makeglossaries%
   \setglossarystyle{indexhypergroup}%
   \setabbreviationstyle[acronym]{long-short-sc}%
@@ -209,7 +209,8 @@
 { commandshell}{#1}
 \usetikzlibrary{trees,backgrounds,fit,calc,positioning}
 \attachfilesetup{color=Hyperlink}
-\newcommand{\targetindexentry}[1]{\hypertarget{index:#1}{#1}}
+\newcommand{\indexmark}[1]{\hypertarget{index:#1}{#1}\markboth{#1}{#1}}
+\newcommand{\targetindexentry}[1]{\indexmark{#1}}
 \newcounter{targeti}
 \newcommand{\targetindexentryi}[1]{\stepcounter{targeti}\hypertarget{\thetargeti:index:#1}{#1}}
 \newcounter{targetii}
@@ -762,7 +763,7 @@ Nouv.~:}~#1}
 {
   \__denisbdoc_alert:n {#1}
 }%
-\makeindex[name=\jobname-changes,title=Historique~des~changements,options=-M~denisbdoc-chng.xdy]
+\makeindex[name=\jobname-changes,title=Historique~des~changements,options=-L~french~-M~denisbdoc-chng.xdy]
 \DeclareDocumentCommand \changes { smmm } {
   \IfBooleanTF {#1}
   {
@@ -770,9 +771,13 @@ Nouv.~:}~#1}
   }{
     \tl_set:Nn \l_tmpa_tl {#4}
   }
+  \ifx\@onlypreamble\@notprerr
   \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl}
+  \else
+  \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble}
+  \fi
 }
-\DeclareDocumentCommand \PrintChanges { o } {
+\DeclareDocumentCommand \PrintChanges { O{} } {
   \indexprologue{#1}
   \def\imki@indexlevel{\chapter}
   \printindex[\jobname-changes]
@@ -841,8 +846,8 @@ Nouv.~:}~#1}
     \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7}
   }{}%
   \IfLanguageName{english}{%
-    \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7}
-    ~class
+    \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7}~%
+    class
   }{}%
 }
 \cs_new_protected:Nn \__denisbdoc_format:n
@@ -899,11 +904,11 @@ Nouv.~:}~#1}
 }
 \NewDocumentCommand{\texlive}{ }
 {
-  \TeX{}\space{}Live\xspace
+  \href{http://www.tug.org/texlive/}{\TeX{}\space{}Live}\xspace
 }
 \NewDocumentCommand{\miktex}{ }
 {
-  MiK\TeX\xspace
+  \href{http://www.tug.org/texlive/}{MiK\TeX}\xspace
 }
 \NewDocumentCommand{\linux}{ }
 {