dasundergaps 1.2 (22jan10)

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

6 files changed, 112 insertions, 84 deletions

diff --git a/Master/texmf-dist/doc/latex/dashundergaps/README b/Master/texmf-dist/doc/latex/dashundergaps/README
index 0ee0780f6b1..5b4692d9b9e 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/README
+++ b/Master/texmf-dist/doc/latex/dashundergaps/README
@@ -1,4 +1,4 @@
-This is the README file of the dashundergaps package v1.1 by Merciadri Luca.
+This is the README file of the dashundergaps package v1.2 by Merciadri Luca.
 
 To use the dashundergaps package correctly, please install the .sty
 file in your LaTeX distribution, or use it in the directories of your
@@ -9,4 +9,4 @@ http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for
 the details of that license.
 
 You can have more info on this at
-http://www.student.montefiore.ulg.ac.be/~merciadri/#dashundergapspckg.
\ No newline at end of file
+http://www.student.montefiore.ulg.ac.be/~merciadri/#dashundergapspckg.
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 867cfc218ad..d25ffe61f06 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 3c296e9b6be..ce845d13686 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
@@ -3,4 +3,10 @@ author = {TUG},
 title = {{Dashed or dotted underline}},
 year = 2009,
 note = {{\url{http://ewus.de/tipp-1014.html}}},
-}
\ No newline at end of file
+}
+@misc{mathematex,
+author = {Mathematex},
+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}}},
+}
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 54b25d28184..984379300d8 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.forlisting
+++ b/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.forlisting
@@ -1,72 +1,80 @@
-%% This is file `dashundergaps.sty' v1.1 by Merciadri Luca.
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dashundergaps}[2009/11/12 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}
-\def\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}
-\def\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}
-
-\newcommand{\gap}[1]{%
-\ifthenelse{\boolean{teachernotes}}
-{\textbf{#1} (\arabic{nth-gaps})}
-{\ifthenelse{\boolean{dash} \AND \boolean{dot}}{\underline{\phantom{#1}} (\arabic{nth-gaps})}
-{\ifthenelse{\boolean{dash}}{\dashuline{\phantom{#1}} (\arabic{nth-gaps})}
-{\ifthenelse{\boolean{dot}}{\dotuline{\phantom{#1}} (\arabic{nth-gaps})}
-{\underline{\phantom{#1}} (\arabic{nth-gaps})}}}}
-\addtocounter{nb-gaps}{1}
-\addtocounter{nth-gaps}{1}
-}}
-
-
-\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/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

+

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 852512b16fb..0742b41b6db 100644
--- a/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.tex
+++ b/Master/texmf-dist/doc/latex/dashundergaps/doc/tex/dashundergaps.tex
@@ -63,8 +63,9 @@
 
 \tableofcontents
 
+\newpage
 \section{Introduction}
-This package (\verb v1.1 ) \textit{helps you to} use (a) pattern(s) from this list:
+This package (\verb v1.2 ) \textit{helps you to} use (a) pattern(s) from this list:
 \begin{enumerate}
 \item \dashuline{dashing};
 \item \dotuline{dotting};
@@ -242,7 +243,7 @@ Col 1 & Col 2 & Col 3\\
 where you want it to appear.
 
 
-
+\newpage
 \section{Implementation}
 Here is the code of \verb dashundergaps.sty :
 \lstset{language=TEX, basicstyle=\tiny, keywordstyle=\bfseries, commentstyle=\itshape, keywords={}, emph={}, emphstyle=\bfseries, numbers=left, stringstyle=\ttseries, showstringspaces=false, stepnumber=2, numbersep=5pt, showspaces=false, showtabs=false, backgroundcolor=\color{white}}
@@ -313,12 +314,16 @@ before
 would be a good idea, since \verb \emph ~is equivalent to \verb \underline ~for \verb ulem ~when the \verb normalem ~option is not given to it. This has been modified, and is in \verb v1.1 .
 
 \section{Bugs}
-No \textit{bugs} are currently known in this package.
+[Chronologically ordered.]
+\begin{enumerate}
+\item (20/01/2010): Thanks to \cite{mathematex}, the first bug has been discovered: if the argument of \verb \gap ~was too long, and that \verb teachernotes ~was activated, the underlining was not done according to margins. It has now be solved. Many thanks to Donald Arseneau for this. \label{bug:20012010}
+\end{enumerate}
 
 \section{Version History}
 \begin{enumerate}
  \item \verb v1.0 : package is introduced to the \LaTeX{} world,
- \item \verb v1.1 : see \ref{subsec:v11}.
+ \item \verb v1.1 : see \ref{subsec:v11},
+ \item \verb v1.2 : fixed bug \ref{bug:20012010}, and the commands are now defined using \verb \providecommand .
 \end{enumerate}
 
 
diff --git a/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty b/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
index 62561b3bdf5..cd7df665d4f 100644
--- a/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
+++ b/Master/texmf-dist/tex/latex/dashundergaps/dashundergaps.sty
@@ -1,7 +1,7 @@
 %% This is file `dashundergaps.sty' v1.1 by Merciadri Luca.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dashundergaps}[2009/11/12 Dashing and underlining (phantom) text]
+\ProvidesPackage{dashundergaps}[2010/20/01 Dashing and underlining (phantom) text]
 \PackageInfo{dashundergaps}{This is DashUnderGaps by Merciadri Luca.}
 
 \RequirePackage{ifthen}[1994/06/01]
@@ -14,7 +14,7 @@
 \DeclareOption{dash}{%
 \typeout{Dashing mode activated!}
 \setboolean{dash}{true}
-\def\dashuline{\bgroup
+\providecommand{\dashuline}{\bgroup
 \ifdim\ULdepth=\maxdimen
 \settodepth\ULdepth{(j}\advance\ULdepth.4pt\fi
 \markoverwith{\kern.15em
@@ -26,7 +26,7 @@
 \DeclareOption{dot}{%
 \typeout{Dotting mode activated!}
 \setboolean{dot}{true}
-\def\dotuline{\bgroup
+\providecommand{\dotuline}{\bgroup
 \ifdim\ULdepth=\maxdimen
 \settodepth\ULdepth{(j}\advance\ULdepth.4pt\fi
 \markoverwith{\begingroup
@@ -44,12 +44,21 @@
 \newcounter{nth-gaps}
 \setcounter{nth-gaps}{1}
 
-\newcommand{\gap}[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}}{\underline{\phantom{#1}} (\arabic{nth-gaps})}{\ifthenelse{\boolean{dash}}{\dashuline{\phantom{#1}} (\arabic{nth-gaps})}{\ifthenelse{\boolean{dot}}{\dotuline{\phantom{#1}} (\arabic{nth-gaps})}{\underline{\phantom{#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
 }}