From 5e7b112815f32ab1cd1e1aa33abd5ab4f65a635c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 6 Dec 2016 22:58:59 +0000 Subject: biblatex-dw (6dec16) git-svn-id: svn://tug.org/texlive/trunk@42649 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-dw/bbx/authortitle-dw.bbx | 10 +- .../tex/latex/biblatex-dw/bbx/footnote-dw.bbx | 4 +- .../tex/latex/biblatex-dw/bbx/standard-dw.bbx | 199 +++++++++++++-------- .../tex/latex/biblatex-dw/cbx/authortitle-dw.cbx | 12 +- .../tex/latex/biblatex-dw/cbx/footnote-dw.cbx | 4 +- .../tex/latex/biblatex-dw/cbx/standard-dw.cbx | 91 +++++++--- .../tex/latex/biblatex-dw/lbx/english-dw.lbx | 4 +- .../tex/latex/biblatex-dw/lbx/german-dw.lbx | 4 +- 8 files changed, 206 insertions(+), 122 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-dw') diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx index 301084eae6f..075131d4ee8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx @@ -1,6 +1,6 @@ -% authortitle-dw.bbx, Dominik Waßenhoven 2013 +% authortitle-dw.bbx, Dominik Waßenhoven 2016 -\ProvidesFile{authortitle-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style] +\ProvidesFile{authortitle-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] \RequireBibliographyStyle{standard-dw} @@ -328,7 +328,7 @@ % oder 'options = {oldbookauthor=true}' % werden nicht in der Schrift von 'namefont' gesetzt % Formatierung der Nachnamen entsprechend der Option 'namefont' -\renewcommand*{\mkbibnamelast}[1]{% +\renewcommand*{\mkbibnamefamily}[1]{% \ifboolexpr{ ( bool {bbx:oldauthor} and @@ -356,7 +356,7 @@ {\bbx@namefont{#1}}} % Formatierung der Vornamen entsprechend der Option 'firstnamefont' -\renewcommand*{\mkbibnamefirst}[1]{% +\renewcommand*{\mkbibnamegiven}[1]{% \ifboolexpr{ ( bool {bbx:oldauthor} and @@ -415,7 +415,7 @@ {\bbx@firstnamefont{#1}}}} % suffix richtet sich nach 'firstnamefont' -\renewcommand*{\mkbibnameaffix}[1]{% +\renewcommand*{\mkbibnamesuffix}[1]{% \ifboolexpr{ ( bool {bbx:oldauthor} and diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx index 8f85cf8bf8f..a0ebd77967c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx @@ -1,6 +1,6 @@ -% footnote-dw.bbx, Dominik Waßenhoven 2013 +% footnote-dw.bbx, Dominik Waßenhoven 2016 -\ProvidesFile{footnote-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style] +\ProvidesFile{footnote-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] \RequireBibliographyStyle{authortitle-dw} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx index 2b5d32bba90..66d77408027 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx @@ -1,12 +1,12 @@ -% standard-dw.bbx, Dominik Waßenhoven 2013 +% standard-dw.bbx, Dominik Waßenhoven 2016 -\ProvidesFile{standard-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style] +\ProvidesFile{standard-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] -\@ifpackagelater{biblatex}{2011/11/13} +\@ifpackagelater{biblatex}{2016/03/11} {} {\PackageError{biblatex-dw} {Outdated 'biblatex' package\MessageBreak - Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak + Upgrade to biblatex v3.3 (2016/03/11) or later.\MessageBreak I found: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now}% \endinput} @@ -19,7 +19,9 @@ \newbool{bbx:acronym} \newbool{bbx:journumafteryear} \newbool{bbx:journumdate} +\newbool{bbx:seriesstandard} \newbool{bbx:seriesafteryear} +\newbool{bbx:seriesbeforeedition} \newbool{bbx:seriesinparens} \newbool{bbx:shorthandacro} \newbool{bbx:shorthandinbib} @@ -74,15 +76,26 @@ \DeclareBibliographyOption{bernhard}[true]{% \csuse{bool#1}{bbx:bernhard}} -% Option series=standard|afteryear -\newcommand{\bbx@option@series}{} -\DeclareBibliographyOption{series}{% - \renewcommand{\bbx@option@series}{#1}} -\AtBeginDocument{% - \ifdefstring{\bbx@option@series}{afteryear} - {\global\booltrue{bbx:seriesafteryear}} - {\global\boolfalse{bbx:seriesafteryear}}} - +% Option series=standard|afteryear|beforeedition +\DeclareBibliographyOption{series}[standard]{% + \ifcsdef{bbx@opt@series@#1} + {\csuse{bbx@opt@series@#1}} + {\blxdw@error{% + Invalid option 'series=#1'\MessageBreak + Valid values are 'standard', 'afteryear', 'beforeedition'}}} +\def\bbx@opt@series@standard{% + \global\booltrue{bbx:seriesstandard}% + \global\boolfalse{bbx:seriesafteryear}% + \global\boolfalse{bbx:seriesbeforeedition}} +\def\bbx@opt@series@afteryear{% + \global\boolfalse{bbx:seriesstandard}% + \global\booltrue{bbx:seriesafteryear}% + \global\boolfalse{bbx:seriesbeforeedition}} +\def\bbx@opt@series@beforeedition{% + \global\boolfalse{bbx:seriesstandard}% + \global\boolfalse{bbx:seriesafteryear}% + \global\booltrue{bbx:seriesbeforeedition}} + % Option seriesformat=standard|parens \newcommand{\bbx@option@seriesformat}{} \DeclareBibliographyOption{seriesformat}{% @@ -206,7 +219,7 @@ \printfield{booktitle}% \newunit} -\DeclareBibliographyDriver{shorthands}{% +\DeclareBibliographyDriver{shorthand}{% \toggletrue{listofshorthands}% \usebibmacro{terselos}} @@ -216,7 +229,7 @@ %% List of Shorthands: Länge der Labels einstellbar \AtBeginDocument{% \ifbool{bbx:shorthandwidthbool} - {\defbibenvironment{shorthands} + {\defbibenvironment{shorthand} {\list {\printfield[shorthandwidth]{shorthand}% \printtext{\shorthandpunct}} @@ -229,7 +242,7 @@ \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} {\item}} - {\defbibenvironment{shorthands} + {\defbibenvironment{shorthand} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% @@ -644,13 +657,17 @@ \usebibmacro{maintitle+booktitle}% \newunit \usebibmacro{byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -677,13 +694,17 @@ \usebibmacro{maintitle+booktitle}% \newunit \usebibmacro{ifuse:byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -714,10 +735,10 @@ \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -748,10 +769,10 @@ \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{edition}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -829,13 +850,17 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -912,13 +937,17 @@ \printlist{language}% \newunit\newblock \usebibmacro{byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1102,11 +1131,16 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{type}% \newunit @@ -1297,10 +1331,10 @@ \usebibmacro{byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1500,13 +1534,17 @@ \ifbool{xref:inbook}% child is an @inbook entry {\usebibmacro{byeditor+others}} {\usebibmacro{ifuse:byeditor+others}}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1546,13 +1584,17 @@ \printlist{language}% \newunit\newblock \usebibmacro{ifuse:byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1596,10 +1638,10 @@ \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1650,13 +1692,17 @@ \ifbool{xref:inbook}% child is an @inbook entry {\usebibmacro{byeditor+others}} {\usebibmacro{ifuse:byeditor+others}}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1692,13 +1738,17 @@ \printlist{language}% \newunit\newblock \usebibmacro{ifuse:byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1738,10 +1788,10 @@ \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1822,13 +1872,6 @@ Thus, 'omiteditor' is ignored}} {}}% {}% - \ifdefstring{\bbx@option@series}{standard} - {} - {\ifdefstring{\bbx@option@series}{afteryear} - {} - {\blxdw@warning@noline{% - Unknown value for option 'series'.\MessageBreak - Option 'series=standard' used instead}}}% \ifdefstring{\bbx@option@seriesformat}{standard} {} {\ifdefstring{\bbx@option@seriesformat}{parens} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx index 0b7771ecd1d..4362c0355c8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx @@ -1,6 +1,6 @@ -% authortitle-dw.cbx, Dominik Waßenhoven 2013 +% authortitle-dw.cbx, Dominik Waßenhoven 2016 -\ProvidesFile{authortitle-dw.cbx}[2013/09/22 v1.6a biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2016/12/06 v1.7 biblatex citation style] \RequireCitationStyle{standard-dw} @@ -25,7 +25,7 @@ \boolfalse{cbx:inref}} \def\cbx@opt@inreference@full{% \booltrue{cbx:inref}% - \ExecuteBibliographyOptions[inreference]{skipbib}} + \ExecuteBibliographyOptions[inreference]{skipbib=true,}} % Test, ob inreference genutzt wird \AtEveryCitekey{% @@ -115,7 +115,11 @@ \ifnameundef{labelname} {\blxdw@warning@noline{No author or editor given for \textcite}% \textbf{\thefield{entrykey}}} - {\ifbool{cbx:firstfullname} + {\ifboolexpr{ + bool {cbx:citeauthornamefirstfull} + or + bool {cbx:citeauthornamefull} + } {\printnames[citeauthor]{labelname}} {\printnames{labelname}}% \setunit{% diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx index 1a8ed50eb6e..a45a55f2606 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx @@ -1,6 +1,6 @@ -% footnote-dw.cbx, Dominik Waßenhoven 2013 +% footnote-dw.cbx, Dominik Waßenhoven 2016 -\ProvidesFile{footnote-dw.cbx}[2013/09/22 v1.6a biblatex citation style] +\ProvidesFile{footnote-dw.cbx}[2016/12/06 v1.7 biblatex citation style] \RequireCitationStyle{standard-dw} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx index 2447880fb3a..348daefb5d5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx @@ -1,12 +1,12 @@ -% standard-dw.cbx, Dominik Waßenhoven 2013 +% standard-dw.cbx, Dominik Waßenhoven 2016 -\ProvidesFile{standard-dw.cbx}[2013/09/22 v1.6a biblatex citation style] +\ProvidesFile{standard-dw.cbx}[2016/12/06 v1.7 biblatex citation style] -\@ifpackagelater{biblatex}{2011/11/13} +\@ifpackagelater{biblatex}{2016/03/11} {} {\PackageError{biblatex-dw} {Outdated 'biblatex' package\MessageBreak - Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak + Upgrade to biblatex v3.3 (2016/03/11) or later.\MessageBreak I found: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now}% \endinput} @@ -16,9 +16,10 @@ \newbool{cbx:citeauthor} \newbool{cbx:citeauthorfoot} \newbool{cbx:citeauthornormalfont} +\newbool{cbx:citeauthornamefirstfull} +\newbool{cbx:citeauthornamefull} \newbool{cbx:citedas} \newbool{cbx:edstringincitations} -\newbool{cbx:firstfullname} \newbool{cbx:fullcite}% Test, ob fullcite ausgeführt wurde (wichtig für @review) \newbool{cbx:idemfull} \newbool{cbx:noidem} @@ -36,8 +37,6 @@ \csuse{bool#1}{cbx:citedas}} \DeclareBibliographyOption{edstringincitations}[true]{% \csuse{bool#1}{cbx:edstringincitations}} -\DeclareBibliographyOption{firstfullname}[true]{% - \csuse{bool#1}{cbx:firstfullname}} \DeclareBibliographyOption{omiteditor}[true]{% \csuse{bool#1}{cbx:omiteditor}} \DeclareBibliographyOption{shorthandibid}[true]{% @@ -64,6 +63,27 @@ \booltrue{cbx:citeauthornormalfont}% \boolfalse{cbx:citeauthorfoot}} +\DeclareBibliographyOption{citeauthorname}[normal]{% + \ifcsdef{cbx@opt@citeauthorname@#1} + {\csuse{cbx@opt@citeauthorname@#1}} + {\blxdw@error{% + Invalid option 'citeauthorname=#1'\MessageBreak + Valid values are 'normal', 'firstfull', 'full'}}} +\def\cbx@opt@citeauthorname@normal{% + \boolfalse{cbx:citeauthornamefull}% + \boolfalse{cbx:citeauthornamefirstfull}} +\def\cbx@opt@citeauthorname@firstfull{% + \boolfalse{cbx:citeauthornamefull}% + \booltrue{cbx:citeauthornamefirstfull}} +\def\cbx@opt@citeauthorname@full{% + \booltrue{cbx:citeauthornamefull}% + \boolfalse{cbx:citeauthornamefirstfull}} + +\DeclareBibliographyOption{firstfullname}[true]{% aus Kompatibilitätsgründen + \blxdw@error{% + Option 'firstfullname' is obsolete,\MessageBreak + please use option 'citeauthorname' instead}} + \DeclareBibliographyOption{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=context}}% Standard: constrict @@ -251,7 +271,7 @@ \clearname{translator}} {}} -% Option 'nameseen' +% Option 'citeauthorname' \newcommand*{\cbx@seennames}{} \newrobustcmd*{\cbx@nameseen}[1]{% \listxadd{\cbx@seennames}{\detokenize{#1}}} @@ -259,19 +279,20 @@ \xifinlist{\detokenize{#1}}{\cbx@seennames}} \AtBeginDocument{% - \ifbool{cbx:firstfullname} + \ifbool{cbx:citeauthornamefirstfull} {\DeclareNameFormat{citeauthor}{% - \cbx@ifnameseen{#1#3#5#7} + \nameparts{#1}% + \cbx@ifnameseen{\namepartfamily\namepartgiven\namepartprefix\namepartsuffix} {\ifcase\value{uniquename}% - \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \usebibmacro{name:family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}% \or \ifuseprefix - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}} - {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}} + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefixi}{\namepartsuffixi}}% \fi}% - {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% - \cbx@nameseen{#1#3#5#7}}% - \usebibmacro{name:andothers}} + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}% + \cbx@nameseen{\namepartfamily\namepartgiven\namepartprefix\namepartsuffix}}% + \usebibmacro{name:andothers}}% \DeclareCiteCommand{\citeauthor} {\booltrue{cbx:citeauthor}% \boolfalse{citetracker}% @@ -281,15 +302,31 @@ \printnames[citeauthor]{labelname}} {\multicitedelim} {\usebibmacro{postnote}}} - {\DeclareCiteCommand{\citeauthor} - {\booltrue{cbx:citeauthor}% - \boolfalse{citetracker}% - \boolfalse{pagetracker}% - \usebibmacro{prenote}} - {\indexnames{labelname}% - \printnames{labelname}} - {\multicitedelim} - {\usebibmacro{postnote}}}} + {\ifbool{cbx:citeauthornamefull} + {\DeclareNameFormat{citeauthor}{% + \nameparts{#1}% + \ifuseprefix + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}} + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}}% + \usebibmacro{name:andothers}}% + \DeclareCiteCommand{\citeauthor} + {\booltrue{cbx:citeauthor}% + \boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\indexnames{labelname}% + \printnames[citeauthor]{labelname}} + {\multicitedelim} + {\usebibmacro{postnote}}} + {\DeclareCiteCommand{\citeauthor} + {\booltrue{cbx:citeauthor}% + \boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\indexnames{labelname}% + \printnames{labelname}} + {\multicitedelim} + {\usebibmacro{postnote}}}}} %% Formatierung von 'ibidem' entsprechend der Option 'ibidemfont' \providecommand*{\mkibid}[1]{% @@ -416,8 +453,8 @@ {} {\usebibmacro{citeindex}% \ifentryseen{\bbx@reviewparent} - {\global\booltrue{cbx:rpcited}} - {\global\boolfalse{cbx:rpcited}}% + {\booltrue{cbx:rpcited}} + {\boolfalse{cbx:rpcited}}% \ifbool{cbx:fullcite} {\usedriver {\DeclareNameAlias{sortname}{default}} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx index 4006521eb82..1f61a78583d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx @@ -1,6 +1,6 @@ -% english-dw.lbx, Dominik Waßenhoven 2013 +% english-dw.lbx, Dominik Waßenhoven 2016 -\ProvidesFile{english-dw.lbx}[2013/09/22 v1.6a biblatex localization file] +\ProvidesFile{english-dw.lbx}[2016/12/06 v1.7 biblatex localization file] \NewBibliographyString{% idemdat,% diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx index 0527d992816..99976350ff9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx @@ -1,6 +1,6 @@ -% german-dw.lbx, Dominik Waßenhoven 2013 +% german-dw.lbx, Dominik Waßenhoven 2016 -\ProvidesFile{german-dw.lbx}[2013/09/22 v1.6a biblatex localization file] +\ProvidesFile{german-dw.lbx}[2016/12/06 v1.7 biblatex localization file] \InheritBibliographyExtras{german} -- cgit v1.2.3