From 535852b7b6a917aae03c2e757b2964fc07b5371e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 Jul 2016 23:08:19 +0000 Subject: genealogytree (29jul16) git-svn-id: svn://tug.org/texlive/trunk@41768 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/genealogytree/genealogytree.sty | 11 ++++++----- .../latex/genealogytree/gtrcore.contour.code.tex | 6 +++--- .../latex/genealogytree/gtrcore.drawing.code.tex | 21 +++++++++++++++------ .../tex/latex/genealogytree/gtrcore.node.code.tex | 6 +++--- .../latex/genealogytree/gtrcore.options.code.tex | 7 ++++--- .../tex/latex/genealogytree/gtrcore.parser.code.tex | 6 +++--- .../latex/genealogytree/gtrcore.processing.code.tex | 13 ++++++++----- .../latex/genealogytree/gtrcore.symbols.code.tex | 6 +++--- .../latex/genealogytree/gtrlang.english.code.tex | 4 ++-- .../tex/latex/genealogytree/gtrlang.german.code.tex | 4 ++-- .../tex/latex/genealogytree/gtrlib.debug.code.tex | 4 ++-- .../latex/genealogytree/gtrlib.templates.code.tex | 6 +++--- 12 files changed, 54 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty b/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty index 5cd5c92497a..566eb666699 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty +++ b/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% genealogytree.sty: genealogy trees (graphs) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,10 +18,11 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{genealogytree}[2015/09/21 version 1.00 genealogy trees] -\def\gtr@version{1.00} +\ProvidesPackage{genealogytree}[2016/07/29 version 1.01 genealogy trees] +\def\gtr@version{1.01} + +\RequirePackage{tcolorbox}[2016/07/14] -\RequirePackage{tcolorbox}[2015/08/12] \tcbuselibrary{skins,fitting,external} \usetikzlibrary{arrows.meta} \usetikzlibrary{fit} diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.contour.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.contour.code.tex index c861b462ee7..f95fb58a4ba 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.contour.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.contour.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrcore.contour.code.tex: Contours %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} %%%%%%%%%%%%%%%%%%%%%%% %% Contour diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.drawing.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.drawing.code.tex index 50282d9fb2e..9362dd2bdc5 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.drawing.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.drawing.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrcore.drawing.code.tex: Drawing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,13 +17,14 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} %%%%%%%%%%%%%%%%%%%%%%% %% Drawing %%%%%%%%%%%%%%%%%%%%%%% \tikzset{genealogytree edges scope/.style={}} +\tikzset{genealogytree extra edges scope/.style={}} \def\gtr@reset@before@parser{% \global\def\gtrkv@after@parser{}% @@ -90,10 +91,18 @@ } \def\gtr@create@node@person#1{% + \ifcsdef{gtr@per@#1@tikz}{% + \letcs\gtr@temp@tikz{gtr@per@#1@tikz}% + \tikzset{gtr@node@opt/.code={\pgfkeysalsofrom{\gtr@temp@tikz}}}% + }{% + \tikzset{gtr@node@opt/.code={}}% + }% \letcs\gtr@temp{gtr@per@#1@box}% \node[minimum width=\dimexpr\wd\gtr@temp\relax, minimum height=\dimexpr\ht\gtr@temp+\dp\gtr@temp\relax, - alias={\csuse{gtr@per@#1@id}}] (p@#1) + alias={\csuse{gtr@per@#1@id}}, + gtr@node@opt% + ] (p@#1) at (\csuse{gtr@per@#1@x},\csuse{gtr@per@#1@y}){}; } @@ -390,7 +399,7 @@ %%%%%%%%%%%%%%%%%% \def\gtr@draw@family@extra(#1#2#3){% - \begingroup% + \begin{scope}[genealogytree extra edges scope]% \csundef{gtr@fam@\gtr@currentfamily @par}% \def\do##1{% \gtr@getPerNumForId{##1}% @@ -417,7 +426,7 @@ \tikzset{gtr@link/.style={/gtr/edge/gtr@edge@foreground}}%, \csuse{gtr@edge@\gtrkv@edgemode @\gtr@timeflow}% \fi% - \endgroup% + \end{scope}% } \def\gtr@draw@family#1{% diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.node.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.node.code.tex index d24faf71f0d..bef936cc63a 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.node.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.node.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrcore.node.code.tex: Node Boxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} %%%%%%%%%%%%%% % Processors % diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.options.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.options.code.tex index abc1d136854..a46870202f6 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.options.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.options.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrcore.options.code.tex: Options %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} %%%%%%%%%%%%%%%%%%%%%%% %% General handling @@ -191,6 +191,7 @@ id suffix/.store in=\gtr@kv@idsuffix, id/.code={\xdef\gtr@gkv@id{\expandonce\gtr@kv@idprefix\unexpanded{#1}\expandonce\gtr@kv@idsuffix}}, distance/.gstore in=\gtr@gkv@distance, + tikz/.gstore in=\gtr@gkv@tikz, pivot@@value/.gstore in=\gtr@gkv@pivot, pivot@none/.style={pivot@@value=0}, pivot@child/.style={pivot@@value=1}, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.parser.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.parser.code.tex index 9c40a11e3ee..2a98c638e60 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.parser.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.parser.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrcore.parser.code.tex: Parser %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} %% (local) stack implementation \def\gtrnewstack#1{% diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.processing.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.processing.code.tex index a47d6ace856..a0c8f325eda 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.processing.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.processing.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrcore.processing.code.tex: Processing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} %%%%%%%%%%%%%%%%%%%%%%% %% Processing - common %%%%%%%%%%%%%%%%%%%%%%% @@ -90,7 +90,7 @@ \global\gtr@ignorefalse% \begingroup% \gtrset{id=,pivot shift=0pt, - family/.code={\gtrkeysgappto\gtr@gkv@opt@family{##1}}, + family/.code={\gtrkeysgappto\gtr@gkv@opt@family{##1}\gtrset{##1}}, subtree/.code={\gtrkeysgappto\gtr@gkv@opt@subtree{##1}}, node/.code={\gtrkeysgappto\gtr@gkv@opt@family{##1}},% sic! }% @@ -500,7 +500,7 @@ \begingroup% \begin{pgfinterruptpicture}% \global\gtr@ignorefalse% - \gtrset{id=,distance=-1sp,pivot=none, + \gtrset{id=,distance=-1sp,pivot=none,tikz=, code={% \gtr@cs@keysalsofrom{gtr@fam@\gtr@currentfamily @opt@subtree}% \csuse{gtr@linked@family@options@\gtrnodetype}% @@ -527,6 +527,9 @@ \else\csedef{gtr@per@\gtr@currentperson @pivo@chi}{}% \csedef{gtr@per@\gtr@currentperson @pivo@par}{}% \fi% + \ifx\gtr@gkv@tikz\@empty\else% + \csedef{gtr@per@\gtr@currentperson @tikz}{\gtr@gkv@tikz}% + \fi% % \gtr@set@level@position{\gtr@currentperson}% \fi% diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.symbols.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.symbols.code.tex index aa5cc91c671..beffb065e96 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.symbols.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.symbols.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrcore.symbols.code.tex: Symbols %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} %%%%%%%%%%%%%%%%%%%%%%% %% Symbols diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.english.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.english.code.tex index 7d25fb70f20..b85f2e2820d 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.english.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.english.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrlang.english.code.tex: English language %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} \gtrset{language@/english/.code={% \gtrset{symlang/.cd, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.german.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.german.code.tex index 33ce1420caa..d5af794d247 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.german.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.german.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrlang.german.code.tex: German language %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} \gtrset{language@/german/.code={% \gtrset{symlang/.cd, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlib.debug.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlib.debug.code.tex index 2bb3cb4c6d8..7d5b026e94f 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlib.debug.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlib.debug.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrlib.debug.code.tex: Debugger %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} \RequirePackage{array,tabularx} \tcbuselibrary{breakable} diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlib.templates.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlib.templates.code.tex index 5392a61c854..13a63ea0243 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlib.templates.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlib.templates.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.01 (2016/07/29) %% gtrlib.templates.code.tex: Templates %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.01} % Templates -- cgit v1.2.3