summaryrefslogtreecommitdiff
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
parent61ee60ad9aa2ba669734c69ebc5617a8193ff19f (diff)
biblatex-dw (23sep13)
git-svn-id: svn://tug.org/texlive/trunk@31752 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/CHANGES14
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH4
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/README4
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex8
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdfbin161846 -> 162842 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex23
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdfbin176240 -> 177013 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex29
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdfbin351006 -> 351006 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex3
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdfbin356999 -> 356999 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex3
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdfbin320831 -> 320825 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex3
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdfbin327147 -> 327147 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx2
-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
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx2
26 files changed, 120 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES b/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES
index 77827fc8739..a554093bde9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES
@@ -1,9 +1,21 @@
-biblatex-dw 2013/09/07 v1.6
+biblatex-dw 2013/09/22 v1.6a
Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de>
Version history
---------------
+v1.6a [2013/09/22]
+This version of biblatex-dw was tested with biblatex 2.7a and biber 1.7.
+ - New option "inreference" (authortitle-dw only) which can take the values
+ "normal" and "full": If set to "full", @inreference entries are printed always
+ in full, but are omitted from the bibliography. Note that when using
+ "xref=false", you have to cite the corresponding @reference entry manually
+ (e.g. with \nocite) if you wish to see the @reference entry in the
+ bibliography. The "inreference" option complies with both ibidtracker and
+ idemtracker. The default for this option is "normal".
+ - BUGFIX: With the option "addyear" a superfluous space was introduced in some
+ circumstances. This should be fixed now.
+
v1.6 [2013/09/07]
This version of biblatex-dw was tested with biblatex 2.7a and biber 1.7.
- New option "addyear" (authortitle-dw only): If set to "true", the year of the
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH b/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH
index 6e11c2293a5..cff9a0b3e7d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH
@@ -1,5 +1,5 @@
-biblatex-dw 2013/09/07 v1.6
-Copyright (c) 2008-2012 Dominik Waßenhoven <domwass(at)web.de>
+biblatex-dw 2013/09/22 v1.6a
+Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de>
************************************************************
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/README b/Master/texmf-dist/doc/latex/biblatex-dw/README
index ab233e11081..d0155bd7a7d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/README
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/README
@@ -1,5 +1,5 @@
-biblatex-dw 2013/09/07 v1.6
-Copyright (c) 2008-2012 Dominik Waßenhoven <domwass(at)web.de>
+biblatex-dw 2013/09/22 v1.6a
+Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de>
************************************************************
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex
index f000d4d0f21..282e2d596c7 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex
@@ -1,14 +1,14 @@
%!TEX encoding = UTF-8 Unicode
% biblatex-dw
-% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2012
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013
%
% This file is the preamble for the documentation of
% biblatex-dw (both the English and the German version)
%%%%% biblatex-dw Version %%%%% version of biblatex-dw %%%%%
-\newcommand{\biblatexdwversion}{1.6}
-\newcommand{\biblatexdwdate}{\printdate{2013-09-07}}
+\newcommand{\biblatexdwversion}{1.6a}
+\newcommand{\biblatexdwdate}{\printdate{2013-09-22}}
\newcommand{\mindestanforderung}{1.7}% minimum biblatex version
\newcommand{\testversion}{2.7a}% tested biblatex version
\newcommand{\biberversion}{1.7}% tested biber version
@@ -205,7 +205,7 @@
\newcommand{\feldformat}[3]{\item[{\option{\cmd{DeclareFieldFormat\{{#1}\}\{}\cmd{#2\}}}}]~\\#3}
\newcommand{\eintragstyp}[3]{\item[{\texttt{@#1}}]#2 {\small(in \bl{}:
\iflanguage{ngerman}{wie}{same as} \texttt{@#3})}\hfill%
- {\footnotesize\sffamily\seite{\pageref{#1}}}}
+ {\footnotesize\sffamily\seite{\pageref{@#1}}}}
\newcommand{\achtung}{\marginnote{\footnotesize\dbend}}
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex
index 0fd3de20431..68142863037 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex
@@ -1,6 +1,6 @@
%!TEX encoding = UTF-8 Unicode
% biblatex-dw
-% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2011
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013
%
% This file configures the documentation
% of biblatex-dw to be printed
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex
index c26bb81a11c..566c636a97f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex
@@ -1,6 +1,6 @@
%!TEX encoding = UTF-8 Unicode
% biblatex-dw
-% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2011
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013
%
% This file configures the documentation
% of biblatex-dw to be viewed on a screen
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdf
index 26b9d62bd77..aee97865959 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex
index 1c732b69e02..f8371dd3a7c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex
@@ -2,7 +2,7 @@
%!TEX encoding = UTF-8 Unicode
% biblatex-dw
-% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2012
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013
\documentclass[english]{scrartcl}
\input{biblatex-dw-preamble}% preamble
@@ -333,7 +333,7 @@ edition = {2., revised}
\item If both \option{annotation} and \option{library} are set to
\wert{true}, the contents of the \texttt{annotation} field is placed
before the contents of the \texttt{library} field.
- \item In\beschreibung{inreference}
+ \item In\beschreibung{@inreference}
normal \bl{}, the entry type \texttt{@inreference} is an alias for
\texttt{@incollection} entries. In \bldw{}, this entry type can be used
for articles in encyclopedias or dictionaries. The output is similar to
@@ -350,14 +350,22 @@ edition = {2., revised}
The \texttt{@reference} entry type still is an alias to \texttt{@collection}.
Thus, you can use either \texttt{@collection} or \texttt{@reference} for
a work of reference.
- \item In\beschreibung{review}
+ \item Using the\beschreibung{inreference} option \option{inreference=full},
+ \texttt{@inreference} entries are printed always in full, but are omitted
+ from the bibliography. Note that when using \option{xref=false}, you have to
+ cite the corresponding \texttt{@reference} entry manually (e.g. with \cmd{nocite})
+ if you wish to include the \texttt{@reference} entry in the bibliography. The
+ \option{inreference} option complies with both \option{ibidtracker} and
+ \option{idemtracker}. The default for this option is \wert{normal}.
+
+ \item In\beschreibung{@review}
normal \bl{}, the entry type \texttt{@review} is an alias for
\texttt{@article} entries. In \bldw{}, this entry type can be used
for reviews. The output is similar to \texttt{@article}, with the
following differences:
\begin{itemize}
\item The title is enclosed in quotes.
- \item The bibliography string \enquote{review} (standard:
+ \item The bibliography string \enquote{reviewof} (standard:
\enquote{Review of}) is put in front of the title.
\item Instead of manually entering the data for the reviewed work in the \texttt{title}
field of the \texttt{@review} entry, it is also possible to add a reference in the field
@@ -523,8 +531,8 @@ edition = {2., revised}
This style is similar to \xbx{verbose-inote}. It is based on the
\xbx{authortitle-dw} style. Thus, you can use all options defined in
-\xbx{authortitle-dw}; the only exceptions are the options \option{firstfull}
-and \option{addyear}.
+\xbx{authortitle-dw}; the only exceptions are the options \option{addyear},
+\option{firstfull} and \option{inreference}.
Apart from that, there are the following differences between \xbx{footnote-dw} and
\xbx{authortitle-dw}:
\medskip
@@ -721,6 +729,9 @@ file (\texttt{biblatex.cfg}). The value in parentheses shows the default.
Possible values are \wert{smallcaps}, \wert{italic}, \wert{bold} and
\wert{normal}. If this option is not set, the font shape indicated by the
option \option{namefont} is used (this is the default behaviour).
+ \optlist[\xbx{authortitle-dw} only]{inreference}{normal}
+ If set to \wert{full}, \texttt{@inreference} entries are printed in full
+ in the citations, but are omitted from the bibliography.
\optlist{journalnumber}{standard}
Position of a journal's \texttt{number}: with \wert{standard} as in the
standard styles, with \wert{afteryear} after the \texttt{year}, introduced
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdf
index 6d2a6d89c31..85fa60a38a3 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex
index 6296674af0a..d7db6d459af 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex
@@ -2,7 +2,7 @@
%!TEX encoding = UTF-8 Unicode
% biblatex-dw
-% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2012
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013
%
% Diese Datei enthält die deutschsprachige Dokumentation von biblatex-dw
@@ -399,7 +399,7 @@ edition = {2., aktualisierte}
\item Werden sowohl \option{annotation} als auch \option{library} auf
\wert{true} gesetzt, so wird der Inhalt des Feldes \texttt{annotation}
vor dem Inhalt des \texttt{library}-Feldes ausgegeben.
- \item In\beschreibung{inreference}
+ \item In\beschreibung{@inreference}
\bl{} ist der Eintragstyp \texttt{@inreference} ein Alias für
\texttt{@incollection}. In \bldw{} kann dieser Eintragstyp für
Artikel in Nachschlagewerken verwendet werden. Die Ausgabe ist ähnlich
@@ -415,14 +415,22 @@ edition = {2., aktualisierte}
Der Eintragstyp \texttt{@reference} bleibt ein Alias zu \texttt{@collection}.
Damit kann also sowohl \texttt{@collection} als auch \texttt{@reference} für
Nachschlagewerke (Lexika, Wörterbücher etc.) verwendet werden.
- \item In\beschreibung{review}
+ \item Mit\beschreibung{inreference} der Option \option{inreference=full} werden
+ \texttt{@inreference}"=Einträge in Literaturverweisen immer vollständig ausgegeben,
+ dafür aber nicht in die Bibliographie aufgenommen. Beachten Sie, dass bei Benutzung
+ der Option \option{xref=false} der korrespondierende \texttt{@reference}"=Eintrag
+ manuell zitiert werden muss (z.\,B. mit \cmd{nocite}), wenn er in der Bibliographie
+ erscheinen soll. Die Option \option{inreference} befolgt die Einstellungen sowohl
+ von \option{ibidtracker} als auch \option{idemtracker}. Der Standardwert für diese
+ Option ist \wert{normal}.
+ \item In\beschreibung{@review}
\bl{} ist der Eintragstyp \texttt{@review} ein Alias für
\texttt{@article}. In \bldw{} kann dieser Eintragstyp für
Rezensionen verwendet werden. Die Ausgabe ist ähnlich wie bei
\texttt{@article}, mit folgenden Unterschieden:
\begin{itemize}
\item Der Titel wird in Anführungszeichen gesetzt.
- \item Der \emph{bibliography string} \enquote{review} (Standard:
+ \item Der \emph{bibliography string} \enquote{reviewof} (Standard:
\enquote{Rezension zu}\slash\enquote{Rez. zu}) wird vor dem
Titel ausgegeben.
\item Statt einer manuellen Angabe des rezensierten Werkes im \texttt{title}"=Feld
@@ -607,8 +615,10 @@ edition = {2., aktualisierte}
\section{Der Stil \xbx{footnote-dw}}
Dieser Stil ähnelt dem Stil \xbx{verbose-inote}. Er basiert auf
-\xbx{authortitle-dw}, so dass auch alle Optionen, die von \xbx{authortitle-dw} definiert werden, mit \xbx{footnote-dw} benutzt werden können, mit Ausnahme der
-Option \option{firstfull}. Daneben gibt es folgende Unterschiede:
+\xbx{authortitle-dw}, so dass auch alle Optionen, die von \xbx{authortitle-dw} definiert
+werden, mit \xbx{footnote-dw} benutzt werden können, mit Ausnahme der Optionen
+\option{addyear}, \option{firstfull} und \option{inreference}. Daneben gibt es folgende
+Unterschiede:
\medskip
\begin{itemize}
\item Zitate sind \emph{nur} innerhalb von Fußnoten möglich. Zitate
@@ -765,8 +775,8 @@ gesetzt. Der Wert in Klammern gibt den Standard an.
\enquote{im Folgenden zit. als~\ldots} angefügt.
\optlist{citepages}{separate}
Legt fest, ob bei einem Voll- oder Erstzitat (bei \xbx{authortitle-dw} nur mit der
- Option \option{firstfull}) eines Eintrags mit \texttt{pages}"=Feld die Seitenangaben ausgegeben
- werden oder nicht.
+ Option \option{firstfull}) eines Eintrags mit \texttt{pages}"=Feld die Seitenangaben
+ ausgegeben werden oder nicht.
\optlist{edbyidem}{true}
\enquote{hg.\,v.\,dems.} statt \enquote{hg.\,v. \emph{Herausgeber}}.
\optlist{editionstring}{false}
@@ -820,6 +830,9 @@ gesetzt. Der Wert in Klammern gibt den Standard an.
\wert{bold} (fett) und \wert{normal}. Wird die Option nicht gesetzt, so
wird der Schriftschnitt von der Option \option{namefont} übernommen (das
ist auch die Voreinstellung).
+ \optlist[nur \xbx{authortitle-dw}]{inreference}{normal}
+ Mit \wert{inreference=full} werden \texttt{@inreference}"=Einträge in Literaturverweisen
+ vollständig ausgegeben, aber nicht in die Bibliographie aufgenommen.
\optlist{journalnumber}{standard}
Position der Heftnummer (\texttt{number}) einer Zeitschrift: bei
\wert{standard} wie in den Standard"=Stilen, bei \wert{afteryear} nach dem
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf
index a3ae9223832..330a15a7950 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex
index 54d4f13daaf..001d270d84d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex
@@ -1,4 +1,4 @@
-% v 1.6
+% v 1.6a
% This file presents the `authortitle-dw' style
%
\listfiles
@@ -27,6 +27,7 @@
% idembib=false,
% idembibformat=dash,
% idemfont=smallcaps,%italic,%bold,
+% inreference=full,%normal,
% journalnumber=afteryear,%date,%standard
library=true,
% namefont=smallcaps,%italic,%bold,
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf
index 7c083374a82..2dbf8fcf20c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex
index 117014820e1..76c11581758 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex
@@ -1,4 +1,4 @@
-% v 1.6
+% v 1.6a
% This file presents the `footnote-dw' style
%
\documentclass[a4paper]{article}
@@ -26,6 +26,7 @@
% idembib=false,
% idembibformat=dash,
% idemfont=smallcaps,%italic,%bold,
+% inreference=full,%normal,
% journalnumber=afteryear,%date,%standard
library=true,
% namefont=smallcaps,%italic,%bold,
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf
index aa710bff788..db58bcaf441 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex
index 0c3029143f8..0c9b434d6b6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex
@@ -1,4 +1,4 @@
-% v 1.6
+% v 1.6a
% This file presents the `authortitle-dw' style
%
\documentclass[a4paper]{article}
@@ -26,6 +26,7 @@
% idembib=false,
% idembibformat=dash,
% idemfont=smallcaps,%italic,%bold,
+% inreference=full,%normal,
% journalnumber=afteryear,%date,%standard
library=true,
% namefont=smallcaps,%italic,%bold,
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf
index 62896fd1680..965a123300b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex
index 16c94fac075..1eb12e96bd4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex
@@ -1,4 +1,4 @@
-% v 1.6
+% v 1.6a
% This file presents the `footnote-dw' style
%
\documentclass[a4paper]{article}
@@ -25,6 +25,7 @@
% idembib=false,
% idembibformat=dash,
% idemfont=smallcaps,%italic,%bold,
+% inreference=full,%normal,
% journalnumber=afteryear,%date,%standard
library=true,
% namefont=smallcaps,%italic,%bold,
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 e39ca992ba7..301084eae6f 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,6 +1,6 @@
% authortitle-dw.bbx, Dominik Waßenhoven 2013
-\ProvidesFile{authortitle-dw.bbx}[2013/09/07 v1.6 biblatex bibliography style]
+\ProvidesFile{authortitle-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style]
\RequireBibliographyStyle{standard-dw}
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 43804aed50e..8f85cf8bf8f 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,6 +1,6 @@
% footnote-dw.bbx, Dominik Waßenhoven 2013
-\ProvidesFile{footnote-dw.bbx}[2013/09/07 v1.6 biblatex bibliography style]
+\ProvidesFile{footnote-dw.bbx}[2013/09/22 v1.6a 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 42f059e319b..2b5d32bba90 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,6 @@
% standard-dw.bbx, Dominik Waßenhoven 2013
-\ProvidesFile{standard-dw.bbx}[2013/09/07 v1.6 biblatex bibliography style]
+\ProvidesFile{standard-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style]
\@ifpackagelater{biblatex}{2011/11/13}
{}
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}
{}
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx
index 48ea16eae44..4006521eb82 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx
@@ -1,6 +1,6 @@
% english-dw.lbx, Dominik Waßenhoven 2013
-\ProvidesFile{english-dw.lbx}[2013/09/07 v1.6 biblatex localization file]
+\ProvidesFile{english-dw.lbx}[2013/09/22 v1.6a biblatex localization file]
\NewBibliographyString{%
idemdat,%
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx
index 44625002f0e..0527d992816 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx
@@ -1,6 +1,6 @@
% german-dw.lbx, Dominik Waßenhoven 2013
-\ProvidesFile{german-dw.lbx}[2013/09/07 v1.6 biblatex localization file]
+\ProvidesFile{german-dw.lbx}[2013/09/22 v1.6a biblatex localization file]
\InheritBibliographyExtras{german}