diff options
18 files changed, 400 insertions, 101 deletions
diff --git a/Master/texmf-dist/doc/latex/genealogytree/README b/Master/texmf-dist/doc/latex/genealogytree/README index e949c1b3e0b..43d0fa82baf 100644 --- a/Master/texmf-dist/doc/latex/genealogytree/README +++ b/Master/texmf-dist/doc/latex/genealogytree/README @@ -1,4 +1,4 @@ -%% The LaTeX package genealogytree - version 0.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-1.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-1.pdf Binary files differindex 0a06bcd2d71..9eac7a7beaf 100644 --- a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-1.pdf +++ b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-1.pdf diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-2.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-2.pdf Binary files differindex ccdbde18888..fef525be7dd 100644 --- a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-2.pdf +++ b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-2.pdf diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-3.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-3.pdf Binary files differindex 3721d729059..d459b8f6471 100644 --- a/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-3.pdf +++ b/Master/texmf-dist/doc/latex/genealogytree/genealogytree-example-3.pdf diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree.doc.sources.zip b/Master/texmf-dist/doc/latex/genealogytree/genealogytree.doc.sources.zip Binary files differindex b064982656b..d4dc13b6a2b 100644 --- a/Master/texmf-dist/doc/latex/genealogytree/genealogytree.doc.sources.zip +++ b/Master/texmf-dist/doc/latex/genealogytree/genealogytree.doc.sources.zip diff --git a/Master/texmf-dist/doc/latex/genealogytree/genealogytree.pdf b/Master/texmf-dist/doc/latex/genealogytree/genealogytree.pdf Binary files differindex 1309d43901d..19e1da928a7 100644 --- a/Master/texmf-dist/doc/latex/genealogytree/genealogytree.pdf +++ b/Master/texmf-dist/doc/latex/genealogytree/genealogytree.pdf diff --git a/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty b/Master/texmf-dist/tex/latex/genealogytree/genealogytree.sty index 48fa6f78684..b5b55c9f092 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% genealogytree.sty: genealogy trees (graphs) %% %% ------------------------------------------------------------------------------------------- @@ -18,11 +18,11 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{genealogytree}[2015/05/22 version 0.90 genealogy trees] -\def\gtr@version{0.90} +\ProvidesPackage{genealogytree}[2015/06/22 version 0.91 genealogy trees] +\def\gtr@version{0.91} \RequirePackage{tcolorbox}[2015/05/07] -\tcbuselibrary{skins,fitting} +\tcbuselibrary{skins,fitting,external} \usetikzlibrary{arrows.meta} \usetikzlibrary{fit} diff --git a/Master/texmf-dist/tex/latex/genealogytree/gtrcore.contour.code.tex b/Master/texmf-dist/tex/latex/genealogytree/gtrcore.contour.code.tex index db1cd0b6bd4..8a45e73f1ba 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrcore.contour.code.tex: Contours %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} %%%%%%%%%%%%%%%%%%%%%%% %% 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 d79674f49ea..8d1851c47f8 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrcore.drawing.code.tex: Drawing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} %%%%%%%%%%%%%%%%%%%%%%% %% Drawing @@ -25,13 +25,15 @@ \tikzset{genealogytree edges scope/.style={}} -\def\gtr@reset@after{% +\def\gtr@reset@before@parser{% \global\def\gtrkv@after@parser{}% \def\gtrkv@after@tree{}% \def\gtr@parse@afternode@hook{}% \def\gtr@parse@afterfamily@hook{}% \def\gtr@parse@beginfamily@hook{}% \def\gtr@parse@endfamily@hook{}% + \def\gtr@kv@idprefix{}% + \def\gtr@kv@idsuffix{}% \undef\gtr@parse@afternode@hook@content% \undef\gtr@parse@afterfamily@hook@content% \undef\gtr@parse@beginfamily@hook@content% @@ -45,7 +47,7 @@ {\genealogytree\space can only be used inside a tikzpicture environment. Alternatively, use genealogypicture (see documentation).}% \fi% - \gtr@reset@after% + \gtr@reset@before@parser% \tcb@layer@pushup% \gtr@parsegraph[#1]{#2}% \gtrkv@after@parser% @@ -67,8 +69,8 @@ {genealogypicture cannot be used inside a tikzpicture environment. Alternatively, use \genealogytree\space (see documentation).}% \fi% - \gtr@reset@after% - \def\gtr@reset@after{}% + \gtr@reset@before@parser% + \def\gtr@reset@before@parser{}% \gtrset{#1}% \begingroup\edef\x{\endgroup\noexpand\begin{tikzpicture}[\expandonce\gtrkv@tikzpicture]% \noexpand\genealogytree{\expandonce\BODY}% @@ -76,6 +78,8 @@ \x% } +\newtcbexternalizeenvironment{exgenealogypicture}{genealogypicture}{}{}{} + \newcommand{\genealogytreeinput}[2][]{\genealogytree[#1]{input{#2}}} \tikzset{% 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 54366ddca53..cc2315fd365 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrcore.node.code.tex: Node Boxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} %%%%%%%%%%%%%% % Processors % @@ -726,6 +726,30 @@ \csuse{#1year}% } +\gtr@dateformat@factory{d.month yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}.~}{}% + \gtr@cs@monthlong{#1month} % + }{}% + \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}/}{}% @@ -750,38 +774,50 @@ \csuse{#1year}% } -\gtr@dateformat@factory{mm/dd/yyyy}{% +\gtr@dateformat@factory{dd/month/yyyy}{% \ifcsdef{#1month}{% - \csuse{#1month}/% \ifcsdef{#1day}{\csuse{#1day}/}{}% + \gtr@cs@monthlong{#1month}/% }{}% \csuse{#1year}% } -\gtr@dateformat@factory{m/d/yyyy}{% +\gtr@dateformat@factory{d/month/yyyy}{% \ifcsdef{#1month}{% - \gtr@cs@strip@zero{#1month}/% \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}/}{}% + \gtr@cs@monthlong{#1month}/% }{}% \csuse{#1year}% } -\gtr@dateformat@factory{yyyy-mm-dd}{% +\gtr@dateformat@factory{dd/mon/yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\csuse{#1day}/}{}% + \gtr@cs@monthshort{#1month}/% + }{}% \csuse{#1year}% +} + +\gtr@dateformat@factory{d/mon/yyyy}{% \ifcsdef{#1month}{% - -\csuse{#1month}% - \ifcsdef{#1day}{-\csuse{#1day}}{}% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}/}{}% + \gtr@cs@monthshort{#1month}/% }{}% + \csuse{#1year}% } -\gtr@dateformat@factory{yyyy}{% +\gtr@dateformat@factory{dd mm yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\csuse{#1day}~}{}% + \csuse{#1month}~% + }{}% \csuse{#1year}% } -\gtr@dateformat@factory{d.month yyyy}{% +\gtr@dateformat@factory{d M yyyy}{% \ifcsdef{#1month}{% - \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}.~}{}% - \gtr@cs@monthlong{#1month} % + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}~}{}% + \gtr@cs@Roman{#1month}~% }{}% \csuse{#1year}% } @@ -794,34 +830,58 @@ \csuse{#1year}% } -\gtr@dateformat@factory{month d yyyy}{% +\gtr@dateformat@factory{dd mon yyyy}{% \ifcsdef{#1month}{% - \gtr@cs@monthlong{#1month}% - \ifcsdef{#1day}{ \gtr@cs@strip@zero{#1day}}{}, % + \ifcsdef{#1day}{\csuse{#1day} }{}% + \gtr@cs@monthshort{#1month} % }{}% \csuse{#1year}% } -\gtr@dateformat@factory{d.mon.yyyy}{% +\gtr@dateformat@factory{d mon yyyy}{% \ifcsdef{#1month}{% - \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}.~}{}% - \gtr@cs@monthshortdot{#1month}\ % + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day} }{}% + \gtr@cs@monthshort{#1month} % }{}% \csuse{#1year}% } -\gtr@dateformat@factory{d/mon/yyyy}{% +\gtr@dateformat@factory{dd-mm-yyyy}{% \ifcsdef{#1month}{% - \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}/}{}% - \gtr@cs@monthshort{#1month}/% + \ifcsdef{#1day}{\csuse{#1day}-}{}% + \csuse{#1month}-% }{}% \csuse{#1year}% } -\gtr@dateformat@factory{d mon yyyy}{% +\gtr@dateformat@factory{d-m-yyyy}{% \ifcsdef{#1month}{% - \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day} }{}% - \gtr@cs@monthshort{#1month} % + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}-}{}% + \gtr@cs@strip@zero{#1month}-% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{d-M-yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}-}{}% + \gtr@cs@Roman{#1month}-% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{dd-month-yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\csuse{#1day}-}{}% + \gtr@cs@monthlong{#1month}-% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{d-month-yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}-}{}% + \gtr@cs@monthlong{#1month}-% }{}% \csuse{#1year}% } @@ -834,14 +894,219 @@ \csuse{#1year}% } -\gtr@dateformat@factory{dd/mon/yyyy}{% +\gtr@dateformat@factory{d-mon-yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}-}{}% + \gtr@cs@monthshort{#1month}-% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{ddmonyyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\csuse{#1day}}{}% + \gtr@cs@monthshort{#1month}% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{yyyy.mm.dd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + .\csuse{#1month}% + \ifcsdef{#1day}{.\csuse{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy.m.d}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + .\gtr@cs@strip@zero{#1month}% + \ifcsdef{#1day}{.\gtr@cs@strip@zero{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy.m.d.}{% + \csuse{#1year}.% + \ifcsdef{#1month}{% + ~\gtr@cs@strip@zero{#1month}.% + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}.}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy.M.d.}{% + \csuse{#1year}.% + \ifcsdef{#1month}{% + ~\gtr@cs@Roman{#1month}.% + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}.}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy.month d.}{% + \csuse{#1year}.% + \ifcsdef{#1month}{% + ~\gtr@cs@monthlong{#1month}% + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}.}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy.mon.d.}{% + \csuse{#1year}.% + \ifcsdef{#1month}{% + ~\gtr@cs@monthshortdot{#1month}% + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}.}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy/mm/dd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + /\csuse{#1month}% + \ifcsdef{#1day}{/\csuse{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy/m/d}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + /\gtr@cs@strip@zero{#1month}% + \ifcsdef{#1day}{/\gtr@cs@strip@zero{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy mm dd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + ~\csuse{#1month}% + \ifcsdef{#1day}{~\csuse{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy month d}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + ~\gtr@cs@monthlong{#1month}% + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy mon dd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + ~\gtr@cs@monthshort{#1month}% + \ifcsdef{#1day}{~\csuse{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy-mm-dd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + -\csuse{#1month}% + \ifcsdef{#1day}{-\csuse{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy-mon-dd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + -\gtr@cs@monthshort{#1month}% + \ifcsdef{#1day}{-\csuse{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyy-mon-d}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + -\gtr@cs@monthshort{#1month}% + \ifcsdef{#1day}{-\gtr@cs@strip@zero{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{yyyymmdd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + \csuse{#1month}% + \ifcsdef{#1day}{\csuse{#1day}}{}% + }{}% +} + +\gtr@dateformat@factory{mm.dd.yyyy}{% + \ifcsdef{#1month}{% + \csuse{#1month}.% + \ifcsdef{#1day}{\csuse{#1day}.}{}% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{m.d.yyyy}{% + \ifcsdef{#1month}{% + \gtr@cs@strip@zero{#1month}.% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}.}{}% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{mm/dd/yyyy}{% \ifcsdef{#1month}{% + \csuse{#1month}/% \ifcsdef{#1day}{\csuse{#1day}/}{}% - \gtr@cs@monthshort{#1month}/% }{}% \csuse{#1year}% } +\gtr@dateformat@factory{m/d/yyyy}{% + \ifcsdef{#1month}{% + \gtr@cs@strip@zero{#1month}/% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}/}{}% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{mm-dd-yyyy}{% + \ifcsdef{#1month}{% + \csuse{#1month}-% + \ifcsdef{#1day}{\csuse{#1day}-}{}% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{m-d-yyyy}{% + \ifcsdef{#1month}{% + \gtr@cs@strip@zero{#1month}-% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}-}{}% + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{month d yyyy}{% + \ifcsdef{#1month}{% + \gtr@cs@monthlong{#1month}% + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{mon.d yyyy}{% + \ifcsdef{#1month}{% + \gtr@cs@monthshortdot{#1month}% + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{mon d yyyy}{% + \ifcsdef{#1month}{% + \gtr@cs@monthshort{#1month}% + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{yyyy}{% + \csuse{#1year}% +} + + \def\gtr@print@date@single@calendar@all#1{% \ifcsempty{#1year}{}{% \letcs\gtr@temp{#1cal}% @@ -921,6 +1186,7 @@ date range before/.code 2 args={\def\gtrkv@range@before@A{#1}\def\gtrkv@range@before@B{#2}}, date range after/.code 2 args={\def\gtrkv@range@after@A{#1}\def\gtrkv@range@after@B{#2}}, date range separator/.style={date range full={}{#1}{},date range before={#1}{},date range after={}{#1}}, + date range separator/.default={--}, place text/.code 2 args={\def\gtrkv@place@pre{#1}\def\gtrkv@place@app{#2}}, event text/.code n args={4}{\def\gtrkv@event@pre{#1}\def\gtrkv@event@sepdate{#2}\def\gtrkv@event@sepplace{#3}\def\gtrkv@event@app{#4}}, event format/.is choice, @@ -931,7 +1197,7 @@ \gtrset{% date format=d.M.yyyy, - date range separator={--}, + date range separator, calendar print=all but AD, event text={}{~}{ }{}, event format=prefix date place, 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 1b55e58f5f5..8d71f345047 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrcore.options.code.tex: Options %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} %%%%%%%%%%%%%%%%%%%%%%% %% General handling @@ -187,7 +187,9 @@ \newif\ifgtr@ignore \gtrset{% - id/.gstore in=\gtr@gkv@id, + 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}}, distance/.gstore in=\gtr@gkv@distance, pivot@@value/.gstore in=\gtr@gkv@pivot, pivot@none/.style={pivot@@value=0}, @@ -340,16 +342,13 @@ #1}, % % - phantom/.style={subtree={processing=tcolorbox,deletion content interpreter,disconnect, - box={empty,no shadow,no borderline,code={\ifstrempty{#1}{}{% - \ifgtr@timeflow@vertical\tcbset{width=#1}\else\tcbset{height=#1}\fi% - }}}}}, - phantom/.default=, phantom*/.style={subtree={processing=tcolorbox,deletion content interpreter,edges=none, - box={empty,code={\ifstrempty{#1}{}{% + box={empty,notitle,no underlay,no overlay,no shadow,no borderline,code={\ifstrempty{#1}{}{% \ifgtr@timeflow@vertical\tcbset{width=#1}\else\tcbset{height=#1}\fi% }}}}}, phantom*/.default=, + phantom/.style={phantom*={#1},subtree=disconnect}, + phantom/.default=, } \pgfkeys{/gtr/edge/.is family} @@ -434,6 +433,8 @@ \gtrset{% reset/.style={% + id prefix=, + id suffix=, timeflow=down, level distance=5mm, level size=3.5cm, 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 83e24e976d6..b66abcb270d 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrcore.parser.code.tex: Parser %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} %% (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 66597df86c7..72a21189432 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrcore.processing.code.tex: Processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} %%%%%%%%%%%%%%%%%%%%%%% %% 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 6569d4d2deb..114617fabc3 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrcore.symbols.code.tex: Symbols %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} %%%%%%%%%%%%%%%%%%%%%%% %% 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 97053ed4ef7..9b0749276ca 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrlang.english.code.tex: English language %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} \gtrset{language@/english/.code={% \gtrset{symlang/.cd, @@ -55,28 +55,28 @@ }% \gtrset{% month short/.cd, - 01/.initial=Jan\dot, - 02/.initial=Feb\dot, - 03/.initial=Mar\dot, - 04/.initial=Apr\dot, + 01/.initial=Jan\protect\dot, + 02/.initial=Feb\protect\dot, + 03/.initial=Mar\protect\dot, + 04/.initial=Apr\protect\dot, 05/.initial=May, - 06/.initial=Jun\dot, - 07/.initial=Jul\dot, - 08/.initial=Aug\dot, - 09/.initial=Sep\dot, - 10/.initial=Oct\dot, - 11/.initial=Nov\dot, - 12/.initial=Dec\dot, + 06/.initial=Jun\protect\dot, + 07/.initial=Jul\protect\dot, + 08/.initial=Aug\protect\dot, + 09/.initial=Sep\protect\dot, + 10/.initial=Oct\protect\dot, + 11/.initial=Nov\protect\dot, + 12/.initial=Dec\protect\dot, }% \gtrset{% calendar text for=AD is {AD }{}, calendar text for=BC is {}{ BC}, - calendar text for=GR is {}{\textsuperscript{greg.}}, - calendar text for=JU is {}{\textsuperscript{jul.}}, + calendar text for=GR is {}{\protect\textsuperscript{greg.}}, + calendar text for=JU is {}{\protect\textsuperscript{jul.}}, calendar text for=caAD is {ca.~AD }{}, calendar text for=caBC is {ca.~}{ BC}, calendar text for=ca is {ca.~}{}, - date range full={}{--}{}, + date range full={}{ to }{}, date range before={before }{}, date range after={after }{}, place text={in }{}, 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 a79188c18a8..59bd9f1ca76 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrlang.german.code.tex: German language %% %% ------------------------------------------------------------------------------------------- @@ -17,19 +17,19 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} \gtrset{language@/german/.code={% \gtrset{symlang/.cd, Born=geboren, - Bornoutofwedlock=au\ss{}erehelich geboren, + Bornoutofwedlock=au\protect\ss{}erehelich geboren, Stillborn=tot geboren, Diedonbirthday=am Tag der Geburt gestorben, Baptized=getauft, Engaged=verlobt, Married=verheiratet, Divorced=geschieden, - Partnership=au\ss{}ereheliche Verbindung, + Partnership=au\protect\ss{}ereheliche Verbindung, Died=gestorben, Killed=gefallen, Buried=begraben, @@ -42,7 +42,7 @@ month long/.cd, 01/.initial=Januar, 02/.initial=Februar, - 03/.initial=M\"arz, + 03/.initial=M\protect\"arz, 04/.initial=April, 05/.initial=Mai, 06/.initial=Juni, @@ -55,28 +55,28 @@ }% \gtrset{% month short/.cd, - 01/.initial=Jan\dot, - 02/.initial=Feb\dot, - 03/.initial=M\"ar\dot, - 04/.initial=Apr\dot, + 01/.initial=Jan\protect\dot, + 02/.initial=Feb\protect\dot, + 03/.initial=M\protect\"ar\protect\dot, + 04/.initial=Apr\protect\dot, 05/.initial=Mai, - 06/.initial=Jun\dot, - 07/.initial=Jul\dot, - 08/.initial=Aug\dot, - 09/.initial=Sep\dot, - 10/.initial=Okt\dot, - 11/.initial=Nov\dot, - 12/.initial=Dez\dot, + 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=Dez\protect\dot, }% \gtrset{% calendar text for=AD is {}{ n.~Chr.}, calendar text for=BC is {}{ v.~Chr.}, - calendar text for=GR is {}{\textsuperscript{greg.}}, - calendar text for=JU is {}{\textsuperscript{jul.}}, + calendar text for=GR is {}{\protect\textsuperscript{greg.}}, + calendar text for=JU is {}{\protect\textsuperscript{jul.}}, calendar text for=caAD is {ca.~}{ n.~Chr.}, calendar text for=caBC is {ca.~}{ v.~Chr.}, calendar text for=ca is {ca.~}{}, - date range full={}{--}{}, + date range full={}{ bis }{}, date range before={vor }{}, date range after={nach }{}, place text={in }{}, @@ -86,7 +86,7 @@ language@/german-german/.style={language@=german}, % language@/german-austrian/.style={language@=german, - month long/01/.initial=J\"anner, - month short/01/.initial=J\"an\dot, + month long/01/.initial=J\protect\"anner, + month short/01/.initial=J\protect\"an\protect\dot, }, } 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 97eb255285f..bbd763f598e 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrlib.debug.code.tex: Debugger %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} \RequirePackage{array,tabularx} \tcbuselibrary{breakable} @@ -131,7 +131,7 @@ Genealogytree Parser Debugger \ifblank{#1}{}{\par Graph Options: {\ttfamily\detokenize{#1}}}% \end{tcolorbox}% - \gtr@reset@after% + \gtr@reset@before@parser% \gtr@parsegraph[#1]{#2}% \begin{tcolorbox}[ gtr@debug@box,after skip=\medskipamount,sharp corners,colframe=black!75!white, @@ -298,7 +298,7 @@ \ifblank{#1}{}{\par Graph Options: {\ttfamily\detokenize{#1}}}% \end{tcolorbox}% % - \gtr@reset@after% + \gtr@reset@before@parser% \gtr@parsegraph[#1]{#2}% \gtr@debug@family@loop{\gtr@num@fam@first}% % 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 5d6ea8bc4a6..1eb5276631a 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.90 (2015/05/22) +%% The LaTeX package genealogytree - version 0.91 (2015/06/22) %% gtrlib.templates.code.tex: Templates %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{0.90} +\gtr@set@library@version{0.91} % Templates @@ -126,7 +126,7 @@ level size=4.5cm, node size=2cm, name font=\bfseries, - surn code=##1, + surn code={##1}, database@malefemale, box clear, box={enhanced,boxrule=0.3mm, @@ -150,7 +150,7 @@ level size=4cm, node size=2cm, name font=\bfseries, - surn code=##1, + surn code={##1}, event format=prefix date, database@malefemale, box clear, @@ -207,6 +207,34 @@ }, }, % + template/database sideways/.style={ + timeflow=left, + processing=database, + database format=medium, + level distance=6mm, + level size=4cm, + node size from=3mm to 50mm, + surn code=\textbf{##1}, + pref code=\textbf{##1}, + database@malefemale, + list separators={\tcbline\hangindent=\tcbfitdim\hangafter=1}% + {\par\hangindent=\tcbfitdim\hangafter=1}{\par}{\gtrifcommentdefined{\tcbline}{}}, + box clear, + box={enhanced,boxrule=0.3mm, + top=1mm,bottom=1mm,left=1mm,right=1mm,middle=0.7mm,boxsep=0pt, + fit basedim=7pt, + halign=flush left, + fontupper=\sffamily, + before upper={\parskip 0.15\tcbfitdim plus 0pt minus 0pt}, + segmentation style={solid,shorten >=1mm,shorten <=1mm}, + \gtrDBsex, + }, + 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}, female/.style={colframe=red!50!black,colback=red!50!yellow!5}, |