CTAN sync 202007290304

30 files changed, 212 insertions, 166 deletions

diff --git a/macros/generic/witharrows/witharrows-french.pdf b/macros/generic/witharrows/witharrows-french.pdf
index 9a9a5e3918..3c95de9c42 100644
--- a/macros/generic/witharrows/witharrows-french.pdf
+++ b/macros/generic/witharrows/witharrows-french.pdf
diff --git a/macros/generic/witharrows/witharrows.dtx b/macros/generic/witharrows/witharrows.dtx
index 9a4b5067ef..b32e5f62d8 100644
--- a/macros/generic/witharrows/witharrows.dtx
+++ b/macros/generic/witharrows/witharrows.dtx
@@ -15,8 +15,8 @@
 %
 % \fi
 % \iffalse
-\def\myfileversion{2.5}
-\def\myfiledate{2020/06/22}
+\def\myfileversion{2.5.1}
+\def\myfiledate{2020/07/28}
 %
 %
 %<*batchfile>
@@ -162,7 +162,7 @@ version 2005/12/01 or later.
 % \end{WithArrows}$
 %
 % \interitem
-% It's possible to put several arrows which start from the same row.
+% It's possible to put several arrows starting from the same row.
 % \begin{Verbatim}
 % $\begin{WithArrows}
 % A & = \bigl((a+b)+1\bigr)^2 ~emphase#\Arrow{}\Arrow{}[jump=2]@ \\
@@ -1579,7 +1579,7 @@ version 2005/12/01 or later.
 % the left margin can be controlled with the option |mathindent| (with a name
 % inspired by the parameter |\mathindent| of standard LaTeX\footnote{In LaTeX,
 % |mathindent| is a dimension (|dim|) and not a glue (|skip|) but should become
-% a skip in a future version of LaTeX. As for now, the parameter |mathindent| of
+% a skip in a future version of LaTeX. As of now, the parameter |mathindent| of
 % \pkg{witharrows} is a dimension.}). The initial value
 % of this parameter is 25~pt.
 %
@@ -2699,19 +2699,19 @@ version 2005/12/01 or later.
 % |{WithArrows}|. Idem for the option |footnotehyper|.
 %
 % \medskip
-% The boolean |\g_@@_footnotehyper_bool| will indicate if the option
+% The boolean |\c_@@_footnotehyper_bool| will indicate if the option
 % |footnotehyper| is used.
 %    \begin{macrocode}
 %<*LaTeX>
-\bool_new:N \g_@@_footnotehyper_bool
+\bool_new:N \c_@@_footnotehyper_bool
 %    \end{macrocode}
 %
 % \medskip
-% The boolean |\g_@@_footnote_bool| will indicate if the option |footnote| is
+% The boolean |\c_@@_footnote_bool| will indicate if the option |footnote| is
 % used, but quicky, it will also be set to |true| if the option |footnotehyper|
 % is used.
 %    \begin{macrocode}
-\bool_new:N \g_@@_footnote_bool
+\bool_new:N \c_@@_footnote_bool
 %</LaTeX>
 %    \end{macrocode}
 %
@@ -2734,8 +2734,8 @@ version 2005/12/01 or later.
 %<*LaTeX>
 \keys_define:nn { WithArrows / package }
   { 
-    footnote .bool_gset:N = \g_@@_footnote_bool ,
-    footnotehyper .bool_gset:N = \g_@@_footnotehyper_bool ,
+    footnote .bool_set:N = \c_@@_footnote_bool ,
+    footnotehyper .bool_set:N = \c_@@_footnotehyper_bool ,
     unknown .code:n = 
       \@@_fatal:n { Option~unknown~for~package } 
   }
@@ -2793,7 +2793,7 @@ version 2005/12/01 or later.
 %
 % \medskip
 %    \begin{macrocode}
-\bool_if:NT \g_@@_footnote_bool 
+\bool_if:NT \c_@@_footnote_bool 
   { 
     \@ifclassloaded { beamer }
       { \msg_info:nn { witharrows } { Option~incompatible~with~Beamer } }
@@ -2806,7 +2806,7 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\bool_if:NT \g_@@_footnotehyper_bool 
+\bool_if:NT \c_@@_footnotehyper_bool 
   { 
     \@ifclassloaded { beamer }
       { \@@_info:n  { Option~incompatible~with~Beamer } }
@@ -2815,11 +2815,11 @@ version 2005/12/01 or later.
           { \@@_error:n { footnotehyper~with~footnote~package } }
           { \usepackage { footnotehyper } }
       }
-    \bool_gset_true:N \g_@@_footnote_bool 
+    \bool_set_true:N \c_@@_footnote_bool 
   }
 %    \end{macrocode}
-% The flag |\g_@@_footnote_bool| is raised and so, we will only have to test
-% |\g_@@_footnote_bool| in order to know if we have to insert an environment
+% The flag |\c_@@_footnote_bool| is raised and so, we will only have to test
+% |\c_@@_footnote_bool| in order to know if we have to insert an environment
 % |{savenotes}| (the |\begin{savenotes}| is in |\@@_pre_halign:n| and
 % |\end{savenotes}| at the end of the environments |{WithArrows}| and
 % |{DispWithArrows}|).
@@ -2850,7 +2850,6 @@ version 2005/12/01 or later.
 %
 % 
 %    \begin{macrocode}
-\cs_generate_variant:Nn \tl_put_right:Nn { N v }
 \cs_generate_variant:Nn \seq_set_split:Nnn { N x x }
 %    \end{macrocode}
 % 
@@ -2918,22 +2917,14 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % 
 % \bigskip
-% The following command converts each item of a sequence from |tl| to |str|. It
-% will be used when creating list of keys (a key name is always a |str|).
+% The following command creates a sequence of strings (|str|) from a |clist|. Be
+% careful: we use |\seq_set_map:NNn| and the name of that function will maybe
+% change to |\eq_set_map_x:NNn|.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_convert_to_str_seq:N #1
-  {
-    \seq_clear:N \l_tmpa_seq
-    \seq_map_inline:Nn #1 
-      {
-        \seq_put_left:Nx \l_tmpa_seq { \tl_to_str:n { ##1 } }
-      }
-    \seq_set_eq:NN #1 \l_tmpa_seq
-  }
 \cs_new_protected:Npn \@@_set_seq_of_str_from_clist:Nn #1 #2
   {
     \seq_set_from_clist:Nn #1 { #2 }
-    \@@_convert_to_str_seq:N #1
+    \seq_set_map:NNn #1 #1 { \tl_to_str:n { ##1 } }
   }
 %    \end{macrocode}
 % 
@@ -3686,7 +3677,6 @@ version 2005/12/01 or later.
     t, tikz, tikz-code, 
     xoffset, ygap, ystart 
   } 
-\@@_convert_to_str_seq:N \l_@@_options_WithArrows_seq
 %    \end{macrocode}
 %
 % \medskip
@@ -4332,14 +4322,14 @@ version 2005/12/01 or later.
 % \pkg{footnote} or the package \pkg{footnotehyper}).
 %    \begin{macrocode}
 %<*LaTeX>
-    \bool_if:NT \g_@@_footnote_bool { \begin { savenotes } }
+    \bool_if:NT \c_@@_footnote_bool { \begin { savenotes } }
 %</LaTeX>
 %    \end{macrocode}
 %
 % \bigskip
 % We execute the code |\l_@@_code_before_tl| of the option |code-before| of the
-% environment after the eventual |\begin{savenotes}| and, symetrically, we will
-% execute the |\l_@@_code_after_tl| before the eventual |\end{savenotes}| (we
+% environment after the potential |\begin{savenotes}| and, symetrically, we will
+% execute the |\l_@@_code_after_tl| before the potential |\end{savenotes}| (we
 % have a good reason for the last point: we want to extract the footnotes of the
 % arrows executed in the |code-after|).
 %    \begin{macrocode}
@@ -4514,11 +4504,6 @@ version 2005/12/01 or later.
           node~contents = { } ,
           @@_node_style ,
           name = wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - l ,
-          alias = 
-            { 
-              \str_if_empty:NF \l_@@_name_str
-                { \l_@@_name_str - \int_use:N \g_@@_line_int - l }
-            } 
         ] 
         ;
     \hfil
@@ -4535,13 +4520,19 @@ version 2005/12/01 or later.
           node~contents = { } ,
           @@_node_style ,
           name = wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - r ,
-          alias = 
-            {
-              \str_if_empty:NF \l_@@_name_str
-                { \l_@@_name_str - \int_use:N \g_@@_line_int - r }
-            } 
         ] 
         ;
+    \str_if_empty:NF \l_@@_name_str
+      {
+        \pgfpicture
+        \pgfnodealias 
+          { \l_@@_name_str - \int_use:N \g_@@_line_int - l }
+          { wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - l }
+        \pgfnodealias 
+          { \l_@@_name_str - \int_use:N \g_@@_line_int - r }
+          { wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - r }
+        \endpgfpicture
+      }
     \bool_if:NT \l_@@_show_node_names_bool
       { 
         \hbox_overlap_right:n 
@@ -4654,7 +4645,7 @@ version 2005/12/01 or later.
 % \pkg{footnote} or the package \pkg{footnotehyper}).
 %    \begin{macrocode}
 %<*LaTeX>
-    \bool_if:NT \g_@@_footnote_bool { \end { savenotes } }
+    \bool_if:NT \c_@@_footnote_bool { \end { savenotes } }
 %</LaTeX>
 %<*plain-TeX>
     \group_end:
@@ -4723,7 +4714,7 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % The command |\MultiArrow| is available in |code-after|, and we have a special
 % version of |\Arrow|, called ``|\Arrow| in |code-after|'' in the
-% documentation.\footnote{As for now, |\MultiArrow| has no option, and that's
+% documentation.\footnote{As of now, |\MultiArrow| has no option, and that's
 % why its internal name is a name of \pkg{expl3} with the signature |:nn|
 % whereas |\Arrow| in |code-after| provides options and has the name of a
 % function defined with |\NewDocumentCommand|.}
@@ -5435,7 +5426,7 @@ version 2005/12/01 or later.
 % extract the footnotes with an environment |{savenotes}| (of the package
 % \pkg{footnote} or the package \pkg{footnotehyper}).
 %    \begin{macrocode}
-    \bool_if:NT \g_@@_footnote_bool { \end { savenotes } }
+    \bool_if:NT \c_@@_footnote_bool { \end { savenotes } }
 %</LaTeX>
 %<*plain-TeX>
     \group_end:
@@ -7892,6 +7883,9 @@ version 2005/12/01 or later.
 %
 % \pkg{witharrows} now requires and loads \pkg{varwidth}
 %
+% \subsection*{Changes between 2.5 and 2.5.1}
+% 
+% Correction of the erroneous programmation of the nodes aliases.
 %
 % \PrintIndex
 %
diff --git a/macros/generic/witharrows/witharrows.ins b/macros/generic/witharrows/witharrows.ins
index bc0fccc6b3..66ef8293fb 100644
--- a/macros/generic/witharrows/witharrows.ins
+++ b/macros/generic/witharrows/witharrows.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2017-2019 by F. Pantigny
+%% Copyright (C) 2017-2020 by F. Pantigny
 %%
 %%
 %% This file may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 \usedir{tex/latex/witharrows}
 \preamble
 
-Copyright (C) 2017-2019 by F. Pantigny
+Copyright (C) 2017-2020 by F. Pantigny
 
 This file may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
diff --git a/macros/generic/witharrows/witharrows.pdf b/macros/generic/witharrows/witharrows.pdf
index 64cd930e62..3d89c2d242 100644
--- a/macros/generic/witharrows/witharrows.pdf
+++ b/macros/generic/witharrows/witharrows.pdf
diff --git a/macros/latex/contrib/genealogytree/README b/macros/latex/contrib/genealogytree/README
index b3afb7d612..3b793e1cef 100644
--- a/macros/latex/contrib/genealogytree/README
+++ b/macros/latex/contrib/genealogytree/README
@@ -1,7 +1,7 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/macros/latex/contrib/genealogytree/genealogytree-example-1.pdf b/macros/latex/contrib/genealogytree/genealogytree-example-1.pdf
index 36771dfba5..0f4311d752 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-example-1.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-example-1.pdf
diff --git a/macros/latex/contrib/genealogytree/genealogytree-example-2.pdf b/macros/latex/contrib/genealogytree/genealogytree-example-2.pdf
index 1c657ccf5c..ef6cb5cef5 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-example-2.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-example-2.pdf
diff --git a/macros/latex/contrib/genealogytree/genealogytree-example-3.pdf b/macros/latex/contrib/genealogytree/genealogytree-example-3.pdf
index 3fe43018cf..fb446c4923 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-example-3.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-example-3.pdf
diff --git a/macros/latex/contrib/genealogytree/genealogytree-example-4.pdf b/macros/latex/contrib/genealogytree/genealogytree-example-4.pdf
index 1a90b164f4..cd3c8ec48e 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-example-4.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-example-4.pdf
diff --git a/macros/latex/contrib/genealogytree/genealogytree-languages.pdf b/macros/latex/contrib/genealogytree/genealogytree-languages.pdf
index 31850dcf74..023068205a 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-languages.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-languages.pdf
diff --git a/macros/latex/contrib/genealogytree/genealogytree.pdf b/macros/latex/contrib/genealogytree/genealogytree.pdf
index c3311fe7c6..fb25a1a87c 100644
--- a/macros/latex/contrib/genealogytree/genealogytree.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree.pdf
diff --git a/macros/latex/contrib/genealogytree/genealogytree.sty b/macros/latex/contrib/genealogytree/genealogytree.sty
index d4ec561772..e9675d9491 100644
--- a/macros/latex/contrib/genealogytree/genealogytree.sty
+++ b/macros/latex/contrib/genealogytree/genealogytree.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% genealogytree.sty: genealogy trees (graphs)
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{genealogytree}[2020/06/19 version 2.00 genealogy trees]
-\def\gtr@version{2.00}
+\ProvidesPackage{genealogytree}[2020/07/28 version 2.01 genealogy trees]
+\def\gtr@version{2.01}
 
 \RequirePackage{expl3}[2020/02/25]
 \RequirePackage{xparse}
@@ -39,7 +39,13 @@
 
 \def\gtr@load@language@nil#1-#2\@nil{\gtruselibrary{lang.#1}}
 \def\gtr@load@language#1{\gtr@load@language@nil#1-\@nil}%
-\def\gtrloadlanguage#1{\forcsvlist{\gtr@load@language}{#1}}
+\ExplSyntaxOn
+\NewDocumentCommand{\gtrloadlanguage}{ m }
+  {
+    \clist_set:Nn \l_tmpa_clist { #1 }
+    \clist_map_function:NN \l_tmpa_clist \gtr@load@language
+  }
+\ExplSyntaxOff
 
 \gtrset{
   code/.code={#1},
diff --git a/macros/latex/contrib/genealogytree/gtrcore.contour.code.tex b/macros/latex/contrib/genealogytree/gtrcore.contour.code.tex
index ed8fdc948e..70b302a0cb 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.contour.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.contour.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrcore.contour.code.tex: Contours
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 %%%%%%%%%%%%%%%%%%%%%%%
 %% Contour
diff --git a/macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex b/macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex
index 33ccb6edcd..f917d7cc92 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrcore.drawing.code.tex: Drawing
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 %%%%%%%%%%%%%%%%%%%%%%%
 %% Auxiliary Tools
@@ -502,36 +502,40 @@
 
 %%%%%%%%%%%%%%%%%%
 
-\def\gtr@draw@family@extra(#1#2#3){%
-  \begin{scope}[genealogytree extra edges scope]%
-  \csundef{gtr@fam@\gtr@currentfamily @par}%
-  \def\do##1{%
-    \gtr@getPerNumForId{##1}%
-    \ifdefempty{\gtr@tmp@num}{}{%
-      \listcseadd{gtr@fam@\gtr@currentfamily @par}{\gtr@tmp@num}}%
-  }%
-  \docsvlist{#1}%
-  \csundef{gtr@fam@\gtr@currentfamily @chi}%
-  \def\do##1{%
-    \gtr@getPerNumForId{##1}%
-    \ifdefempty{\gtr@tmp@num}{}{%
-      \listcseadd{gtr@fam@\gtr@currentfamily @chi}{\gtr@tmp@num}}%
-  }%
-  \docsvlist{#2}%
-  \gtrset{edges={#3}}%
-  %
-  \gtr@predraw@family{\gtr@currentfamily}%
-  \dimdef\gtr@dat@draw@x{\gtr@dat@draw@x+\gtrkv@edge@core@xshift}%
-  \dimdef\gtr@dat@draw@y{\gtr@dat@draw@y+\gtrkv@edge@core@yshift}%
-  \coordinate (dat@draw) at (\gtr@dat@draw@x,\gtr@dat@draw@y) {};
-  \ifnum\numexpr\gtr@legnum>\gtrkv@edge@noleg\relax%
-    \tikzset{gtr@link/.style={/gtr/edge/gtr@edge@background}}%,
-    \csuse{gtr@edge@\gtrkv@edgemode @\gtr@timeflow}%
-    \tikzset{gtr@link/.style={/gtr/edge/gtr@edge@foreground}}%,
-    \csuse{gtr@edge@\gtrkv@edgemode @\gtr@timeflow}%
-  \fi%
-  \end{scope}%
+\ExplSyntaxOn
+\def\gtr@draw@family@extra(#1#2#3){
+  \begin{scope}[genealogytree~extra~edges~scope]
+  \csundef{gtr@fam@\gtr@currentfamily @par}
+  \clist_set:Nn \l_tmpa_clist { #1 }
+  \clist_map_inline:Nn \l_tmpa_clist
+    {
+      \gtr@getPerNumForId{##1}
+      \ifdefempty{\gtr@tmp@num}{}{
+        \listcseadd{gtr@fam@\gtr@currentfamily @par}{\gtr@tmp@num}}
+    }
+  \csundef{gtr@fam@\gtr@currentfamily @chi}
+  \clist_set:Nn \l_tmpa_clist { #2 }
+  \clist_map_inline:Nn \l_tmpa_clist
+    {
+      \gtr@getPerNumForId{##1}
+      \ifdefempty{\gtr@tmp@num}{}{
+        \listcseadd{gtr@fam@\gtr@currentfamily @chi}{\gtr@tmp@num}}
+    }
+  \gtrset{edges={#3}}
+  \gtr@predraw@family{\gtr@currentfamily}
+  \dimdef\gtr@dat@draw@x{\gtr@dat@draw@x+\gtrkv@edge@core@xshift}
+  \dimdef\gtr@dat@draw@y{\gtr@dat@draw@y+\gtrkv@edge@core@yshift}
+  \coordinate~(dat@draw)~at~(\gtr@dat@draw@x,\gtr@dat@draw@y)~{};
+  \ifnum\numexpr\gtr@legnum>\gtrkv@edge@noleg\relax
+    \tikzset{gtr@link/.style={/gtr/edge/gtr@edge@background}}
+    \csuse{gtr@edge@\gtrkv@edgemode @\gtr@timeflow}
+    \tikzset{gtr@link/.style={/gtr/edge/gtr@edge@foreground}}
+    \csuse{gtr@edge@\gtrkv@edgemode @\gtr@timeflow}
+  \fi
+  \end{scope}
 }
+\ExplSyntaxOff
+
 
 \def\gtr@draw@family#1{%
   \begingroup%
diff --git a/macros/latex/contrib/genealogytree/gtrcore.node.code.tex b/macros/latex/contrib/genealogytree/gtrcore.node.code.tex
index 956bb07303..a02204cef1 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.node.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.node.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrcore.node.code.tex: Node Boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 %%%%%%%%%%%%%%
 % Processors %
@@ -253,7 +253,7 @@
   male/.style={colframe=blue},
   female/.style={colframe=red},
   neuter/.style={},
-  if image defined/.code 2 args={\gtrifimagedefined{\tcbset{#1}}{\tcbset{#2}}},
+  if image defined/.code n args={2}{\gtrifimagedefined{\tcbset{#1}}{\tcbset{#2}}},
 }
 
 \gtrset{
@@ -1297,11 +1297,11 @@
   calendar print/none/.code={\let\gtr@print@date@single@calendar\gtr@print@date@single@calendar@none},
   calendar print/all but AD/.code={\let\gtr@print@date@single@calendar\gtr@print@date@single@calendar@AD},
   date range full/.code n args={3}{\def\gtrkv@range@full@A{#1}\def\gtrkv@range@full@B{#2}\def\gtrkv@range@full@C{#3}},
-  date range before/.code 2 args={\def\gtrkv@range@before@A{#1}\def\gtrkv@range@before@B{#2}},
-  date range after/.code 2 args={\def\gtrkv@range@after@A{#1}\def\gtrkv@range@after@B{#2}},
+  date range before/.code n args={2}{\def\gtrkv@range@before@A{#1}\def\gtrkv@range@before@B{#2}},
+  date range after/.code n args={2}{\def\gtrkv@range@after@A{#1}\def\gtrkv@range@after@B{#2}},
   date range separator/.style={date range full={}{#1}{},date range before={#1}{},date range after={}{#1}},
   date range separator/.default={--},
-  place text/.code 2 args={\def\gtrkv@place@pre{#1}\def\gtrkv@place@app{#2}},
+  place text/.code n args={2}{\def\gtrkv@place@pre{#1}\def\gtrkv@place@app{#2}},
   event text/.code n args={4}{\def\gtrkv@event@pre{#1}\def\gtrkv@event@sepdate{#2}\def\gtrkv@event@sepplace{#3}\def\gtrkv@event@app{#4}},
   event format/.is choice,
   event format/prefix date place/.code={\let\gtrPrintEvent=\gtrPrintEvent@prefixdateplace},
diff --git a/macros/latex/contrib/genealogytree/gtrcore.options.code.tex b/macros/latex/contrib/genealogytree/gtrcore.options.code.tex
index 7dc7f3c232..10eb3711a7 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.options.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.options.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrcore.options.code.tex: Options
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 %%%%%%%%%%%%%%%%%%%%%%%
 %% General handling
@@ -94,40 +94,81 @@
 %%%%%%%%%%%%%%%%%%%%%%%
 
 
-\newcommand{\gtrsetoptionsforsubtree}[2]{%
-  \def\do##1{%
-    \gtr@keys@addvalue{/gtr/sopt/##1}{subtree={#2}}%
-  }%
-  \docsvlist{#1}%
-}
+\ExplSyntaxOn
 
 
-\newcommand{\gtrsetoptionsforfamily}[2]{%
-  \def\do##1{%
-    \gtr@keys@addvalue{/gtr/sopt/##1}{family={#2}}%
-  }%
-  \docsvlist{#1}%
-}
+\cs_new:Npn \getree_set_options_for_subtree:nn #1#2
+  {
+    \clist_set:Nn \l_tmpa_clist { #1 }
+    \clist_map_inline:Nn \l_tmpa_clist
+      {
+        \gtr@keys@addvalue{/gtr/sopt/##1}{#2}
+      }
+  }
 
-\newcommand{\gtrsetoptionsfornode}[2]{%
-  \def\do##1{%
-    \gtr@keys@addvalue{/gtr/nopt/##1}{#2}%
-  }%
-  \docsvlist{#1}%
-}
 
+\cs_new:Npn \getree_set_options_for_family:nn #1#2
+  {
+    \clist_set:Nn \l_tmpa_clist { #1 }
+    \clist_map_inline:Nn \l_tmpa_clist
+      {
+        \gtr@keys@addvalue{/gtr/sopt/##1}{family={#2}}
+      }
+  }
 
-\newcommand{\gtrignoresubtree}[1]{%
-  \def\do##1{%
-    \gtr@keys@addvalue{/gtr/sopt/##1}{ignore}%
-  }%
-  \docsvlist{#1}%
-}
 
-\newcommand{\gtrignorenode}[1]{%
-  \gtrsetoptionsfornode{#1}{ignore}%
+\cs_new:Npn \getree_set_options_for_node:nn #1#2
+  {
+    \clist_set:Nn \l_tmpa_clist { #1 }
+    \clist_map_inline:Nn \l_tmpa_clist
+      {
+        \gtr@keys@addvalue{/gtr/nopt/##1}{#2}
+      }
+  }
+
+
+\NewDocumentCommand{\gtrsetoptionsforsubtree}{ m +m }
+  {
+    \getree_set_options_for_subtree:nn {#1}{#2}
+  }
+
+
+\NewDocumentCommand{\gtrsetoptionsforfamily}{ m +m }
+  {
+    \getree_set_options_for_family:nn {#1}{#2}
+  }
+
+
+\NewDocumentCommand{\gtrsetoptionsfornode}{ m +m }
+  {
+    \getree_set_options_for_node:nn {#1}{#2}
+  }
+
+
+\NewDocumentCommand{\gtrignoresubtree}{ m }
+  {
+    \getree_set_options_for_subtree:nn{#1}{ignore}
+  }
+
+
+\NewDocumentCommand{\gtrignorenode}{ m }
+  {
+    \getree_set_options_for_node:nn{#1}{ignore}
+  }
+
+
+\gtrset{
+  options~for~subtree/.code~n~args={2}{\getree_set_options_for_subtree:nn{#1}{#2}},
+  options~for~family/.code~n~args={2}{\getree_set_options_for_family:nn{#1}{#2}},
+  options~for~node/.code~n~args={2}{\getree_set_options_for_node:nn{#1}{#2}},
+  %
+  ignore~subtree/.code={\getree_set_options_for_subtree:nn{#1}{ignore}},
+  ignore~node/.code={\getree_set_options_for_node:nn{#1}{ignore}},
 }
 
+\ExplSyntaxOff
+
+
 
 \def\gtr@set@level@position@down#1{%
   \csdimdef{gtr@per@#1@y}{\gtr@level@reference}%
@@ -333,12 +374,6 @@
   },
   disconnect/.default=both,
   %
-  options for subtree/.code 2 args={\gtrsetoptionsforsubtree{#1}{#2}},
-  options for family/.code 2 args={\gtrsetoptionsforfamily{#1}{#2}},
-  options for node/.code 2 args={\gtrsetoptionsfornode{#1}{#2}},
-  %
-  ignore subtree/.code={\gtrignoresubtree{#1}},
-  ignore node/.code={\gtrignorenode{#1}},
   ignore level/.code={%
     \ifnum#1>0\relax%
       \gtrset{level #1/.style={node=ignore}}%
diff --git a/macros/latex/contrib/genealogytree/gtrcore.parser.code.tex b/macros/latex/contrib/genealogytree/gtrcore.parser.code.tex
index 579be1f91a..6b11207edd 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.parser.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.parser.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrcore.parser.code.tex: Parser
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 %% (local) stack implementation
 \def\gtrnewstack#1{%
diff --git a/macros/latex/contrib/genealogytree/gtrcore.processing.code.tex b/macros/latex/contrib/genealogytree/gtrcore.processing.code.tex
index 38ef43851e..2720096a29 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.processing.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.processing.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrcore.processing.code.tex: Processing
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 %%%%%%%%%%%%%%%%%%%%%%%
 %% Processing - common
 %%%%%%%%%%%%%%%%%%%%%%%
diff --git a/macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex b/macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex
index a4587240b8..783a75ca05 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrcore.symbols.code.tex: Symbols
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 %%%%%%%%%%%%%%%%%%%%%%%
 %% Symbols
@@ -46,15 +46,22 @@
   \gtr@symbol@box@hook%
 }
 
-\newcommand{\gtrSymbolsSetCreateSelected}[2]{%
-  \colorlet{gtrsymbol}{#1}%
-  \let\gtr@symbol@core\gtr@symbol@copy%
-  \def\do##1{%
-    \begingroup\edef\x{\endgroup\noexpand\setbox\expandonce{\csname gtr@sym@##1@box\endcsname}%
-      =\noexpand\color@hbox\expandonce{\csname gtr@sym@##1@pic\endcsname}\noexpand\color@endbox}%
-    \x}%
-  \docsvlist{#2}%
-}
+\ExplSyntaxOn
+\NewDocumentCommand{\gtrSymbolsSetCreateSelected}{ m m }
+  {
+    \colorlet{gtrsymbol}{#1}
+    \let\gtr@symbol@core\gtr@symbol@copy
+    \clist_set:Nn \l_tmpa_clist { #2 }
+    \clist_map_inline:Nn \l_tmpa_clist
+      {
+        \use:x
+          {
+            \exp_not:N\setbox \exp_not:c{gtr@sym@##1@box} = \exp_not:N\hbox:n{ \exp_not:c{gtr@sym@##1@pic} }
+          }
+      }
+  }
+\ExplSyntaxOff
+
 
 \def\gtr@symbol@print#1{%
   \gtrlistseparator%
diff --git a/macros/latex/contrib/genealogytree/gtrlang.danish.code.tex b/macros/latex/contrib/genealogytree/gtrlang.danish.code.tex
index dc128db8cf..9596726bbe 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.danish.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.danish.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlang.danish.code.tex: Danish language
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \gtrset{language@/danish/.code={%
   \gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex b/macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex
index 6a1fd02d0b..7b068271da 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlang.dutch.code.tex: Dutch language
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \gtrset{language@/dutch/.code={%
   \gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.english.code.tex b/macros/latex/contrib/genealogytree/gtrlang.english.code.tex
index 2d3654f12c..ba77f95949 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.english.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.english.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlang.english.code.tex: English language
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \gtrset{language@/english/.code={%
   \gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.french.code.tex b/macros/latex/contrib/genealogytree/gtrlang.french.code.tex
index 54b083c9ff..cfe2af2b63 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.french.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.french.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlang.french.code.tex: French language
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \gtrset{language@/french/.code={%
   \gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.german.code.tex b/macros/latex/contrib/genealogytree/gtrlang.german.code.tex
index 104212f362..e084601e0c 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.german.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.german.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlang.german.code.tex: German language
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \gtrset{language@/german/.code={%
   \gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.italian.code.tex b/macros/latex/contrib/genealogytree/gtrlang.italian.code.tex
index 64ac85ca7a..bc99cced20 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.italian.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.italian.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlang.italian.code.tex: Italian language
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \gtrset{language@/italian/.code={%
   \gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex b/macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex
index 67a621aed3..81ffcee6f8 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlang.spanish.code.tex: Spanish language
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \gtrset{language@/spanish/.code={%
   \gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex b/macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex
index 9522390ed9..0b4f57c79e 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlang.swedish.code.tex: Swedish language
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \gtrset{language@/swedish/.code={%
   \gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlib.debug.code.tex b/macros/latex/contrib/genealogytree/gtrlib.debug.code.tex
index 1ed43e435e..2fd01928b0 100644
--- a/macros/latex/contrib/genealogytree/gtrlib.debug.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlib.debug.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlib.debug.code.tex: Debugger
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \RequirePackage{array,tabularx}
 \tcbuselibrary{breakable}
diff --git a/macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex b/macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex
index 5ba40199b0..e62e479bdc 100644
--- a/macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlib.fanchart.code.tex: Fancharts
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 \ExplSyntaxOn
 
@@ -83,9 +83,9 @@
 
      \tl_set:Nn \l_tmpa_tl {\fp_to_dim:n{ sqrt(2)*\l__getree_fanchart_inner_fp }}
     \use:x
-    {
-      \exp_not:N\pgfkeys{/gtr/level~0/.append~code={\exp_not:N\pgfkeysalso{node~size=\l_tmpa_tl,level~size=\l_tmpa_tl}}}
-    }
+      {
+        \exp_not:N\pgfkeys{/gtr/level~0/.append~code={\exp_not:N\pgfkeysalso{node~size=\l_tmpa_tl,level~size=\l_tmpa_tl}}}
+      }
     \int_step_inline:nnn {1} { \c_getree_fanchart_maximum_rings_tl-1 }
       {
         \fp_set:Nn \l__getree_fanchart_outer_fp { \fparray_item:Nn\g__getree_fanchart_radii_fparry{##1+1} }
diff --git a/macros/latex/contrib/genealogytree/gtrlib.templates.code.tex b/macros/latex/contrib/genealogytree/gtrlib.templates.code.tex
index 0dc5a7ea9b..d0d9564701 100644
--- a/macros/latex/contrib/genealogytree/gtrlib.templates.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlib.templates.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package genealogytree - version 2.00 (2020/06/19)
+%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
 %% gtrlib.templates.code.tex: Templates
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\gtr@set@library@version{2.00}
+\gtr@set@library@version{2.01}
 
 % Templates