From 8a59d2054279db3001a55544b759a14f88892f54 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Sep 2015 21:58:45 +0000 Subject: genealogytree (21sep15) git-svn-id: svn://tug.org/texlive/trunk@38426 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/genealogytree/genealogytree.sty | 42 ++++++++------------- .../latex/genealogytree/gtrcore.contour.code.tex | 4 +- .../latex/genealogytree/gtrcore.drawing.code.tex | 4 +- .../tex/latex/genealogytree/gtrcore.node.code.tex | 4 +- .../latex/genealogytree/gtrcore.options.code.tex | 4 +- .../latex/genealogytree/gtrcore.parser.code.tex | 4 +- .../genealogytree/gtrcore.processing.code.tex | 4 +- .../latex/genealogytree/gtrcore.symbols.code.tex | 4 +- .../latex/genealogytree/gtrlang.english.code.tex | 4 +- .../latex/genealogytree/gtrlang.german.code.tex | 4 +- .../tex/latex/genealogytree/gtrlib.debug.code.tex | 4 +- .../latex/genealogytree/gtrlib.templates.code.tex | 44 +++++++++++++++++++++- 12 files changed, 77 insertions(+), 49 deletions(-) (limited to 'Master/texmf-dist/tex/latex/genealogytree') diff --git a/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty b/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty index b5b55c9f092..5cd5c92497a 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty +++ b/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% genealogytree.sty: genealogy trees (graphs) %% %% ------------------------------------------------------------------------------------------- @@ -18,10 +18,10 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{genealogytree}[2015/06/22 version 0.91 genealogy trees] -\def\gtr@version{0.91} +\ProvidesPackage{genealogytree}[2015/09/21 version 1.00 genealogy trees] +\def\gtr@version{1.00} -\RequirePackage{tcolorbox}[2015/05/07] +\RequirePackage{tcolorbox}[2015/08/12] \tcbuselibrary{skins,fitting,external} \usetikzlibrary{arrows.meta} \usetikzlibrary{fit} @@ -64,13 +64,13 @@ \def\gtr@set@library@version#1{% \def\gtr@library@version{#1}% - \typeout{Library (genealogytree): '\gtr@library@inload' version '\gtr@library@version'} + \typeout{Library (genealogytree): '\@currname' version '\gtr@library@version'} \gtr@check@library@version% } \def\gtr@check@library@version{% \ifx\gtr@library@version\gtr@version\else% - \PackageError{genealogytree}{genealogytree version '\gtr@version' loads library '\gtr@library@inload' with version '\gtr@library@version'} + \PackageError{genealogytree}{genealogytree version '\gtr@version' loads library '\@currname' with version '\gtr@library@version'} \fi% } @@ -79,28 +79,17 @@ \providecommand{\gtrpkgprefix}{} -\def\gtr@input@library@in#1{% - \input\gtrpkgprefix#1\relax% -} - -\let\gtr@input@library=\gtr@input@library@in% - -\def\gtr@input@library@ex#1{% - \let\gtr@input@library=\gtr@input@library@in% - \edef\gtr@at@catcode{\the\catcode`@}% - \catcode`\@11\relax% - \gtr@input@library@in{#1}% - \catcode`\@\gtr@at@catcode\relax% - \let\gtr@input@library=\gtr@input@library@ex% -} - \def\gtr@load@library#1#2{% \pgfkeysifdefined{/gtr/libload/#1}{}{% \pgfkeyssetvalue{/gtr/libload/#1}{}% - \def\gtr@library@inload{#2}% + \@pushfilename% + \xdef\@currname{#2}% + \makeatletter% \def\gtr@library@version{-}% - \gtr@input@library{#2}% - \gtr@check@library@version}% + \input\gtrpkgprefix#2\relax% + \gtr@check@library@version% + \@popfilename% + }% } \def\gtr@add@library#1#2{% @@ -141,6 +130,5 @@ lang.english, } -\edef\gtr@temp{\noexpand\gtruselibrary{\gtr@optionlist}} -\gtr@temp -\let\gtr@input@library=\gtr@input@library@ex% +\begingroup\edef\x{\endgroup\noexpand\gtruselibrary{\gtr@optionlist}}\x + 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 8a45e73f1ba..c861b462ee7 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.contour.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.contour.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrcore.contour.code.tex: Contours %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} %%%%%%%%%%%%%%%%%%%%%%% %% 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 8d1851c47f8..50282d9fb2e 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.drawing.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.drawing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrcore.drawing.code.tex: Drawing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} %%%%%%%%%%%%%%%%%%%%%%% %% Drawing 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 cc2315fd365..d24faf71f0d 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.node.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.node.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrcore.node.code.tex: Node Boxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} %%%%%%%%%%%%%% % 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 8d71f345047..abc1d136854 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.options.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.options.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrcore.options.code.tex: Options %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} %%%%%%%%%%%%%%%%%%%%%%% %% General handling 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 b66abcb270d..9c40a11e3ee 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.parser.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.parser.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrcore.parser.code.tex: Parser %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} %% (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 72a21189432..a47d6ace856 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.processing.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.processing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrcore.processing.code.tex: Processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} %%%%%%%%%%%%%%%%%%%%%%% %% 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 114617fabc3..aa5cc91c671 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.symbols.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.symbols.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrcore.symbols.code.tex: Symbols %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} %%%%%%%%%%%%%%%%%%%%%%% %% 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 9b0749276ca..7d25fb70f20 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 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrlang.english.code.tex: English language %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} \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 59bd9f1ca76..33ce1420caa 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 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrlang.german.code.tex: German language %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} \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 bbd763f598e..2bb3cb4c6d8 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 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrlib.debug.code.tex: Debugger %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} \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 1eb5276631a..5392a61c854 100644 --- a/Master/texmf-dist/tex/latex/genealogytree/gtrlib.templates.code.tex +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlib.templates.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.91 (2015/06/22) +%% The LaTeX package genealogytree - version 1.00 (2015/09/21) %% gtrlib.templates.code.tex: Templates %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.91} +\gtr@set@library@version{1.00} % Templates @@ -234,6 +234,46 @@ background={white,line width=0.8mm} }, }, +% + template/database relationship/.style={ + timeflow=down, + processing=database, + database format=medium no marriage, + level distance=3mm, + level size=15mm, + node size=8cm, + parent distance=3mm, + child distance=1cm, + further distance=1cm, + name font=\bfseries, + surn code={##1}, + date format=d.mon.yyyy, + database@malefemale, + box clear, + box={ + boxrule=0.15mm,arc=1mm,boxsep=0mm, + top=0.5mm,bottom=0.5mm,left=1mm,right=1mm, + halign=flush center, + valign=center, + fit basedim=8pt, + fontupper=\sffamily, + before upper={\parskip 0.15\tcbfitdim plus 0pt minus 0pt}, + \gtrDBsex, + if image defined={% + code={\tcbdimto\gtr@im@width{0.77778\dimexpr\gtrkv@level@size-0.3mm\relax}},% + left=\gtr@im@width+1mm, + underlay={\begin{tcbclipinterior}% + \path[fill overzoom image=\gtrDBimage] + (interior.south west) rectangle ([xshift=\gtr@im@width]interior.north west); + \end{tcbclipinterior}% + }, + }{}, + }, + edges={perpendicular, + foreground={black,line width=0.3mm}, + background={white,line width=0.8mm} + }, + }, % ahnentafel@malefemale/.style={ tcbset={male/.style={colframe=blue!50!black,colback=blue!50!yellow!5,arc is angular}, -- cgit v1.2.3