summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/CHANGES26
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH10
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/README10
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex14
-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.pdfbin162842 -> 156882 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex50
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdfbin177013 -> 172592 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex55
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdfbin351006 -> 351005 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex6
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdfbin356999 -> 357012 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdfbin320825 -> 320826 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdfbin327147 -> 327161 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx199
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx12
-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.cbx91
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx4
26 files changed, 310 insertions, 199 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES b/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES
index a554093bde9..73a77cc9503 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES
@@ -1,9 +1,31 @@
-biblatex-dw 2013/09/22 v1.6a
-Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de>
+biblatex-dw 2016/12/06 v1.7
+Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de>
Version history
---------------
+v1.7 [2016/12/06]
+This version of biblatex-dw needs at least biblatex 3.3 and was testet with
+biblatex 3.6 and biber 2.6.
+- New option "citeauthorname" (instead of "firstfullname") which can take the
+ values "normal" (\citeauthor and \textcite print the surname only, as in
+ standard biblatex), "firstfull" (at the first use of \citeauthor or \textcite,
+ the full name is printed, otherwise the surname only; thus, this is the
+ behaviour of the former option "firstfullname") and "full" (the full name is
+ always printed when using \citeauthor or \textcite). The default for this option
+ is "normal".
+- Option "firstfullname" has been dropped (see above, option "citeauthorname").
+- Option "series" can now take the values "standard", "afteryear" and
+ "beforeedition". The latter is new and prints the series ahead of the edition.
+ The default for this option is "standard".
+- BUGFIX: From version 3.3 of biblatex, \DeclareNameFormat has changed. This
+ version of biblatex-dw is now compatible with the new syntax.
+- BUGFIX: In some circumstances, the option "inreference=full" was broken. This
+ should be fixed now.
+- BUGFIX: In some cases, @review in combination with the xref functionality
+ suppressed the output of pages. This should be fixed.
+- Compatibility with biblatex 2.9 regarding the list of shorthands.
+
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
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH b/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH
index cff9a0b3e7d..efe17b60f43 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/22 v1.6a
-Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de>
+biblatex-dw 2016/12/06 v1.7
+Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de>
************************************************************
@@ -111,9 +111,9 @@ Inhalt der Datei LIESMICH
* Ondrej Salvet * Johann Konrad Schwarz
* Salome Södergran * Jonas Stein
* Matthias Steinbrink * Philipp Stephani
- * Bernhard Tempel * Dominik Weber
- * Christian Weitert * Christofer Zwanzig
- * Дмитрий Гордеев
+ * Bernhard Tempel * Herbert Voss
+ * Dominik Weber * Christian Weitert
+ * Christofer Zwanzig * Дмитрий Гордеев
7. Lizenz
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/README b/Master/texmf-dist/doc/latex/biblatex-dw/README
index d0155bd7a7d..e0535eadd25 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/22 v1.6a
-Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de>
+biblatex-dw 2016/12/06 v1.7
+Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de>
************************************************************
@@ -105,9 +105,9 @@ Contents of README
* Ondrej Salvet * Johann Konrad Schwarz
* Salome Södergran * Jonas Stein
* Matthias Steinbrink * Philipp Stephani
- * Bernhard Tempel * Dominik Weber
- * Christian Weitert * Christofer Zwanzig
- * Дмитрий Гордеев
+ * Bernhard Tempel * Herbert Voss
+ * Dominik Weber * Christian Weitert
+ * Christofer Zwanzig * Дмитрий Гордеев
7. Licence
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 282e2d596c7..19bee121194 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,17 +1,17 @@
%!TEX encoding = UTF-8 Unicode
% biblatex-dw
-% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016
%
% 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.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
+\newcommand{\biblatexdwversion}{1.7}
+\newcommand{\biblatexdwdate}{\printdate{2016-12-06}}
+\newcommand{\mindestanforderung}{3.3}% minimum biblatex version
+\newcommand{\testversion}{3.6}% tested biblatex version
+\newcommand{\biberversion}{2.6}% tested biber version
\newcommand{\screenversion}{}
\newcommand{\TOC}{}
\newcommand{\lizenz}{}
@@ -75,7 +75,7 @@
%%%%% Verschiedene Pakete %%%%% Miscellaneous packages
\usepackage{microtype}% optischer Randausgleich
-\usepackage{dtklogos}% Logos wie \BibTeX
+\usepackage{dtk-logos}% Logos wie \BibTeX etc.
\usepackage{xspace}
\usepackage{textcomp}% Text-Companion-Symbole
\usepackage{manfnt}% für das Achtung-Symbol
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 68142863037..2c54dddd092 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>, 2013
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016
%
% 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 566c636a97f..d7002df1240 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>, 2013
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016
%
% 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 aee97865959..bc9bf9f977f 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 f8371dd3a7c..ddb76a24d8f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex
@@ -274,11 +274,11 @@ edition = {2., revised}
\addspace vol\adddot\space}
\end{lstlisting}
\item The\beschreibung{series} option \option{series} affects the position of the \texttt{series}
- field. If set to \wert{afteryear}, the series is printed after the
- year. This affects the entry types \texttt{@book}, \texttt{@inbook},
+ field, possible values are \wert{afteryear}, \wert{beforeedition} and \wert{standard}. This affects the entry types \texttt{@book}, \texttt{@inbook},
\texttt{@collection}, \texttt{@incollection}, \texttt{@proceedings},
- \texttt{@inproceedings} and \texttt{@manual}. The standard value for
- this option is \wert{standard}.
+ \texttt{@inproceedings} and \texttt{@manual}.
+ If set to \wert{afteryear} or \wert{beforeedition}, the series will be put after the year or before the edition.
+ The standard value for this option is \wert{standard}, the series will be printed before the location.
\item The\beschreibung{seriesformat} option \option{seriesformat} can
take the values \wert{standard} and \wert{parens}. If set to
\wert{parens}, \texttt{series} and \texttt{number} (of a book etc.)
@@ -483,22 +483,23 @@ edition = {2., revised}
Author: Title, in: Book, pp.\,100--150, here p.\,125.
\end{quote}
- \item The\beschreibung{firstfullname} option \option{firstfullname=true} offers the possibility to have
- authors\slash editors printed with first name and last name for the
- first citation when using the commands \cmd{citeauthor} or
- \cmd{textcite}; only when they are cited for the second time, the last
- name is printed on its own. This works also with different citations
- from the same author such as the full name is only given with the
- first citation. It does not matter, if you only use \cmd{citeauthor}
- or {textcite} or both. The standard for this option is \wert{false}
- (i.e. only the last names are printed).
- \item The\beschreibung{citeauthor} \option{citeauthor} option controls the name format for the
- \cmd{citeauthor} command; it can take the values \wert{namefont}, \wert{namefontfoot} and
- \wert{normalfont}. With \option{citeauthor=namefont} the same format as set by the option
- \option{namefont} is used. This is the default behaviour. With \option{citeauthor=normalfont}
- the normal font is always used for \cmd{citeauthor}, regardless of the \option{namefont} option.
- With \option{citeauthor=namefontfoot} the \option{namefont} format is used if the
+ \item The\beschreibung{citeauthor} \option{citeauthor} option controls the name format for
+ the \cmd{citeauthor} command; it can take the values \wert{namefont},
+ \wert{namefontfoot} and \wert{normalfont}. With \option{citeauthor=namefont} the
+ same format as set by the option \option{namefont} is used. This is the default
+ behaviour. With \option{citeauthor=normalfont} the normal font is always used for
+ \cmd{citeauthor}, regardless of the \option{namefont} option. With
+ \option{citeauthor=namefontfoot} the \option{namefont} format is used if the
\cmd{citeauthor} command is inside a footnote, otherwise the normal font is used.
+ \item The\beschreibung{citeauthorname} option \option{citeauthorname} controls the
+ appearance of names when using the the commands \cmd{citeauthor} and \cmd{textcite}.
+ With \option{citeauthorname=firsfull}, the name is given in full when cited for the
+ first time; from the second citation onwards, only the last name is printed. This
+ works also with different citations from the same author, regardless whether you
+ only use \cmd{citeauthor} or \cmd{textcite} or both. With
+ \option{citeauthorname=full} the name is always given in full, with
+ \option{citeauthorname=normal} only the given name is printed.
+ The default value for this option is \wert{normal}.
\item If\beschreibung{singletitle} you use the \bl{} option \option{singletitle=true}, the title of
a cited work is only printed if there is more than one work of the same
author. See the biblatex documentation for details.
@@ -673,6 +674,11 @@ file (\texttt{biblatex.cfg}). The value in parentheses shows the default.
Specifies the font shape of the authors' names when the \cmd{citeauthor}
command is used. Possible values are \wert{namefont}, \wert{normalfont} and
\wert{namefontfoot}.
+ \optlist{citeauthorname}{normal}
+ Controls the name output when using \cmd{citeauthor} or \cmd{textcite}. With
+ \wert{firstfull} the full name is printed at first citation, at all
+ subsequent citations only the last name is printed. With \wert{full} the full name is
+ always printed, whereas \wert{normal} always gives the given name only.
\optlist{citedas}{true}
The first citation (in \xbx{authortitle-dw} only if the option
\option{firstfull} is used) is followed by the string
@@ -702,10 +708,6 @@ file (\texttt{biblatex.cfg}). The value in parentheses shows the default.
The edition is printed as superscript number straight ahead of the year.
\optlist[\xbx{authortitle-dw} only]{firstfull}{false}
The first citation is printed with full reference.
- \optlist{firstfullname}{false}
- At the first citation with \cmd{citeauthor} or \cmd{textcite}
- the full name is printed, at all
- subsequent citations only the last name is printed.
\optlist{firstnamefont}{normal}
Specifies the font shape of the first names of authors and editors as well
as of name affixes and (if \option{useprefix} is set to \wert{false}) of
@@ -775,7 +777,7 @@ file (\texttt{biblatex.cfg}). The value in parentheses shows the default.
\option{pseudoauthor} are \emph{not} printed.
\optlist{series}{standard}
Position of a work's \texttt{series}: with \wert{standard} as in the
- standard styles, with \wert{afteryear} after the \texttt{year}.
+ standard styles, with \wert{afteryear} after the \texttt{year}, with \wert{beforeedition} before the \texttt{edition}.
\optlist{seriesformat}{parens}
Format of a work's \texttt{series}: with \wert{standard} as in the
standard styles, with \wert{parens} in parentheses.
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 85fa60a38a3..0121beb0eb4 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 d7db6d459af..02af0f9b2cb 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>, 2013
+% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016
%
% Diese Datei enthält die deutschsprachige Dokumentation von biblatex-dw
@@ -333,11 +333,10 @@ edition = {2., aktualisierte}
\end{lstlisting}
\item Die\beschreibung{series}
Option \option{series} bestimmt die Position der Reihe (Feld
- \texttt{series}). Setzt man sie auf \wert{afteryear}, wird die Reihe
- nach dem Jahr ausgegeben. Das betrifft die Typen \texttt{@book},
+ \texttt{series}), möglich sind die Werte \wert{afteryear}, \wert{beforeedition} und \wert{standard}. Das betrifft die Typen \texttt{@book},
\texttt{@inbook}, \texttt{@collection}, \texttt{@incollection},
- \texttt{@proceedings}, \texttt{@inproceedings} und \texttt{@manual}.
- Der Standardwert für diese Option ist \wert{standard}.
+ \texttt{@proceedings}, \texttt{@inproceedings} und \texttt{@manual}. Bei \wert{afteryear} wird die Reihe nach dem Jahr ausgegeben, bei \wert{beforeedition} vor der Auf"|lage.
+ Der Standardwert für diese Option ist \wert{standard}, die Reihe wird dann vor dem Ort ausgegeben.
\item Die\beschreibung{seriesformat} Option \option{seriesformat} kann
die Werte \wert{standard} und \wert{parens} annehmen. Mit
\wert{parens} werden Reihe und Nummer eines Werkes (\texttt{series} und
@@ -561,24 +560,27 @@ edition = {2., aktualisierte}
Autor: Titel, in: Buch, S.\,100--150, hier S.\,125.
\end{quote}
- \item Mit\beschreibung{firstfullname}
- der Option \option{firstfullname=true} hat man die Möglichkeit, beim ersten
- Zitieren eines Autors\slash Herausgebers mit dem Befehl \cmd{citeauthor}
- oder mit dem Befehl \cmd{textcite} automatisch den vollen Namen
- ausgeben zu lassen; erst beim zweiten Zitieren wird dann nur der Nachname
- ausgegeben. Das funktioniert auch bei unterschiedlichen Literaturverweisen
- desselben Autors, so dass auch dann der volle Name nur beim ersten Verweis
- ausgegeben wird. Dabei ist es egal, ob man nur \cmd{citeauthor}, nur \cmd{textcite}
- oder beide Befehle gemischt einsetzt. Der Standard für diese Option ist
- \wert{false} (d.\,h., es wird immer nur der Nachname ausgegeben).
\item Die\beschreibung{citeauthor} Option \option{citeauthor} bestimmt das Format für den
Befehl \cmd{citeauthor}; sie kann die Werte \wert{namefont}, \wert{namefontfoot} und
- \wert{normalfont} annehmen. Mit \option{citeauthor=namefont} wird das Format benutzt,
- das mit der Option \option{namefont} eingestellt wurde. Dies ist die Standardeinstellung.
- Mit \option{citeauthor=normalfont} wird immer die normale Schrift für \cmd{citeauthor}
- benutzt, unabhängig von der Einstellung der Option \option{namefont}. Mit
- \option{citeauthor=namefontfoot} wird das \option{namefont}"=Format benutzt, wenn der
- \cmd{citeauthor}"=Befehl in einer Fußnote steht, ansonsten wird die normale Schrift benutzt.
+ \wert{normalfont} annehmen. Mit \option{citeauthor=namefont} wird das Format
+ benutzt, das mit der Option \option{namefont} eingestellt wurde. Dies ist die
+ Standardeinstellung. Mit \option{citeauthor=normalfont} wird immer die normale
+ Schrift für \cmd{citeauthor} benutzt, unabhängig von der Einstellung der Option
+ \option{namefont}. Mit \option{citeauthor=namefontfoot} wird das
+ \option{namefont}"=Format benutzt, wenn der \cmd{citeauthor}"=Befehl in einer
+ Fußnote steht, ansonsten wird die normale Schrift benutzt.
+ \item Mit\beschreibung{citeauthorname}
+ der Option \option{citeauthorname} hat man die Möglichkeit, die Namensform
+ beim Zitieren eines Autors\slash Herausgebers mit dem Befehl \cmd{citeauthor}
+ oder mit dem Befehl \cmd{textcite} zu steuern. \option{citeauthorname=firstfull}
+ bewirkt, dass beim ersten Zitieren der volle Name ausgegeben wird und bei allen
+ weiteren Zitaten nur der Nachname. Das funktioniert auch bei unterschiedlichen
+ Literaturverweisen desselben Autors, so dass auch dann der volle Name nur beim
+ ersten Verweis ausgegeben wird. Dabei ist es egal, ob man nur \cmd{citeauthor},
+ nur \cmd{textcite} oder beide Befehle gemischt einsetzt. Mit
+ \option{citeauthorname=full} wird immer der volle Name ausgegeben, mit
+ \option{citeauthorname=normal} wird immer nur der Nachname ausgegeben.
+ Der Standard für diese Option ist \wert{normal}.
\item Mit\beschreibung{singletitle}
der \bl"=Option \option{singletitle=true} wird der Titel eines Werkes
nur dann ausgegeben, wenn mehr als ein Werk desselben Autors vorhanden ist.
@@ -769,6 +771,11 @@ gesetzt. Der Wert in Klammern gibt den Standard an.
Legt den Schriftschnitt der Autorennamen bei Verwendung des Befehls \cmd{citeauthor}
fest. Mögliche Werte sind \wert{namefont}, \wert{normalfont} und
\wert{namefontfoot}.
+ \optlist{citeauthorname}{normal}
+ Legt fest, ob bei \cmd{citeauthor} oder \cmd{textcite} nur der Nachname oder der volle
+ Name ausgegeben wird. Mögliche Werte sind \wert{normal} (nur Nachname), \wert{full}
+ (immer voller Name) und \wert{firstfull} (beim ersten Zitat voller Name, danach nur
+ Nachname).
\optlist{citedas}{true}
Bei Einträgen mit \texttt{shorthand} wird dem Erstzitat (bei
\xbx{authortitle-dw} nur mit der Option \option{firstfull}) ein
@@ -800,10 +807,6 @@ gesetzt. Der Wert in Klammern gibt den Standard an.
dem Jahr ausgegeben.
\optlist[nur \xbx{authortitle-dw}]{firstfull}{false}
Beim ersten Zitat wird die volle Literaturangabe ausgegeben.
- \optlist{firstfullname}{false}
- Beim ersten Zitat mit \cmd{citeauthor} oder \cmd{textcite}
- wird der volle Name ausgegeben, bei
- allen weiteren Zitaten nur der Nachname.
\optlist{firstnamefont}{normal}
Legt den Schriftschnitt der Vornamen von Autoren und Editoren fest, ebenso
von Namensaffixen und (mit der Option \option{useprefix=false})
@@ -879,7 +882,7 @@ gesetzt. Der Wert in Klammern gibt den Standard an.
\option{pseudoauthor} \emph{nicht} ausgegeben.
\optlist{series}{standard}
Position der Reihe (\texttt{series}) eines Werkes: bei \wert{standard} wie
- in den Standard"=Stilen, bei \wert{afteryear} nach dem Jahr
+ in den Standard"=Stilen, bei \wert{afteryear} nach dem Jahr und bei \wert{beforeedition} vor der Auf"|lage
(\texttt{year}\slash \texttt{date}).
\optlist{seriesformat}{parens}
Format der Reihe (\texttt{series}) eines Werkes: bei \wert{standard} wie in
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 330a15a7950..d479778800d 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 001d270d84d..7c7ede76783 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.6a
+% v 1.7
% This file presents the `authortitle-dw' style
%
\listfiles
@@ -14,6 +14,7 @@
% addyear=true,
annotation=true,
% citeauthor=normalfont,%namefontfoot,%namefont,
+% citeauthorname=firstfull,%full,%normal
% citedas=false,
% citepages=suppress,%omit,%permit,%separate,
% edbyidem=false,
@@ -21,7 +22,6 @@
% edstringincitations=false,
% edsuper=true,
% firstfull=true,
-% firstfullname=true,
% firstnamefont=smallcaps,%italic,%bold,
% ibidemfont=smallcaps,%italic,%bold,
% idembib=false,
@@ -39,7 +39,7 @@
% origfieldsformat=parens,%brackets,%punct,
% pagetotal=true,
% pseudoauthor=false,
-% series=afteryear,
+ series=beforeedition,%afteryear,%beforeedition,%standard
% shorthandibid=false,
% shorthandinbib=true,
% shorthandwidth=40pt,%3em,
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 2dbf8fcf20c..d9281cbc542 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 76c11581758..4ffce5a3381 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.6a
+% v 1.7
% This file presents the `footnote-dw' style
%
\documentclass[a4paper]{article}
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 db58bcaf441..6cee32c20fe 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 0c9b434d6b6..08176143757 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.6a
+% v 1.7
% This file presents the `authortitle-dw' style
%
\documentclass[a4paper]{article}
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 965a123300b..4b4b7c95f16 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 1eb12e96bd4..e2b66043137 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.6a
+% v 1.7
% This file presents the `footnote-dw' style
%
\documentclass[a4paper]{article}
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 301084eae6f..075131d4ee8 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
+% authortitle-dw.bbx, Dominik Waßenhoven 2016
-\ProvidesFile{authortitle-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style]
+\ProvidesFile{authortitle-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style]
\RequireBibliographyStyle{standard-dw}
@@ -328,7 +328,7 @@
% oder 'options = {oldbookauthor=true}'
% werden nicht in der Schrift von 'namefont' gesetzt
% Formatierung der Nachnamen entsprechend der Option 'namefont'
-\renewcommand*{\mkbibnamelast}[1]{%
+\renewcommand*{\mkbibnamefamily}[1]{%
\ifboolexpr{
( bool {bbx:oldauthor}
and
@@ -356,7 +356,7 @@
{\bbx@namefont{#1}}}
% Formatierung der Vornamen entsprechend der Option 'firstnamefont'
-\renewcommand*{\mkbibnamefirst}[1]{%
+\renewcommand*{\mkbibnamegiven}[1]{%
\ifboolexpr{
( bool {bbx:oldauthor}
and
@@ -415,7 +415,7 @@
{\bbx@firstnamefont{#1}}}}
% suffix richtet sich nach 'firstnamefont'
-\renewcommand*{\mkbibnameaffix}[1]{%
+\renewcommand*{\mkbibnamesuffix}[1]{%
\ifboolexpr{
( bool {bbx:oldauthor}
and
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 8f85cf8bf8f..a0ebd77967c 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
+% footnote-dw.bbx, Dominik Waßenhoven 2016
-\ProvidesFile{footnote-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style]
+\ProvidesFile{footnote-dw.bbx}[2016/12/06 v1.7 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 2b5d32bba90..66d77408027 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,12 +1,12 @@
-% standard-dw.bbx, Dominik Waßenhoven 2013
+% standard-dw.bbx, Dominik Waßenhoven 2016
-\ProvidesFile{standard-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style]
+\ProvidesFile{standard-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style]
-\@ifpackagelater{biblatex}{2011/11/13}
+\@ifpackagelater{biblatex}{2016/03/11}
{}
{\PackageError{biblatex-dw}
{Outdated 'biblatex' package\MessageBreak
- Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak
+ Upgrade to biblatex v3.3 (2016/03/11) or later.\MessageBreak
I found: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now}%
\endinput}
@@ -19,7 +19,9 @@
\newbool{bbx:acronym}
\newbool{bbx:journumafteryear}
\newbool{bbx:journumdate}
+\newbool{bbx:seriesstandard}
\newbool{bbx:seriesafteryear}
+\newbool{bbx:seriesbeforeedition}
\newbool{bbx:seriesinparens}
\newbool{bbx:shorthandacro}
\newbool{bbx:shorthandinbib}
@@ -74,15 +76,26 @@
\DeclareBibliographyOption{bernhard}[true]{%
\csuse{bool#1}{bbx:bernhard}}
-% Option series=standard|afteryear
-\newcommand{\bbx@option@series}{}
-\DeclareBibliographyOption{series}{%
- \renewcommand{\bbx@option@series}{#1}}
-\AtBeginDocument{%
- \ifdefstring{\bbx@option@series}{afteryear}
- {\global\booltrue{bbx:seriesafteryear}}
- {\global\boolfalse{bbx:seriesafteryear}}}
-
+% Option series=standard|afteryear|beforeedition
+\DeclareBibliographyOption{series}[standard]{%
+ \ifcsdef{bbx@opt@series@#1}
+ {\csuse{bbx@opt@series@#1}}
+ {\blxdw@error{%
+ Invalid option 'series=#1'\MessageBreak
+ Valid values are 'standard', 'afteryear', 'beforeedition'}}}
+\def\bbx@opt@series@standard{%
+ \global\booltrue{bbx:seriesstandard}%
+ \global\boolfalse{bbx:seriesafteryear}%
+ \global\boolfalse{bbx:seriesbeforeedition}}
+\def\bbx@opt@series@afteryear{%
+ \global\boolfalse{bbx:seriesstandard}%
+ \global\booltrue{bbx:seriesafteryear}%
+ \global\boolfalse{bbx:seriesbeforeedition}}
+\def\bbx@opt@series@beforeedition{%
+ \global\boolfalse{bbx:seriesstandard}%
+ \global\boolfalse{bbx:seriesafteryear}%
+ \global\booltrue{bbx:seriesbeforeedition}}
+
% Option seriesformat=standard|parens
\newcommand{\bbx@option@seriesformat}{}
\DeclareBibliographyOption{seriesformat}{%
@@ -206,7 +219,7 @@
\printfield{booktitle}%
\newunit}
-\DeclareBibliographyDriver{shorthands}{%
+\DeclareBibliographyDriver{shorthand}{%
\toggletrue{listofshorthands}%
\usebibmacro{terselos}}
@@ -216,7 +229,7 @@
%% List of Shorthands: Länge der Labels einstellbar
\AtBeginDocument{%
\ifbool{bbx:shorthandwidthbool}
- {\defbibenvironment{shorthands}
+ {\defbibenvironment{shorthand}
{\list
{\printfield[shorthandwidth]{shorthand}%
\printtext{\shorthandpunct}}
@@ -229,7 +242,7 @@
\renewcommand*{\makelabel}[1]{##1\hss}}}
{\endlist}
{\item}}
- {\defbibenvironment{shorthands}
+ {\defbibenvironment{shorthand}
{\list
{\printfield[shorthandwidth]{shorthand}}
{\setlength{\labelwidth}{\shorthandwidth}%
@@ -644,13 +657,17 @@
\usebibmacro{maintitle+booktitle}%
\newunit
\usebibmacro{byeditor+others}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -677,13 +694,17 @@
\usebibmacro{maintitle+booktitle}%
\newunit
\usebibmacro{ifuse:byeditor+others}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -714,10 +735,10 @@
\usebibmacro{ifuse:byeditor+others}%
\newunit\newblock
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -748,10 +769,10 @@
\usebibmacro{ifuse:byeditor+others}%
\newunit\newblock
\usebibmacro{edition}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -829,13 +850,17 @@
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{byeditor+others}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -912,13 +937,17 @@
\printlist{language}%
\newunit\newblock
\usebibmacro{byeditor+others}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1102,11 +1131,16 @@
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{byeditor}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{type}%
\newunit
@@ -1297,10 +1331,10 @@
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1500,13 +1534,17 @@
\ifbool{xref:inbook}% child is an @inbook entry
{\usebibmacro{byeditor+others}}
{\usebibmacro{ifuse:byeditor+others}}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1546,13 +1584,17 @@
\printlist{language}%
\newunit\newblock
\usebibmacro{ifuse:byeditor+others}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1596,10 +1638,10 @@
\usebibmacro{ifuse:byeditor+others}%
\newunit\newblock
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1650,13 +1692,17 @@
\ifbool{xref:inbook}% child is an @inbook entry
{\usebibmacro{byeditor+others}}
{\usebibmacro{ifuse:byeditor+others}}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1692,13 +1738,17 @@
\printlist{language}%
\newunit\newblock
\usebibmacro{ifuse:byeditor+others}%
+ \ifbool{bbx:seriesbeforeedition}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\usebibmacro{edition}%
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1738,10 +1788,10 @@
\usebibmacro{ifuse:byeditor+others}%
\newunit\newblock
\usebibmacro{volumes+volume+part}%
- \setunit{\addspace}%
- \ifbool{bbx:seriesafteryear}
- {}
- {\usebibmacro{series+number}}%
+ \ifbool{bbx:seriesstandard}
+ {\setunit{\addspace}%
+ \usebibmacro{series+number}}
+ {}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1822,13 +1872,6 @@
Thus, 'omiteditor' is ignored}}
{}}%
{}%
- \ifdefstring{\bbx@option@series}{standard}
- {}
- {\ifdefstring{\bbx@option@series}{afteryear}
- {}
- {\blxdw@warning@noline{%
- Unknown value for option 'series'.\MessageBreak
- Option 'series=standard' used instead}}}%
\ifdefstring{\bbx@option@seriesformat}{standard}
{}
{\ifdefstring{\bbx@option@seriesformat}{parens}
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 0b7771ecd1d..4362c0355c8 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 2013
+% authortitle-dw.cbx, Dominik Waßenhoven 2016
-\ProvidesFile{authortitle-dw.cbx}[2013/09/22 v1.6a biblatex citation style]
+\ProvidesFile{authortitle-dw.cbx}[2016/12/06 v1.7 biblatex citation style]
\RequireCitationStyle{standard-dw}
@@ -25,7 +25,7 @@
\boolfalse{cbx:inref}}
\def\cbx@opt@inreference@full{%
\booltrue{cbx:inref}%
- \ExecuteBibliographyOptions[inreference]{skipbib}}
+ \ExecuteBibliographyOptions[inreference]{skipbib=true,}}
% Test, ob inreference genutzt wird
\AtEveryCitekey{%
@@ -115,7 +115,11 @@
\ifnameundef{labelname}
{\blxdw@warning@noline{No author or editor given for \textcite}%
\textbf{\thefield{entrykey}}}
- {\ifbool{cbx:firstfullname}
+ {\ifboolexpr{
+ bool {cbx:citeauthornamefirstfull}
+ or
+ bool {cbx:citeauthornamefull}
+ }
{\printnames[citeauthor]{labelname}}
{\printnames{labelname}}%
\setunit{%
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 1a8ed50eb6e..a45a55f2606 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 2013
+% footnote-dw.cbx, Dominik Waßenhoven 2016
-\ProvidesFile{footnote-dw.cbx}[2013/09/22 v1.6a biblatex citation style]
+\ProvidesFile{footnote-dw.cbx}[2016/12/06 v1.7 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 2447880fb3a..348daefb5d5 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,12 +1,12 @@
-% standard-dw.cbx, Dominik Waßenhoven 2013
+% standard-dw.cbx, Dominik Waßenhoven 2016
-\ProvidesFile{standard-dw.cbx}[2013/09/22 v1.6a biblatex citation style]
+\ProvidesFile{standard-dw.cbx}[2016/12/06 v1.7 biblatex citation style]
-\@ifpackagelater{biblatex}{2011/11/13}
+\@ifpackagelater{biblatex}{2016/03/11}
{}
{\PackageError{biblatex-dw}
{Outdated 'biblatex' package\MessageBreak
- Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak
+ Upgrade to biblatex v3.3 (2016/03/11) or later.\MessageBreak
I found: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now}%
\endinput}
@@ -16,9 +16,10 @@
\newbool{cbx:citeauthor}
\newbool{cbx:citeauthorfoot}
\newbool{cbx:citeauthornormalfont}
+\newbool{cbx:citeauthornamefirstfull}
+\newbool{cbx:citeauthornamefull}
\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}
@@ -36,8 +37,6 @@
\csuse{bool#1}{cbx:citedas}}
\DeclareBibliographyOption{edstringincitations}[true]{%
\csuse{bool#1}{cbx:edstringincitations}}
-\DeclareBibliographyOption{firstfullname}[true]{%
- \csuse{bool#1}{cbx:firstfullname}}
\DeclareBibliographyOption{omiteditor}[true]{%
\csuse{bool#1}{cbx:omiteditor}}
\DeclareBibliographyOption{shorthandibid}[true]{%
@@ -64,6 +63,27 @@
\booltrue{cbx:citeauthornormalfont}%
\boolfalse{cbx:citeauthorfoot}}
+\DeclareBibliographyOption{citeauthorname}[normal]{%
+ \ifcsdef{cbx@opt@citeauthorname@#1}
+ {\csuse{cbx@opt@citeauthorname@#1}}
+ {\blxdw@error{%
+ Invalid option 'citeauthorname=#1'\MessageBreak
+ Valid values are 'normal', 'firstfull', 'full'}}}
+\def\cbx@opt@citeauthorname@normal{%
+ \boolfalse{cbx:citeauthornamefull}%
+ \boolfalse{cbx:citeauthornamefirstfull}}
+\def\cbx@opt@citeauthorname@firstfull{%
+ \boolfalse{cbx:citeauthornamefull}%
+ \booltrue{cbx:citeauthornamefirstfull}}
+\def\cbx@opt@citeauthorname@full{%
+ \booltrue{cbx:citeauthornamefull}%
+ \boolfalse{cbx:citeauthornamefirstfull}}
+
+\DeclareBibliographyOption{firstfullname}[true]{% aus Kompatibilitätsgründen
+ \blxdw@error{%
+ Option 'firstfullname' is obsolete,\MessageBreak
+ please use option 'citeauthorname' instead}}
+
\DeclareBibliographyOption{ibidpage}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{loccittracker=context}}% Standard: constrict
@@ -251,7 +271,7 @@
\clearname{translator}}
{}}
-% Option 'nameseen'
+% Option 'citeauthorname'
\newcommand*{\cbx@seennames}{}
\newrobustcmd*{\cbx@nameseen}[1]{%
\listxadd{\cbx@seennames}{\detokenize{#1}}}
@@ -259,19 +279,20 @@
\xifinlist{\detokenize{#1}}{\cbx@seennames}}
\AtBeginDocument{%
- \ifbool{cbx:firstfullname}
+ \ifbool{cbx:citeauthornamefirstfull}
{\DeclareNameFormat{citeauthor}{%
- \cbx@ifnameseen{#1#3#5#7}
+ \nameparts{#1}%
+ \cbx@ifnameseen{\namepartfamily\namepartgiven\namepartprefix\namepartsuffix}
{\ifcase\value{uniquename}%
- \usebibmacro{name:last}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
\or
\ifuseprefix
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}
- {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}%
+ {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}}
+ {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefixi}{\namepartsuffixi}}%
\fi}%
- {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
- \cbx@nameseen{#1#3#5#7}}%
- \usebibmacro{name:andothers}}
+ {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+ \cbx@nameseen{\namepartfamily\namepartgiven\namepartprefix\namepartsuffix}}%
+ \usebibmacro{name:andothers}}%
\DeclareCiteCommand{\citeauthor}
{\booltrue{cbx:citeauthor}%
\boolfalse{citetracker}%
@@ -281,15 +302,31 @@
\printnames[citeauthor]{labelname}}
{\multicitedelim}
{\usebibmacro{postnote}}}
- {\DeclareCiteCommand{\citeauthor}
- {\booltrue{cbx:citeauthor}%
- \boolfalse{citetracker}%
- \boolfalse{pagetracker}%
- \usebibmacro{prenote}}
- {\indexnames{labelname}%
- \printnames{labelname}}
- {\multicitedelim}
- {\usebibmacro{postnote}}}}
+ {\ifbool{cbx:citeauthornamefull}
+ {\DeclareNameFormat{citeauthor}{%
+ \nameparts{#1}%
+ \ifuseprefix
+ {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}}
+ {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}}%
+ \usebibmacro{name:andothers}}%
+ \DeclareCiteCommand{\citeauthor}
+ {\booltrue{cbx:citeauthor}%
+ \boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\indexnames{labelname}%
+ \printnames[citeauthor]{labelname}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}}
+ {\DeclareCiteCommand{\citeauthor}
+ {\booltrue{cbx:citeauthor}%
+ \boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\indexnames{labelname}%
+ \printnames{labelname}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}}}}
%% Formatierung von 'ibidem' entsprechend der Option 'ibidemfont'
\providecommand*{\mkibid}[1]{%
@@ -416,8 +453,8 @@
{}
{\usebibmacro{citeindex}%
\ifentryseen{\bbx@reviewparent}
- {\global\booltrue{cbx:rpcited}}
- {\global\boolfalse{cbx:rpcited}}%
+ {\booltrue{cbx:rpcited}}
+ {\boolfalse{cbx:rpcited}}%
\ifbool{cbx:fullcite}
{\usedriver
{\DeclareNameAlias{sortname}{default}}
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 4006521eb82..1f61a78583d 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
+% english-dw.lbx, Dominik Waßenhoven 2016
-\ProvidesFile{english-dw.lbx}[2013/09/22 v1.6a biblatex localization file]
+\ProvidesFile{english-dw.lbx}[2016/12/06 v1.7 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 0527d992816..99976350ff9 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
+% german-dw.lbx, Dominik Waßenhoven 2016
-\ProvidesFile{german-dw.lbx}[2013/09/22 v1.6a biblatex localization file]
+\ProvidesFile{german-dw.lbx}[2016/12/06 v1.7 biblatex localization file]
\InheritBibliographyExtras{german}