8 files changed, 35 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 7f05ae5a17e..0b1fd7f9827 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 1.6
+Version 1.8
 
 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-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
index dd783fbbb4f..a0c5b0c0025 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
@@ -322,3 +322,10 @@
   YEAR           = {2007},
   KEYWORDS       = {noinclude}
 }
+
+% (APA 6.28a)
+@BOOK{6.28a,
+  AUTHOR         = {Arthur Somebody},
+  TITLE          = {Some Title},
+  KEYWORDS       = {noinclude}
+}
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 c805188e59c..211f1d13110 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 056e8831330..e9abe573e25 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
@@ -7,12 +7,13 @@
 \usepackage{ifthen}
 \usepackage{color}
 \usepackage{MnSymbol}
-\MakeShortVerb{\|}
 
 % Biblatex
 \usepackage[style=apa,%
             bibencoding=inputenc]{biblatex}
 
+\MakeShortVerb{\|}
+
 \newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}%
                        {\textcolor{blue}{\texttt{(APA #2)}}}%
                        {\textcolor{blue}{\texttt{(APA #2 Example #1)}}}}
@@ -235,10 +236,17 @@ the |\textcite| command but omits the parenthesis and uses commas instead.
 See the |biblatex-apa| docs.\\
 \apaex{(\nptextcite[see Table 3 of][]{6.21} for complete data)}
 
+\noindent\apa{6.28}\\
+Entries with no date use ``n.d.''.\\
+\apaex{\textcite{6.28a}}\\
+\apaex{\parencite{6.28a}}\\
+\apaex{(\nptextcite{6.28a})}\\
+
 \noindent\apa{A7.07}\\
 A patent citation uses the title but with no quotes\\
 \apaex{\textcite{A7.07}}\\
-\apaex{\parencite{A7.07}}
+\apaex{\parencite{A7.07}}\\
+
 
 \newpage
 \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 e799b204c31..3ba2127a2c3 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 ffc14a69c8e..d695b44885e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -18,7 +18,7 @@
   url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip@kime.org.uk},
-  revision={1.6},
+  revision={1.8},
   date={\today}}
 
 \hypersetup{%
@@ -322,6 +322,16 @@ to see how it was implemented. Some general notes:
 
 \begin{changelog}
 
+\begin{release}{1.8}{2010-08-06}
+\item Fixed seven author ellipsis bug
+\end{release}
+
+\begin{release}{1.7}{2010-08-05}
+\item Corrected dateless entry format, added examples to test doc
+\item Corrected multi delim for |\citeyear|
+\item Updated test doc for |biblatex| 0.9b compat
+\end{release}
+
 \begin{release}{1.6}{2010-07-19}
 \item Added correct |\citeyear| definition
 \end{release}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 26ccf3eda55..4fd11e27717 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -183,7 +183,7 @@
 % (APA 7.10 Example 67) Unknown names and dates
 
 \DeclareNameFormat{apaauthor}{%
-  \ifthenelse{\value{listcount}=7}
+  \ifthenelse{\value{listcount}=7\AND\value{listcount}<\value{liststop}}
     {\addcomma\addspace\ldots}
     {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
       {}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index a1da921bb6e..282d58067fe 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -130,8 +130,7 @@
 %            need to be repeated but the full years must be repeated with
 %            their extrayear postfixes
 %            "in press" extrayear needs a short dash to join to label
-% (APA 6.28) If no date, use "n.d." without parentheses and with a comma
-%             and space before.
+% (APA 6.28) If no date, use "(n.d.)"
 % (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
 
 \newbibmacro*{cite}{%
@@ -190,11 +189,9 @@
            {\printnames{shortauthor}}
            {\printnames{author}}}%
   % Year
-        \setunit{\iffieldundef{labelyear}
-                 {\nameyeardelim}
-                 {\ifbool{cbx:np}
-                   {\nameyeardelim}
-                   {\global\booltrue{cbx:parens}\addspace\bibleftparen}}}%
+        \setunit{\ifbool{cbx:np}
+                  {\nameyeardelim}
+                  {\global\booltrue{cbx:parens}\addspace\bibleftparen}}%
   % Put the shortauthor inside the year brackets if necessary
         \ifnameundef{shortauthor}
          {}
@@ -335,7 +332,7 @@
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
   {\usebibmacro{cite:labelyear+extrayear}}
-  {\multicitedelim}
+  {\multinamedelim}
   {\usebibmacro{postnote}}
 
 \DeclareCiteCommand{\cite}