diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-29 22:33:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-29 22:33:43 +0000 |
commit | f8fc789d01fafa97888e0536262890aa47b8ced2 (patch) | |
tree | 902253bec74eed59750c66fc7cfd82f29502e8bf /Master/texmf-dist/tex/latex/genealogytree | |
parent | bd56ba4e78930d918f50e0ca082dea03bc614938 (diff) |
genealogytree (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/genealogytree')
14 files changed, 366 insertions, 122 deletions
diff --git a/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty b/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty index 566eb666699..bb27ff47214 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% genealogytree.sty: genealogy trees (graphs) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,10 +18,10 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{genealogytree}[2016/07/29 version 1.01 genealogy trees] -\def\gtr@version{1.01} +\ProvidesPackage{genealogytree}[2017/01/29 version 1.10 genealogy trees] +\def\gtr@version{1.10} -\RequirePackage{tcolorbox}[2016/07/14] +\RequirePackage{tcolorbox}[2016/11/18] \tcbuselibrary{skins,fitting,external} \usetikzlibrary{arrows.meta} @@ -80,19 +80,35 @@ \providecommand{\gtrpkgprefix}{} -\def\gtr@load@library#1#2{% - \pgfkeysifdefined{/gtr/libload/#1}{}{% - \pgfkeyssetvalue{/gtr/libload/#1}{}% +\def\gtr@load@library@#1#2#3{% + \pgfkeysifdefined{/gtr/libload/#2}{}{% + \pgfkeyssetvalue{/gtr/libload/#2}{}% \@pushfilename% - \xdef\@currname{#2}% + \xdef\@currname{#3}% \makeatletter% - \def\gtr@library@version{-}% - \input\gtrpkgprefix#2\relax% - \gtr@check@library@version% + #1% \@popfilename% }% } +\def\gtr@load@library{\gtr@load@library@{% + \def\gtr@library@version{-}% + \input\gtrpkgprefix\@currname\relax% + \gtr@check@library@version% +}} + +\def\gtr@load@external@library{\gtr@load@library@{% + \typeout{External library (genealogytree): '\@currname'} + \input\@currname\relax% +}} + +\gtrset{library/.unknown/.code={% + \IfFileExists{gtrlib.\pgfkeyscurrentname.code.tex}% + {\begingroup\edef\x{\endgroup\noexpand\gtr@load@external@library% + {\pgfkeyscurrentname}{gtrlib.\pgfkeyscurrentname.code.tex}}\x}% + {\gtr@error{The library '\pgfkeyscurrentname' is unknown}{Perhaps you misspelled it.}}% +}} + \def\gtr@add@library#1#2{% \gtrset{library/#1/.code={\gtr@load@library{#1}{#2}}}% \DeclareOption{#1}{\appto\gtr@optionlist{,#1}}% @@ -110,7 +126,9 @@ \gtr@add@library{core.options}{gtrcore.options.code.tex} \gtr@add@library{core.symbols}{gtrcore.symbols.code.tex} +\gtr@add@library{lang.danish}{gtrlang.danish.code.tex} \gtr@add@library{lang.english}{gtrlang.english.code.tex} +\gtr@add@library{lang.french}{gtrlang.french.code.tex} \gtr@add@library{lang.german}{gtrlang.german.code.tex} \gtr@add@library{debug}{gtrlib.debug.code.tex} @@ -132,4 +150,3 @@ } \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 f95fb58a4ba..1bbd83d7392 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.contour.code.tex: Contours %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% 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 9362dd2bdc5..b81b09d0974 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.drawing.code.tex: Drawing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% Drawing @@ -33,8 +33,8 @@ \def\gtr@parse@afterfamily@hook{}% \def\gtr@parse@beginfamily@hook{}% \def\gtr@parse@endfamily@hook{}% - \def\gtr@kv@idprefix{}% - \def\gtr@kv@idsuffix{}% + \def\gtrkv@idprefix{}% + \def\gtrkv@idsuffix{}% \undef\gtr@parse@afternode@hook@content% \undef\gtr@parse@afterfamily@hook@content% \undef\gtr@parse@beginfamily@hook@content% 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 bef936cc63a..7c6d4145786 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.node.code.tex: Node Boxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%% % Processors % @@ -201,6 +201,7 @@ \gtr@db@new@store{name} \gtr@db@new@store{shortname} \gtr@db@new@store{comment} +\gtr@db@new@store{profession} \gtr@db@new@store{sex} \gtr@db@new@store{uuid} \gtr@db@new@store{kekule} @@ -354,6 +355,7 @@ }{\gtrlistseparatorfinal} \newenvironment{gtreventlist}{}{} +\newenvironment{gtrinfolist}{}{} \gtrset{% database format/.is choice, @@ -362,6 +364,8 @@ {\par\hangindent=#1\hangafter=1}{\par}{\par}}, list separators hang/.default=\tcbfitdim, list separators={\par}{\par}{\par}{\par}, + info separators/.code n args={4}{\renewenvironment{gtrinfolist}{\begin{gtrprintlist}{#1}{#2}{#3}{#4}}{\end{gtrprintlist}}}, + info separators={\par}{. }{.}{}, } \newcommand{\gtrDeclareDatabaseFormat}[3]{% @@ -376,6 +380,13 @@ \def\gtr@list@event#1{\gtrifeventdefined{#1}{\gtrlistseparator\hspace{0pt}\gtrPrintEvent{#1}}{}} +\def\gtr@print@infolist{% + \begin{gtrinfolist}% + \gtrifprofessiondefined{\gtrlistseparator\gtrPrintProfession}{}% + \gtrifcommentdefined{\gtrlistseparator\gtrPrintComment}{}% + \end{gtrinfolist}% +} + \gtrDeclareDatabaseFormat{full}{}{% \gtrPrintName% \begin{gtreventlist}% @@ -387,7 +398,7 @@ \gtr@list@event{death}% \gtr@list@event{burial}% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \def\gtr@ifmarriagedefined#1#2{% @@ -413,7 +424,7 @@ \gtr@list@event{death}% \gtr@list@event{burial}% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \gtrDeclareDatabaseFormat{full marriage below}{}{% @@ -424,7 +435,7 @@ \gtr@list@event{death}% \gtr@list@event{burial}% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% \gtr@ifmarriagedefined{% \tcbline\begin{gtreventlist}% \gtr@list@event{engagement}% @@ -442,7 +453,7 @@ \gtr@list@event{death}% \gtr@list@event{burial}% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \def\gtr@list@event@birth{% @@ -472,7 +483,7 @@ \gtr@list@event@marriage% \gtr@list@event@death% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \gtrDeclareDatabaseFormat{medium marriage above}{}{% @@ -482,7 +493,7 @@ \gtr@list@event@birth% \gtr@list@event@death% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \gtrDeclareDatabaseFormat{medium marriage below}{}{% @@ -491,7 +502,7 @@ \gtr@list@event@birth% \gtr@list@event@death% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% \gtr@ifmarriagedefined{\tcbline\begin{gtreventlist}\gtr@list@event@marriage\end{gtreventlist}}{}% } @@ -501,7 +512,7 @@ \gtr@list@event@birth% \gtr@list@event@death% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \gtrDeclareDatabaseFormat{short}{}{% @@ -575,12 +586,16 @@ %%%%%%%%%%%%%%%%%%%%%% -% Comment and Places % +% Comment, Profession and Places % \def\gtrifcommentdefined#1#2{% \ifdefvoid{\gtrDBcomment}{#2}{#1}% } +\def\gtrifprofessiondefined#1#2{% + \ifdefvoid{\gtrDBprofession}{#2}{#1}% +} + \def\gtrifplacedefined#1#2#3{% \ifcsvoid{gtrDB#1place}{#3}{#2}% } @@ -674,21 +689,18 @@ } \def\gtr@cs@monthlong#1{% - \letcs\gtr@temp{#1}% - \pgfkeysvalueof{/gtr/month long/\gtr@temp}% + \pgfkeysvalueof{/gtr/month long/\csuse{#1}}% } -\def\gtr@cs@monthshort#1{% - {\letcs\gtr@temp{#1}% +\def\gtr@cs@monthshort#1{{% \def\dot{}% - \pgfkeysvalueof{/gtr/month short/\gtr@temp}}% -} + \pgfkeysvalueof{/gtr/month short/\csuse{#1}}% +}} -\def\gtr@cs@monthshortdot#1{% - {\letcs\gtr@temp{#1}% +\def\gtr@cs@monthshortdot#1{{% \def\dot{.}% - \pgfkeysvalueof{/gtr/month short/\gtr@temp}}% -} + \pgfkeysvalueof{/gtr/month short/\csuse{#1}}% +}} \def\gtrifdatedefined#1#2#3{% \ifcsdef{gtrDB#1year}{#2}{% @@ -699,7 +711,7 @@ \def\gtr@dateformat@factory#1#2{% \csdef{gtrPrintDateCore@#1}##1{#2}% - \gtrset{date format/{#1}/.code={\letcs{\gtrPrintDateCore}{gtrPrintDateCore@#1}}}% + \gtrset{date format/{#1}/.code={\letcs\gtrPrintDateCore{gtrPrintDateCore@#1}}}% } \gtr@dateformat@factory{dd.mm.yyyy}{% @@ -729,7 +741,7 @@ \gtr@dateformat@factory{d.month yyyy}{% \ifcsdef{#1month}{% \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}.~}{}% - \gtr@cs@monthlong{#1month} % + \gtr@cs@monthlong{#1month}\ % }{}% \csuse{#1year}% } @@ -750,6 +762,22 @@ \csuse{#1year}% } +\gtr@dateformat@factory{dd mon.yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\csuse{#1day}~}{}% + \gtr@cs@monthshortdot{#1month}\ % + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{d mon.yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}~}{}% + \gtr@cs@monthshortdot{#1month}\ % + }{}% + \csuse{#1year}% +} + \gtr@dateformat@factory{dd/mm/yyyy}{% \ifcsdef{#1month}{% \ifcsdef{#1day}{\csuse{#1day}/}{}% @@ -758,6 +786,14 @@ \csuse{#1year}% } +\gtr@dateformat@factory{dd/mm yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\csuse{#1day}/}{}% + \csuse{#1month}\ % + }{}% + \csuse{#1year}% +} + \gtr@dateformat@factory{d/m/yyyy}{% \ifcsdef{#1month}{% \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}/}{}% @@ -825,23 +861,23 @@ \gtr@dateformat@factory{d month yyyy}{% \ifcsdef{#1month}{% \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}~}{}% - \gtr@cs@monthlong{#1month} % + \gtr@cs@monthlong{#1month}\ % }{}% \csuse{#1year}% } \gtr@dateformat@factory{dd mon yyyy}{% \ifcsdef{#1month}{% - \ifcsdef{#1day}{\csuse{#1day} }{}% - \gtr@cs@monthshort{#1month} % + \ifcsdef{#1day}{\csuse{#1day}~}{}% + \gtr@cs@monthshort{#1month}\ % }{}% \csuse{#1year}% } \gtr@dateformat@factory{d mon yyyy}{% \ifcsdef{#1month}{% - \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day} }{}% - \gtr@cs@monthshort{#1month} % + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}~}{}% + \gtr@cs@monthshort{#1month}\ % }{}% \csuse{#1year}% } @@ -1022,6 +1058,14 @@ }{}% } +\gtr@dateformat@factory{yyyymondd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + \gtr@cs@monthshort{#1month}% + \ifcsdef{#1day}{\csuse{#1day}}{}% + }{}% +} + \gtr@dateformat@factory{yyyymmdd}{% \csuse{#1year}% \ifcsdef{#1month}{% @@ -1081,7 +1125,7 @@ \gtr@dateformat@factory{month d yyyy}{% \ifcsdef{#1month}{% \gtr@cs@monthlong{#1month}% - \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{},\ % }{}% \csuse{#1year}% } @@ -1089,7 +1133,7 @@ \gtr@dateformat@factory{mon.d yyyy}{% \ifcsdef{#1month}{% \gtr@cs@monthshortdot{#1month}% - \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{},\ % }{}% \csuse{#1year}% } @@ -1097,7 +1141,7 @@ \gtr@dateformat@factory{mon d yyyy}{% \ifcsdef{#1month}{% \gtr@cs@monthshort{#1month}% - \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{},\ % }{}% \csuse{#1year}% } @@ -1172,11 +1216,14 @@ } \gtrset{% + date format/typical/.code={\letcs\gtrPrintDateCore{gtrPrintDateCore@\gtr@typical@date@format}}, + set@typical@date@format/.code={\edef\gtr@typical@date@format{#1}\gtrset{date format=typical}}, calendar text for/.style args={#1 is #2#3}{calendar/#1/.code={\def\gtr@db@cal@pre{#2}\def\gtr@db@cal@app{#3}}}, calendar/.unknown/.code={\def\gtr@db@cal@pre{}\def\gtr@db@cal@app{ (\pgfkeyscurrentname)}}, date code/.code={\def\gtrPrintDateCore##1{#1}}, event code/.code={\def\gtrPrintEvent##1{#1}}, comment code/.code={\def\gtrPrintComment{#1}}, + profession code/.code={\def\gtrPrintProfession{#1}}, date format/.is choice, calendar print/.is choice, calendar print/all/.code={\let\gtr@print@date@single@calendar\gtr@print@date@single@calendar@all}, @@ -1196,10 +1243,11 @@ } \gtrset{% - date format=d.M.yyyy, + set@typical@date@format=d.M.yyyy, date range separator, calendar print=all but AD, event text={}{~}{ }{}, event format=prefix date place, comment code={\hspace{0pt}{\itshape\gtrDBcomment}}, + profession code={\hspace{0pt}{\itshape\gtrDBprofession}}, } 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 a46870202f6..87a9713ecfd 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.options.code.tex: Options %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% General handling @@ -187,9 +187,9 @@ \newif\ifgtr@ignore \gtrset{% - id prefix/.store in=\gtr@kv@idprefix, - id suffix/.store in=\gtr@kv@idsuffix, - id/.code={\xdef\gtr@gkv@id{\expandonce\gtr@kv@idprefix\unexpanded{#1}\expandonce\gtr@kv@idsuffix}}, + id prefix/.store in=\gtrkv@idprefix, + id suffix/.store in=\gtrkv@idsuffix, + id/.code={\xdef\gtr@gkv@id{\expandonce\gtrkv@idprefix\unexpanded{#1}\expandonce\gtrkv@idsuffix}}, distance/.gstore in=\gtr@gkv@distance, tikz/.gstore in=\gtr@gkv@tikz, pivot@@value/.gstore in=\gtr@gkv@pivot, @@ -257,15 +257,15 @@ timeflow/left/.style={time@flow=left}, timeflow/right/.style={time@flow=right}, % - level distance/.store in=\gtrkv@level@distance, - level size/.store in=\gtrkv@level@size, - node size from/.code args={#1 to #2}{\def\gtrkv@node@minsize{#1}\def\gtrkv@node@maxsize{#2}}, - node size/.code={\def\gtrkv@node@minsize{#1}\def\gtrkv@node@maxsize{#1}},% - child distance in parent graph/.store in=\gtrkv@dist@sibling@par,% - child distance in child graph/.store in=\gtrkv@dist@sibling@chi,% - parent distance in parent graph/.store in=\gtrkv@dist@parent@par,% - parent distance in child graph/.store in=\gtrkv@dist@parent@chi,% - further distance/.store in=\gtrkv@dist@further,% + level distance/.dimstore in=\gtr@@kv@@gtr@level@distance, + level size/.dimstore in=\gtr@@kv@@gtr@level@size, + node size from/.code args={#1 to #2}{\dimdef\gtr@@kv@@gtr@node@minsize{#1}\dimdef\gtr@@kv@@gtr@node@maxsize{#2}}, + node size/.code={\dimdef\gtr@@kv@@gtr@node@minsize{#1}\dimdef\gtr@@kv@@gtr@node@maxsize{#1}},% + child distance in parent graph/.dimstore in=\gtr@@kv@@gtr@dist@sibling@par,% + child distance in child graph/.dimstore in=\gtr@@kv@@gtr@dist@sibling@chi,% + parent distance in parent graph/.dimstore in=\gtr@@kv@@gtr@dist@parent@par,% + parent distance in child graph/.dimstore in=\gtr@@kv@@gtr@dist@parent@chi,% + further distance/.dimstore in=\gtr@@kv@@gtr@dist@further,% % child distance/.style={child distance in parent graph=#1,child distance in child graph=#1},% parent distance/.style={parent distance in parent graph=#1,parent distance in child graph=#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 2a98c638e60..a8486668dea 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.parser.code.tex: Parser %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} %% (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 a0c8f325eda..16a85f243f3 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.processing.code.tex: Processing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,36 +17,49 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.01} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% Processing - common %%%%%%%%%%%%%%%%%%%%%%% - -\def\gtr@proc@level@save@settings{% - \dimdef\gtr@rv@level@distance{\gtrkv@level@distance}% - \dimdef\gtr@rv@level@size{\gtrkv@level@size}% - \dimdef\gtr@rv@node@minsize{\gtrkv@node@minsize}% - \dimdef\gtr@rv@node@maxsize{\gtrkv@node@maxsize}% - \dimdef\gtr@rv@dist@sibling@par{\gtrkv@dist@sibling@par}% - \dimdef\gtr@rv@dist@sibling@chi{\gtrkv@dist@sibling@chi}% - \dimdef\gtr@rv@dist@parent@par{\gtrkv@dist@parent@par}% - \dimdef\gtr@rv@dist@parent@chi{\gtrkv@dist@parent@chi}% - \dimdef\gtr@rv@dist@further{\gtrkv@dist@further}% +% register a macro to localizable for levels +% #1: variable +% #2: key setting +% #3: global save +\def\gtr@proc@register@level@local@core#1#2#3{% + \appto\gtr@proc@level@save@settings{\let#3#2}% + \appto\gtr@proc@level@load@settings{\let#2#3}% + \appto\gtr@proc@level@globalize@settings{\global\let#1#2}% +} + +% register a macro to be localizable for levels +% #1: variable +% key setting: gtr@@kv@@#1 +% global save: gtr@@save@@#1 +\def\gtr@proc@register@level@local#1{% + \begingroup\edef\x{\endgroup\noexpand\gtr@proc@register@level@local@core{% + \noexpand#1% + }{% + \csname gtr@@kv@@\expandafter\@gobble\string#1\endcsname% + }{% + \csname gtr@@save@@\expandafter\@gobble\string#1\endcsname% + }}\x% } +\gtr@proc@register@level@local{\gtr@level@distance} +\gtr@proc@register@level@local{\gtr@level@size} +\gtr@proc@register@level@local{\gtr@node@minsize} +\gtr@proc@register@level@local{\gtr@node@maxsize} +\gtr@proc@register@level@local{\gtr@dist@sibling@par} +\gtr@proc@register@level@local{\gtr@dist@sibling@chi} +\gtr@proc@register@level@local{\gtr@dist@parent@par} +\gtr@proc@register@level@local{\gtr@dist@parent@chi} +\gtr@proc@register@level@local{\gtr@dist@further} + \def\gtr@proc@level@opt{% \begingroup% - \let\gtrkv@level@distance\gtr@rv@level@distance% - \let\gtrkv@level@size\gtr@rv@level@size% - \let\gtrkv@node@minsize\gtr@rv@node@minsize% - \let\gtrkv@node@maxsize\gtr@rv@node@maxsize% - \let\gtrkv@dist@sibling@par\gtr@rv@dist@sibling@par% - \let\gtrkv@dist@sibling@chi\gtr@rv@dist@sibling@chi% - \let\gtrkv@dist@parent@par\gtr@rv@dist@parent@par% - \let\gtrkv@dist@parent@chi\gtr@rv@dist@parent@chi% - \let\gtrkv@dist@further\gtr@rv@dist@further% + \gtr@proc@level@load@settings% % \global\let\gtr@gkv@opt@family@level\@empty% \global\let\gtr@gkv@opt@subtree@level\@empty% @@ -70,15 +83,7 @@ \global\let\gtr@gkv@opt@ignore@level\@empty% \fi% % - \global\let\gtr@level@distance\gtrkv@level@distance% - \global\let\gtr@level@size\gtrkv@level@size% - \global\let\gtr@node@minsize\gtrkv@node@minsize% - \global\let\gtr@node@maxsize\gtrkv@node@maxsize% - \global\let\gtr@dist@sibling@par\gtrkv@dist@sibling@par% - \global\let\gtr@dist@sibling@chi\gtrkv@dist@sibling@chi% - \global\let\gtr@dist@parent@par\gtrkv@dist@parent@par% - \global\let\gtr@dist@parent@chi\gtrkv@dist@parent@chi% - \global\let\gtr@dist@further\gtrkv@dist@further% + \gtr@proc@level@globalize@settings% % \endgroup% % 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 beffb065e96..a7d5b9a8f35 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.symbols.code.tex: Symbols %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% 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 new file mode 100644 index 00000000000..1328dddc4ab --- /dev/null +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.danish.code.tex @@ -0,0 +1,86 @@ +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) +%% gtrlang.danish.code.tex: Danish language +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Translation by Mikkel Eide Eriksen <mikkel dot eriksen at gmail dot com> +%% ------------------------------------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of all files listed in README +%% +\gtr@set@library@version{1.10} + +\gtrset{language@/danish/.code={% + \gtrset{symlang/.cd, + Born=f\protect\o{}dt, + Bornoutofwedlock=f\protect\o{}dt uden for \protect\ae{}gteskab, + Stillborn=d\protect\o{}df\protect\o{}dt, + Diedonbirthday=d\protect\o{}d p\protect\aa{} f\protect\o{}dselsdagen, + Baptized=d\protect\o{}bt, + Engaged=forlovet, + Married=gift, + Divorced=skilt, + Partnership=ugift partnerskab, + Died=d\protect\o{}d, + Killed=faldet, + Buried=begravet, + Funeralurn=kremeret, + Female=kvinde, + Male=mand, + Neuter=ukendt k\protect\o{}n + }% + \gtrset{% + month long/.cd, + 01/.initial=januar, + 02/.initial=februar, + 03/.initial=marts, + 04/.initial=april, + 05/.initial=maj, + 06/.initial=juni, + 07/.initial=juli, + 08/.initial=august, + 09/.initial=september, + 10/.initial=oktober, + 11/.initial=november, + 12/.initial=december, + }% + \gtrset{% + month short/.cd, + 01/.initial=jan\protect\dot, + 02/.initial=feb\protect\dot, + 03/.initial=mar\protect\dot, + 04/.initial=apr\protect\dot, + 05/.initial=maj, + 06/.initial=jun\protect\dot, + 07/.initial=jul\protect\dot, + 08/.initial=aug\protect\dot, + 09/.initial=sep\protect\dot, + 10/.initial=okt\protect\dot, + 11/.initial=nov\protect\dot, + 12/.initial=dec\protect\dot, + }% + \gtrset{% + set@typical@date@format=d.month yyyy, + calendar text for=AD is {}{ e.~Kr.}, + calendar text for=BC is {}{ f.~Kr.}, + calendar text for=GR is {}{\protect\textsuperscript{greg.}}, + calendar text for=JU is {}{\protect\textsuperscript{jul.}}, + calendar text for=caAD is {ca.~}{ e.~Kr.}, + calendar text for=caBC is {ca.~}{ f.~Kr.}, + calendar text for=ca is {ca.~}{}, + date range full={}{ til }{}, + date range before={f\protect\o{}r }{}, + date range after={efter }{}, + place text={i }{}, + }% +}} 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 b85f2e2820d..d37e063dc96 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 1.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrlang.english.code.tex: English language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} \gtrset{language@/english/.code={% \gtrset{symlang/.cd, @@ -69,6 +69,7 @@ 12/.initial=Dec\protect\dot, }% \gtrset{% + set@typical@date@format=month d yyyy, calendar text for=AD is {AD }{}, calendar text for=BC is {}{ BC}, calendar text for=GR is {}{\protect\textsuperscript{greg.}}, diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrlang.french.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.french.code.tex new file mode 100644 index 00000000000..cdc35cdf932 --- /dev/null +++ b/Master/texmf-dist/tex/latex/genealogytree/gtrlang.french.code.tex @@ -0,0 +1,86 @@ +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) +%% gtrlang.french.code.tex: French language +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Translation by Denis Bitouze <denis dot bitouze at univ-littoral fr> +%% ------------------------------------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of all files listed in README +%% +\gtr@set@library@version{1.10} + +\gtrset{language@/french/.code={% + \gtrset{symlang/.cd, + Born=n\'e\textperiodcentered e, + Bornoutofwedlock=n\'e\textperiodcentered e hors mariage, + Stillborn=mort-n\'e\textperiodcentered e, + Diedonbirthday=d\'ec\'ed\'e\textperiodcentered e le jour de sa naissance, + Baptized=baptis\'e\textperiodcentered e, + Engaged=fianc\'es, + Married=mari\'es, + Divorced=divorc\'es, + Partnership=en union libre, + Died=d\'ec\'ed\'e\textperiodcentered e, + Killed=mort\textperiodcentered e au combat, + Buried=enterr\'e\textperiodcentered e, + Funeralurn=incin\'er\'e\textperiodcentered e, + Female=femme, + Male=homme, + Neuter=neutre + }% + \gtrset{% + month long/.cd, + 01/.initial=janvier, + 02/.initial=f\'evrier, + 03/.initial=mars, + 04/.initial=avril, + 05/.initial=mai, + 06/.initial=juin, + 07/.initial=juillet, + 08/.initial=ao\^ut, + 09/.initial=septembre, + 10/.initial=octobre, + 11/.initial=novembre, + 12/.initial=d\'ecembre, + }% + \gtrset{% + month short/.cd, + 01/.initial=janv\protect\dot, + 02/.initial=f\'evr\protect\dot, + 03/.initial=mars, + 04/.initial=avr\protect\dot, + 05/.initial=mai, + 06/.initial=juin, + 07/.initial=juil\protect\dot, + 08/.initial=ao\^ut, + 09/.initial=sept\protect\dot, + 10/.initial=oct\protect\dot, + 11/.initial=nov\protect\dot, + 12/.initial=d\'ec\protect\dot, + }% + \gtrset{% + set@typical@date@format=d month yyyy, + calendar text for=AD is {apr.~J.-C. }{}, + calendar text for=BC is {}{ av.~J.-C.}, + calendar text for=GR is {}{\protect\textsuperscript{gr\'eg.}}, + calendar text for=JU is {}{\protect\textsuperscript{jul.}}, + calendar text for=caAD is {v.~apr.~J.-C. }{}, + calendar text for=caBC is {v.~}{ av.~J.-C.}, + calendar text for=ca is {v.~}{}, + date range full={}{ \`a }{}, + date range before={avant }{}, + date range after={apr\`es }{}, + place text={\`a }{}, + }% +}} 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 d5af794d247..85c41d8eb71 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 1.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrlang.german.code.tex: German language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} \gtrset{language@/german/.code={% \gtrset{symlang/.cd, @@ -29,7 +29,7 @@ Engaged=verlobt, Married=verheiratet, Divorced=geschieden, - Partnership=au\protect\ss{}ereheliche Verbindung, + Partnership=au\protect\ss{}erehelich verbunden, Died=gestorben, Killed=gefallen, Buried=begraben, @@ -69,6 +69,7 @@ 12/.initial=Dez\protect\dot, }% \gtrset{% + set@typical@date@format=d.month yyyy, calendar text for=AD is {}{ n.~Chr.}, calendar text for=BC is {}{ v.~Chr.}, calendar text for=GR is {}{\protect\textsuperscript{greg.}}, 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 7d5b026e94f..a16e5aeb7e6 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 1.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrlib.debug.code.tex: Debugger %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2014-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} \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 13a63ea0243..2411a7eb046 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.01 (2016/07/29) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrlib.templates.code.tex: Templates %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% 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.01} +\gtr@set@library@version{1.10} % Templates @@ -218,7 +218,7 @@ pref code=\textbf{##1}, database@malefemale, list separators={\tcbline\hangindent=\tcbfitdim\hangafter=1}% - {\par\hangindent=\tcbfitdim\hangafter=1}{\par}{\gtrifcommentdefined{\tcbline}{}}, + {\par\hangindent=\tcbfitdim\hangafter=1}{\par}{\gtrifcommentdefined{\tcbline}{\gtrifprofessiondefined{\tcbline}{}}}, box clear, box={enhanced,boxrule=0.3mm, top=1mm,bottom=1mm,left=1mm,right=1mm,middle=0.7mm,boxsep=0pt, @@ -260,7 +260,7 @@ 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}},% + code={\tcbdimto\gtr@im@width{0.77778\dimexpr\gtr@level@size-0.3mm\relax}},% left=\gtr@im@width+1mm, underlay={\begin{tcbclipinterior}% \path[fill overzoom image=\gtrDBimage] |