summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-dw/cbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-08 01:03:08 +0000
committerKarl Berry <karl@freefriends.org>2011-02-08 01:03:08 +0000
commit374087c5ca5704662336227756f2fd1a155a1ab4 (patch)
treed59ee726b78ae975ffabedf801b8f477899f9d96 /Master/texmf-dist/tex/latex/biblatex-dw/cbx
parentdeeff75c49f1d72c90ee36be95e3e0c4c0c35a04 (diff)
biblatex-dw 1.3c (7feb11)
git-svn-id: svn://tug.org/texlive/trunk@21335 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx99
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx62
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx17
3 files changed, 90 insertions, 88 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 85aaec9daa5..8b539f59755 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 2010
+% authortitle-dw.cbx, Dominik Waßenhoven 2011
-\ProvidesFile{authortitle-dw.cbx}[2010/11/21 v1.3b biblatex citation style]
+\ProvidesFile{authortitle-dw.cbx}[2011/02/06 v1.3c biblatex citation style]
\RequireCitationStyle{standard-dw}
@@ -12,13 +12,12 @@
\newbibmacro*{cite}{%
\usebibmacro{cite:citepages}%
\global\boolfalse{cbx:loccit}%
- \global\let\cbx@tempa\empty
\ifbool{cbx:firstfull}
{\ifciteseen
{\usebibmacro{cite:normal}}
{\usebibmacro{cite:firstfull}}}
{\usebibmacro{cite:normal}}}
-
+
\newbibmacro*{cite:normal}{%
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
@@ -66,7 +65,6 @@
{}}}
\newbibmacro*{cite:shorthand}{%
- \cbx@tempa
\printtext[bibhyperref]{\printfield{shorthand}}%
\global\booltrue{cbx:noidem}}
@@ -95,7 +93,6 @@
%% xref
\newbibmacro*{cite:xref}{%
- \global\let\cbx@tempa\empty
\ifbool{cbx:firstfull}
{\ifciteseen
{\iffieldundef{shorthand}
@@ -221,7 +218,6 @@
\newbibmacro*{citetitle}{%
\global\boolfalse{cbx:loccit}%
- \global\let\cbx@tempa\empty
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
@@ -229,17 +225,59 @@
{\usebibmacro{cite:shorthand}}}
\newbibmacro*{cite:title}{%
- \cbx@tempa
\ifsingletitle
{\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
- {\printtext[bibhyperref]{%
- \printfield[citetitle]{labeltitle}}}}
+ {\ifboolexpr{
+ test {\iffieldequalstr{entrytype}{review}}
+ and
+ not test {\iffieldundef{xref}}
+ }
+ {\printtext[review]{\bbx@xref{\thefield{xref}}}}
+ {\printtext[bibhyperref]{%
+ \printfield[citetitle]{labeltitle}}}}}
\newbibmacro*{cite:title:force}{%
- \cbx@tempa
\printtext[bibhyperref]{%
\printfield[citetitle]{labeltitle}}}
+\DeclareCiteCommand{\cite}
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\textcite}
+ {\boolfalse{cbx:parens}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{textcite}}
+ {\ifbool{cbx:parens}
+ {\bibcloseparen\boolfalse{cbx:parens}}
+ {}%
+ \multicitedelim}
+ {\usebibmacro{textcite:postnote}}
+
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
%%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%%
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
@@ -253,7 +291,6 @@
{\ExecuteBibliographyOptions{loccittracker=false}}}
\newbibmacro*{cite:ibid}{%
- \cbx@tempa
\printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}%
\ifloccit
{\global\booltrue{cbx:loccit}}
@@ -269,13 +306,6 @@
{\addspace\bibopenparen}%
\printfield{postnote}\bibcloseparen}}
-\DeclareCiteCommand{\cite}
- {\usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite}}
- {\multicitedelim}
- {\usebibmacro{cite:postnote}}
-
\DeclareCiteCommand*{\cite}
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -283,13 +313,6 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\parencite}[\mkbibparens]
- {\usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite}}
- {\multicitedelim}
- {\usebibmacro{cite:postnote}}
-
\DeclareCiteCommand*{\parencite}[\mkbibparens]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -297,28 +320,4 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\footcite}[\mkbibfootnote]
- {\usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite}}
- {\multicitedelim}
- {\usebibmacro{cite:postnote}}
-
-\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
- {\usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite}}
- {\multicitedelim}
- {\usebibmacro{cite:postnote}}
-
-\DeclareCiteCommand{\textcite}
- {\boolfalse{cbx:parens}}
- {\usebibmacro{citeindex}%
- \usebibmacro{textcite}}
- {\ifbool{cbx:parens}
- {\bibcloseparen\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}
- {\usebibmacro{textcite: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 b558c6493ef..4bf04a27fd0 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 2010
-\ProvidesFile{footnote-dw.cbx}[2010/11/21 v1.3b biblatex citation style]
+\ProvidesFile{footnote-dw.cbx}[2011/02/06 v1.3c biblatex citation style]
\RequireCitationStyle{standard-dw}
@@ -89,10 +89,18 @@
{}}}}
\newbibmacro*{cite:title}{%
- \ifsingletitle
- {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
- {\printtext[bibhyperlink]{%
- \printfield[citetitle]{labeltitle}}}%
+ \ifboolexpr{
+ test {\iffieldequalstr{entrytype}{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
+ {\ifsingletitle
+ {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
+ {\printtext[bibhyperlink]{%
+ \printfield[citetitle]{labeltitle}}}}%
\ifboolexpr{
test \ifuseeditor
or
@@ -122,27 +130,29 @@
{\usebibmacro{cite:seenote}}}
\newbibmacro*{cite:seenote}{%
- \ifbool{cbx:parencitefoot}
- {\addspace\mkbibbrackets{%
- \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}%
- \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}%
- \ifbool{cbx:pageref}
- {\ifsamepage{\the\value{instcount}}
- {\csuse{cbx@first@\thefield{entrykey}}}
- {}
- {\addcomma\space\bibstring{page}\addnbspace
- \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}}
- {}}}
- {\addspace\mkbibparens{%
- \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}%
- \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}%
- \ifbool{cbx:pageref}
- {\ifsamepage{\the\value{instcount}}
- {\csuse{cbx@first@\thefield{entrykey}}}
- {}
- {\addcomma\space\bibstring{page}\addnbspace
- \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}}
- {}}}}
+ \ifbool{cbx:review}
+ {}
+ {\ifbool{cbx:parencitefoot}
+ {\addspace\mkbibbrackets{%
+ \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}%
+ \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}%
+ \ifbool{cbx:pageref}
+ {\ifsamepage{\the\value{instcount}}
+ {\csuse{cbx@first@\thefield{entrykey}}}
+ {}
+ {\addcomma\space\bibstring{page}\addnbspace
+ \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}}
+ {}}}
+ {\addspace\mkbibparens{%
+ \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}%
+ \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}%
+ \ifbool{cbx:pageref}
+ {\ifsamepage{\the\value{instcount}}
+ {\csuse{cbx@first@\thefield{entrykey}}}
+ {}
+ {\addcomma\space\bibstring{page}\addnbspace
+ \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}}
+ {}}}}}
%% xref
\newbibmacro*{cite:xref}{%
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 9f81ea04b95..9a0652c4c3f 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,6 +1,6 @@
-% standard-dw.cbx, Dominik Waßenhoven 2010
+% standard-dw.cbx, Dominik Waßenhoven 2011
-\ProvidesFile{standard-dw.cbx}[2010/11/21 v1.3b biblatex citation style]
+\ProvidesFile{standard-dw.cbx}[2011/02/06 v1.3c biblatex citation style]
\newbool{cbx:authauthxref}
\newbool{cbx:authedxref}
@@ -10,13 +10,14 @@
\newbool{cbx:idemfull}
\newbool{cbx:noidem}
\newbool{cbx:omiteditor}
+\newbool{cbx:review}
\newbool{cbx:xrefparent:firstcite}
\newbool{cbx:shorthandibid}
\newbibmacro*{cite:citepages}{}
\newbibmacro*{cite:full:citepages}{}
\newbibmacro*{cite:postnote}{}
-
+
\DeclareBibliographyOption{citedas}[true]{%
\csuse{bool#1}{cbx:citedas}}
\DeclareBibliographyOption{edstringincitations}[true]{%
@@ -161,15 +162,7 @@
}
%% Titelformate in Zitaten
-\DeclareFieldFormat{citetitle}{#1}
-\DeclareFieldFormat[article]{citetitle}{#1}
-\DeclareFieldFormat[inbook]{citetitle}{#1}
-\DeclareFieldFormat[incollection]{citetitle}{#1}
-\DeclareFieldFormat[inproceedings]{citetitle}{#1}
-\DeclareFieldFormat[patent]{citetitle}{#1}
-\DeclareFieldFormat[thesis]{citetitle}{#1}
-\DeclareFieldFormat[unpublished]{citetitle}{#1}
-\DeclareFieldFormat{labelyear}{#1}% e.g., the 'a' in '1995a'
+\DeclareFieldFormat*{citetitle}{#1}
\newbibmacro*{cite:name}{%
\printnames{labelname}%