5 files changed, 93 insertions, 88 deletions
diff --git a/Master/texmf-dist/doc/latex/dashundergaps/doc/pdf/dashundergaps.pdf b/Master/texmf-dist/doc/latex/dashundergaps/doc/pdf/dashundergaps.pdf
index d25ffe61f06..a08c4c21f62 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/doc/pdf/dashundergaps.pdf
+++ b/Master/texmf-dist/doc/latex/dashundergaps/doc/pdf/dashundergaps.pdf
diff --git a/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps-bib.bib b/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps-bib.bib
index ce845d13686..5727411d9aa 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps-bib.bib
+++ b/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps-bib.bib
@@ -1,5 +1,5 @@
 @misc{tugdodu,
-author = {TUG},
+author = {Wegners, Erik},
 title = {{Dashed or dotted underline}},
 year = 2009,
 note = {{\url{http://ewus.de/tipp-1014.html}}},
@@ -10,3 +10,9 @@ title = {{Souligner un phantom en pointill\'es avec retour \`a la ligne : LaTeX}
 year = 2009,
 note = {{\url{http://forum.mathematex.net/latex-f6/souligner-un-phantom-en-pointilles-avec-retour-a-la-ligne-t10057.html}}},
 }
+@misc{gdttdu,
+author = {Deschrijver, Glad},
+title =  {{\TeX{} Tricks -- Dashed underline}},
+note = {\url{http://users.ugent.be/~gdschrij/LaTeX/textricks.html#dashedul}},
+year = 2011,
+}
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.forlisting b/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.forlisting
index 984379300d8..92c64411bc9 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.forlisting
+++ b/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.forlisting
@@ -1,80 +1,79 @@
-%% This is file `dashundergaps.sty' v1.2 by Merciadri Luca.
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dashundergaps}[2010/20/01 Dashing and underlining (phantom) text]
-\PackageInfo{dashundergaps}{This is DashUnderGaps by Merciadri Luca.}
-
-\RequirePackage{ifthen}[1994/06/01]
-\PassOptionsToPackage{normalem}{ulem}
-\RequirePackage{ulem}
-\newboolean{dot} % false at start
-\newboolean{dash} % false at start
-
-
-\DeclareOption{dash}{%
-\typeout{Dashing mode activated!}
-\setboolean{dash}{true}
-\providecommand{\dashuline}{\bgroup
-\ifdim\ULdepth=\maxdimen
-\settodepth\ULdepth{(j}\advance\ULdepth.4pt\fi
-\markoverwith{\kern.15em
-\vtop{\kern\ULdepth \hrule width .3em}%
-\kern.15em}\ULon}
-}
-
-
-\DeclareOption{dot}{%
-\typeout{Dotting mode activated!}
-\setboolean{dot}{true}
-\providecommand{\dotuline}{\bgroup
-\ifdim\ULdepth=\maxdimen
-\settodepth\ULdepth{(j}\advance\ULdepth.4pt\fi
-\markoverwith{\begingroup
-\advance\ULdepth0.08ex
-\lower\ULdepth\hbox{\kern.15em .\kern.1em}%
-\endgroup}\ULon}
-}
-
-
-\DeclareOption{phantomtext}{%
-\typeout{Phantom mode activated! All the gaps will be filled.}
-\newboolean{teachernotes} % false at start
-\newcounter{nb-gaps}
-\setcounter{nb-gaps}{1}
-\newcounter{nth-gaps}
-\setcounter{nth-gaps}{1}
-
-\def\phantom@putbox{\ifx\UL@start\@empty \else % not inner
-  \vrule\@width\z@ \LA@penalty\@M
-  {\UL@skip\wd\UL@box \UL@leaders \kern-\UL@skip}%
-  \hbox to\wd\UL@box{}\fi}%
-
-\providecommand{\gap}[1]{%
-\bgroup
-\let\UL@putbox=\phantom@putbox
-\ifthenelse{\boolean{teachernotes}}
-{\textbf{#1} (\arabic{nth-gaps})}
-{\ifthenelse{\boolean{dash} \AND \boolean{dot}}{\uline{#1}(\arabic{nth-gaps})}%
-{\ifthenelse{\boolean{dash}}{\dashuline{#1} (\arabic{nth-gaps})}%
-{\ifthenelse{\boolean{dot}}{\dotuline{#1} (\arabic{nth-gaps})}{\uline{#1} (\arabic{nth-gaps})}}}%
-}
-\addtocounter{nb-gaps}{1}
-\addtocounter{nth-gaps}{1}
-\egroup
-}}
-
-
-\DeclareOption{teachernotes}{%
-\typeout{Phantom mode deactivated! All the gaps will be filled with their content.}
-\setboolean{teachernotes}{true}
-}
-
-
-\DeclareOption{displaynbgaps}{%
-\typeout{Gaps counting mode activated!}
-\addtocounter{nb-gaps}{-1}
-\AtEndDocument{\vfill \centering \bfseries GAPS: \arabic{nb-gaps}.}
-}
-
-\ProcessOptions\relax
-
+%% This is file `dashundergaps.sty' v1.2 by Merciadri Luca.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{dashundergaps}[2010/01/20 Dashing and underlining (phantom) text]
+\PackageInfo{dashundergaps}{This is DashUnderGaps by Merciadri Luca.}
+
+\RequirePackage{ifthen}[1994/06/01]
+\PassOptionsToPackage{normalem}{ulem}
+\RequirePackage{ulem}
+\newboolean{dot} % false at start
+\newboolean{dash} % false at start
+
+
+\DeclareOption{dash}{%
+\typeout{Dashing mode activated!}
+\setboolean{dash}{true}
+\providecommand{\dashuline}{\bgroup
+\ifdim\ULdepth=\maxdimen
+\settodepth\ULdepth{(j}\advance\ULdepth.4pt\fi
+\markoverwith{\kern.15em
+\vtop{\kern\ULdepth \hrule width .3em}%
+\kern.15em}\ULon}
+}
+
+
+\DeclareOption{dot}{%
+\typeout{Dotting mode activated!}
+\setboolean{dot}{true}
+\providecommand{\dotuline}{\bgroup
+\ifdim\ULdepth=\maxdimen
+\settodepth\ULdepth{(j}\advance\ULdepth.4pt\fi
+\markoverwith{\begingroup
+\advance\ULdepth0.08ex
+\lower\ULdepth\hbox{\kern.15em .\kern.1em}%
+\endgroup}\ULon}
+}
+
+
+\DeclareOption{phantomtext}{%
+\typeout{Phantom mode activated! All the gaps will be filled.}
+\newboolean{teachernotes} % false at start
+\newcounter{nb-gaps}
+\setcounter{nb-gaps}{1}
+\newcounter{nth-gaps}
+\setcounter{nth-gaps}{1}
+
+\def\phantom@putbox{\ifx\UL@start\@empty \else % not inner
+  \vrule\@width\z@ \LA@penalty\@M
+  {\UL@skip\wd\UL@box \UL@leaders \kern-\UL@skip}%
+  \hbox to\wd\UL@box{}\fi}%
+
+\providecommand{\gap}[1]{%
+\bgroup
+\let\UL@putbox=\phantom@putbox
+\ifthenelse{\boolean{teachernotes}}
+{\textbf{#1} (\arabic{nth-gaps})}
+{\ifthenelse{\boolean{dash} \AND \boolean{dot}}{\uline{#1}(\arabic{nth-gaps})}{\ifthenelse{\boolean{dash}}{\dashuline{#1} (\arabic{nth-gaps})}{%
+\ifthenelse{\boolean{dot}}{\dotuline{#1} (\arabic{nth-gaps})}{\uline{#1} (\arabic{nth-gaps})}}}
+}
+\addtocounter{nb-gaps}{1}
+\addtocounter{nth-gaps}{1}
+\egroup
+}}
+
+
+\DeclareOption{teachernotes}{%
+\typeout{Phantom mode deactivated! All the gaps will be filled with their content.}
+\setboolean{teachernotes}{true}
+}
+
+
+\DeclareOption{displaynbgaps}{%
+\typeout{Gaps counting mode activated!}
+\addtocounter{nb-gaps}{-1}
+\AtEndDocument{\vfill \centering \bfseries GAPS: \arabic{nb-gaps}.}
+}
+
+\ProcessOptions\relax
+
diff --git a/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.tex b/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.tex
index baccca31797..bbc8b53e72d 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.tex
+++ b/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.tex
@@ -80,7 +80,7 @@ for a word which can be either
 This can be \textit{useful in} these situations:
 \begin{enumerate}
 \item You are writing a document for which you need to dash or (and) to dot text,
-\item You want to write a test for which students have to ``fill in the gaps,'' and you want to chose when to print the answers.
+\item You want to write a test for which students have to ``fill in the gaps,'' and you want to choose when to print the answers.
 \end{enumerate}
 
 \section{Use}
@@ -98,7 +98,7 @@ Without any option, the package will not be really useful, as it will not perfor
 \begin{verbatim}
 \dashuline{text}
 \end{verbatim}
-where you want ``text'' to be dashed (\textit{i.e.} somewhere in the \verb document ~environment)
+where you want ``text'' to be dashed (\textit{i.e.} somewhere in the \verb document ~environment),
 \item \verb dot : will dot \dotuline{text} if used with the command\index{\texttt{dot}}
 \begin{verbatim}
 \dotuline{text}
@@ -120,7 +120,7 @@ where you want ``text'' to be dotted (\textit{i.e.} somewhere in the \verb docum
 
 \newpage
 \section{Possible Combinations}
-All the possible sensed commands (the launching order has no importance) of \verb dashundergap.sty ~are given at Table \ref{tab:exuse} \textit{except} the use of \verb displaynbgaps , which can trivially be used iff \verb phantomtext ~is used. Here, ``$\times$'' is equivalent to the well-known ``N.A.'' and thus means ``Not Applicable here,'' or, equivalently, ``Not Available.''
+All the possible sensed commands (the launching order has no importance) of \verb dashundergaps.sty ~are given at Table \ref{tab:exuse} \textit{except} the use of \verb displaynbgaps , which can trivially be used iff \verb phantomtext ~is used. Here, ``$\times$'' is equivalent to the well-known ``N.A.'' and thus means ``Not Applicable.'' Notice that gaps are automatically numbered.
 
 \begin{table}[!h]
 \begin{center}
@@ -208,7 +208,7 @@ We can still \dotuline{dot this}.
 results in
 \begin{center}
 \begin{boxedminipage}{\textwidth}
-In Computer Science, ``PC'' means ``Personal \dotuline{\phantom{Computer}}.''
+In Computer Science, ``PC'' means ``Personal \dotuline{\phantom{Computer}} (1).''
 
 We can still \dotuline{dot this}.
 \end{boxedminipage}
@@ -330,8 +330,8 @@ would be a good idea, since \verb \emph ~is equivalent to \verb \underline ~for
 \section{Contact}
 If you have any question concerning this package (limitations, bugs, \ldots), please contact me at \href{mailto:Luca.Merciadri@student.ulg.ac.be}{Luca.Merciadri@student.ulg.ac.be}.
 
-
-
+\section{Thanks}
+Thanks to many users for feedback and to Glad Deschrijver \cite{gdttdu} for the \verb|\dotuline| and \verb|\dashuline| code.
 
 \newpage
 
diff --git a/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty b/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
index 7012b766335..fb6e197aea2 100644
--- a/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
+++ b/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
@@ -1,4 +1,4 @@
-%% This is file `dashundergaps.sty' v1.1 by Merciadri Luca.
+%% This is file `dashundergaps.sty' v1.2 by Merciadri Luca.
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{dashundergaps}[2010/01/20 Dashing and underlining (phantom) text]