summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-dw/cbx
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/cbx
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/cbx')
-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
3 files changed, 46 insertions, 18 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 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}
{}%