biblatex-apa 1.5 (11jul10)

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

6 files changed, 32 insertions, 39 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 115ea29fcdd..e43416ccc9a 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.4
+Version 1.5
 
 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-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
index 4f8205aa071..2814b70b0ad 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
@@ -536,7 +536,8 @@
   TITLE          = {Meaning Through Narrative},
   SUBTITLE       = {A Personal Narrative Discussing Growing Up with an Alchoholic Mother},
   YEAR           = {2006},
-  NOTE           = {Available from ProQuest Dissertations and These database. (UMI No. 1434728)}
+  NOTE           = {Available from ProQuest Dissertations and Theses database},
+  ADDENDUM       = {UMI No. 1434728}
 }
 
 % (APA 7.05 Example 41)
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 21734524353..d5a6ab89476 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 3490faf1840..466799b2183 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 43003bb2c8f..2d5075832f9 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.4},
+  revision={1.5},
   date={\today}}
 
 \hypersetup{%
@@ -280,6 +280,8 @@ state. So, the new citation command
 \noindent is provided for such situations. It is identical to |\textcite|
 but does not put parentheses around the year and separates items with
 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|;
 
 \subsection{References}
 
@@ -320,6 +322,11 @@ to see how it was implemented. Some general notes:
 
 \begin{changelog}
 
+\begin{release}{1.5}{2010-07-12}
+\item Corrected |NOTE/ADDENDUM| examples
+\item Made |\nptextcite| behave more consistently like |\textcite| for multi-cites.
+\end{release}
+
 \begin{release}{1.4}{2010-07-07}
 \item Removed extra space after DOI
 \end{release}
@@ -369,7 +376,7 @@ to see how it was implemented. Some general notes:
   multiple cites and actually cited the year twice for multiple cite
   commands in some circumstances.
 \item Corrected bug where |\textcite| would leave a stray open bracket on
-  the stack when year was suppressed withing a paragraph.
+  the stack when year was suppressed within a paragraph.
 \end{release}
 
 \begin{release}{0.5}{2009-09-19}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 58c6832af68..de7e2f48584 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -174,7 +174,9 @@
        {\iffieldundef{shorthand}
     % Cite using title
          {\usebibmacro{cite:noname}%
-          \setunit{\global\booltrue{cbx:parens}\addspace\bibleftparen}%
+          \setunit{\ifbool{cbx:np}%
+                   {\nameyeardelim}%
+                   {\global\booltrue{cbx:parens}\addspace\bibleftparen}}%
           \usebibmacro{cite:plabelyear+extrayear}}
     % Cite using shorthand
          {\usebibmacro{cite:shorthand}}}
@@ -190,7 +192,9 @@
   % Year
         \setunit{\iffieldundef{labelyear}
                  {\nameyeardelim}
-                 {\global\booltrue{cbx:parens}\addspace\bibleftparen}}
+                 {\ifbool{cbx:np}
+                   {\nameyeardelim}
+                   {\global\booltrue{cbx:parens}\addspace\bibleftparen}}}%
   % Put the shortauthor inside the year brackets if necessary
         \ifnameundef{shortauthor}
          {}
@@ -201,11 +205,13 @@
           {\usebibmacro{cite:noyear}}%
           {\usebibmacro{cite:plabelyear+extrayear}}%
         \savefield{namehash}{\cbx@lasthash}}}%
-  \gdef\cbx@tempa{\ifbool{cbx:parens}
+  \gdef\cbx@tempa{\ifboolexpr{bool {cbx:parens} and not bool {cbx:np}}
                    {\bibrightparen\global\boolfalse{cbx:parens}}
                    {}%
                   \multicitedelim}}
 
+
+
 \newcommand{\apashortdash}{-}
 
 \newbibmacro*{cite:plabelyear+extrayear}{%
@@ -265,45 +271,22 @@
 % (APA 6.21) No parens round year for cites when the cite is in
 %            parentheses. Use new command \nptextcite for such cites.
 
+
+\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim}
 \DeclareCiteCommand{\nptextcite}
   {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
    \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \printtext[bibhyperref]{\usebibmacro{nptextcite}}}
+   \global\booltrue{cbx:np}%
+   \printtext[bibhyperref]{\usebibmacro{textcite}}%
+   \global\boolfalse{cbx:np}}%
   {}
   {\iffieldundef{postnote}
      {}
-     {\ifbool{cbx:parens}
-        {\postnotedelim}
-	{\nameyeardelim}%
+     {\nameyeardelim
       \printfield{postnote}}}
 
-\newbibmacro*{nptextcite}{%
-  \iffieldequals{namehash}{\cbx@lasthash}
-    {\setunit{\compcitedelim}%
-     \usebibmacro{cite:plabelyear+extrayear}}
-    {\cbx@tempa
-     \ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
-       {\usebibmacro{cite:noname}%
-	   \setunit{%
-	     \global\booltrue{cbx:parens}%
-	     \nameyeardelim}%
-	   \usebibmacro{cite:plabelyear+extrayear}}
-       {\printnames{labelname}%
-	\setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \nameyeardelim}%
-        \iffieldundef{labelyear}
-           {\usebibmacro{cite:noyear}}
-           {\usebibmacro{cite:plabelyear+extrayear}}}%
-        \savefield{namehash}{\cbx@lasthash}}%
-  \gdef\cbx@tempa{%
-    \ifbool{cbx:parens}
-      {\addcomma\global\boolfalse{cbx:parens}}
-      {}%
-    \multicitedelim}}
-
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -329,6 +312,7 @@
 
 
 \newbool{cbx:parens}
+\newbool{cbx:np} % variable to say we're using a non-parentheses text cite
 
 \newbibmacro*{cite:init}{%
   \global\boolfalse{cbx:parens}%
@@ -372,19 +356,20 @@
   {}
   {\usebibmacro{postnote}}
 
+
 \DeclareCiteCommand{\textcite}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \printtext[bibhyperref]{\usebibmacro{textcite}}}
+   \printtext[bibhyperref]{\usebibmacro{textcite}}}%
   {}
   {\iffieldundef{postnote}
      {\ifbool{cbx:parens}
         {\bibrightparen}
-	{}}
+  {}}
      {\ifbool{cbx:parens}
         {\postnotedelim}
-	{\addspace\bibleftparen}%
+  {\addspace\bibleftparen}%
       \printfield{postnote}\bibrightparen}}
 
 \endinput