summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-dw
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-21 23:52:45 +0000
committerKarl Berry <karl@freefriends.org>2010-11-21 23:52:45 +0000
commit67db10d00fe1667acb186aa61d485eecd5a8d828 (patch)
tree42f036781d28f48c11b6e594b6b8c59dfff90e2d /Master/texmf-dist/tex/latex/biblatex-dw
parent00076ea08ace90e5d76ff06db470c1be81449289 (diff)
biblatex-dw 1.3b (22nov10)
git-svn-id: svn://tug.org/texlive/trunk@20521 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw')
-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.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx42
-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
8 files changed, 60 insertions, 29 deletions
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 cdc92d47b4a..60fe20dfdae 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,13 +1,13 @@
% authortitle-dw.bbx, Dominik Waßenhoven 2010
-\ProvidesFile{authortitle-dw.bbx}[2010/09/21 v1.3a biblatex bibliography style]
+\ProvidesFile{authortitle-dw.bbx}[2010/11/21 v1.3b biblatex bibliography style]
-\@ifpackagelater{biblatex}{2010/08/04}
+\@ifpackagelater{biblatex}{2010/09/03}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
{The version of the 'authortitle-dw' style you are using\MessageBreak
- requires biblatex v0.9b or later.\MessageBreak
+ requires biblatex v0.9d or later.\MessageBreak
You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
@@ -750,7 +750,9 @@
\ifboolexpr{
( test {\ifnamesequal{editor}{author}}
or
- bool {xrefidem} )
+ ( bool {xrefidem}
+ and not
+ bool {cbx:authauthxref} ) )
and
bool {bbx:edbyidem}
}
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 b5a1c898766..92b3047e0ce 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,13 +1,13 @@
% footnote-dw.bbx, Dominik Waßenhoven 2010
-\ProvidesFile{footnote-dw.bbx}[2010/09/21 v1.3a biblatex bibliography style]
+\ProvidesFile{footnote-dw.bbx}[2010/11/21 v1.3b biblatex bibliography style]
-\@ifpackagelater{biblatex}{2010/08/04}
+\@ifpackagelater{biblatex}{2010/09/03}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
{The version of the 'footnote-dw' style you are using\MessageBreak
- requires biblatex v0.9 or later.\MessageBreak
+ requires biblatex v0.9d or later.\MessageBreak
You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
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 7641f3d5e68..96ca28b651c 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 2010
-\ProvidesFile{standard-dw.bbx}[2010/09/21 v1.3a biblatex bibliography style]
+\ProvidesFile{standard-dw.bbx}[2010/11/21 v1.3b biblatex bibliography style]
\RequireBibliographyStyle{standard}
@@ -892,6 +892,7 @@
{\booltrue{xrefidem}}%
{\boolfalse{xrefidem}}}
{\usebibmacro{authedxrefcheck}%
+ \usebibmacro{authauthxrefcheck}%
\ifbool{cbx:authedxref}
{\booltrue{xrefidem}}
{\boolfalse{xrefidem}}}%
@@ -1524,7 +1525,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\printtext{\bibstring[\mkidem]{idem\thefield{gender}}}%
- \setunit{\citenamepunct}%
+ \setunit{\nametitledelim}%
\usebibmacro{maintitle+title}%
\newunit
\printlist{language}%
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 b70030ddc5c..85aaec9daa5 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
-\ProvidesFile{authortitle-dw.cbx}[2010/09/21 v1.3a biblatex citation style]
+\ProvidesFile{authortitle-dw.cbx}[2010/11/21 v1.3b biblatex citation style]
\RequireCitationStyle{standard-dw}
@@ -104,7 +104,7 @@
{\ifbool{xrefidem}
{\usebibmacro{cite:xref:idem}}%
{\usebibmacro{cite:editor}
- \citenamepunct}}%
+ \nametitledelim}}%
\usebibmacro{cite:title}%
\ifnameundef{labelname}
{\ifboolexpr{
@@ -130,9 +130,9 @@
{\ifbool{bbx:edbyidem}
{\usebibmacro{cite:idem}}%
{\printnames{labelname}%
- \citenamepunct}}%
+ \nametitledelim}}%
{\usebibmacro{cite:editor}%
- \citenamepunct}%
+ \nametitledelim}%
\usebibmacro{cite:title}%
\ifuseeditor
{}
@@ -231,7 +231,7 @@
\newbibmacro*{cite:title}{%
\cbx@tempa
\ifsingletitle
- {\setunit{}}% Löschen des \citenamepunct, falls kein Titel ausgegeben wird
+ {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
{\printtext[bibhyperref]{%
\printfield[citetitle]{labeltitle}}}}
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 f8545a1ca85..b558c6493ef 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/09/21 v1.3a biblatex citation style]
+\ProvidesFile{footnote-dw.cbx}[2010/11/21 v1.3b biblatex citation style]
\RequireCitationStyle{standard-dw}
@@ -90,7 +90,7 @@
\newbibmacro*{cite:title}{%
\ifsingletitle
- {\setunit{}}% Löschen des \citenamepunct, falls kein Titel ausgegeben wird
+ {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird
{\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}%
\ifboolexpr{
@@ -153,10 +153,14 @@
{\ifbool{xrefidem}
{\usebibmacro{cite:xref:idem}}
{\usebibmacro{cite:editor}%
- \citenamepunct}}%
+ \nametitledelim}}%
\usebibmacro{cite:title}}
{\usebibmacro{cite:shorthand}}}
- {\ifbool{xrefidem}
+ {\ifboolexpr{
+ bool {xrefidem}
+ or
+ bool {cbx:authauthxref}
+ }
{\ifbool{bbx:edbyidem}
{\usebibmacro{cite:fullxrefidem}}%
{\usebibmacro{cite:fullxref}}}%
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 6b4fb701250..9f81ea04b95 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,7 +1,8 @@
% standard-dw.cbx, Dominik Waßenhoven 2010
-\ProvidesFile{standard-dw.cbx}[2010/09/21 v1.3a biblatex citation style]
+\ProvidesFile{standard-dw.cbx}[2010/11/21 v1.3b biblatex citation style]
+\newbool{cbx:authauthxref}
\newbool{cbx:authedxref}
\newbool{cbx:citedas}
\newbool{cbx:edstringincitations}
@@ -84,10 +85,12 @@
and
test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
and
- (
- not test {\iffieldundef{pages}}
- or
- not test {\iffieldundef{pagetotal}}
+ ( not test {\iffieldundef{pages}}
+ or
+ ( not test {\iffieldundef{pagetotal}}
+ and
+ bool {bbx:pagetotal}
+ )
)
}
{\usebibmacro{cite:postnote:pages}}
@@ -134,7 +137,13 @@
}
%% Doppelpunkt nach Autoren/Editoren
+%% aus Kompatibilitätsgründen zu früheren Versionen wird
+%% \citenamepunct verwendet
\newcommand*{\citenamepunct}{\addcolon\space}
+\renewcommand*{\nametitledelim}{\citenamepunct}
+\AtEveryCite{% bei jedem Zitat nametitledelim statt labelnamepunct verwenden
+ \let\labelnamepunct\nametitledelim
+}
%% Slashes zwischen Autoren/Editoren
\newcommand*{\citerevsdnamedelim}{}
@@ -195,7 +204,7 @@
\ifbool{cbx:edstringincitations}
{\usebibmacro{cite:editorstrg/translatorstrg}}
{}%
- \setunit{\citenamepunct}}
+ \setunit{\nametitledelim}}
\newbibmacro*{cite:editorstrg/translatorstrg}{%
\ifthenelse{\ifuseeditor\AND\ifnameundef{author}%
@@ -311,9 +320,9 @@
{}
{\usebibmacro{postnote}}}
-%% Test, ob author und editor bei xref identisch sind
+%% Test, ob author und editor bei xref identisch sind
%% (für xref=true, useeditor=false oder usetranslator=false,
-%% edbyidem=true)
+%% edbyidem=true)
\newbibmacro*{authedxrefcheck}{%
\iffieldundef{xref}
{}
@@ -330,7 +339,22 @@
}
{\booltrue{cbx:authedxref}}
{\boolfalse{cbx:authedxref}}}}
-
+
+%% Test, author des @inbook und author des @book) bei xref
+%% identisch sind (für xref=true, edbyidem=true); nötig,
+%% damit der Herausgeber nicht durch idem ersetzt wird
+\newbibmacro*{authauthxrefcheck}{%
+ \iffieldundef{xref}
+ {}
+ {\savefield{xref}{\bbx@tempa}%
+ \entrydata{\bbx@tempa}{%
+ \savename{author}{\bbx@tempa}}%
+ \ifboolexpr{
+ test {\ifnameequals{author}{\bbx@tempa}}
+ }
+ {\booltrue{cbx:authauthxref}}
+ {\boolfalse{cbx:authauthxref}}}}
+
%% xref
\DeclareCiteCommand{\bbx@xref}
{}%
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 31e360b6301..a6367a2d82d 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 2010
-\ProvidesFile{english-dw.lbx}[2010/09/21 v1.3a biblatex localization file]
+\ProvidesFile{english-dw.lbx}[2010/11/21 v1.3b biblatex localization file]
\NewBibliographyString{idemdat,idemdatsf,idemdatsm,%
idemdatsn,idemdatpf,idemdatpm,idemdatpn,idemdatpp,inrefstring}
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 42863a4f8aa..629c975d0ac 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 2010
-\ProvidesFile{german-dw.lbx}[2010/09/21 v1.3a biblatex localization file]
+\ProvidesFile{german-dw.lbx}[2010/11/21 v1.3b biblatex localization file]
\InheritBibliographyExtras{german}