summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-dw/bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx111
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx125
3 files changed, 153 insertions, 97 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}}}
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 16f962ff196..f05a070a024 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,16 +1,6 @@
-% footnote-dw.bbx, Dominik Waßenhoven 2011
+% footnote-dw.bbx, Dominik Waßenhoven 2012
-\ProvidesFile{footnote-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style]
-
-\@ifpackagelater{biblatex}{2011/07/29}
- {}
- {\PackageError{biblatex}
- {Outdated 'biblatex' package}
- {The version of the 'footnote-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}
+\ProvidesFile{footnote-dw.bbx}[2012/06/28 v1.5 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 462231a704f..36d8e3966b4 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,6 +1,15 @@
-% standard-dw.bbx, Dominik Waßenhoven 2011
+% standard-dw.bbx, Dominik Waßenhoven 2012
-\ProvidesFile{standard-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style]
+\ProvidesFile{standard-dw.bbx}[2012/06/28 v1.5 biblatex bibliography style]
+
+\@ifpackagelater{biblatex}{2011/11/13}
+ {}
+ {\PackageError{biblatex-dw}
+ {Outdated 'biblatex' package\MessageBreak
+ Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak
+ I found: '\csuse{ver@biblatex.sty}'.\MessageBreak
+ This is a fatal error. I'm aborting now}%
+ \endinput}
\RequireBibliographyStyle{standard}
@@ -152,17 +161,51 @@
{\printnames{author}}%
\setunit{\labelnamepunct}}%
\iffieldundef{booktitle}
- {\usebibmacro{maintitle+title}}
- {\usebibmacro{title}%
+ {\usebibmacro{maintitle+title-terselos}}
+ {\printfield{title}%
\newunit\newblock
\usebibmacro{in:}%
- \usebibmacro{maintitle+booktitle}}%
+ \usebibmacro{maintitle+booktitle-terselos}}%
\finentry}
{\usedriver
{\DeclareNameAlias{sortname}{default}}
{\thefield{entrytype}}%
\finentry}}
+\newbibmacro*{maintitle+title-terselos}{%
+ \iffieldsequal{maintitle}{title}
+ {\clearfield{maintitle}%
+ \clearfield{mainsubtitle}%
+ \clearfield{maintitleaddon}}
+ {\iffieldundef{maintitle}
+ {}
+ {\printfield{maintitle}%
+ \newunit\newblock
+ \iffieldundef{volume}
+ {}
+ {\iffieldundef{volumes}
+ {}
+ {\printfield{volumes}%
+ \setunit{\addcomma\space}}%
+ \printfield{volume}%
+ \printfield{part}%
+ \setunit{\addcolon\space}}}}%
+ \printfield{title}%
+ \newunit}
+
+\newbibmacro*{maintitle+booktitle-terselos}{%
+ \iffieldundef{maintitle}
+ {}
+ {\printfield{maintitle}%
+ \newunit\newblock
+ \iffieldundef{volume}
+ {}
+ {\printfield{volume}%
+ \printfield{part}%
+ \setunit{\addcolon\space}}}%
+ \printfield{booktitle}%
+ \newunit}
+
\DeclareBibliographyDriver{shorthands}{%
\toggletrue{listofshorthands}%
\usebibmacro{terselos}}
@@ -208,17 +251,17 @@
\newcommand*{\shorthandinbibpunct}{\addspace}
\renewbibmacro*{begentry}{%
\ifboolexpr{
- test {\ifcitation}
- or
- togl {listofshorthands}
+ bool {bbx:shorthandinbib}
+ and not
+ ( test {\ifcitation}
+ or
+ togl {listofshorthands} )
}
- {}% im Zitat und der langen List of Shorthands sollen shorthands nicht ausgegeben werden
- {\ifbool{bbx:shorthandinbib}
- {\iffieldundef{shorthand}
- {}
- {\printfield[shorthandinbib]{shorthand}%
- \shorthandinbibpunct}}% ohne \setunit, damit das auf jeden Fall ausgegeben wird
- {}}}
+ {\iffieldundef{shorthand}
+ {}
+ {\printfield[shorthandinbib]{shorthand}%
+ \nopunct\shorthandinbibpunct}}
+ {}}
%% bei useeditor=true oder usetranslator=true
\newbibmacro*{useeditor+others}{%
@@ -252,7 +295,7 @@
\setunit{\labelnamepunct}\newblock}
\newbibmacro*{usetranslator}{%
- {\ifnamesequal{author}{translator}
+ \ifnamesequal{author}{translator}
{\ifbool{bbx:edbyidem}
{\midsentence*\bibstring[\mkidem]{idem\thefield{gender}}%
\addspace}%
@@ -265,7 +308,6 @@
\usebibmacro{translatorstrg}%
\clearname{translator}%
\setunit{\labelnamepunct}\newblock}
- {}}
%% Wenn 'volumes' und 'volume' angegeben sind,
%% 'volumes' immer vor 'volume' ausgeben
@@ -363,13 +405,15 @@
\xifinlistcs{\strfield{xref}}{novolume@xrefparent}
{\iffieldundef{volume}
{}
- {\xifinlistcs{\strfield{xref}}{citedas@xrefparent}
- {\ifbool{cbx:xrefparent:firstcite}
+ {\ifbibliography
+ {\setunit{\addspace}}
+ {\xifinlistcs{\strfield{xref}}{citedas@xrefparent}
+ {\ifbool{cbx:xrefparent:firstcite}
+ {\newunit
+ \printtext{\bibstring{volume}\addspace}}
+ {\setunit{\addspace}}}
{\newunit
- \printtext{\bibstring{volume}\addspace}}
- {\setunit{\addspace}}}
- {\newunit
- \printtext{\bibstring{volume}\addspace}}%
+ \printtext{\bibstring{volume}\addspace}}}%
\printfield{volume}%
\iffieldxref{year}% wenn 'year' bei child und parent gleich
{}
@@ -862,9 +906,7 @@
\ifbool{cbx:idemfull}
{}
{\usebibmacro{editor+others/translator+others}%
- \ifnameundef{labelname}
- {}
- {\setunit{\labelnamepunct}}}%
+ \setunit*{\labelnamepunct}}%
\usebibmacro{maintitle+title}%
\newunit
\printlist{language}%
@@ -903,7 +945,9 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}}
+\newbool{xref:inbook}%
\DeclareBibliographyDriver{inbook}{%
+ \booltrue{xref:inbook}% the child is an inbook
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\ifbool{cbx:idemfull}
@@ -919,20 +963,11 @@
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{in:}%
- \ifboolexpr{
- test \ifuseeditor
- or
- test \ifusetranslator
- }
- {\ifnamexref{labelname}%
- {\booltrue{xrefidem}}%
- {\boolfalse{xrefidem}}}
- {\usebibmacro{authedxrefcheck}%
- \usebibmacro{authauthxrefcheck}%
- \ifbool{cbx:authedxref}
- {\booltrue{xrefidem}}
- {\boolfalse{xrefidem}}}%
- \ifbool{bbx:xref}
+ \usebibmacro{authauthxrefcheck}%
+ \ifbool{cbx:authauthxref}
+ {\booltrue{xrefidem}}
+ {\boolfalse{xrefidem}}%
+ \ifbool{bbx:xref}
{\iffieldundef{xref}%
{% Code, wenn kein xref vorhanden
\usebibmacro{noxref:inbook}}%
@@ -962,7 +997,7 @@
\ifbool{cbx:authedxref}
{\booltrue{xrefidem}}
{\boolfalse{xrefidem}}%
- \ifbool{bbx:xref}
+ \ifbool{bbx:xref}
{\iffieldundef{xref}
{% Code, wenn kein xref vorhanden
\usebibmacro{noxref:incollection}}
@@ -1462,7 +1497,9 @@
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
- \usebibmacro{ifuse:byeditor+others}%
+ \ifbool{xref:inbook}% child is an @inbook entry
+ {\usebibmacro{byeditor+others}}
+ {\usebibmacro{ifuse:byeditor+others}}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
@@ -1610,7 +1647,9 @@
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
- \usebibmacro{ifuse:byeditor+others}%
+ \ifbool{xref:inbook}% child is an @inbook entry
+ {\usebibmacro{byeditor+others}}
+ {\usebibmacro{ifuse:byeditor+others}}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%