summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-24 20:23:52 +0000
committerKarl Berry <karl@freefriends.org>2018-09-24 20:23:52 +0000
commitc4ed0da09cb7e61d24056b1d29d603a36602b0d0 (patch)
tree2db192ce1ebc4915a111b02c5c36408b7487f576 /Master/texmf-dist
parentae7a8a028827d6b76f6909efbdeafb2a6b89fa51 (diff)
witharrows (24sep18)
git-svn-id: svn://tug.org/texlive/trunk@48751 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/witharrows/witharrows.pdfbin322581 -> 321825 bytes
-rw-r--r--Master/texmf-dist/source/latex/witharrows/witharrows.dtx45
-rw-r--r--Master/texmf-dist/tex/latex/witharrows/witharrows.sty18
3 files changed, 15 insertions, 48 deletions
diff --git a/Master/texmf-dist/doc/latex/witharrows/witharrows.pdf b/Master/texmf-dist/doc/latex/witharrows/witharrows.pdf
index efcdc42e180..17b8fde1193 100644
--- a/Master/texmf-dist/doc/latex/witharrows/witharrows.pdf
+++ b/Master/texmf-dist/doc/latex/witharrows/witharrows.pdf
Binary files differ
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:
diff --git a/Master/texmf-dist/tex/latex/witharrows/witharrows.sty b/Master/texmf-dist/tex/latex/witharrows/witharrows.sty
index 5b9bb5d4710..0edba169c1d 100644
--- a/Master/texmf-dist/tex/latex/witharrows/witharrows.sty
+++ b/Master/texmf-dist/tex/latex/witharrows/witharrows.sty
@@ -18,8 +18,8 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\def\myfileversion{1.10}
-\def\myfiledate{2018/09/13}
+\def\myfileversion{1.10.1}
+\def\myfiledate{2018/09/24}
\RequirePackage{tikz}
\usetikzlibrary{arrows.meta,bending}
\RequirePackage{l3keys2e}
@@ -560,15 +560,6 @@
\dim_compare:nNnT \l_tmpa_dim < \g__ww_x_right_dim
{\dim_gset:Nn \g__ww_x_right_dim \l_tmpa_dim} }
\end{tikzpicture}}
- {\begin{tikzpicture} [__ww_standard]
- \int_step_variable:nnnNn 1 1 \g__ww_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
- {\__ww_msg_error:n {Collision}}}
- \end{tikzpicture}}
\__ww_post_environment:
\bool_if:nT \c__ww_mathtools_loaded_bool
{\MH_if_boolean:nT {show_only_refs}
@@ -844,11 +835,6 @@
{The~option~"\tl_use:N\l_keys_key_tl"~is~unknown~or~
meaningless~in~the~context.~If~you~go~on,~it~will~be~ignored.}
\msg_new:nnn {witharrows}
- {Collision}
- {You~have~a~collision~(or~almost~a~collision)~at~the~end~of~row~
- \int_use:N\g__ww_line_int.~
- You~can~go~on~but~maybe~you~will~have~overlapping~texts.}
-\msg_new:nnn {witharrows}
{Third~column~in~an~environment~{WithArrows}}
{By~default,~an~environment~\{WithArrows\}~can~only~have~two~columns.~
Maybe~you~have~forgotten~a~\str_use:N \c_backslash_str