From f35fe392acb9ef6c90da5b202faf4d2ff001a272 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Apr 2016 21:03:56 +0000 Subject: geschichtsfrkl (17apr16) git-svn-id: svn://tug.org/texlive/trunk@40577 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/geschichtsfrkl/geschichtsfrkl.bbx | 31 ++++++++++++---------- .../tex/latex/geschichtsfrkl/geschichtsfrkl.cbx | 16 ++++++----- 2 files changed, 26 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/tex/latex/geschichtsfrkl') diff --git a/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx b/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx index d09ec59857f..d264dfced0b 100644 --- a/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx +++ b/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx @@ -21,11 +21,11 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{geschichtsfrkl.bbx}% - [2016/01/30 v1.3 geschichtsfrkl -- % + [2016/04/17 v1.4 geschichtsfrkl -- % biblatex für Historiker, bbx-Datei] \RequireBibliographyStyle{standard} \AtBeginDocument{\typeout{}\typeout% - {========= geschichtsfrkl -- biblatex für Historiker v1.3 ========}} + {========= geschichtsfrkl -- biblatex für Historiker v1.4 ========}} \ExecuteBibliographyOptions{% pagetracker=true,% bibencoding=utf8,% @@ -97,30 +97,33 @@ \newcommand*{\autorenschriftart}{\scshape}% \newcommand*{\autorentrennzeichen}{\addnbspace\slash}% \DeclareNameFormat{author}{% + \nameparts{#1}% {\autorenschriftart% - \ifblank{#5}{}{#5\addspace}% - #1}% - \ifblank{#3}{}{\addcomma\space% - \ifbool{bbx:nurinit}{#4}{#3}}% + \ifblank{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily}% + \ifblank{\namepartgiven}{}{\addcomma\space% + \ifbool{bbx:nurinit}{\namepartgiveni}{\namepartgiven}}% \isdot% \ifthenelse{\value{listcount}<\value{liststop}}% {\autorentrennzeichen\addspace}{}% }% \DeclareNameFormat{editor}{% - \ifblank{#3}{}{% - \ifbool{bbx:nurinit}{#4}{#3}\addspace}% - \ifblank{#5}{}{#5\addspace}% - #1% + \nameparts{#1}% + \ifblank{\namepartgiven}{}{% + \ifbool{bbx:nurinit}{\namepartgiveni}{\namepartgiven}\addspace}% + \ifblank{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% \ifnumcomp{\value{listcount}}{<}{\value{liststop}-1}% {\addcomma\addspace}% {\ifnumcomp{\value{listcount}}{=}{\value{liststop}}% {}{\addspace\bibstring{and}\addspace}}% }% \DeclareNameFormat{hrsg}{% - \ifblank{#5}{}{#5\addspace}% - #1% - \ifblank{#3}{}{\addcomma\space% - \ifbool{bbx:nurinit}{#4}{#3}}% + \nameparts{#1} + \ifblank{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifblank{\namepartgiven}{}{\addcomma\space% + \ifbool{bbx:nurinit}{\namepartgiveni}{\namepartgiven}}% \ifthenelse{\value{listcount}<\value{liststop}}% {\addnbspace\slash\addspace}{}% }% diff --git a/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx b/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx index f0891442e92..09027e54ee1 100644 --- a/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx +++ b/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{geschichtsfrkl.cbx}% - [2016/01/30 v1.3 geschichtsfrkl -- % + [2016/04/17 v1.4 geschichtsfrkl -- % biblatex für Historiker, cbx-Datei]% \ExecuteBibliographyOptions{% citetracker=true,% @@ -69,7 +69,8 @@ \DeclareFieldFormat{postnote}{#1}% \DeclareFieldFormat{shorttitle}{#1}% \DeclareNameFormat{frg}{% - #1% + \nameparts{#1}% + \namepartfamily% \ifthenelse{\value{listcount}<\value{liststop}}% {\addspace\slash\addspace}{}% }% @@ -78,13 +79,14 @@ \newcommand*{\citeautorentrennzeichen}% {\addnbspace\slash\addspace}% \DeclareNameFormat{cite:author}{% + \nameparts{#1}% {\citeautorenschriftart% - \ifblank{#5}{}{#5\addspace}% - #1}% + \ifblank{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily}% \ifbool{cbx:mitvn}{% - \ifblank{#3}{}{\addcomma\space% - \ifbool{cbx:nurinit}{#4}{#3}}}{% - \ifbool{cbx:nurinit}{\addcomma\addspace#4}{}% + \ifblank{\namepartgiven}{}{\addcomma\space% + \ifbool{cbx:nurinit}{\namepartgiveni}{\namepartgiven}}}{% + \ifbool{cbx:nurinit}{\addcomma\addspace\namepartgiveni}{}% }% \ifthenelse{\value{listcount}<\value{liststop}}% {\citeautorentrennzeichen}{}% -- cgit v1.2.3