12 files changed, 28 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index d02e4a8c3d3..0ba84fb51dd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 2.8
+Version 2.9
 
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
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 8d1e2334c26..e40a38fd548 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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index 46411360a51..e19579e651e 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 2f65e38f91e..3d27918d7e4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -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.8},
+  revision={2.9},
   date={\today}}
 
 \hypersetup{%
@@ -320,6 +320,12 @@ to see how it was implemented. Some general notes:
 
 \begin{changelog}
 
+\begin{release}{2.8}{2011-05-03}
+\item APA wants no space between volume and number for articles, even though it's
+  horribly ugly\ldots
+\item Made urls not optional with |biblatex| url toggle in |ONLINE| entrytype (thanks to Mattias Erll)
+\end{release}
+
 \begin{release}{2.8}{2011-04-23}
 \item Added a Greek localisation strings file.
 \end{release}
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 b503f79b66d..cbe3c6ba9bc 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.8
+% v2.9
 \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 7a9ad798f5a..a0e2cc121f6 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.8
+%% apa.bbx v2.9
 %% Copyright 2011 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
@@ -463,7 +463,6 @@
      \printfield{series}
      \setunit{\addcomma\space}}%
   \printfield{volume}%
-  \setunit{\addspace}%
   \printfield{number}%
   \setunit{\addspace}\newblock
   \usebibmacro{issuename}%
@@ -1328,7 +1327,18 @@
   \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
   \printfield{entrysubtype}%
   \addperiod\addspace
-  \usebibmacro{doi+eprint+url}%
+  \iftoggle{bbx:doi}
+    {\printfield{doi}%
+     \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}%
+     \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{url+urldate}%
+  \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}
   \newunit\newblock
   \printfield{addendum}%
   \usebibmacro{apa:finpunct}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 012cb96e40b..aca49a9bd8f 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.8
+%% apa.cbx v2.9
 %% Copyright 2011 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
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 8bd9c9ceb9d..6e02457ee60 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.8
+% v2.9
 \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 910d2996973..549c12f8fdb 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.8
+% v2.9
 \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 4f052b488d8..e5e0d6c63b0 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.8
+% v2.9
 \ProvidesFile{german-apa.lbx}
 \InheritBibliographyExtras{german}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
index fdb3812008f..05382ca25dc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,4 +1,4 @@
-% v2.8
+% v2.9
 \ProvidesFile{greek-apa.lbx}
 \InheritBibliographyExtras{greek}
 
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 04026a83dc7..db3006d9cb6 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.8
+% v2.9
 \ProvidesFile{ngerman-apa.lbx}
 \InheritBibliographyExtras{ngerman}