biblatex-apa (15mar11)

git-svn-id: svn://tug.org/texlive/trunk@21735 c570f23f-e606-0410-a88d-b1316a301751

13 files changed, 70 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index ec5433c9c16..fb03c12c834 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,9 +1,9 @@
-Version 2.5
+Version 2.6
 
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
 1.3c (http://www.latex-project.org/lppl.txt). The current
-maintainer is Philip Kime (© 2010).
+maintainer is Philip Kime (© 2011).
 
 This package is a biblatex style for APA (American Psychological
 Association) style compliant documents typeset in LaTeX. It
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
index de56d140614..f07ce1525e4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
@@ -314,3 +314,15 @@
   LOCATION       = {Washington, DC},
   PUBLISHER      = {U.S. Patent and Trademark Office}
 }
+
+% Testing fullcite so make it nice and long
+@ARTICLE{FC1,
+  AUTHOR         = {Arthur Amorous and Brian Belligerent and Clive Clandestine},
+  TITLE          = {Names Which Inspire Envy},
+  SUBTITLE       = {The Fashions of Nominal Imprudence},
+  YEAR           = {1923},
+  JOURNALTITLE   = {Journal of International Interest},
+  VOLUME         = {87},
+  NUMBER         = {12},
+  PAGES          = {1423--1458},
+}
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
index 146e1d6daa3..332ba24b73d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
index 5aaa6b12ab0..a2c57f90f33 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
@@ -260,7 +260,10 @@ Some misc test cases\\
 \apaex{\textcite{6.16c,6.16d,6.16e}}\\
 \apaex{\textcite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\
 \apaex{\cite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\
-\apaex{\cite{6.16k,6.16l}}
+\apaex{\cite{6.16k,6.16l}}\\
+\apaex{\fullcite{FC1}}\\
+\apaex{\fullcitebib{FC1}}
+
 \end{refsection}
 \begin{refsection}[biblatex-apa-test-references]
 \nocite{*}
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index 7d3a4704d3c..7ea17a95ab4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
index 49aa0e3c08f..a53a1352583 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -9,8 +9,8 @@
 % Unicode
 \usepackage{fontspec}
 \setmainfont[Ligatures=TeX]{TeXGyrePagella}
-\setsansfont{Arial}
-\setmonofont{Courier New}
+\setsansfont[Ligatures=TeX]{TexGyreHeros}
+\setmonofont[Ligatures=NoCommon]{TeXGyreCursor}
 
 \newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}%
                        {\texttt{(APA #2)}}%
@@ -23,7 +23,7 @@
   url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip@kime.org.uk},
-  revision={2.5},
+  revision={2.6},
   date={\today}}
 
 \hypersetup{%
@@ -291,6 +291,19 @@ commas. See examples using this command in \path{biblatex-apa-test.tex}.
 There is also a multi-cite version |\nptextcites| that works in the same
 way as |\textcites|.
 
+The |\fullcite| command uses ampersands, like the references section
+and there is also a |\fullcitebib| command which is the same as
+|\fullcite| but which fakes a mini references section with APA style
+indentation and so is not intended to be used inline like
+|\fullcite|. See examples in the test file. Please note that APA style
+does not have multiple citation lists sorted---they appear in the
+order cited. Since |\fullcitebib| is a citation command, the citations
+will not be sorted which might appear odd since this «citation» style
+looks like a references section excerpt. There is no way around this
+since the |sortcites| biblatex option is a package-level option. If
+you want to customise such a fake references section «citation», you
+should probably be using |\printbibliography| with a filter.
+
 \subsection{References}
 
 The references style was based on the \sty{biblatex} default
@@ -336,6 +349,11 @@ to see how it was implemented. Some general notes:
 
 \begin{changelog}
 
+\begin{release}{2.6}{2011-03-15}
+\item Made fullcite use ampersand
+\item Added fullcitebib macro to allow fake bib citations
+\end{release}
+
 \begin{release}{2.5}{2010-11-24}
 \item Refactored hyperref to only link from years to make it
   consistent across cite commands
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}