From 686de8f583ee4257eb36fdb308554f40063acdc6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Mar 2022 20:25:26 +0000 Subject: genealogytree (17mar22) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62760 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/genealogytree/CHANGES.md | 41 +- .../texmf-dist/doc/latex/genealogytree/README.md | 4 +- .../genealogytree/genealogytree-example-1.pdf | Bin 207638 -> 207760 bytes .../genealogytree/genealogytree-example-2.pdf | Bin 259454 -> 259457 bytes .../genealogytree/genealogytree-example-3.pdf | Bin 205128 -> 205130 bytes .../genealogytree/genealogytree-example-4.pdf | Bin 307949 -> 307952 bytes .../genealogytree/genealogytree-languages.pdf | Bin 466559 -> 468253 bytes .../genealogytree/genealogytree.doc.sources.zip | Bin 210338 -> 212189 bytes .../doc/latex/genealogytree/genealogytree.pdf | Bin 8620249 -> 9292843 bytes .../tex/latex/genealogytree/genealogytree.sty | 10 +- .../latex/genealogytree/gtrcore.contour.code.tex | 6 +- .../latex/genealogytree/gtrcore.drawing.code.tex | 6 +- .../tex/latex/genealogytree/gtrcore.node.code.tex | 6 +- .../latex/genealogytree/gtrcore.options.code.tex | 7 +- .../latex/genealogytree/gtrcore.parser.code.tex | 8 +- .../genealogytree/gtrcore.processing.code.tex | 6 +- .../latex/genealogytree/gtrcore.symbols.code.tex | 6 +- .../latex/genealogytree/gtrlang.danish.code.tex | 6 +- .../tex/latex/genealogytree/gtrlang.dutch.code.tex | 6 +- .../latex/genealogytree/gtrlang.english.code.tex | 6 +- .../latex/genealogytree/gtrlang.french.code.tex | 6 +- .../latex/genealogytree/gtrlang.german.code.tex | 6 +- .../latex/genealogytree/gtrlang.italian.code.tex | 6 +- .../genealogytree/gtrlang.portuguese.code.tex | 6 +- .../latex/genealogytree/gtrlang.spanish.code.tex | 6 +- .../latex/genealogytree/gtrlang.swedish.code.tex | 6 +- .../tex/latex/genealogytree/gtrlib.debug.code.tex | 6 +- .../latex/genealogytree/gtrlib.fanchart.code.tex | 6 +- .../latex/genealogytree/gtrlib.templates.code.tex | 651 +++++++++++++++++---- 29 files changed, 642 insertions(+), 175 deletions(-) diff --git a/Master/texmf-dist/doc/latex/genealogytree/CHANGES.md b/Master/texmf-dist/doc/latex/genealogytree/CHANGES.md index cdf54934e18..186d064592b 100644 --- a/Master/texmf-dist/doc/latex/genealogytree/CHANGES.md +++ b/Master/texmf-dist/doc/latex/genealogytree/CHANGES.md @@ -17,6 +17,39 @@ and this project adheres to +## [2.2.0] - 2022-03-17 + +### Added +- Option `complemented family` +- Color `gtr_Male_Frame` +- Color `gtr_Male_Background` +- Color `gtr_Female_Frame` +- Color `gtr_Female_Background` +- Color `gtr_Neuter_Frame` +- Color `gtr_Neuter_Background` +- Template `template=display 16:9 3` +- Template `template=display 16:9 4` +- Template `template=display 16:9 5` +- Template `template=display 16:10 3` +- Template `template=display 16:10 4` +- Template `template=display 16:10 5` +- Template `template=a4paper 3` +- Template `template=a4paper 4` +- Template `template=a3paper 5` +- Template `template=letterpaper 3` +- Template `template=letterpaper 4` +- Option `template horizontal border` +- Option `template vertical border` + +### Changed +- Implementation of templates `ahnentafel 3`, `ahnentafel 4`, `ahnentafel 5` adapted + +### Fixed +- Documentation example *Edge Varieties for Families with Unions* in 14.2.2 + had a wrong summary number and 3 wrong pictures + + + ## [2.1.0] - 2021-09-20 ### Added @@ -38,7 +71,7 @@ and this project adheres to ## [2.01] - 2020-07-28 ### Added -- New *LaTeXÜ macros added corresponding to existing macros: +- New *LaTeX* macros added corresponding to existing macros: - `\getree_set_options_for_subtree:nn` - `\getree_set_options_for_family:nn` - `\getree_set_options_for_node:nn` @@ -46,7 +79,7 @@ and this project adheres to to the documentation (issue #36) ### Changed -- Implementation changed to avoid problems with spurious blanks +- Implementation changed to avoid problems with spurious blanks and resulting errors for - Option `tcb/if image defined` - Option `date range before` @@ -227,7 +260,7 @@ and this project adheres to - `tcolorbox` needs to be version 4.20 (2019/03/02) or newer. ### Fixed -- The templates library used some internal color names of `tcolorbox`. +- The templates library used some internal color names of `tcolorbox`. They are adapted now to the new official names (issue #30). @@ -267,7 +300,7 @@ and this project adheres to ## [1.21] - 2017-09-15 ### Added -- Italian translation `language=italian` provided by Andrea Vaccari +- Italian translation `language=italian` provided by Andrea Vaccari - Template `database pole reduced` - Template `database poleportrait` - Template `database poleportrait reduced` diff --git a/Master/texmf-dist/doc/latex/genealogytree/README.md b/Master/texmf-dist/doc/latex/genealogytree/README.md index 5d22561834b..25c4d06ef49 100644 --- a/Master/texmf-dist/doc/latex/genealogytree/README.md +++ b/Master/texmf-dist/doc/latex/genealogytree/README.md @@ -1,6 +1,6 @@ -# The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +# The LaTeX package genealogytree - version 2.2.0 (2022/03/17) -> Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +> Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm > This work may be distributed and/or modified under the > conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-1.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-1.pdf index d05dc7aad87..0b893c644a5 100644 Binary files a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-1.pdf and b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-1.pdf differ diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-2.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-2.pdf index 19777639198..ec8a2ea0fca 100644 Binary files a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-2.pdf and b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-2.pdf differ diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-3.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-3.pdf index 1214fcfc3cc..8fa4eb74cc2 100644 Binary files a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-3.pdf and b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-3.pdf differ diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-4.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-4.pdf index 7a3beb3f528..9995cbd07a0 100644 Binary files a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-4.pdf and b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-4.pdf differ diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-languages.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-languages.pdf index 44c63e75008..58f985e5dbe 100644 Binary files a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-languages.pdf and b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-languages.pdf differ diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree.doc.sources.zip b/Master/texmf-dist/doc/latex/genealogytree/genealogytree.doc.sources.zip index 7095d2b1a63..61b6d3b03e0 100644 Binary files a/Master/texmf-dist/doc/latex/genealogytree/genealogytree.doc.sources.zip and b/Master/texmf-dist/doc/latex/genealogytree/genealogytree.doc.sources.zip differ diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree.pdf index 933a55d0019..9c75dfe74ea 100644 Binary files a/Master/texmf-dist/doc/latex/genealogytree/genealogytree.pdf and b/Master/texmf-dist/doc/latex/genealogytree/genealogytree.pdf differ diff --git a/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty b/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty index f6be9022927..8ab1ac5fd41 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% genealogytree.sty: genealogy trees (graphs) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,11 +18,11 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{genealogytree}[2021/09/20 version 2.1.0 genealogy trees] -\def\gtr@version{2.1.0} +\ProvidesPackage{genealogytree}[2022/03/17 version 2.2.0 genealogy trees] +\def\gtr@version{2.2.0} \RequirePackage{expl3}[2020/02/25] -\RequirePackage{xparse} +\RequirePackage{xparse,xfp} \RequirePackage{tcolorbox}[2020/04/28] \tcbuselibrary{skins,fitting,external} 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 cf4bb3d9e78..1d2644f4849 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrcore.contour.code.tex: Contours %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} %%%%%%%%%%%%%%%%%%%%%%% %% 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 1112737c576..effbc01f084 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrcore.drawing.code.tex: Drawing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} %%%%%%%%%%%%%%%%%%%%%%% %% Auxiliary Tools 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 5baae2638ba..2b6c7081cc2 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrcore.node.code.tex: Node Boxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} %%%%%%%%%%%%%% % 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 592ac1ea541..cc06b0d245d 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrcore.options.code.tex: Options %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} %%%%%%%%%%%%%%%%%%%%%%% %% General handling @@ -562,6 +562,7 @@ tree offset=0pt, level/.style=, complemented/.style=, + complemented family/.style=, box clear, processing=fit, edges={perpendicular,foreground=,background=,anchoring=periphery,hide single leg,xshift=0pt,yshift=0pt}, 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 239a0afa05a..ae6c57edce5 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrcore.parser.code.tex: Parser %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} %% (local) stack implementation \def\gtrnewstack#1{% @@ -491,7 +491,7 @@ \long\def\gtr@trav@@complementedparent#1{% \gtr@up@level@push% \gtr@next@family% - \gtr@proc@@parent@begin{}% + \gtr@proc@@parent@begin{family=complemented family}% \ifgtr@ignore% \advance\gtr@c@family -1\relax% \else% 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 dcc54415c23..e2766e6db50 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrcore.processing.code.tex: Processing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} %%%%%%%%%%%%%%%%%%%%%%% %% Processing - common %%%%%%%%%%%%%%%%%%%%%%% 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 f95179043f0..defe242cfd9 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrcore.symbols.code.tex: Symbols %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} %%%%%%%%%%%%%%%%%%%%%%% %% Symbols diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.danish.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.danish.code.tex index bb03fc5b40e..1d9a4e52a0f 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.danish.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.danish.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.danish.code.tex: Danish language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm %% Translation by Mikkel Eide Eriksen %% ------------------------------------------------------------------------------------------- %% @@ -18,7 +18,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/danish/.code={% \gtrset{symlang/.cd, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.dutch.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.dutch.code.tex index 0410fa78194..d38f7791f7e 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.dutch.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.dutch.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.dutch.code.tex: Dutch language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm %% Translation by Dirk Bosmans %% ------------------------------------------------------------------------------------------- %% @@ -18,7 +18,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/dutch/.code={% \gtrset{symlang/.cd, 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 a208c468bc7..c13b2f4c694 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.english.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.english.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.english.code.tex: English language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/english/.code={% \gtrset{symlang/.cd, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.french.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.french.code.tex index 011443f392d..aceff41a25f 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.french.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.french.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.french.code.tex: French language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm %% Translation by Denis Bitouze %% ------------------------------------------------------------------------------------------- %% @@ -18,7 +18,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/french/.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 0e52d7c7dc1..4d0152a7897 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.german.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.german.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.german.code.tex: German language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/german/.code={% \gtrset{symlang/.cd, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.italian.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.italian.code.tex index 8368cfcd37b..ed2b1def4ff 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.italian.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.italian.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.italian.code.tex: Italian language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm %% Translation by Andrea Vaccari %% ------------------------------------------------------------------------------------------- %% @@ -18,7 +18,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/italian/.code={% \gtrset{symlang/.cd, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.portuguese.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.portuguese.code.tex index 8bdb4640b37..e67ffb84aaf 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.portuguese.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.portuguese.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.portuguese.code.tex: Portuguese language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm %% Translation by Natan de Almeida Laverde %% ------------------------------------------------------------------------------------------- %% @@ -18,7 +18,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/portuguese/.code={% \gtrset{symlang/.cd, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.spanish.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.spanish.code.tex index 810aa3add40..d2a5bd45d82 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.spanish.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.spanish.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.spanish.code.tex: Spanish language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm %% Translation by Francisco G. Perez Sanchez %% ------------------------------------------------------------------------------------------- %% @@ -18,7 +18,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/spanish/.code={% \gtrset{symlang/.cd, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.swedish.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.swedish.code.tex index 708ffb79f19..18d3e10a635 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.swedish.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.swedish.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlang.swedish.code.tex: Swedish language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 by Prof. Dr. Dr. Thomas F. Sturm %% Translation by Per Starbaeck %% ------------------------------------------------------------------------------------------- %% @@ -18,7 +18,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{2.1.0} +\gtr@set@library@version{2.2.0} \gtrset{language@/swedish/.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 5450d3f69bc..80a7ee79aeb 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlib.debug.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlib.debug.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlib.debug.code.tex: Debugger %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} \RequirePackage{array,tabularx} \tcbuselibrary{breakable} diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlib.fanchart.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlib.fanchart.code.tex index d9e485bc021..8c09a9eb456 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlib.fanchart.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlib.fanchart.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlib.fanchart.code.tex: Fancharts %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} \ExplSyntaxOn 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 6460a178c76..b58ace10435 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 2.1.0 (2021/09/20) +%% The LaTeX package genealogytree - version 2.2.0 (2022/03/17) %% gtrlib.templates.code.tex: Templates %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2013-2022 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{2.1.0} +\gtr@set@library@version{2.2.0} % Templates @@ -114,17 +114,17 @@ }, % database@malefemale/.style={ - tcbset={male/.style={colframe=blue!50!black,colback=blue!50!yellow!5,arc is angular,drop fuzzy shadow=blue!25!black!30}, - female/.style={colframe=red!50!black,colback=red!50!yellow!5,drop fuzzy shadow=red!25!black!30}, - neuter/.style={colframe=black!75,colback=yellow!5,drop fuzzy shadow=black!30}}, + tcbset={male/.style={colframe=gtr_Male_Frame,colback=gtr_Male_Background,arc is angular,drop fuzzy shadow=blue!25!black!30}, + female/.style={colframe=gtr_Female_Frame,colback=gtr_Female_Background,drop fuzzy shadow=red!25!black!30}, + neuter/.style={colframe=gtr_Neuter_Frame,colback=gtr_Neuter_Background,drop fuzzy shadow=black!30}}, }, % database@malefemale@reduced/.style={ - tcbset={male/.style={colframe=blue!50!black,colback=blue!50!yellow!5,arc is angular, + tcbset={male/.style={colframe=gtr_Male_Frame,colback=gtr_Male_Background,arc is angular, fuzzy shadow={0.1mm}{-0.1mm}{0mm}{0.012mm}{blue!25!black!30}}, - female/.style={colframe=red!50!black,colback=red!50!yellow!5, + female/.style={colframe=gtr_Female_Frame,colback=gtr_Female_Background, fuzzy shadow={0.1mm}{-0.1mm}{0mm}{0.012mm}{red!25!black!30}}, - neuter/.style={colframe=black!75,colback=yellow!5, + neuter/.style={colframe=gtr_Neuter_Frame,colback=gtr_Neuter_Background, fuzzy shadow={0.1mm}{-0.1mm}{0mm}{0.012mm}{black!30}}}, }, % @@ -543,12 +543,12 @@ }, % ahnentafel@malefemale/.style={ - tcbset={male/.style={colframe=blue!50!black,colback=blue!50!yellow!5,arc is angular}, - female/.style={colframe=red!50!black,colback=red!50!yellow!5}, - neuter/.style={colframe=black!75,colback=yellow!5}}, + tcbset={male/.style={colframe=gtr_Male_Frame,colback=gtr_Male_Background,arc is angular}, + female/.style={colframe=gtr_Female_Frame,colback=gtr_Female_Background}, + neuter/.style={colframe=gtr_Neuter_Frame,colback=gtr_Neuter_Background}}, }, % - template/ahnentafel 3/.style={ + template/ahnentafel 3/.style={% timeflow=left, processing=database, database format=medium, @@ -561,33 +561,34 @@ ahnentafel@malefemale, box={\gtrDBsex,before upper={\parskip=0.1\tcbfitdim},halign=flush left,}, edges={mesh,anchoring=center,no background,foreground={line width=10mm,green!50!black!50}}, - level/.code={\ifnum\numexpr##1>2\relax% - \gtrset{% + level/.code={% + \ifcase##1\relax\gtrset{% 0 + level size=42mm, + node size=50mm, + node box={fit basedim=10pt} + }% + \or\gtrset{% 1 + level size=37mm, + node size=50mm, + parent distance=4mm, + further distance=2mm, + node box={fit basedim=9pt} + }% + \or\gtrset{% 2 + level distance=3mm, + level size=36mm, + node size=40mm, + parent distance=2mm, + further distance=1mm, + node box={boxrule=0.4mm,arc=0.8mm,fit basedim=9pt} + }% + \else\gtrset{% 3+ parent distance=1mm, further distance=0.5mm, node box={boxrule=0.3mm,arc=0.6mm,valign=center,fit basedim=9pt}, family edges={foreground={line width=8mm,green!50!black!50}}, }% - \fi}, - level 2/.style={ - level distance=3mm, - level size=36mm, - node size=40mm, - parent distance=2mm, - further distance=1mm, - node box={boxrule=0.4mm,arc=0.8mm,fit basedim=9pt} - }, - level 1/.style={ - level size=37mm, - node size=50mm, - parent distance=4mm, - further distance=2mm, - node box={fit basedim=9pt} - }, - level 0/.style={ - level size=42mm, - node size=50mm, - node box={fit basedim=10pt} + \fi% }, }, % @@ -604,42 +605,43 @@ ahnentafel@malefemale, box={\gtrDBsex,before upper={\parskip=0.1\tcbfitdim},halign=flush left,}, edges={mesh,anchoring=center,no background,foreground={line width=10mm,green!50!black!50}}, - level/.code={\ifnum\numexpr##1>3\relax% - \gtrset{% + level/.code={% + \ifcase##1\relax\gtrset{% 0 + level size=42mm, + node size=50mm, + node box={fit basedim=10pt} + }% + \or\gtrset{% 1 + level distance=-25mm, + level size=37mm, + node size=50mm, + parent distance=58mm, + further distance=2mm, + node box={fit basedim=9pt} + }% + \or\gtrset{% 2 + level distance=3mm, + level size=36mm, + node size=40mm, + parent distance=2mm, + further distance=1mm, + node box={boxrule=0.4mm,arc=0.8mm,fit basedim=9pt} + }% + \or\gtrset{% 3 + level size=38mm, + node size=26mm, + parent distance=1mm, + further distance=0.5mm, + node box={boxrule=0.3mm,arc=0.6mm,valign=center,fit basedim=8pt}, + family edges={foreground={line width=8mm,green!50!black!50}}, + }% + \else\gtrset{% 4+ parent distance=0.25mm, further distance=0.25mm, node box={boxrule=0.2mm,arc=0.4mm,valign=center,fit basedim=8pt}, family edges={foreground={line width=7mm,green!50!black!50}}, }% - \fi}, - level 3/.style={ - level size=38mm, - node size=26mm, - parent distance=1mm, - further distance=0.5mm, - node box={boxrule=0.3mm,arc=0.6mm,valign=center,fit basedim=8pt}, - family edges={foreground={line width=8mm,green!50!black!50}}, - }, - level 2/.style={ - level distance=3mm, - level size=36mm, - node size=40mm, - parent distance=2mm, - further distance=1mm, - node box={boxrule=0.4mm,arc=0.8mm,fit basedim=9pt} - }, - level 1/.style={ - level distance=-25mm, - level size=37mm, - node size=50mm, - parent distance=58mm, - further distance=2mm, - node box={fit basedim=9pt} - }, - level 0/.style={ - level size=42mm, - node size=50mm, - node box={fit basedim=10pt} + \fi% }, }, % @@ -656,57 +658,481 @@ ahnentafel@malefemale, box={\gtrDBsex,before upper={\parskip=0.1\tcbfitdim},halign=flush left,}, edges={mesh,anchoring=center,no background,foreground={line width=5mm,green!50!black!50}}, - level/.code={\ifnum\numexpr##1>4\relax% - \gtrset{% + level/.code={% + \ifcase##1\relax\gtrset{% 0 + level size=40mm, + node size=50mm, + node box={fit basedim=10pt}, + family edges={foreground={line width=10mm,green!50!black!50}}, + }% + \or\gtrset{% 1 + level distance=-25mm, + level size=35mm, + node size=50mm, + parent distance=58mm, + further distance=2mm, + node box={fit basedim=9pt}, + family edges={foreground={line width=10mm,green!50!black!50}}, + }% + \or\gtrset{% 2 + level distance=3mm, + level size=30mm, + node size=40mm, + parent distance=2mm, + further distance=1mm, + node box={boxrule=0.4mm,arc=0.8mm,fit basedim=8pt}, + family edges={foreground={line width=10mm,green!50!black!50}}, + }% + \or\gtrset{% 3 + level size=30mm, + node size=26mm, + parent distance=1mm, + further distance=0.5mm, + node box={boxrule=0.3mm,arc=0.6mm,fit basedim=7pt}, + family edges={foreground={line width=8mm,green!50!black!50}}, + }% + \or\gtrset{% 4 + level size=34mm, + node size=16mm, + parent distance=0.25mm, + further distance=0.25mm, + node={list separators={\par}{, }{.\par}{\par}}, + node box={boxrule=0.2mm,arc=0.4mm,valign=center,fit basedim=7pt}, + family edges={foreground={line width=7mm,green!50!black!50}}, + }% + \else\gtrset{% 5+ node={database format=short,list separators={, }{, }{.}{}}, node box={size=fbox,boxsep=0.5mm,boxrule=0.1mm,arc=0.2mm, valign=center,fit basedim=6pt}, family edges={foreground={line width=5mm,green!50!black!50}}, }% - \fi}, - level 4/.style={ - level size=34mm, - node size=16mm, - parent distance=0.25mm, - further distance=0.25mm, - node={list separators={\par}{, }{.\par}{\par}}, - node box={boxrule=0.2mm,arc=0.4mm,valign=center,fit basedim=7pt}, - family edges={foreground={line width=7mm,green!50!black!50}}, - }, - level 3/.style={ - level size=30mm, - node size=26mm, - parent distance=1mm, - further distance=0.5mm, - node box={boxrule=0.3mm,arc=0.6mm,fit basedim=7pt}, - family edges={foreground={line width=8mm,green!50!black!50}}, - }, - level 2/.style={ - level distance=3mm, - level size=30mm, - node size=40mm, - parent distance=2mm, - further distance=1mm, - node box={boxrule=0.4mm,arc=0.8mm,fit basedim=8pt}, - family edges={foreground={line width=10mm,green!50!black!50}}, - }, - level 1/.style={ - level distance=-25mm, - level size=35mm, - node size=50mm, - parent distance=58mm, - further distance=2mm, - node box={fit basedim=9pt}, - family edges={foreground={line width=10mm,green!50!black!50}}, - }, - level 0/.style={ - level size=40mm, - node size=50mm, - node box={fit basedim=10pt}, - family edges={foreground={line width=10mm,green!50!black!50}}, + \fi% + }, + }, +% + template horizontal border/.style = {}, + template vertical border/.style = {}, + template@fixedsize@common/.style = {% + processing=database, + database format=full marriage below, + name font=\bfseries, + surn code={##1}, + tcbset={% + male/.style={colframe=gtr_Male_Frame,colback=gtr_Male_Background,arc is angular}, + female/.style={colframe=gtr_Female_Frame,colback=gtr_Female_Background}, + neuter/.style={colframe=gtr_Neuter_Frame,gtr_Neuter_Background}% + },% + box clear, + complemented/.style={% + box={colframe=gray!50,colback=white}, }, + empty name text={}, }, % + template@fixedsize@common@3/.style = {% + template@fixedsize@common, + autofill parents male female* = 3, + box={enhanced,top=0mm,bottom=0mm,middle=0.15mm, + boxrule=0.15mm,boxsep=0.25mm,arc=0.5mm,fit basedim=9pt, + halign=flush center, + fontupper=\sffamily, + before upper={\parskip 0.15\tcbfitdim plus 0pt minus 0pt}, + segmentation style={solid,line width=0.06mm,shorten >=0.4mm,shorten <=0.4mm}, + \gtrDBsex, + }, + edges={rounded=3pt, + foreground={black,line width=0.3mm}, + background={white,line width=0.9mm} + }, + complemented family/.style={% + edges={rounded=3pt, + foreground={gray!50,line width=0.3mm}, + background={white,line width=0.9mm} + }, + }, + level/.code={% + \ifcase##1\relax\gtrset{% 0 + level size=\gtr@tmpl@height@z, + node size=\gtr@tmpl@width@z, + }% + \or\gtrset{% 1 + level size=\gtr@tmpl@height@i, + node size=\gtr@tmpl@width@i, + }% + \or\gtrset{% 2 + level size=\gtr@tmpl@height@ii, + node size=\gtr@tmpl@width@ii, + }% + \or\gtrset{% 3 + level size=\gtr@tmpl@height@iii, + node size=\gtr@tmpl@width@iii, + node box={fit basedim=8pt}, + }% + \or\gtrset{% 4 + node=ignore, + }% + \else\gtrset{% 5+ + ignore, + }% + \fi% + }, + }, +% + template@fixedsize@common@4/.style = {% + template@fixedsize@common, + autofill parents male female* = 4, + box={enhanced,top=0mm,bottom=0mm,middle=0.15mm, + boxrule=0.15mm,boxsep=0.25mm,arc=0.5mm,fit basedim=6.5pt, + halign=flush center, + fontupper=\sffamily, + before upper={\parskip 0.15\tcbfitdim plus 0pt minus 0pt}, + segmentation style={solid,line width=0.06mm,shorten >=0.4mm,shorten <=0.4mm}, + \gtrDBsex, + }, + edges={rounded=3pt, + foreground={black,line width=0.3mm}, + background={white,line width=0.9mm} + }, + complemented family/.style={% + edges={rounded=3pt, + foreground={gray!50,line width=0.3mm}, + background={white,line width=0.9mm} + }, + }, + level/.code={% + \ifcase##1\relax\gtrset{% 0 + level size=\gtr@tmpl@height@z, + node size=\gtr@tmpl@width@z, + }% + \or\gtrset{% 1 + level size=\gtr@tmpl@height@i, + node size=\gtr@tmpl@width@i, + }% + \or\gtrset{% 2 + level size=\gtr@tmpl@height@ii, + node size=\gtr@tmpl@width@ii, + }% + \or\gtrset{% 3 + level size=\gtr@tmpl@height@iii, + node size=\gtr@tmpl@width@iii, + }% + \or\gtrset{% 4 + level size=\gtr@tmpl@height@iv, + node size=\gtr@tmpl@width@iv, + node box={fit basedim=6pt}, + }% + \or\gtrset{% 5 + node=ignore, + }% + \else\gtrset{% 6+ + ignore, + }% + \fi% + }, + }, +% + template/display 16:9 3/.style={ + template@fixedsize@common@3, + template@horizontal@border/.code={% + \edef\gtr@tmpl@xscale {\fpeval{(312mm-2*(##1))/308mm}}% + \edef\gtr@tmpl@width@z {\fpeval{70mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@i {\fpeval{70mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@ii {\fpeval{70mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iii{\fpeval{38.5mm*\gtr@tmpl@xscale}pt}% + }, + template@vertical@border/.code={% + \edef\gtr@tmpl@yscale {\fpeval{(171mm-2*(##1))/167mm}}% + \edef\gtr@tmpl@height@z {\fpeval{36mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@i {\fpeval{36mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@ii {\fpeval{36mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iii{\fpeval{59mm*\gtr@tmpl@yscale}pt}% + }, + template horizontal border/.style={template@horizontal@border={##1}}, + template vertical border/.style={template@vertical@border={##1}}, + template horizontal border=2mm, + template vertical border=2mm, + level distance=3mm, + parent distance in parent graph=1.142857mm, + further distance=1.142857mm, + }, +% + template/display 16:10 3/.style={ + template=display 16:9 3, + template vertical border/.style={template@vertical@border=(##1-10mm)}, + template vertical border=2mm, + }, +% + template/display 16:9 4/.style={% + template@fixedsize@common@4, + template@horizontal@border/.code={% + \edef\gtr@tmpl@xscale {\fpeval{(308mm-2*(##1))/304mm}}% + \edef\gtr@tmpl@width@z {\fpeval{48mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@i {\fpeval{48mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@ii {\fpeval{48mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iii{\fpeval{30mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iv {\fpeval{19mm*\gtr@tmpl@xscale}pt}% + }, + template@vertical@border/.code={% + \edef\gtr@tmpl@yscale {\fpeval{(168mm-2*(##1))/164mm}}% + \edef\gtr@tmpl@height@z {\fpeval{25mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@i {\fpeval{25mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@ii {\fpeval{25mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iii{\fpeval{40mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iv {\fpeval{49mm*\gtr@tmpl@yscale}pt}% + }, + template horizontal border/.style={template@horizontal@border={##1}}, + template vertical border/.style={template@vertical@border={##1}}, + template horizontal border=2mm, + template vertical border=2mm, + level distance=3mm, + parent distance in parent graph=0.8mm, + further distance=0.8mm, + }, +% + template/display 16:10 4/.style={ + template=display 16:9 4, + template vertical border/.style={template@vertical@border=(##1-10mm)}, + template vertical border=2mm, + }, +% + template/display 16:9 5/.style={% + template@fixedsize@common, + template@horizontal@border/.code={% + \edef\gtr@tmpl@xscale {\fpeval{(304.8mm-2*(##1))/300.8mm}}% + \edef\gtr@tmpl@width@z {\fpeval{40mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@i {\fpeval{40mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@ii {\fpeval{40mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iii{\fpeval{20mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iv {\fpeval{15mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@v {\fpeval{9.4mm*\gtr@tmpl@xscale}pt}% + }, + template@vertical@border/.code={% + \edef\gtr@tmpl@yscale {\fpeval{(167.5mm-2*(##1))/163.5mm}}% + \edef\gtr@tmpl@height@z {\fpeval{15mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@i {\fpeval{15mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@ii {\fpeval{15mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iii{\fpeval{30mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iv {\fpeval{40mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@v {\fpeval{48.5mm*\gtr@tmpl@yscale}pt}% + }, + template horizontal border/.style={template@horizontal@border={##1}}, + template vertical border/.style={template@vertical@border={##1}}, + template horizontal border=2mm, + template vertical border=2mm, + level distance=2.5mm, + parent distance in parent graph=0.490323mm, + further distance=0.490323mm, + autofill parents male female* = 5, + box={enhanced,top=0mm,bottom=0mm,middle=0.1mm, + boxrule=0.1mm,boxsep=0.2mm,arc=0.4mm,fit basedim=5pt, + halign=flush center, + fontupper=\sffamily, + before upper={\parskip 0.15\tcbfitdim plus 0pt minus 0pt}, + segmentation style={solid,line width=0.05mm,shorten >=0.3mm,shorten <=0.3mm}, + \gtrDBsex, + }, + edges={rounded=3pt, + foreground={black,line width=0.2mm}, + background={white,line width=0.6mm} + }, + complemented family/.style={% + edges={rounded=3pt, + foreground={gray!50,line width=0.2mm}, + background={white,line width=0.6mm} + }, + }, + level/.code={% + \ifcase##1\relax\gtrset{% 0 + level size=\gtr@tmpl@height@z, + node size=\gtr@tmpl@width@z, + }% + \or\gtrset{% 1 + level size=\gtr@tmpl@height@i, + node size=\gtr@tmpl@width@i, + }% + \or\gtrset{% 2 + level size=\gtr@tmpl@height@ii, + node size=\gtr@tmpl@width@ii, + }% + \or\gtrset{% 3 + level size=\gtr@tmpl@height@iii, + node size=\gtr@tmpl@width@iii, + }% + \or\gtrset{% 4 + level size=\gtr@tmpl@height@iv, + node size=\gtr@tmpl@width@iv, + }% + \or\gtrset{% 5 + level size=\gtr@tmpl@height@v, + node size=\gtr@tmpl@width@v, + node box={fit basedim=3.5pt}, + }% + \or\gtrset{% 6 + node=ignore, + }% + \else\gtrset{% 7+ + ignore, + }% + \fi% + }, + }, +% + template/display 16:10 5/.style={ + template=display 16:9 5, + template vertical border/.style={template@vertical@border=(##1-10mm)}, + template vertical border=2mm, + }, +% + template/a4paper 3/.style={ + template@fixedsize@common@3, + template@horizontal@border/.code={% + \edef\gtr@tmpl@xscale {\fpeval{(290mm-2*(##1))/276mm}}% + \edef\gtr@tmpl@width@z {\fpeval{65mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@i {\fpeval{65mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@ii {\fpeval{60mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iii{\fpeval{34.5mm*\gtr@tmpl@xscale}pt}% + }, + template@vertical@border/.code={% + \edef\gtr@tmpl@yscale {\fpeval{(201mm-2*(##1))/187mm}}% + \edef\gtr@tmpl@height@z {\fpeval{38mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@i {\fpeval{38mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@ii {\fpeval{41mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iii{\fpeval{70mm*\gtr@tmpl@yscale}pt}% + }, + template horizontal border/.style={template@horizontal@border={##1}}, + template vertical border/.style={template@vertical@border={##1}}, + template horizontal border=7mm, + template vertical border=7mm, + level distance=3mm, + parent distance in parent graph=1mm, + further distance=1mm, + }, +% + template/letterpaper 3/.style={ + template=a4paper 3, + template horizontal border/.style={template@horizontal@border=(##1+8.8mm)}, + template vertical border/.style={template@vertical@border=(##1-2.95mm)}, + template horizontal border=0.25in, + template vertical border=0.25in, + }, +% + template/a4paper 4/.style={ + template@fixedsize@common@4, + template@horizontal@border/.code={% + \edef\gtr@tmpl@xscale {\fpeval{(286mm-2*(##1))/272mm}}% + \edef\gtr@tmpl@width@z {\fpeval{48mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@i {\fpeval{48mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@ii {\fpeval{48mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iii{\fpeval{30mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iv {\fpeval{17mm*\gtr@tmpl@xscale}pt}% + }, + template@vertical@border/.code={% + \edef\gtr@tmpl@yscale {\fpeval{(198mm-2*(##1))/184mm}}% + \edef\gtr@tmpl@height@z {\fpeval{27mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@i {\fpeval{27mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@ii {\fpeval{27mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iii{\fpeval{43mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iv {\fpeval{60mm*\gtr@tmpl@yscale}pt}% + }, + template horizontal border/.style={template@horizontal@border={##1}}, + template vertical border/.style={template@vertical@border={##1}}, + template horizontal border=7mm, + template vertical border=7mm, + level distance=3mm, + parent distance in parent graph=0.733333mm, + further distance=0.733333mm, + }, +% + template/letterpaper 4/.style={ + template=a4paper 4, + template horizontal border/.style={template@horizontal@border=(##1+8.8mm)}, + template vertical border/.style={template@vertical@border=(##1-2.95mm)}, + template horizontal border=0.25in, + template vertical border=0.25in, + }, +% + template/a3paper 5/.style={ + template@fixedsize@common, + template@horizontal@border/.code={% + \edef\gtr@tmpl@xscale {\fpeval{(398mm-2*(##1))/384mm}}% + \edef\gtr@tmpl@width@z {\fpeval{50mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@i {\fpeval{50mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@ii {\fpeval{50mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iii{\fpeval{30mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@iv {\fpeval{20mm*\gtr@tmpl@xscale}pt}% + \edef\gtr@tmpl@width@v {\fpeval{12mm*\gtr@tmpl@xscale}pt}% + }, + template@vertical@border/.code={% + \edef\gtr@tmpl@yscale {\fpeval{(282mm-2*(##1))/268mm}}% + \edef\gtr@tmpl@height@z {\fpeval{30mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@i {\fpeval{30mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@ii {\fpeval{30mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iii{\fpeval{50mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@iv {\fpeval{58mm*\gtr@tmpl@yscale}pt}% + \edef\gtr@tmpl@height@v {\fpeval{70mm*\gtr@tmpl@yscale}pt}% + }, + template horizontal border/.style={template@horizontal@border={##1}}, + template vertical border/.style={template@vertical@border={##1}}, + template horizontal border=7mm, + template vertical border=7mm, + level distance=3mm, + parent distance in parent graph=0.709677mm, + further distance=0.709677mm, + autofill parents male female* = 5, + box={enhanced,top=0mm,bottom=0mm,middle=0.15mm, + boxrule=0.15mm,boxsep=0.25mm,arc=0.5mm,fit basedim=6.5pt, + halign=flush center, + fontupper=\sffamily, + before upper={\parskip 0.15\tcbfitdim plus 0pt minus 0pt}, + segmentation style={solid,line width=0.06mm,shorten >=0.4mm,shorten <=0.4mm}, + \gtrDBsex, + }, + edges={rounded=3pt, + foreground={black,line width=0.3mm}, + background={white,line width=0.9mm} + }, + complemented family/.style={% + edges={rounded=3pt, + foreground={gray!50,line width=0.3mm}, + background={white,line width=0.9mm} + }, + }, + level/.code={% + \ifcase##1\relax\gtrset{% 0 + level size=\gtr@tmpl@height@z, + node size=\gtr@tmpl@width@z, + }% + \or\gtrset{% 1 + level size=\gtr@tmpl@height@i, + node size=\gtr@tmpl@width@i, + }% + \or\gtrset{% 2 + level size=\gtr@tmpl@height@ii, + node size=\gtr@tmpl@width@ii, + }% + \or\gtrset{% 3 + level size=\gtr@tmpl@height@iii, + node size=\gtr@tmpl@width@iii, + }% + \or\gtrset{% 4 + level size=\gtr@tmpl@height@iv, + node size=\gtr@tmpl@width@iv, + node box={fit basedim=6pt}, + }% + \or\gtrset{% 5 + level size=\gtr@tmpl@height@v, + node size=\gtr@tmpl@width@v, + node box={fit basedim=5pt}, + }% + \or\gtrset{% 6 + node=ignore, + }% + \else\gtrset{% 7+ + ignore, + }% + \fi% + }, + }, } @@ -752,3 +1178,10 @@ \definecolor{gtr_Blue_6}{rgb}{0.858824,0.898039,0.945098} \definecolor{gtr_Bright_Red}{rgb}{1.000000,0.294118,0.062745} + +\colorlet{gtr_Male_Frame}{blue!50!black} +\colorlet{gtr_Male_Background}{blue!50!yellow!5} +\colorlet{gtr_Female_Frame}{red!50!black} +\colorlet{gtr_Female_Background}{red!50!yellow!5} +\colorlet{gtr_Neuter_Frame}{black!75} +\colorlet{gtr_Neuter_Background}{yellow!5} -- cgit v1.2.3