biblatex-apa (9may13)

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

18 files changed, 161 insertions, 157 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 7acc6c338c9..d00cb46c681 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 @@
-\ProvidesFile{american-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -36,7 +35,6 @@
   available        = {{available}{available}},
   from             = {{from}{from}},
   archivedat       = {{archived\space at}{archived\space at}},
-  nodate           = {{no\space date}{{}n\adddot d\adddot}},
   with             = {{with}{with}},
   reprintas        = {{reprinted as}{reprinted as}},
   reprintfrom      = {{reprinted from}{reprinted from}},
@@ -84,7 +82,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\thefield{#1}}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#1}%
@@ -100,7 +98,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\thefield{#1}\printfield{extrayear}}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#1}%
@@ -128,7 +126,7 @@
           {}%
           {\addspace}}%
         {\addcomma\addspace}%
-       \thefield{#1}}}}
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 199b147c21f..0ccedb54c6d 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 @@
-%% Copyright 2012 Philip Kime
+%% Copyright 2013 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.bbx}[2012/12/28\space v5.7\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2013/03/20\space v5.9\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -191,17 +191,19 @@
 
 % Don't fall back on other year fields if there is no year, use
 % "nodate" string
-\DeclareLabelyear{%
+\DeclareLabeldate{%
   \field{pubstate}
-  \field{year}
+  \field{date}
+  \literal{nodate}
 }
 
 % Due to APA strange requirements like truncation after first cite and
 % ellipsis from 7th to n-1 in bib, there might be some really strange
 % edge cases which can't be handled as this needs treating in the style
 % after biber has finished. Very unlikely though.
-\ExecuteBibliographyOptions{labelyear=true,%
+\ExecuteBibliographyOptions{labeldate=true,%
                             sorting=apa,%
+                            autocite=inline,%
                             backref=true,%
                             pagetracker=true,%
                             useprefix=true,%
@@ -216,6 +218,7 @@
                             abbreviate=true,%
                             mincrossrefs=999,%
                             date=apalong,%
+                            datelabel=apalong,%
                             origdate=apalong,%
                             urldate=apalong,%
                             eventdate=comp}
@@ -404,34 +407,14 @@
 \newbibmacro*{labelyear+extrayear}{%
   \iffieldundef{labelyear}
     {\iffieldundef{origyear}
-      {\printtext[parens]{\usebibmacro{noyear}}}
+      {}
       {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}}%
-    {\ifthenelse{\iffieldequalstr{labelyear}{inpress}\OR\iffieldequalstr{labelyear}{in press}}
-      {\printtext[parens]{\biblcstring{inpress}%
-       \iffieldundef{extrayear}
-        {\setunit{\relax}}
-        {\setunit{\apashortdash}}%
-       \printfield{extrayear}}}
-     {\printtext[yearorunkyear]{\printdateextra}}}}
+    {\printtext[yearorunkyear]{\printdateextralabel}}}
 
 \DeclareFieldFormat{yearorunkyear}{%
   \ifthenelse{\iffieldequalstr{doubtfuldate}{true}}
     {\mkbibbrackets{ca\adddot\addspace#1}}
-    {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND\iffieldundef{day}}
-      {\mkbibparens{\usebibmacro{noyear}}}
-      {\mkbibparens{#1}}}}
-
-\newbibmacro*{noyear}{%
-  \ifnameundef{shortauthor}
-    {}
-    {\ifciteseen
-      {}
-      {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
-  \bibstring{nodate}%
-  \iffieldundef{extrayear}
-    {\setunit{\relax}}
-    {\setunit{\apashortdash}}%
-    \printfield{extrayear}}
+    {\mkbibparens{#1}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -462,7 +445,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 7.01 Example 10) Newspapers have prefix for pages.
 
-\DeclareFieldFormat[newsarticle]{pages}{\mkpageprefix{#1}}
+\DeclareFieldFormat[newsarticle]{pages}{%
+    \DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}%
+    \mkpageprefix{#1}%
+    \DeclareNumChars{.}}
+
 \DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}}
 \DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}}
 \DeclareFieldFormat[newsarticle]{title}{#1}
@@ -661,16 +648,6 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.01 Example 20) Even non-numeral pages need prefix
-
-\NumCheckSetup{\ifcurrentfield{pages}
-  {\DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}}
-  {}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.27) Name format. Don't capitalise prefixes
 % (APA 6.27) Full name disambiguation using brackets
@@ -681,7 +658,7 @@
 % #4 = name prefix, a.k.a. 'von part'
 % #5 = name affix, a.k.a. 'junior part'
 
-\renewbibmacro*{name:apa:last-first}[5]{%
+\newbibmacro*{name:apa:last-first}[5]{%
   \ifuseprefix
     {\usebibmacro{name:delim}{#4#1}%
      \usebibmacro{name:hook}{#4#1}%
@@ -706,7 +683,7 @@
      \ifblank{#4}{}{\addlowpenspace\mkbibnameprefix{#4}\isdot}%
      \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
 
-\renewbibmacro*{name:apa:first-last}[5]{%
+\newbibmacro*{name:apa:first-last}[5]{%
   \ifuseprefix
     {\usebibmacro{name:delim}{#2}%
      \usebibmacro{name:hook}{#2}%
@@ -1220,7 +1197,7 @@
 \DeclareFieldFormat{related:reprintfrom}{\mkbibparens{#1}}
 \DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}}
 
-\newbibmacro*{related:reprintfrom}[1]{%
+\renewbibmacro*{related:reprintfrom}[1]{%
   \entrydata*{#1}{%
     \printtext{\mkbibemph{\printfield[apacase]{title}}}%
     \setunit{\bibpagespunct}%
@@ -1230,7 +1207,9 @@
     \printnames[apanames][-\value{listtotal}]{editor}%
     \printnames[apanames][-\value{listtotal}]{author}%
     \setunit{\addcomma\addspace}%
-    \usebibmacro{location+publisher}}}
+    \usebibmacro{location+publisher}%
+    \newunit\newblock
+    \usebibmacro{related}}}
 
 \newbibmacro*{related:reviewof}[1]{%
   \setunit{}% Sanitize this in case no author
@@ -1244,7 +1223,9 @@
     \printnames[apanames][-\value{listtotal}]{producer}%
     \printnames[apanames][-\value{listtotal}]{director}%
     \setunit{\addcomma\addspace}%
-    \printdateextra}}
+    \printdateextra
+    \newunit\newblock
+    \usebibmacro{related}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1269,7 +1250,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{finentry}}
@@ -1293,7 +1277,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{finentry}}
@@ -1313,13 +1300,16 @@
   \newunit\newblock
   \usebibmacro{location+publisher}%
   \newunit\newblock
-  \usebibmacro{origyear}%
-  \newunit\newblock
   \usebibmacro{doi+eprint+url}%
+  \setunit*{\addspace}\newblock
+  \usebibmacro{origyear}%
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1343,7 +1333,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1373,7 +1366,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1397,7 +1393,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1427,7 +1426,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1457,7 +1459,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1495,7 +1500,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1525,7 +1533,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1554,7 +1565,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1579,7 +1593,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1605,7 +1622,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1628,7 +1648,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1648,7 +1671,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1660,7 +1686,10 @@
   \setunit{\labelnamepunct}\newblock
   \usebibmacro{title}%
   \newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \newunit\newblock
   \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extrayear}}{}%
   \newunit\newblock
@@ -1702,7 +1731,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1728,7 +1760,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1752,7 +1787,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1776,7 +1814,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1802,7 +1843,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1828,7 +1872,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1852,7 +1899,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1869,7 +1919,10 @@
   \usebibmacro{location+publisher}%
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1886,7 +1939,10 @@
   \usebibmacro{doi+eprint+url}%
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
@@ -1910,7 +1966,10 @@
   \newunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}
   \usebibmacro{finentry}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index ae483689653..f3c49e42f49 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 @@
-%% Copyright 2012 Philip Kime
+%% Copyright 2013 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,13 +25,14 @@
 %% biblatex-apa-test-citations.bib (Style examples - citations)
 %% biblatex-apa-test-references.bib (Style examples - references)
 
-\ProvidesFile{apa.cbx}[2012/12/28\space v5.7\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2013/03/20\space v5.9\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.16) year postfix is not emphasised or italic
+% (APA 6.16) labelyear postfix is not emphasised or italic
+%            Dashes between labelyear and non-numeric year (or pseudo-year)
 
-\DeclareFieldFormat{extrayear}{\mknumalph{#1}}
+\DeclareFieldFormat{extrayear}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -160,8 +161,6 @@
 % (APA 6.16) Multiple same author cites in a compact citation call do not
 %            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.)"
 % (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
 
 \newbibmacro*{cite:author}{%
@@ -254,16 +253,10 @@
 
 \newbibmacro*{cite:plabelyear+extrayear}{%
   \iffieldundef{labelyear}
-    {\usebibmacro{cite:noyear}}
-    {\ifthenelse{\iffieldequalstr{labelyear}{inpress}\OR\iffieldequalstr{labelyear}{in press}}
-      {\printtext[bibhyperref]{\bibxstring{inpress}%
-       \iffieldundef{extrayear}
-         {}
-         {\apashortdash}%
-       \printfield{extrayear}}}
-      {\printtext[bibhyperref]{%
+    {}
+    {\printtext[bibhyperref]{%
        \printfield[noformat]{origyear}\setunit*{\addslash}%
-       \printfield{labelyear}\printfield{extrayear}}}}}%
+       \printfield{labelyear}\printfield{extrayear}}}}
 
 \newbibmacro*{cite:shorthand}{%
   \ifciteseen
@@ -291,26 +284,6 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.22) Fall back to "nodate" bibstring for citations without dates
-%            Strings defined in apa.bbx
-% (APA 6.16) "in press" for PUBSTATE "inpress"
-
-\newbibmacro*{cite:noyear}{%
-  \ifnameundef{shortauthor}
-    {}
-    {\ifciteseen
-      {}
-      {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
-    \printtext[bibhyperref]{\bibstring{nodate}%
-      \iffieldundef{extrayear}
-        {\setunit{\relax}}
-        {\setunit{\apashortdash}}%
-      \printfield{extrayear}}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.21) No parens round year for cites when the cite is in
 %            parentheses. Use new command \nptextcite for such cites.
@@ -341,8 +314,7 @@
 % 
 \newbibmacro*{citeyear}{%
   \iffieldundef{labelyear}
-    {\usebibmacro{cite:noyear}%
-     \usebibmacro{cite:init}}
+    {\usebibmacro{cite:init}}
     {\iffieldequals{namehash}{\cbx@lasthash}
        {\setunit{\compcitedelim}%
         \usebibmacro{cite:plabelyear+extrayear}}
@@ -366,7 +338,8 @@
       \global\boolfalse{bbx:volseen}%
       \global\boolfalse{bbx:titleinauthpos}%
       \global\boolfalse{bbx:editorinauthpos}%
-      \global\boolfalse{bbx:in}}
+      \global\boolfalse{bbx:in}%
+      \global\let\blx@related@loop\@empty}
     {\thefield{entrytype}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index ad660814ed6..22ff3690a95 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -1,4 +1,4 @@
-%% Copyright 2012 Philip Kime
+%% Copyright 2013 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
 %% biblatex-apa-test-citations.bib (Style examples - citations)
 %% biblatex-apa-test-references.bib (Style examples - references)
 
-\ProvidesFile{apa.dbx}[2012/12/28\space v5.7\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2013/03/20\space v5.9\space APA biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
index 22121e1a082..0ae5a09ffba 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -53,7 +52,6 @@
   with             = {{mit}{mit}},
   from             = {{unter}{unter}},
   archivedat       = {{archiviert\space unter}{archiviert\space unter}},
-  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
   reviewof         = {{Rezension\space des}{Rezension\space des}},
   paragraph        = {{\P}{\P}},
   paragraphs       = {{\P\P}{\P\P}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
index 3c952f1c6ef..30aa24ee6b8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -34,7 +33,6 @@
   available        = {{dispon\'ivel}{disp.}},
   from             = {{de}{de}},
   archivedat       = {{arquivado\space em}{arquivado\space em}},
-  nodate           = {{sem\space data}{{}s\adddot d\adddot}},
   reviewof         = {{Revis\~ao\space de}{revis\~ao\space de}},
   producer         = {{producer}{producer}},
   execproducer     = {{executive producer}{executive producer}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
index 0815cdfdf98..7455ecafcd8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -36,7 +35,6 @@
   available        = {{available}{available}},
   from             = {{from}{from}},
   archivedat       = {{archived\space at}{archived\space at}},
-  nodate           = {{no\space date}{{}n\adddot d\adddot}},
   reviewof         = {{Review\space of}{review\space of}},
   producer         = {{producer}{producer}},
   execproducer     = {{executive producer}{executive producer}},
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 4331407e4c7..d363c9c620c 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 @@
-\ProvidesFile{dutch-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -36,7 +35,6 @@
   available        = {{beschikbaar}{beschikbaar}},
   from             = {{van}{van}},
   archivedat       = {{gearchiveerd\space onder}{gearchiveerd\space onder}},
-  nodate           = {{geen\space datum}{{}n\adddot d\adddot}},
   reviewof         = {{Bespreking\space van}{bespreking\space van}},
   producer         = {{producer}{producer}},
   execproducer     = {{executive producer}{executive producer}},
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 ddcf2e76c45..3d2e915d425 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 @@
-\ProvidesFile{french-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{french}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -54,7 +53,6 @@
   available        = {{disponible}{disponible}},
   from             = {{\`a\space partir\space de}{\`a\space partir\space de}},
   archivedat       = {{archiv\'es\space \`a}{archiv\'es\space \`a}},
-  nodate           = {{pas\space de\space date}{{}p\adddot d\adddot}},
   reviewof         = {{critique\space de}{critique\space de}},
   paragraph        = {{\P}{\P}},
   paragraphs       = {{\P\P}{\P\P}},
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 56fba8ff3e2..aa0d74da277 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 @@
-\ProvidesFile{german-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{german}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -53,7 +52,6 @@
   with             = {{mit}{mit}},
   from             = {{unter}{unter}},
   archivedat       = {{archiviert\space unter}{archiviert\space unter}},
-  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
   reviewof         = {{Rezension\space des}{Rezension\space des}},
   paragraph        = {{\P}{\P}},
   paragraphs       = {{\P\P}{\P\P}},
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 26d2d27f2be..5fc34d9b417 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 @@
-\ProvidesFile{greek-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{greek}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -36,7 +35,6 @@
   available        = {{διαθέσιμο}{διαθέσιμο}},
   from             = {{από}{από}},
   archivedat       = {{αρχειοθετήθηκε\space στις}{αρχειοθετήθηκε\space στις}},
-  nodate           = {{χωρίς\space ημερομηνία}{{}χ\adddot η\adddot}},
   reviewof         = {{Αναθεώρηση\space του}{αναθεώρηση\space του}},
   producer         = {{producer}{producer}},
   execproducer     = {{executive producer}{executive producer}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
index a2b5e2b4c44..92ed1abc695 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{italian}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -36,7 +35,6 @@
   available        = {{disponibile}{disponibile}},
   from             = {{da}{da}},
   archivedat       = {{archiviato\space il}{archiviato\space il}},
-  nodate           = {{senza\space data}{{}n\adddot d\adddot}},
   reviewof         = {{Revisione\space di}{revisione\space di}},
   producer         = {{producer}{producer}},
   execproducer     = {{executive producer}{executive producer}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
index 3e10f912313..b84a4c87db0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{naustrian}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -53,7 +52,6 @@
   available        = {{Erh\"altlich}{Erh\"altlich}},
   from             = {{unter}{unter}},
   archivedat       = {{archiviert\space unter}{archiviert\space unter}},
-  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
   reviewof         = {{Rezension\space des}{Rezension\space des}},
   paragraph        = {{\P}{\P}},
   paragraphs       = {{\P\P}{\P\P}},
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 5993cac8bf0..9a6511b0cf4 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 @@
-\ProvidesFile{ngerman-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{ngerman}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -53,7 +52,6 @@
   available        = {{Erh\"altlich}{Erh\"altlich}},
   from             = {{unter}{unter}},
   archivedat       = {{archiviert\space unter}{archiviert\space unter}},
-  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
   reviewof         = {{Rezension\space des}{Rezension\space des}},
   paragraph        = {{\P}{\P}},
   paragraphs       = {{\P\P}{\P\P}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
index 4be0ba4bbde..5c9d86e0960 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2012/12/28\space v5.8\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{norsk}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -36,7 +35,6 @@
   available        = {{tilgjengelig}{tilgjengelig}},
   from             = {{fra}{fra}},
   archivedat       = {{arkivert\space ved}{arkivert\space ved}},
-  nodate           = {{udatert}{udatert}},
   reviewof         = {{anmeldelse\space av}{anmeldelse\space av}},
   producer         = {{produsent}{produsent}},
   execproducer     = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
index f8d2cfcddb5..5d48130edab 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
index ffe8bf5227c..6abb2547d7d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 % (APA 6.22) The example abbreviations
@@ -16,7 +16,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -36,7 +35,6 @@
   available        = {{tilgjengeleg}{tilgjengeleg}},
   from             = {{fr{\aa}}{fr{\aa}}},
   archivedat       = {{arkivert\space ved}{arkivert\space ved}},
-  nodate           = {{udatert}{udatert}},
   reviewof         = {{melding\space av}{melding\space av}},
   producer         = {{produsent}{produsent}},
   execproducer     = {{ut{\o}vande produsent}{ut{\o}vande produsent}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
index 0ecc9f86b2a..d7c59f36c5b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation]
 \InheritBibliographyExtras{spanish}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -18,7 +18,6 @@
 \NewBibliographyString{retrieved}
 \NewBibliographyString{available}
 \NewBibliographyString{from}
-\NewBibliographyString{nodate}
 \NewBibliographyString{archivedat}
 \NewBibliographyString{origyear}
 \NewBibliographyString{reviewof}
@@ -58,7 +57,6 @@
   available        = {{disponible}{disponible}},
   from             = {{desde}{desde}},
   archivedat       = {{archivado en}{archiv\'es\space \`a}},
-  nodate           = {{sin\space fecha}{{}s\adddot f\adddot}},
   reviewof         = {{revisi\'on\space de}{revisi\'on\space de}},
   paragraph        = {{\P}{\P}},
   paragraphs       = {{\P\P}{\P\P}},