summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-dw/cbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-24 22:34:38 +0000
committerKarl Berry <karl@freefriends.org>2013-09-24 22:34:38 +0000
commit8bf589e665b12fbe605d9e60956d67d8253a364f (patch)
tree51f4674cb649929d66a49427510bfb621b336f79 /Master/texmf-dist/tex/latex/biblatex-dw/cbx
parent61ee60ad9aa2ba669734c69ebc5617a8193ff19f (diff)
biblatex-dw (23sep13)
git-svn-id: svn://tug.org/texlive/trunk@31752 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.cbx51
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx2
3 files changed, 46 insertions, 11 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 6fe1d082d54..0b7771ecd1d 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,11 +1,13 @@
% authortitle-dw.cbx, Dominik Waßenhoven 2013
-\ProvidesFile{authortitle-dw.cbx}[2013/09/07 v1.6 biblatex citation style]
+\ProvidesFile{authortitle-dw.cbx}[2013/09/22 v1.6a biblatex citation style]
\RequireCitationStyle{standard-dw}
\newbool{cbx:addyear}
\newbool{cbx:firstfull}
+\newbool{cbx:inref}% Option inreference (true: inreference=full; false: inreference=normal)
+\newbool{cbx:inreffull}% für fullcite bei inreference (nur bei Option inreference=full)
\DeclareBibliographyOption{addyear}[true]{%
\csuse{bool#1}{cbx:addyear}}
@@ -13,17 +15,39 @@
\DeclareBibliographyOption{firstfull}[true]{%
\csuse{bool#1}{cbx:firstfull}}
+\DeclareBibliographyOption{inreference}[normal]{%
+ \ifcsdef{cbx@opt@inreference@#1}
+ {\csuse{cbx@opt@inreference@#1}}
+ {\blxdw@error
+ {Invalid option 'inreference=#1'\MessageBreak
+ Valid values are 'normal' and 'full'}}}
+\def\cbx@opt@inreference@normal{%
+ \boolfalse{cbx:inref}}
+\def\cbx@opt@inreference@full{%
+ \booltrue{cbx:inref}%
+ \ExecuteBibliographyOptions[inreference]{skipbib}}
+
+% Test, ob inreference genutzt wird
+\AtEveryCitekey{%
+ \ifentrytype{inreference}
+ {\ifbool{cbx:inref}
+ {\booltrue{cbx:inreffull}}
+ {\boolfalse{cbx:inreffull}}}
+ {}}
+
%% Zeichen zwischen Titel und Jahr (bei addyear=true)
\newcommand*{\titleyeardelim}{\addspace}
\newbibmacro*{cite}{%
\usebibmacro{cite:citepages}%
\global\boolfalse{cbx:loccit}%
- \ifbool{cbx:firstfull}
- {\ifciteseen
- {\usebibmacro{cite:normal}}
- {\usebibmacro{cite:firstfull}}}
- {\usebibmacro{cite:normal}}}
+ \ifbool{cbx:inreffull}
+ {\usebibmacro{cite:inreffull}}
+ {\ifbool{cbx:firstfull}
+ {\ifciteseen
+ {\usebibmacro{cite:normal}}
+ {\usebibmacro{cite:firstfull}}}
+ {\usebibmacro{cite:normal}}}}
\newbibmacro*{cite:normal}{%
\iffieldundef{shorthand}
@@ -51,6 +75,17 @@
{\usebibmacro{cite:shorthand}}}%
{\usebibmacro{cite:shorthand}}}}
+\newbibmacro*{cite:inreffull}{%
+ \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+ {\usebibmacro{cite:ibid}}
+ {\ifthenelse{\ifciteidem\AND\NOT\boolean{cbx:noidem}%
+ \AND\NOT\iffirstonpage}
+ {\usebibmacro{cite:idem}%
+ \booltrue{cbx:idemfull}}
+ {}%
+ \printtext[bibhyperref]{\usebibmacro{cite:full}}}%
+ \usebibmacro{cite:save}}
+
\newbibmacro*{cite:firstfull}{%
\ifthenelse{\ifciteidem\AND\NOT\boolean{cbx:noidem}%
\AND\NOT\iffirstonpage}
@@ -93,7 +128,7 @@
\ifbool{cbx:firstfull}
{\ifciteseen
{\usebibmacro{textcite:normal}}
- {\usebibmacro{textcite:firstfull}}}
+ {\usebibmacro{textcite:firstfull}}}%
{\usebibmacro{textcite:normal}}}
\newbibmacro*{textcite:firstfull}{%
@@ -255,7 +290,7 @@
}
{\printtext[review]{\bbx@review{\thefield{xref}}}}
{\printtext[bibhyperref]{%
- \printfield[citetitle]{labeltitle}}}
+ \printfield[citetitle]{labeltitle}}}%
\ifbool{cbx:addyear}
{\iffieldundef{year}
{}
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 fe4646eae91..1a8ed50eb6e 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 2012
+% footnote-dw.cbx, Dominik Waßenhoven 2013
-\ProvidesFile{footnote-dw.cbx}[2013/06/03 v1.5a (beta) biblatex citation style]
+\ProvidesFile{footnote-dw.cbx}[2013/09/22 v1.6a biblatex citation style]
\RequireCitationStyle{standard-dw}
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 37d7961a709..2447880fb3a 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 2013
-\ProvidesFile{standard-dw.cbx}[2013/09/07 v1.6 biblatex citation style]
+\ProvidesFile{standard-dw.cbx}[2013/09/22 v1.6a biblatex citation style]
\@ifpackagelater{biblatex}{2011/11/13}
{}