summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-dw/cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx56
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx90
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx75
3 files changed, 129 insertions, 92 deletions
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 8b539f59755..2147945d171 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 2011
+% authortitle-dw.cbx, Dominik Waßenhoven 2011
-\ProvidesFile{authortitle-dw.cbx}[2011/02/06 v1.3c biblatex citation style]
+\ProvidesFile{authortitle-dw.cbx}[2011/11/20 v1.4 biblatex citation style]
\RequireCitationStyle{standard-dw}
@@ -141,21 +141,10 @@
\AtBeginBibliography{%
\renewbibmacro*{cite:xref}{%
- \iffieldundef{shorthand}%
- {\ifuseeditor
- {\ifnameundef{labelname}
- {}
- {\ifbool{xrefidem}%
- {\ifbool{bbx:edbyidem}
- {\midsentence%
- \usebibmacro{cite:idem}}%
- {\printnames{labelname}%
- \printtext{\labelnamepunct}}}%
- {\printnames{labelname}%
- \printtext{\labelnamepunct}}}}
- {}%
- \iffieldundef{shorttitle}%
- {\printfield{title}}%
+ \iffieldundef{shorthand}
+ {\usebibmacro{cite:editor}%
+ \iffieldundef{shorttitle}
+ {\printfield{title}}
{\printfield{shorttitle}}%
\ifuseeditor
{}
@@ -163,17 +152,17 @@
{}
{\ifnameundef{editor}
{}
- {\ifbool{xrefidem}%
+ {\ifbool{xrefidem}
{\ifbool{bbx:edbyidem}
- {\newunit
+ {\newunit%
\bibstring{byeditor}%
\setunit{\addspace}%
\bibstring[\mkidem]{idemdat\thefield{gender}}}
- {\newunit
+ {\newunit%
\usebibmacro{byeditor}}}%
- {\newunit
- \usebibmacro{byeditor}}}}}}%
- {\printtext[bibhyperref]{\printfield{shorthand}}}}}
+ {\newunit%
+ \usebibmacro{byeditor}}}}}}
+ {\printtext[bibhyperref]{\printfield{shorthand}}}}}
\newbibmacro*{cite:fullxref}{%
\usebibmacro{cite:full:citepages}%
@@ -199,7 +188,8 @@
\DeclareCiteCommand{\fullcite}
{\usebibmacro{prenote}%
- \usebibmacro{cite:full:citepages}}
+ \usebibmacro{cite:full:citepages}%
+ \booltrue{cbx:fullcite}}
{\usedriver
{\DeclareNameAlias{sortname}{default}}
{\thefield{entrytype}}}
@@ -209,7 +199,8 @@
\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
{\bibsentence
\usebibmacro{prenote}%
- \usebibmacro{cite:full:citepages}}
+ \usebibmacro{cite:full:citepages}%
+ \booltrue{cbx:fullcite}}
{\usedriver
{\DeclareNameAlias{sortname}{default}}
{\thefield{entrytype}}}
@@ -226,13 +217,13 @@
\newbibmacro*{cite:title}{%
\ifsingletitle
- {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
+ {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
{\ifboolexpr{
- test {\iffieldequalstr{entrytype}{review}}
+ test {\ifentrytype{review}}
and
not test {\iffieldundef{xref}}
}
- {\printtext[review]{\bbx@xref{\thefield{xref}}}}
+ {\printtext[review]{\bbx@review{\thefield{xref}}}}
{\printtext[bibhyperref]{%
\printfield[citetitle]{labeltitle}}}}}
@@ -279,7 +270,7 @@
{\usebibmacro{textcite:postnote}}
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%%
+%%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%%
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
\newbool{cbx:parens}
@@ -320,4 +311,11 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
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 4bf04a27fd0..cd6cd7c6b8d 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,17 +1,19 @@
-% footnote-dw.cbx, Dominik Waßenhoven 2010
+% footnote-dw.cbx, Dominik Waßenhoven 2011
-\ProvidesFile{footnote-dw.cbx}[2011/02/06 v1.3c biblatex citation style]
+\ProvidesFile{footnote-dw.cbx}[2011/11/20 v1.4 biblatex citation style]
\RequireCitationStyle{standard-dw}
\newbool{cbx:pageref}
+\newbool{cbx:review}
+\newbool{cbx:textcitefull}
\ExecuteBibliographyOptions{
- loccittracker=true,% für die Option 'ibidpage'
+ loccittracker=true,% für die Option 'ibidpage'
uniquename=false, % damit bei idem=false Vor- und Nachname gesetzt werden!
}
-% Kommandos zum Verpacken der Zitate in Fußnoten
+% Befehle zum Verpacken der Zitate in Fußnoten
\newrobustcmd{\mkfootnotecite}[1]{%
\iffootnote
{#1}
@@ -20,8 +22,8 @@
\bibsentence#1\addperiod}}}
\newbool{cbx:parencitefoot}% wenn parencite innerhalb einer
- % Fußnote aufgerufen wird
- % (wichtig für seenote)
+ % Fußnote aufgerufen wird
+ % (wichtig für seenote)
\newrobustcmd{\mkparencite}[1]{%
\iffootnote
{\booltrue{cbx:parencitefoot}%
@@ -33,11 +35,21 @@
\toggletrue{blx@footnote}%
\bibsentence#1\addperiod}}}
+% Befehl zum Testen, ob in Fußnote (für \textcite)
+\newrobustcmd{\footnotecheck}{%
+ \iffootnote
+ {\booltrue{cbx:parencitefoot}}
+ {\boolfalse{cbx:parencitefoot}}}
+
\newbibmacro*{cite}{%
\usebibmacro{cite:citepages}%
\global\boolfalse{cbx:loccit}%
\bibhypertarget{cite\the\value{instcount}}{%
- \ifciteseen
+ \ifboolexpr{
+ test {\ifciteseen}
+ and not
+ bool {cbx:textcitefull}
+ }
{\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}%
@@ -90,15 +102,15 @@
\newbibmacro*{cite:title}{%
\ifboolexpr{
- test {\iffieldequalstr{entrytype}{review}}
+ test {\ifentrytype{review}}
and
not test {\iffieldundef{xref}}
}
- {\booltrue{cbx:review}% für cite:seenote (damit das rezensierte Werk keinen Verweis bekommt)
- \printtext[review]{\bbx@xref{\thefield{xref}}}%
- \boolfalse{cbx:review}}% \boolfalse ist nötig, damit @review selbst wieder einen Verweis bekommt
+ {\booltrue{cbx:review}% für cite:seenote (damit das rezensierte Werk keinen Verweis bekommt)
+ \printtext[review]{\bbx@review{\thefield{xref}}}%
+ \boolfalse{cbx:review}}% \boolfalse ist nötig, damit @review selbst wieder einen Verweis bekommt
{\ifsingletitle
- {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
+ {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
{\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}}%
\ifboolexpr{
@@ -134,23 +146,23 @@
{}
{\ifbool{cbx:parencitefoot}
{\addspace\mkbibbrackets{%
- \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}%
+ \bibstring{seenote}\addnbspace%
\ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}%
\ifbool{cbx:pageref}
{\ifsamepage{\the\value{instcount}}
{\csuse{cbx@first@\thefield{entrykey}}}
{}
- {\addcomma\space\bibstring{page}\addnbspace
+ {\addcomma\space\bibstring{page}\addnbspace%
\pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}}
{}}}
{\addspace\mkbibparens{%
- \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}%
+ \bibstring{seenote}\addnbspace%
\ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}%
\ifbool{cbx:pageref}
{\ifsamepage{\the\value{instcount}}
{\csuse{cbx@first@\thefield{entrykey}}}
{}
- {\addcomma\space\bibstring{page}\addnbspace
+ {\addcomma\space\bibstring{page}\addnbspace%
\pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}}
{}}}}}
@@ -203,22 +215,7 @@
\AtBeginBibliography{%
\renewbibmacro*{cite:xref}{%
\iffieldundef{shorthand}%
- {\ifboolexpr{
- test \ifuseeditor
- or
- test \ifusetranslator
- }
- {\ifnameundef{labelname}
- {}
- {\ifbool{xrefidem}%
- {\ifbool{bbx:edbyidem}
- {\midsentence%
- \usebibmacro{cite:xref:idem}}%
- {\printnames{labelname}%
- \printtext{\labelnamepunct}}}%
- {\printnames{labelname}%
- \printtext{\labelnamepunct}}}}
- {}%
+ {\usebibmacro{cite:editor}%
\iffieldundef{shorttitle}%
{\printfield{title}}%
{\printfield{shorttitle}}%
@@ -266,7 +263,8 @@
\DeclareCiteCommand{\fullcite}[\mkfootnotecite]
{\usebibmacro{prenote}%
- \usebibmacro{cite:full:citepages}}
+ \usebibmacro{cite:full:citepages}%
+ \booltrue{cbx:fullcite}}
{\usedriver
{\DeclareNameAlias{sortname}{default}}
{\thefield{entrytype}}}
@@ -276,20 +274,35 @@
\DeclareCiteCommand{\footfullcite}[\mkfootnotecite]
{\bibsentence
\usebibmacro{prenote}%
- \usebibmacro{cite:full:citepages}}
+ \usebibmacro{cite:full:citepages}%
+ \booltrue{cbx:fullcite}}
{\usedriver
{\DeclareNameAlias{sortname}{default}}
{\thefield{entrytype}}}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\textcite}[\footnotecheck\cbx@textcite\footcite]
+ {\gdef\cbx@savedkeys{}}
+ {\printnames{labelname}%
+ \ifciteseen
+ {\global\boolfalse{cbx:textcitefull}}
+ {\global\booltrue{cbx:textcitefull}}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}}
+ {\multinamedelim}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite}[2]{%
+ \def\cbx@savedcites{#1}\ifbool{cbx:parencitefoot}{#2\addspace{\mkbibparens{\cbx@savedcites}}}{#2\cbx@savedcites}}
\DeclareMultiCiteCommand{\cites}[\mkfootnotecite]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkparencite]{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\footcites}[\mkfootnotecite]{\footcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\textcitesdelim}
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Unverändert aus verbose-trad1 übernommen %%%%%
+%%%%% Unverändert aus verbose-trad1 übernommen %%%%%
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
\newbool{cbx:loccit}
@@ -318,4 +331,11 @@
\newbibmacro*{cite:ibid:page}{}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
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 9a0652c4c3f..b0375079178 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,16 +1,17 @@
-% standard-dw.cbx, Dominik Waßenhoven 2011
+% standard-dw.cbx, Dominik Waßenhoven 2011
-\ProvidesFile{standard-dw.cbx}[2011/02/06 v1.3c biblatex citation style]
+\ProvidesFile{standard-dw.cbx}[2011/11/20 v1.4 biblatex citation style]
\newbool{cbx:authauthxref}
\newbool{cbx:authedxref}
\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}
\newbool{cbx:omiteditor}
-\newbool{cbx:review}
+\newbool{cbx:rpcited}% wurde der parent des @review schon zitiert?
\newbool{cbx:xrefparent:firstcite}
\newbool{cbx:shorthandibid}
@@ -80,19 +81,19 @@
\global\toggletrue{cbx:fullcite}}%
\renewbibmacro*{cite:postnote}{%
\ifboolexpr{
- togl {cbx:fullcite}
- and
- test {\iffieldpages{postnote}}
- and
- test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
- and
- ( not test {\iffieldundef{pages}}
- or
- ( not test {\iffieldundef{pagetotal}}
- and
- bool {bbx:pagetotal}
- )
- )
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ ( not test {\iffieldundef{pages}}
+ or
+ ( not test {\iffieldundef{pagetotal}}
+ and
+ bool {bbx:pagetotal}
+ )
+ )
}
{\usebibmacro{cite:postnote:pages}}
{\usebibmacro{cite:postnote:ibidpage}}}
@@ -131,14 +132,14 @@
\csxdef{cbx:lastcite@\thefield{entrykey}}{\the\value{instcount}}%
\global\boolfalse{cbx:noidem}}
-% Ausschalten von annotation und library für Zitate im Text
+% Ausschalten von annotation und library für Zitate im Text
\AtEveryCite{%
\boolfalse{bbx:annotation}%
\boolfalse{bbx:library}%
}
%% Doppelpunkt nach Autoren/Editoren
-%% aus Kompatibilitätsgründen zu früheren Versionen wird
+%% aus Kompatibilitätsgründen zu früheren Versionen wird
%% \citenamepunct verwendet
\newcommand*{\citenamepunct}{\addcolon\space}
\renewcommand*{\nametitledelim}{\citenamepunct}
@@ -150,7 +151,7 @@
\newcommand*{\citerevsdnamedelim}{}
\newcommand*{\citemultinamedelim}{\slash}
\newcommand*{\citefinalnamedelim}{\slash}
-\AtEveryCite{%
+\AtBeginDocument{%
\let\revsdnamedelim\citerevsdnamedelim
\let\multinamedelim\citemultinamedelim
\let\finalnamedelim\citefinalnamedelim
@@ -161,6 +162,9 @@
\let\citefinalnamedelim\bibfinalnamedelim
}
+%% Textcite delimiter
+\newcommand*{\textcitesdelim}{\addspace\bibstring{and}\space}
+
%% Titelformate in Zitaten
\DeclareFieldFormat*{citetitle}{#1}
@@ -249,13 +253,13 @@
\providecommand*{\mkibid}[1]{%
\bbx@ibidemfont{#1}}
-%% pages (wichtig für xref)
+%% pages (wichtig für xref)
\newbibmacro*{pages}{%
\setunit{\bibpagespunct}%
\printfield{pages}}
%% in manchen Literaturverweisen (wenn nicht fullcite)
-%% müssen statt der vollen Namen (Format [byeditor])
+%% müssen statt der vollen Namen (Format [byeditor])
%% nur die Nachnamen ausgegeben werden (Format [labelname])
\newbibmacro*{cite:byeditor}{%
\ifnameundef{editor}
@@ -314,7 +318,7 @@
{\usebibmacro{postnote}}}
%% Test, ob author und editor bei xref identisch sind
-%% (für xref=true, useeditor=false oder usetranslator=false,
+%% (für xref=true, useeditor=false oder usetranslator=false,
%% edbyidem=true)
\newbibmacro*{authedxrefcheck}{%
\iffieldundef{xref}
@@ -333,8 +337,8 @@
{\booltrue{cbx:authedxref}}
{\boolfalse{cbx:authedxref}}}}
-%% Test, author des @inbook und author des @book) bei xref
-%% identisch sind (für xref=true, edbyidem=true); nötig,
+%% Test, ob author des @inbook und author des @book bei xref
+%% identisch sind (für xref=true, edbyidem=true); nötig,
%% damit der Herausgeber nicht durch idem ersetzt wird
\newbibmacro*{authauthxrefcheck}{%
\iffieldundef{xref}
@@ -348,11 +352,26 @@
{\booltrue{cbx:authauthxref}}
{\boolfalse{cbx:authauthxref}}}}
+%% für @review
+\DeclareCiteCommand{\bbx@review}
+ {}
+ {\usebibmacro{citeindex}%
+ \ifentryseen{\bbx@reviewparent}
+ {\global\booltrue{cbx:rpcited}}
+ {\global\boolfalse{cbx:rpcited}}%
+ \ifbool{cbx:fullcite}
+ {\usedriver
+ {\DeclareNameAlias{sortname}{default}}
+ {\thefield{entrytype}}}
+ {\usebibmacro{cite}}}
+ {}
+ {}
+
%% xref
\DeclareCiteCommand{\bbx@xref}
- {}%
- {\usebibmacro{cite:xref}}%
- {}%
- {}%
+ {}
+ {\usebibmacro{cite:xref}}
+ {}
+ {}
\endinput