diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx | 91 |
1 files changed, 64 insertions, 27 deletions
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}} |