summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx103
1 files changed, 43 insertions, 60 deletions
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 cd6cd7c6b8d..eab1c03dd5f 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 2011
+% footnote-dw.cbx, Dominik Waßenhoven 2012
-\ProvidesFile{footnote-dw.cbx}[2011/11/20 v1.4 biblatex citation style]
+\ProvidesFile{footnote-dw.cbx}[2012/06/28 v1.5 biblatex citation style]
\RequireCitationStyle{standard-dw}
@@ -9,7 +9,6 @@
\newbool{cbx:textcitefull}
\ExecuteBibliographyOptions{
- loccittracker=true,% für die Option 'ibidpage'
uniquename=false, % damit bei idem=false Vor- und Nachname gesetzt werden!
}
@@ -60,13 +59,9 @@
{\usebibmacro{cite:idem}%
\usebibmacro{cite:title}}
{\ifnameundef{labelname}
- {\usebibmacro{cite:title}}
- {\usebibmacro{cite:name}%
- \ifopcit
- {\ifloccit
- {\usebibmacro{cite:loccit}}
- {\usebibmacro{cite:opcit}}}
- {\usebibmacro{cite:title}}}}%
+ {}
+ {\usebibmacro{cite:name}}%
+ \usebibmacro{cite:title}}%
\usebibmacro{cite:save}}}
{\ifbool{cbx:shorthandibid}%
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
@@ -123,14 +118,15 @@
{}
{\ifnameundef{editor}
{}
- {\ifbool{xrefidem}%
- {\ifbool{bbx:edbyidem}
- {\newunit
- \bibstring{byeditor}%
- \setunit{\addspace}%
- \bibstring[\mkidem]{idemdat\thefield{gender}}}
- {\newunit
- \usebibmacro{cite:byeditor}}}%
+ {\ifboolexpr{
+ bool {xrefidem}
+ and
+ bool {bbx:edbyidem}
+ }
+ {\newunit
+ \bibstring{byeditor}%
+ \setunit{\addspace}%
+ \bibstring[\mkidem]{idemdat\thefield{gender}}}
{\newunit
\usebibmacro{cite:byeditor}}}}}%
\usebibmacro{cite:seenote}}
@@ -172,20 +168,24 @@
{\iffieldundef{shorthand}
{\ifnameundef{labelname}
{}
- {\ifbool{xrefidem}
+ {\ifboolexpr{
+ bool {xrefidem}
+ and
+ bool {bbx:edbyidem}
+ }
{\usebibmacro{cite:xref:idem}}
- {\usebibmacro{cite:editor}%
+ {\ifbool{xref:inbook}
+ {\usebibmacro{author}}
+ {\usebibmacro{cite:editor}}%
\nametitledelim}}%
\usebibmacro{cite:title}}
{\usebibmacro{cite:shorthand}}}
{\ifboolexpr{
bool {xrefidem}
- or
- bool {cbx:authauthxref}
+ and
+ bool {bbx:edbyidem}
}
- {\ifbool{bbx:edbyidem}
- {\usebibmacro{cite:fullxrefidem}}%
- {\usebibmacro{cite:fullxref}}}%
+ {\usebibmacro{cite:fullxrefidem}}
{\usebibmacro{cite:fullxref}}}}
\newbibmacro*{cite:fullxref}{%
@@ -254,8 +254,7 @@
{\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\footcite}[\mkfootnotecite]
- {\bibsentence
- \usebibmacro{prenote}}
+ {\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -272,8 +271,7 @@
{\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\footfullcite}[\mkfootnotecite]
- {\bibsentence
- \usebibmacro{prenote}%
+ {\usebibmacro{prenote}%
\usebibmacro{cite:full:citepages}%
\booltrue{cbx:fullcite}}
{\usedriver
@@ -282,6 +280,13 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkparencite\mkfootnotecite]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\DeclareCiteCommand{\textcite}[\footnotecheck\cbx@textcite\footcite]
{\gdef\cbx@savedkeys{}}
{\printnames{labelname}%
@@ -294,7 +299,12 @@
[\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}}
+ \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}
@@ -302,40 +312,13 @@
\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\textcitesdelim}
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Unverändert aus verbose-trad1 übernommen %%%%%
+%%%%% Unverändert aus verbose-inote übernommen %%%%%
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-\newbool{cbx:loccit}
-
-\DeclareBibliographyOption{ibidpage}[true]{%
- \ifstrequal{#1}{true}
- {\renewbibmacro*{cite:ibid:page}{\global\booltrue{cbx:loccit}}}
- {\renewbibmacro*{cite:ibid:page}{}}}
-
-\newbibmacro*{cite:opcit}{%
- \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}}
-
-\newbibmacro*{cite:loccit}{%
- \printtext{%
- \bibhyperlink{cite\@nameuse{cbx:lastcite@\thefield{entrykey}}}{%
- \bibstring[\mkibid]{loccit}}}%
- \global\booltrue{cbx:loccit}}
-
\newbibmacro*{cite:ibid}{%
- \printtext{%
- \bibhyperlink{cite\@nameuse{cbx:lastcite@\thefield{entrykey}}}{%
- \bibstring[\mkibid]{ibidem}}}%
+ \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
\ifloccit
- {\usebibmacro{cite:ibid:page}}
+ {\global\booltrue{cbx:loccit}}
{}}
-\newbibmacro*{cite:ibid:page}{}
-
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
- {\usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite}}
- {\multicitedelim}
- {\usebibmacro{cite:postnote}}
-
\endinput