diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/genealogytree/gtrcore.node.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/genealogytree/gtrcore.node.code.tex | 114 |
1 files changed, 81 insertions, 33 deletions
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}}, } |