witharrows (24sep18)

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

1 files changed, 13 insertions, 32 deletions

diff --git a/Master/texmf-dist/source/latex/witharrows/witharrows.dtx b/Master/texmf-dist/source/latex/witharrows/witharrows.dtx
index d5535702e84..a40d66b2476 100644
--- a/Master/texmf-dist/source/latex/witharrows/witharrows.dtx
+++ b/Master/texmf-dist/source/latex/witharrows/witharrows.dtx
@@ -15,8 +15,8 @@
 %
 % \fi
 % \iffalse
-\def\myfileversion{1.10}
-\def\myfiledate{2018/09/13}
+\def\myfileversion{1.10.1}
+\def\myfiledate{2018/09/24}
 %
 %
 %<*batchfile>
@@ -1247,8 +1247,6 @@ version 2005/12/01 or later.
 % There are differences between |{DispWithArrows}| and |{align}|. 
 % \begin{itemize}
 % \item The environment |{DispWithArrows}| allows only two columns.
-% \item With |{DispWithArrows}|, an error is raised if there is a collision between an equation and its tag but the
-% tag is not composed on the following line.
 % \item An environment |{DispWithArrows}| is always unbreakable (even with |\allowdisplaybreaks| of \pkg{amsmath}). 
 % \item The commands |\label|, |\tag|, |\notag| and |\nonumber| are allowed only in the second column. 
 % \item 
@@ -1861,9 +1859,9 @@ version 2005/12/01 or later.
                            {}}}
 %    \end{macrocode}
 %
-% We define a Tikz style |@@_node_style| for the nodes that will be created in the |\halign|. The nodes are Tikz
-% nodes of shape ``rectangle'' but with zero width. An arrow between two nodes starts from the \emph{south} anchor
-% of the first node and arrives at the \emph{north} anchor of the second node.
+% We define a Tikz style |@@_node_style| for the |l|-nodes and |r|-nodes that will be created in the |\halign|. These
+% nodes are Tikz nodes of shape ``rectangle'' but with zero width. An arrow between two nodes starts from the
+% \emph{south} anchor of the first node and arrives at the \emph{north} anchor of the second node.
 %    \begin{macrocode}
 \tikzset{@@_node_style/.style= { 
                above = \l_@@_ystart_dim,
@@ -1874,7 +1872,8 @@ version 2005/12/01 or later.
                \bool_if:NT \l_@@_shownodes_bool {draw} }}
 %    \end{macrocode}
 % The color of the nodes is red, but in fact, the nodes will be drawn only when the option |shownodes| is used
-% (this option is useful for debugging).
+% (this option is useful for debugging).\footnote{The |v|-nodes, created near the end of line in |{DispWithArrows}|
+% are not shown with this option.}
 %
 % 
 % \bigskip
@@ -3114,21 +3113,6 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % 
 % \bigskip
-% We test wether there is a collision between a line and a label of equation. If there is no problem, we should
-% probably merge this code with the previous one.
-%    \begin{macrocode}
-           {\begin{tikzpicture} [@@_standard]
-            \int_step_variable:nnnNn 1 1 \g_@@_line_int \l_tmpa_int
-                {\tikz@parse@node\pgfutil@firstofone (\l_tmpa_int-v)
-                     \dim_set:Nn \l_tmpa_dim \pgf@x
-                 \tikz@parse@node\pgfutil@firstofone (\l_tmpa_int-l)
-                     \dim_set:Nn \l_tmpb_dim \pgf@x
-                 \dim_compare:nNnT \l_tmpb_dim > \l_tmpa_dim
-                     {\@@_msg_error:n {Collision}}}
-             \end{tikzpicture}}
-%    \end{macrocode}
-% 
-% \bigskip
 % The code in |\@@_post_environment:| is common to |{WithArrows}| and |{DispWithArrows}|.
 %    \begin{macrocode}
            \@@_post_environment:
@@ -3780,14 +3764,6 @@ version 2005/12/01 or later.
               meaningless~in~the~context.~If~you~go~on,~it~will~be~ignored.}
 %    \end{macrocode}
 %
-%    \begin{macrocode}
-\msg_new:nnn {witharrows}
-             {Collision}
-             {You~have~a~collision~(or~almost~a~collision)~at~the~end~of~row~
-              \int_use:N\g_@@_line_int.~
-              You~can~go~on~but~maybe~you~will~have~overlapping~texts.}
-%    \end{macrocode}
-%
 %    \begin{macrocode}          
 \msg_new:nnn {witharrows}
              {Third~column~in~an~environment~{WithArrows}}
@@ -4180,9 +4156,14 @@ version 2005/12/01 or later.
 %
 % The option |wrap-lines| is now fully compatible with the class option |leqno|.
 %
-% Correction of a bug: |\nointerlineskip| and |\makebox[.6\linewidth]{}| should be inserted in |{DispWithArrows}|
+% Correction of a bug: |\nointerlineskip| and |\makebox[.6\linewidth]{}| should be inserted in |{DispWithArrows}|.
 % only in vertical mode.
 %
+% \subsection{Changes between 1.10 and 1.10.1}
+%
+% The test of collision in the environments |{DispWithArrows}| is deleted (because the programmation was
+% incorrect).
+%
 % \endinput
 %
 % Local Variables: