biblatex-apa (28oct13)

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

20 files changed, 61 insertions, 42 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 aa056527d3b..5e6d41a84a6 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index bafea99507f..214095b462f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.bbx}[2013/10/19\space v6.2\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2013/10/27\space v6.3\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -363,7 +363,7 @@
     {\addcomma\addspace\ldots\addspace}
     {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
       {}
-      {\ifthenelse{\iffieldequalstr{doubtfulauthor}{true}}
+      {\iffieldequalstr{doubtfulauthor}{true}
         {\mkbibbrackets{\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}?}}
         {\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}}}}%
   \ifmorenames{\andothersdelim\bibstring{andothers}}{}}
@@ -503,13 +503,13 @@
       {\printtext[title]{%
         \printfield[apacase]{title}%
         \setunit{\subtitlepunct}%
-        \printfield[apacase]{subtitle}}}%
+        \printfield[apacase]{subtitle}}}
       {\printfield{origtitle}%
        \setunit{\addspace}%
        \printtext[brackets]{%
         \printfield[apacase]{title}%
         \setunit{\subtitlepunct}%
-        \printfield[apacase]{subtitle}}}
+        \printfield[apacase]{subtitle}}}%
      \setunit{\addspace}%
      \printfield{titleaddon}%
      \iffieldequalstr{entrytype}{book}%
@@ -783,10 +783,10 @@
        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
       {\ifnameundef{translator}%
         {}%
-        {\setunit{\relax}%
+        {\setunit{\addspace}%
          \printtext[parens]{\printnames[apanames][-\value{listtotal}]{translator}%
-          \setunit{\addcomma\addspace}%
-          \printtext{\bibcpstring{translator}}}%
+         \setunit{\addcomma\addspace}%
+         \printtext{\bibcpstring{translator}}}%
          \clearname{translator}%
          \setunit{\adddot\addspace}}%
        \usebibmacro{in}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index b0878822110..7976d67deb5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -25,7 +25,7 @@
 %% biblatex-apa-test-citations.bib (Style examples - citations)
 %% biblatex-apa-test-references.bib (Style examples - references)
 
-\ProvidesFile{apa.cbx}[2013/10/19\space v6.2\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2013/10/27\space v6.3\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -64,7 +64,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand*{\parencite}[\mkbibparens]
   {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
@@ -73,7 +74,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{citeyear}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -169,6 +171,12 @@
 %            need to be repeated but the full years must be repeated with
 %            their extrayear postfixes
 % (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
+\def\citeresetapa{\global\let\cbx@apa@names\@empty}
+\citeresetapa
+\def\cbx@apa@ifnamesaved{%
+  \xifinlist{\thefield{namehash}}{\cbx@apa@names}
+    {\@firstoftwo}
+    {\@secondoftwo}}
 
 \newbibmacro*{cite:author}{%
   \iffieldequals{namehash}{\cbx@lasthash}
@@ -183,7 +191,7 @@
 % Normal cite
      {\ifnameundef{shortauthor}
         {\printnames[labelname][-\value{listtotal}]{labelname}}%
-        {\ifciteseen
+        {\cbx@apa@ifnamesaved
           {\printnames{shortauthor}}
           {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
       \savefield{namehash}{\cbx@lasthash}}}%
@@ -204,7 +212,7 @@
 % Normal cite
      {\ifnameundef{shortauthor}
         {\printnames[labelname][-\value{listtotal}]{labelname}}%
-        {\ifciteseen
+        {\cbx@apa@ifnamesaved
           {\printnames{shortauthor}}
           {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
       \setunit{\nameyeardelim}%
@@ -240,7 +248,7 @@
     % Normal full cite
          {\printnames[labelname][-\value{listtotal}]{labelname}}
     % Cite using short author
-         {\ifciteseen
+         {\cbx@apa@ifnamesaved
            {\printnames{shortauthor}}
            {\printnames[labelname][-\value{listtotal}]{author}}}%
   % Year
@@ -250,7 +258,7 @@
   % Put the shortauthor inside the year brackets if necessary
         \ifnameundef{shortauthor}
          {}
-         {\ifciteseen
+         {\cbx@apa@ifnamesaved
            {}
            {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
   % Actual year printing
@@ -309,9 +317,8 @@
   {\iffieldundef{postnote}
      {}
      {\nameyeardelim
-      \printfield{postnote}}}
-
-
+      \printfield{postnote}}%
+   \usebibmacro{cite:post}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -349,7 +356,8 @@
       \global\let\blx@related@loop\@empty}
     {\thefield{entrytype}}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand{\fullcitebib}
   {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
@@ -367,7 +375,8 @@
       \global\boolfalse{bbx:in}}
     {\thefield{entrytype}}\finentry}
   {\item}
-  {\endlist}
+  {\endlist
+   \usebibmacro{cite:post}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -385,6 +394,11 @@
   \global\boolfalse{cbx:parens}%
   \global\undef\cbx@lasthash}
 
+\newbibmacro*{cite:post}{%
+  \xifinlist{\thefield{namehash}}{\cbx@apa@names}
+    {}
+    {\listxadd{\cbx@apa@names}{\thefield{namehash}}}}
+
 \newbibmacro*{cite:labelyear}{%
   \printfield{labelyear}}
 
@@ -411,7 +425,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand*{\cite}
   {\usebibmacro{cite:init}%
@@ -419,7 +434,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{citeyear}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand{\footcite}[\mkbibfootnote]
   {\bibsentence
@@ -428,7 +444,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim}
 
@@ -438,7 +455,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
-  {\usebibmacro{textcite:postnote}}
+  {\usebibmacro{textcite:postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand{\citeauthor}
   {\usebibmacro{cite:init}%
@@ -446,6 +464,7 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{cite:author}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index 8cf8462a25c..4c4512ff285 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -25,7 +25,7 @@
 %% biblatex-apa-test-citations.bib (Style examples - citations)
 %% biblatex-apa-test-references.bib (Style examples - references)
 
-\ProvidesFile{apa.dbx}[2013/10/19\space v6.2\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2013/10/27\space v6.3\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 8af21772da7..f91f5bb28a3 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % (APA 6.22) The example abbreviations
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 182db160b8d..48abce49679 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 % (APA 6.22) The example abbreviations
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 75e40012811..6e6b0d8c4ac 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 % (APA 6.22) The example abbreviations
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 3f9478a8313..15f195c7b38 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
index 050353d7714..621ebed496b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations
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 6e05a5c9f1d..c55f1f438de 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{french}
 
 % (APA 6.22) The example abbreviations
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 1da42e87936..033747ad685 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{german}
 
 % (APA 6.22) The example abbreviations
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 870f2837bcd..5a8e524edf7 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{greek}
 
 % (APA 6.22) The example abbreviations
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 f0d8d8b2757..2036506afc5 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{italian}
 
 % (APA 6.22) The example abbreviations
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 754ca800c65..5b9f0c4dd07 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{naustrian}
 
 % (APA 6.22) The example abbreviations
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 dc430a38058..4853e6b5030 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{ngerman}
 
 % (APA 6.22) The example abbreviations
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 1bbf52a71a3..655d713474b 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{norsk}
 
 % (APA 6.22) The example abbreviations
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 eecef7ab6cc..b7fdd071742 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{norwegian}
 
 % (APA 6.22) The example abbreviations
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 3525894e803..0157bb602d5 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 % (APA 6.22) The example abbreviations
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 a4d3418ffa6..fd9d4025c22 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}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{spanish}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
index abec4476029..e21526a9cd7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 % (APA 6.22) The example abbreviations