witharrows (18may18)

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

3 files changed, 19 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/witharrows/witharrows.pdf b/Master/texmf-dist/doc/latex/witharrows/witharrows.pdf
index a2c3c692dec..8bc1d84ef2f 100644
--- a/Master/texmf-dist/doc/latex/witharrows/witharrows.pdf
+++ b/Master/texmf-dist/doc/latex/witharrows/witharrows.pdf
diff --git a/Master/texmf-dist/source/latex/witharrows/witharrows.dtx b/Master/texmf-dist/source/latex/witharrows/witharrows.dtx
index 191ac8058a5..4261c65e89f 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.6}
-\def\myfiledate{2018/05/10}
+\def\myfileversion{1.6.1}
+\def\myfiledate{2018/05/18}
 %
 %
 %<*batchfile>
@@ -55,7 +55,6 @@ version 2005/12/01 or later.
 \usepackage{mathtools}
 \usepackage{amsfonts}
 \usepackage[only,llbracket,rrbracket]{stmaryrd}
-\usepackage{booktabs}
 \NewDocumentEnvironment {scope} {} {} {}
 \def\interitem{\vskip 7mm plus 2 mm minus 3mm}          
 \def\emphase{\bgroup\color{RoyalPurple}\let\next=}
@@ -2821,9 +2820,15 @@ version 2005/12/01 or later.
 % \bigskip
 % Eventually, we can draw the arrow with the code in |\l_@@_tikz_code_tl|. We recall that the value by default for
 % this token list is :\enskip ``\verb|\draw (#1) to node {#3} (#2) ;|''. This value can be modified
-% with the option |TikzCode|.
+% with the option |TikzCode|. We use the variant |\@@_draw_arrow:nno| of the macro |\@@_draw_arrow:nnn| because of
+% the characters \emph{underscore} in the name |\l_tmpa_tl| : if the user uses the Tikz library |babel|, the third
+% argument of the command |\@@_draw_arrow:nno| will be rescanned because this third argument will be in the
+% argument of a command |node| of an instruction |\draw| of Tikz... and we will have an error because of the
+% characters \emph{underscore}.\footnote{There were other solutions : use another name without \emph{underscore}
+% (like \Verb|\ltmpatl|) or use the package \pkg{underscore} (with this package, the characters \emph{underscore}
+% will be rescanned without errors, even in text mode).}
 %    \begin{macrocode}
-      \@@_draw_arrow:nnn {\g_tmpa_tl} {\g_tmpb_tl} {\l_tmpa_tl}
+      \@@_draw_arrow:nno {\g_tmpa_tl} {\g_tmpb_tl} {\l_tmpa_tl}
 %    \end{macrocode}
 %
 % \smallskip
@@ -2833,11 +2838,6 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 %
 %
-%
-%
-%
-%
-%
 % \bigskip
 % The function |@@_tmpa:nnn| will draw the arrow. It's merely an environment |{tikzpicture}|. However, the Tikz
 % instruction in this environment must be inserted from |\l_@@_tikz_code_tl| with the markers |#1|, |#2| and |#3|.
@@ -2857,6 +2857,7 @@ version 2005/12/01 or later.
 \cs_new_protected:Nn \@@_draw_arrow:nnn
            {\exp_args:No \@@_def_function_tmpa:n \l_@@_tikz_code_tl
             \@@_tmpa:nnn {#1} {#2} {#3} }
+\cs_generate_variant:Nn \@@_draw_arrow:nnn {nno}
 %    \end{macrocode}
 %
 %
@@ -3224,6 +3225,10 @@ version 2005/12/01 or later.
 % The code has been improved to be faster and the Tikz library |calc| is no longer required.
 %
 % A new option |name| is available for the environments |{WithArrows}|.
+%
+% \subsubsection{Changes between 1.6 and 1.6.1}
+%
+% Correction of a bug that leads to incompatibility with |\usetikzlibrary{babel}|.
 % \endinput
 %
 % Local Variables:
diff --git a/Master/texmf-dist/tex/latex/witharrows/witharrows.sty b/Master/texmf-dist/tex/latex/witharrows/witharrows.sty
index 66b60045581..734bd4b0386 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.6}
-\def\myfiledate{2018/05/10}
+\def\myfileversion{1.6.1}
+\def\myfiledate{2018/05/18}
 \RequirePackage{tikz}
 \usetikzlibrary{arrows.meta,bending}
 \RequirePackage{l3keys2e}
@@ -468,7 +468,7 @@
               \tikz@scan@one@point\pgfutil@firstofone (\l__wa_final_tl)
               \tl_gset:Nx \g_tmpb_tl {\dim_use:N \g__wa_x_dim , \dim_use:N \pgf@y}
           \end{tikzpicture}}
-      \__wa_draw_arrow:nnn {\g_tmpa_tl} {\g_tmpb_tl} {\l_tmpa_tl}
+      \__wa_draw_arrow:nno {\g_tmpa_tl} {\g_tmpb_tl} {\l_tmpa_tl}
       \group_end: }
 \cs_new_protected:Nn \__wa_def_function_tmpa:n
     {\cs_set:Nn \__wa_tmpa:nnn
@@ -478,6 +478,7 @@
 \cs_new_protected:Nn \__wa_draw_arrow:nnn
            {\exp_args:No \__wa_def_function_tmpa:n \l__wa_tikz_code_tl
             \__wa_tmpa:nnn {#1} {#2} {#3} }
+\cs_generate_variant:Nn \__wa_draw_arrow:nnn {nno}
 \cs_new_protected:Nn \__wa_update_x_value:nn
     {\int_step_inline:nnnn {#1} \c_one {#2}
        {\cs_if_exist:cT {pgf@sh@ns@wa-\l__wa_prefix_str-##1-l}