summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-01 22:31:32 +0000
committerKarl Berry <karl@freefriends.org>2011-04-01 22:31:32 +0000
commite849d55f9355c10511f579270dd6ded13edee8cc (patch)
treebe8e05a5e65c0290e38a07c925a6b8f0847a4b04 /Master/texmf-dist/tex/latex
parent6a818ea209bfd552cbcc9b8df8ea962299dd850d (diff)
biblatex-apa (1apr11)
git-svn-id: svn://tug.org/texlive/trunk@21913 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx17
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx2
7 files changed, 30 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
index 21f073a3442..66129a1eb7e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,4 +1,4 @@
-% v2.6
+% v2.7
\ProvidesFile{american-apa.lbx}
\InheritBibliographyExtras{american}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index c10c0e3b812..da9c9f863b4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -1,4 +1,4 @@
-%% apa.bbx v2.6
+%% apa.bbx v2.7
%% Copyright 2011 Philip Kime
%%
%% This work may be distributed and/or modified under the
@@ -159,10 +159,12 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.12) Five author max before "et al" and a one author truncation
-% policy. Note that this doesn't really work properly due to
-% BibTeX limitations so we effectively disable it with "999"
-% and deal with it in the author format below
+% (APA 6.12) Five author max before "et al" and a one author truncation policy
+% However, only after the first cite, which means we can't use
+% maxnames/minnames and have to do this in the Format for
+% labelname (in the cbx). Anyway, since the truncation is to
+% one name and APA requires we use the biblatex uniquelist
+% functionality, maxnames/minnames isn't really indicated.
% (APA 6.x) citation tracking is global
% (APA 6.14) uses initials to disambiguate shared surnames
% (APA 6.16) uses year postfix to disambiguate multiple items in same year
@@ -176,10 +178,11 @@
firstinits=true,%
useprefix=true,%
usetranslator=true,%
+ uniquelist=true,%
uniquename=init,%
citetracker=true,%
- maxnames=999,%
- minnames=999,%
+ maxnames=99,%
+ minnames=99,%
abbreviate=true,%
mincrossrefs=999,%
alldates=apalong}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index a43548160c3..4312c0b854f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -1,4 +1,4 @@
-%% apa.cbx v2.6
+%% apa.cbx v2.7
%% Copyright 2011 Philip Kime
%%
%% This work may be distributed and/or modified under the
@@ -68,9 +68,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.12) 3-5 authors have "et al." after first cite. This doesn't
-% work properly in general with disambiguation of "et al"s
-% due to BibTeX limitations, see docs.
+% (APA 6.12) 3-5 authors have "et al." after first cite
% #1 = last name
% #2 = last name (initials)
@@ -91,19 +89,23 @@
\fi
\usebibmacro{name:andothers}}
+% Can't do this with the built-in printnames as APA requires truncation
+% and disambiguation only after first cite
\DeclareNameFormat{labelname}{%
\ifthenelse{\value{listcount}=1\OR\value{listtotal}=2}
{\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}
- {\ifthenelse{\value{listtotal}>5}
- {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi
- \ifnum\value{listcount}>2 \relax\fi}
- {\ifciteseen
- {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi
- \ifnum\value{listcount}=3 \relax\fi
- \ifnum\value{listcount}=4 \relax\fi
- \ifnum\value{listcount}=5 \relax\fi}
- {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}}}
+ {\ifthenelse{\ifciteseen\OR\value{listtotal}>5}
+ {\ifnumcomp{\value{listcount}}{<}{\value{uniquelist} + 1}% normal name
+ {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}%
+ {}%
+ \ifnumcomp{\value{listcount}}{=}{\value{uniquelist} + 1}% first past ul is et al
+ {\andothersdelim\bibstring{andothers}}%
+ {}%
+ \ifnumcomp{\value{listcount}}{>}{\value{uniquelist} + 1}% nothing thereafter
+ {\relax}%
+ {}}%
+ {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
index 82fb0a2ee8a..15c94f4b9c9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,4 +1,4 @@
-% v2.6
+% v2.7
\ProvidesFile{dutch-apa.lbx}
\InheritBibliographyExtras{dutch}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
index 0dc6e643059..edb178ec2fe 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,4 +1,4 @@
-% v2.6
+% v2.7
\ProvidesFile{french-apa.lbx}
\InheritBibliographyExtras{french}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
index 0d1b919c361..77d07131ee5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,4 +1,4 @@
-% v2.6
+% v2.7
\ProvidesFile{german-apa.lbx}
\InheritBibliographyExtras{german}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
index f7bcf8c1abc..5652b7d3c94 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,4 +1,4 @@
-% v2.6
+% v2.7
\ProvidesFile{ngerman-apa.lbx}
\InheritBibliographyExtras{ngerman}