denisbdoc (10jun16)

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

2 files changed, 155 insertions, 101 deletions

diff --git a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx
index eb86441bf3b..5309e788541 100644
--- a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx
+++ b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx
@@ -3,16 +3,18 @@
 \iffalse
 %</internal>
 %<*readme>
-denisbdoc - A personal package for documenting classes and packages, version 0.2
-================================================================================
+denisbdoc - A personal package for documenting classes and packages, v. 0.3
+===========================================================================
 
-This (quick 'n dirty) package is just for documenting the classes I've written.
+**The (quick 'n dirty) `denisbdoc` package is just for documenting the classes
+I've written.**
 
-Installation
-------------
+The class is supplied in `.dtx` format. If you want to unpack the `.dtx`
+yourself, running:
 
-The package is supplied in `dtx` format. If you want to unpack the `.dtx`
-yourself, running `tex denisbdoc.dtx` will extract the package.
+     tex denisbdoc.dtx
+
+will extract the package.
 
 This package is currently not documented.
 %</readme>
@@ -27,9 +29,8 @@ This package is currently not documented.
 \input l3docstrip.tex
 \askforoverwritefalse
 \preamble
------------------------------------------------------------------------
 -----------------------------------------------------------------------------
-denisbdoc --- A personal dirty package for documenting packages, version 0.2
+denisbdoc --- A personal dirty package for documenting packages, version 0.3
 
 Maintained by Denis Bitouz'e
 E-mail: denis.bitouze@lmpa.univ-littoral.fr
@@ -67,10 +68,6 @@ This work consists of the file  denisbdoc.dtx
   \file{\jobname.ins}{\from{\jobname.dtx}{install}}
 }
 \nopreamble\nopostamble
-\usedir{doc/latex/denisbdoc}
-\generate{
-  \file{README.md}{\from{\jobname.dtx}{readme}}
-}
 \usedir{/}
 \generate{
   \file{README.md}{\from{\jobname.dtx}{readme}}
@@ -115,6 +112,7 @@ 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}
 %
 %\begin{abstract}
 % ...
@@ -185,7 +183,7 @@ This work consists of the file  denisbdoc.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {denisbdoc} {2016/04/04} {0.2}
+\ProvidesExplPackage {denisbdoc} {2016/06/10} {0.3}
   {A personal package for documenting packages}
 %    \end{macrocode}
 %
@@ -241,9 +239,7 @@ This work consists of the file  denisbdoc.dtx
 \RequirePackage{fixfoot}%
 \RequirePackage[inline]{enumitem}%
 \RequirePackage{afterpage}%
-\RequirePackage{tabulary}%
 \RequirePackage{calc}%
-\RequirePackage{subcaption}%
 % \RequirePackage[lining]{libertine}%
 \RequirePackage{siunitx}%
 % \RequirePackage[a4paper]{geometry}%
@@ -263,43 +259,23 @@ This work consists of the file  denisbdoc.dtx
 \RequirePackage{ifpdf}%
 \RequirePackage{amssymb}%
 \RequirePackage{tocvsec2}%
+\RequirePackage{ltxcmds}%
 \RequirePackage{csquotes}%
 \RequirePackage{tikz}%
 %
 \RequirePackage[xindy]{imakeidx}
 %
-\RequirePackage{scrlfile}
-\BeforePackage{doc}{\let\oldmaketitle\maketitle}
-\AfterPackage{doc}{\let\maketitle\oldmaketitle}
+% \RequirePackage{scrlfile}
 %
 \let\EUR\relax
 \@ifpackageloaded{tcolorbox}{%
 }{%
   \RequirePackage{tcolorbox}%
 }%
-%    \end{macrocode}
-%
-% We momentarily switch to a \enquote{normal} category code régime in which the
-% colon (:) is treated as \enquote{letter}, which is necessary when colon is
-% used in code (here \pkg{TikZ} and \pkg{tcolorbox}).
-%    \begin{macrocode}
-\ExplSyntaxOff
-\ifpdf
-\tcbuselibrary{listingsutf8}
-\else
-\tcbuselibrary{listings}
-\RequirePackage{fontawesome}%
-\lstMakeShortInline[style=dbtex]×
-\fi
-\tcbuselibrary{%
-  documentation,theorems,breakable,skins%
-}
-\usetikzlibrary{trees,backgrounds,fit,calc,positioning}
-\RequirePackage{attachfile2}
-\ExplSyntaxOn
 \RequirePackage{comment}%
 \RequirePackage{path}%
 \RequirePackage{textcase}%
+\RequirePackage{fontawesome}%
 \@ifpackageloaded{biblatex}{%
 }{%
   \RequirePackage[backend=biber,style=authortitle,autopunct=false,useprefix=true,backref,dashed=false]{biblatex}%
@@ -308,11 +284,15 @@ This work consists of the file  denisbdoc.dtx
 % \RequirePackage[useregional]{datetime2}%
 \RequirePackage[nodayofweek]{datetime}%
 % \RequirePackage{floatrow}%
-% \RequirePackage{subcaption}%
+\RequirePackage{subcaption}%
+% \RequirePackage{caption}%
 \@ifpackageloaded{hyperref}{%
+  % \message{^^J^^JDeja~charge~!^^J^^J}}
 }{%
-  \RequirePackage{hyperref}%
+  \RequirePackage[hyperfootnotes=false]{hyperref}%
+  % \message{^^J^^JPas~deja~charge~!^^J^^J}}
 }%
+\RequirePackage{attachfile2}
 \@ifpackageloaded{nameref}{%
 }{%
   \RequirePackage{nameref}%
@@ -327,7 +307,7 @@ This work consists of the file  denisbdoc.dtx
 }%
 \@ifpackageloaded{glossaries}{%
 }{%
-  \RequirePackage[nowarn]{glossaries}%
+  \RequirePackage[nowarn,toc,hyperfirst=false]{glossaries}%
   \makeglossaries
   \setglossarystyle{indexhypergroup}
   \setacronymstyle{long-sc-short}
@@ -337,6 +317,51 @@ This work consists of the file  denisbdoc.dtx
   \RequirePackage{cleveref}%
 }%
 %    \end{macrocode}
+%
+% A trouble with ×\NoAutoSpacing× from \package{frenchb} has been fixed since
+% version 3.2b 2016-04-18. But this cannot be discriminate directly (see
+% \url{http://tex.stackexchange.com/q/309680/18401}), hence we rely on
+% \Package{ltxcmds} for this:
+%    \begin{macrocode}
+\ltx@iffilelater{frenchb.ldf}{2016/03/20}{%
+}{%
+  \DeclareRobustCommand*{\NoAutoSpacing}{\FBAutoSpaceGuillfalse%
+    \ifFB@active@punct\noautospace@beforeFDP\shorthandoff{;:!?}\fi%
+    \ifFB@xetex@punct\XeTeXinterchartokenstate=0 \fi%
+    \ifFB@luatex@punct\FB@addDPspace=0 \FB@addGUILspace=0 \fi%
+  }%
+}
+%    \end{macrocode}
+%
+% We momentarily switch to a \enquote{normal} category code régime in which the
+% colon (:) is treated as \enquote{letter}, which is necessary when colon is
+% used in code (here \pkg{TikZ} and \pkg{tcolorbox}).
+%    \begin{macrocode}
+\ExplSyntaxOff
+\ifpdf
+\tcbuselibrary{listingsutf8}
+\else
+\tcbuselibrary{listings}
+\pdftex_if_engine:TF
+  {
+    \lstMakeShortInline[style=dbtex]|
+  }{
+    \lstMakeShortInline[style=dbtex]×
+  }
+\fi
+\tcbuselibrary{%
+  documentation,theorems,breakable,skins%
+}
+\usetikzlibrary{trees,backgrounds,fit,calc,positioning}
+%    \end{macrocode}
+%
+% The color of \package{attachfile(2)}'s links is by default too pale. We make
+% it the same as the \package{tcolorbox}' one:
+%    \begin{macrocode}
+\attachfilesetup{color=Hyperlink}
+%
+\ExplSyntaxOn
+%    \end{macrocode}
 % We apply a patch currently necessary (cf. \url|http://tex.stackexchange.com/a/233524/18401|).
 %    \begin{macrocode}
 \ifundef{\inpenc@prehook}{%
@@ -371,8 +396,8 @@ This work consists of the file  denisbdoc.dtx
 % \begin{macro}{\c_@@_treetemplate_string_tl}
 % \begin{macro}{\c_@@_treesample_string_tl}
 %    \begin{macrocode}
-\tl_const:Nn \c_@@_template_string_tl {canevas}
-\tl_const:Nn \c_@@_sample_string_tl {specimens}
+\tl_const:Nn \c_@@_template_string_tl {../exemples/canevas}
+\tl_const:Nn \c_@@_sample_string_tl {../exemples/specimen}
 \tl_const:Nn \c_@@_flattemplate_string_tl {\c_@@_template_string_tl/a-plat}
 \tl_const:Nn \c_@@_flatsample_string_tl {\c_@@_sample_string_tl/a-plat}
 \tl_const:Nn \c_@@_treetemplate_string_tl {\c_@@_template_string_tl/en-arborescence}
@@ -789,7 +814,10 @@ This work consists of the file  denisbdoc.dtx
     committeemembers,estimateddefensedate,seniorresearcher,supervisors-in-committee,%
     supervisors-in-committee-pl,aim,aimand,examiners,examiners-pl,guests,guests-pl,mcf,mcf*,%
     professor,referees,referees-pl,website,defendedon,supervisedby,thesisdefendedby,thesistitle,%
-    inprogress,universitydepartment,inprogressfoottext,submittedfoottext
+    inprogress,universitydepartment,inprogressfoottext,submittedfoottext,%
+    coinstitute,company,institute,cosupervisor,cosupervisor*,comonitor,%
+    comonitor*,supervisor,supervisor*,academicfield,doctoralschool,keywords,%
+    ordernumber,committeepresident,committeepresident*,speciality%
   },%
   alsoletter={!-*1234560}%
 }%
@@ -852,7 +880,7 @@ This work consists of the file  denisbdoc.dtx
     printauthorsdetails,date,title,author,maketitle,item,printbibliography,%
     vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,set,%
     nwejmverb,th,epigraph,keywords,msc,acknowledgments,E,I,grad,Div,curl,rot,supp,%
-    DeclareMathOperator,BinaryOperators,dif%
+    DeclareMathOperator,BinaryOperators,dif,articlesetup%
   },%
   % Environments' names
   morekeywords={%
@@ -870,7 +898,8 @@ This work consists of the file  denisbdoc.dtx
     number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,%
     abstract,frenchtitle,englishtitle,% title,label,%
     pictogram,list,help,diameter,textwidth,xshift,yshift,%
-    affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright%
+    affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright,%
+    gradient%
   },%
   morekeywords=[3]{% Values of key-value lists
     true,false,theorem,definition,proof%
@@ -920,6 +949,7 @@ This work consists of the file  denisbdoc.dtx
   \addtocontents{dbremarklist}{\protect\addvspace{10\p@}}%
   \addtocontents{dbexamplelist}{\protect\addvspace{10\p@}}%
   \addtocontents{dbfaqlist}{\protect\addvspace{10\p@}}%
+  \addtocontents{dbtablist}{\protect\addvspace{10\p@}}%
 }{}{}
 %
 \sisetup{locale=FR,detect-all}
@@ -984,7 +1014,8 @@ This work consists of the file  denisbdoc.dtx
     breakable,
     fonttitle=\bfseries,
     enlarge~top~by=1mm,
-    separator~sign~dash
+    separator~sign~dash,
+    label~separator=-
   }%
 }%
 %
@@ -1088,26 +1119,49 @@ This work consists of the file  denisbdoc.dtx
     }
   }
 }
+%    \end{macrocode}
 %
-\cs_new_protected:Nn \_@@_package:nnn
-{
-  \texorpdfstring{%
-    \IfBooleanTF {#1}
-    {
-      \tl_if_empty:nTF {#2}
-      {%
-        \href{http://www.ctan.org/pkg/#3}{\textsf{#3}}%
-      }{%
-        \href{#2}{\textsf{#3}}%
-      }%
-    }
-    {
-      \textsf{#3}%
-    }
-  }{%
-    \textsf{#3}
-  }%
-}%
+% In case of French language, we ask the plain style of \Package{csquotes} to be
+% the right ones.
+%    \begin{macrocode}
+\IfLanguageName{french}{%
+  \DeclarePlainStyle{«~}{~»}%
+                    {“}{”}
+}{}%
+%    \end{macrocode}
+%
+% The following hack was provided by Clemens Niederberger
+% (see \url{http://tex.stackexchange.com/q/304980}).
+%
+% This saves the url with all characters catcode other:
+%    \begin{macrocode}
+\tl_const:Nx \c_@@_standard_url_tl { \tl_to_str:n { http://www.ctan.org/pkg/ } }
+%    \end{macrocode}
+% Separate formatting:
+\cs_new_protected:Npn \_@@_package_format:n #1
+  { \textsf {#1} }
+% The main macro
+%   #1: boolean (true => no hyperlink)
+%   #2: optional url
+%   #3: package name
+\cs_new_protected:Npn \_@@_package:nnn #1#2#3
+  {
+    \texorpdfstring
+      {
+        \bool_if:nTF {#1}
+          { \_@@_package_format:n {#3} }
+          {
+            \tl_if_blank:nTF {#2}
+              {
+                \href
+                  { \c_@@_standard_url_tl #3}
+                  { \_@@_package_format:n {#3} }
+              }
+              { \href {#2} { \_@@_package_format:n {#3} } }
+          }
+      }
+      {#3}
+  }
 \NewDocumentCommand{\package}{ s O{} m } {
   \_@@_package:nnn {#1}{#2}{#3}
 }
@@ -1176,10 +1230,10 @@ This work consists of the file  denisbdoc.dtx
 {
   \cs_if_exist:NTF \faExternalLink {%
     % \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{\faExternalLink}
-    \texttt{#3}~\textnormal{(\attachfile{#2#3#1})}
+    \texttt{#3}~% \textnormal{(\attachfile{#2#3#1})}
   }{
     % \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{}
-    \texttt{#3}~\textnormal{(\attachfile{#2#3#1})}
+    \texttt{#3}~% \textnormal{(\attachfile{#2#3#1})}
   }
 }
 \cs_new_protected:Nn \_@@_etctree:
@@ -1223,7 +1277,7 @@ This work consists of the file  denisbdoc.dtx
   \bgroup% \color{magenta}
   \bfseries
   \color{blue}
-  \_@@_links:nnn {.}{}{\folder/}
+  \_@@_links:nnn {../exemples}{}{\folder/}
   \egroup
 }
 \NewDocumentCommand{\directorytree}{  }
@@ -1247,14 +1301,14 @@ This work consists of the file  denisbdoc.dtx
 {
   \hyperref[sec-comm-oblig]{%
     \textcolor{red!75!black}{
-      \pdftex_if_engine:TF
-      {
-        % \string!
-        \ding{52}
-      }{
+      % \pdftex_if_engine:TF
+      % {
+      %   % \string!
+      %   \ding{52}
+      % }{
         \faLock
         % \ding{52}
-      }%
+      % }%
     }
     \ifnum\getpagerefnumber{sec-comm-oblig}=\thepage%
     \else%
@@ -1269,43 +1323,43 @@ This work consists of the file  denisbdoc.dtx
 %
 \NewDocumentCommand{\unixtldirectory}{}
 {
-  \directory{\c_@@_unixtldirectory_string_tl}
+  \directorytree{\c_@@_unixtldirectory_string_tl}
 }%
 \NewDocumentCommand{\tlversion}{}
 {
-  \directory{\c_@@_tlversion_string_tl}
+  \directorytree{\c_@@_tlversion_string_tl}
 }%
 \NewDocumentCommand{\wintldirectory}{}
 {
-  \directory{\c_@@_wintldirectory_string_tl}
+  \directorytree{\c_@@_wintldirectory_string_tl}
 }%
 \NewDocumentCommand{\tldistdirectory}{}
 {
-  \directory{\c_@@_tldistdirectory_string_tl}
+  \directorytree{\c_@@_tldistdirectory_string_tl}
 }%
 \NewDocumentCommand{\miktexdistdirectory}{}
 {
-  \directory{\c_@@_miktexdistdirectory_string_tl}
+  \directorytree{\c_@@_miktexdistdirectory_string_tl}
 }%
 \NewDocumentCommand{\docdirectory}{}
 {
-  \directory{\c_@@_docdirectory_string_tl}
+  \directorytree{\c_@@_docdirectory_string_tl}
 }%
 \NewDocumentCommand{\texdirectory}{}
 {
-  \directory{\c_@@_texdirectory_string_tl}
+  \directorytree{\c_@@_texdirectory_string_tl}
 }%
 \NewDocumentCommand{\sourcedirectory}{}
 {
-  \directory{\c_@@_sourcedirectory_string_tl}
+  \directorytree{\c_@@_sourcedirectory_string_tl}
 }%
 \NewDocumentCommand{\jobdirectory}{}
 {
-  \directory{\c_@@_jobdirectory_string_tl}
+  \directorytree{\c_@@_jobdirectory_string_tl}
 }%
 \NewDocumentCommand{\jobdocdirectory}{}
 {
-  \directory{\c_@@_jobdocdirectory_string_tl}
+  \directorytree{\c_@@_jobdocdirectory_string_tl}
 }%
 %    \end{macrocode}
 %
@@ -1351,10 +1405,10 @@ This work consists of the file  denisbdoc.dtx
 % \Package{zref} avec l'option ×xr× dans le \File{.tex} où sont
 % incluses les pages du \File{.pdf} externe.
 %    \begin{macrocode}
-\zexternaldocument{\c_@@_treesample_string_tl/these}%
+\zexternaldocument{\c_@@_flatsample_string_tl/these}%
 \cs_new_protected:Nn \_@@_screenshot:nn
 {
-  \fbox{\includegraphics[bylabel=#2,width=#1\linewidth-2\fboxsep-2\fboxrule]{\c_@@_treesample_string_tl/these}}%
+  \fbox{\includegraphics[bylabel=#2,width=#1\linewidth-2\fboxsep-2\fboxrule]{\c_@@_flatsample_string_tl/these}}%
 }
 \NewDocumentCommand \screenshot { O{.45} m } {%
   \_@@_screenshot:nn {#1}{#2}
@@ -1450,6 +1504,12 @@ This work consists of the file  denisbdoc.dtx
   fontupper=\slshape,
   dbtcb
 }{faq}
+\newtcbtheorem[list~inside=dbtabularlist,number~within=\g_@@_number_within_tl,crefname={tableau}{tableaux}]{dbtab}{Tableau}{%
+  colback=purple!5!white,
+  colframe=purple!75!black,
+  fontupper=\slshape,
+  dbtcb
+}{tab}
 %    \end{macrocode}
 %
 % \section{Macros for menu entries}
@@ -1527,7 +1587,7 @@ This work consists of the file  denisbdoc.dtx
 }
 \NewDocumentCommand \yatcl { }
 {%
-  \Class{\yat}\xspace
+  \texorpdfstring{\Class{\yat}\xspace}{classe yathesis}
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1610,7 +1670,7 @@ This work consists of the file  denisbdoc.dtx
 }
 \NewDocumentCommand \gztauthorcl { }
 {%
-  \Class{\textsl{\texttt{\c_@@_gztauthor_class_name_tl}}}
+  \Class{\gztauthor}
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1638,15 +1698,15 @@ This work consists of the file  denisbdoc.dtx
 }
 \ProvideDocumentCommand \nwejmcl { }
 {%
-  \Class{\textsl{\texttt{\c_@@_nwejm_class_name_tl}}}
+  \Class{\c_@@_nwejm_class_name_tl}
 }
 \NewDocumentCommand \nwejmauthor { }
 {%
-  \textsl{\texttt{\c_@@_nwejmauthor_class_name_tl}}
+  \class[\c_@@_standard_url_tl\c_@@_nwejm_class_name_tl]{\c_@@_nwejmauthor_class_name_tl}
 }
 \NewDocumentCommand \nwejmauthorcl { }
 {%
-  \Class{\textsl{\texttt{\c_@@_nwejmauthor_class_name_tl}}}
+  \Class[\c_@@_standard_url_tl\c_@@_nwejm_class_name_tl]{\c_@@_nwejmauthor_class_name_tl}
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1659,10 +1719,6 @@ This work consists of the file  denisbdoc.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-% \addbibresource{\jobname.bib}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
 %</package>
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins
index cd5c9f11823..2ac9cbbf555 100644
--- a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins
+++ b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins
@@ -5,9 +5,8 @@
 %% The original source files were:
 %%
 %% denisbdoc.dtx  (with options: `install')
-%% -----------------------------------------------------------------------
 %% -----------------------------------------------------------------------------
-%% denisbdoc --- A personal dirty package for documenting packages, version 0.2
+%% denisbdoc --- A personal dirty package for documenting packages, version 0.3
 %% 
 %% Maintained by Denis Bitouz'e
 %% E-mail: denis.bitouze@lmpa.univ-littoral.fr
@@ -18,9 +17,8 @@
 \input l3docstrip.tex
 \askforoverwritefalse
 \preamble
------------------------------------------------------------------------
 -----------------------------------------------------------------------------
-denisbdoc --- A personal dirty package for documenting packages, version 0.2
+denisbdoc --- A personal dirty package for documenting packages, version 0.3
 
 Maintained by Denis Bitouz'e
 E-mail: denis.bitouze@lmpa.univ-littoral.fr