From ae6ef6b688e802ee3a36dde35e801dd71cc982a5 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 16 Mar 2011 22:15:09 +0000
Subject: biblatex-apa (15mar11)

git-svn-id: svn://tug.org/texlive/trunk@21735 c570f23f-e606-0410-a88d-b1316a301751
---
 .../tex/latex/biblatex-apa/american-apa.lbx        |  2 +-
 Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx   |  4 ++--
 Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx   | 26 ++++++++++++++++++++--
 .../tex/latex/biblatex-apa/dutch-apa.lbx           |  2 +-
 .../tex/latex/biblatex-apa/french-apa.lbx          |  2 +-
 .../tex/latex/biblatex-apa/german-apa.lbx          |  2 +-
 .../tex/latex/biblatex-apa/ngerman-apa.lbx         |  2 +-
 7 files changed, 31 insertions(+), 9 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/biblatex-apa')

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 90849369e29..21f073a3442 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.3
+% v2.6
 \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 178fb4e696b..c10c0e3b812 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -1,5 +1,5 @@
-%% apa.bbx v2.5
-%% Copyright 2010 Philip Kime
+%% apa.bbx v2.6
+%% Copyright 2011 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index d55fd69db10..a43548160c3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -1,5 +1,5 @@
-%% apa.cbx v2.5
-%% Copyright 2010 Philip Kime
+%% apa.cbx v2.6
+%% Copyright 2011 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -304,6 +304,28 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Fullcite should use "&"
+\DeclareCiteCommand{\fullcite}
+  {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
+  \usebibmacro{prenote}}
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}}
+    {\thefield{entrytype}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\fullcitebib}
+  {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
+  \begin{thebibliography}\thebibitem}
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}}
+    {\thefield{entrytype}}\finentry}
+  {\thebibitem}
+  {\end{thebibliography}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \newbool{cbx:parens} % boolean to say we're inside parens
 \newbool{cbx:np} % boolean to say we're using a non-parentheses text cite
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 5ec02bb3c78..82fb0a2ee8a 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.5
+% v2.6
 \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 67ba0a75b8a..0dc6e643059 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.5
+% v2.6
 \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 8ba8ff4323e..0d1b919c361 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.5
+% v2.6
 \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 2a309b895c2..f7bcf8c1abc 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.5
+% v2.6
 \ProvidesFile{ngerman-apa.lbx}
 \InheritBibliographyExtras{ngerman}
 
-- 
cgit v1.2.3