diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx | 111 |
1 files changed, 69 insertions, 42 deletions
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 e5400e4e648..c2bac9f4831 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,16 +1,6 @@ -% authortitle-dw.bbx, Dominik Waßenhoven 2011 - -\ProvidesFile{authortitle-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style] - -\@ifpackagelater{biblatex}{2011/07/29} - {} - {\PackageError{biblatex} - {Outdated 'biblatex' package} - {The version of the 'authortitle-dw' style you are using\MessageBreak - requires biblatex v1.6 or later.\MessageBreak - You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak - This is a fatal error. I'm aborting now.}% - \endinput} +% authortitle-dw.bbx, Dominik Waßenhoven 2012 + +\ProvidesFile{authortitle-dw.bbx}[2012/06/28 v1.5 biblatex bibliography style] \RequireBibliographyStyle{standard-dw} @@ -178,7 +168,7 @@ \def\bbx@opt@edstringfont@namefont{% \renewcommand{\bbx@edstringfont}{\bbx@namefont}} -\ExecuteBibliographyOptions{% +\ExecuteBibliographyOptions{ edbyidem=true, editorstring=parens, idembib=true, @@ -243,7 +233,7 @@ %% Formate in der Bibliographie \DeclareFieldFormat{annotation}{% - \annotationfont #1\addperiod} + \annotationfont #1\addperiod\par} \DeclareFieldFormat{booktitle}{#1} \DeclareFieldFormat{edition}{% \ifinteger{#1} @@ -263,7 +253,7 @@ \DeclareFieldFormat{journaltitle}{#1} \DeclareFieldFormat{issuetitle}{#1} \DeclareFieldFormat{library}{% - \libraryfont #1\addperiod} + \libraryfont #1\addperiod\par} \DeclareFieldFormat{maintitle}{#1} \DeclareFieldFormat{review}{% \bibstring{review}% @@ -301,19 +291,6 @@ {#1\isdot}} %% Umdefinierung von finentry für 'annotation' und 'library' -\newbibmacro*{finentry:annotation}{% - \iffieldundef{annotation} - {\finentry}% - {\setunit{\addperiod\par} - \printfield{annotation}}% -} -\newbibmacro*{finentry:library}{% - \iffieldundef{library} - {\finentry} - {\setunit{\addperiod\par} - \printfield{library}% - \finentry} -} \renewbibmacro*{finentry}{% \ifboolexpr{ test {\iffieldundef{annotation}} @@ -322,7 +299,9 @@ } {\finentry} {\iffieldundef{library} - {} + {\iffieldundef{annotation} + {\finentry} + {}}% {\ifbool{bbx:library} {\setunit{\addperiod\par} \printfield{library}} @@ -330,7 +309,9 @@ \iffieldundef{annotation} {} {\ifbool{bbx:annotation} - {\setunit{\addperiod\par} + {\iffieldundef{library}% wenn library ebenfalls ausgegeben wird, keinen Punkt und Absatz machen (ist dann von library schon gesetzt) + {\setunit{\addperiod\par}} + {} \printfield{annotation}} {}}% \finentry}} @@ -351,7 +332,7 @@ % Formatierung der Nachnamen entsprechend der Option 'namefont' \renewcommand*{\mkbibnamelast}[1]{% \ifboolexpr{ - bool {bbx:oldauthor} + ( bool {bbx:oldauthor} and ( ( bool {oldauthor} and @@ -363,7 +344,15 @@ or ( bool {oldbookauthor} and - test {\ifcurrentname{bookauthor}} ) ) + test {\ifcurrentname{bookauthor}} ) ) ) + or + ( bool{cbx:citeauthor} + and + ( bool{cbx:citeauthornormalfont} + or + ( bool{cbx:citeauthorfoot} + and + not test {\iffootnote} ) ) ) } {#1} {\bbx@namefont{#1}}} @@ -371,7 +360,7 @@ % Formatierung der Vornamen entsprechend der Option 'firstnamefont' \renewcommand*{\mkbibnamefirst}[1]{% \ifboolexpr{ - bool {bbx:oldauthor} + ( bool {bbx:oldauthor} and ( ( bool {oldauthor} and @@ -383,7 +372,15 @@ or ( bool {oldbookauthor} and - test {\ifcurrentname{bookauthor}} ) ) + test {\ifcurrentname{bookauthor}} ) ) ) + or + ( bool{cbx:citeauthor} + and + ( bool{cbx:citeauthornormalfont} + or + ( bool{cbx:citeauthorfoot} + and + not test {\iffootnote} ) ) ) } {#1} {\bbx@firstnamefont{#1}}} @@ -392,7 +389,7 @@ % oder 'firstnamefont' (useprefix=false) \renewcommand*{\mkbibnameprefix}[1]{% \ifboolexpr{ - bool {bbx:oldauthor} + ( bool {bbx:oldauthor} and ( ( bool {oldauthor} and @@ -404,7 +401,15 @@ or ( bool {oldbookauthor} and - test {\ifcurrentname{bookauthor}} ) ) + test {\ifcurrentname{bookauthor}} ) ) ) + or + ( bool{cbx:citeauthor} + and + ( bool{cbx:citeauthornormalfont} + or + ( bool{cbx:citeauthorfoot} + and + not test {\iffootnote} ) ) ) } {#1} {\ifuseprefix @@ -414,7 +419,7 @@ % suffix richtet sich nach 'firstnamefont' \renewcommand*{\mkbibnameaffix}[1]{% \ifboolexpr{ - bool {bbx:oldauthor} + ( bool {bbx:oldauthor} and ( ( bool {oldauthor} and @@ -426,7 +431,15 @@ or ( bool {oldbookauthor} and - test {\ifcurrentname{bookauthor}} ) ) + test {\ifcurrentname{bookauthor}} ) ) ) + or + ( bool{cbx:citeauthor} + and + ( bool{cbx:citeauthornormalfont} + or + ( bool{cbx:citeauthorfoot} + and + not test {\iffootnote} ) ) ) } {#1} {\bbx@firstnamefont{#1}}} @@ -784,9 +797,9 @@ \ifnamesequal{author}{bookauthor} {\ifbool{bbx:edbyidem} {\midsentence*\bibstring[\mkidem]{idem\thefield{gender}}\addcolon} - {\printnames{bookauthor}% + {\printnames[byauthor]{bookauthor}% \newunit\newblock}} - {\printnames{bookauthor}% + {\printnames[byauthor]{bookauthor}% \newunit\newblock}} %% Wenn Autor und Hrsg. gleich --> hg. v. dems./ders./dens.: @@ -796,7 +809,19 @@ {\usebibmacro{byeditor+othersstrg}% \setunit{\addspace}% \ifboolexpr{ - ( test {\ifnamesequal{editor}{author}} + ( ( ( not test {\ifentrytype{inbook}}% alle außer inbook: author und editor gleich? + and + test {\ifnamesequal{editor}{author}} ) + or + ( test {\ifentrytype{inbook}} + and + ( test {\ifnameundef{bookauthor}}% inbook ohne bookauthor: author und editor gleich? + and + test {\ifnamesequal{editor}{author}} ) + or + ( not test {\ifnameundef{bookauthor}}% inbook mit bookauthor: author und bookauthor gleich? + and + test {\ifnamesequal{editor}{bookauthor}} ) ) ) or ( bool {xrefidem} and not @@ -838,6 +863,8 @@ ( test \ifusetranslator and not test {\ifnameundef{translator}} ) + or + bool {xref:inbook} } {} {\usebibmacro{byeditor+others}}} |