biblatex-apa (25nov10)

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

6 files changed, 60 insertions, 49 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 5e0e1db5300..178fb4e696b 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.4
+%% apa.bbx v2.5
 %% Copyright 2010 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
@@ -324,7 +324,7 @@
 \newbibmacro*{labelyear+extrayear}{%
   \iffieldundef{labelyear}
     {\iffieldundef{origyear}
-      {\printtext[parens]{\usebibmacro{cite:noyear}}}
+      {\printtext[parens]{\usebibmacro{noyear}}}
       {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}}
     {\printtext[yearorunkyear]{\printdateextra}}}
 
@@ -333,6 +333,14 @@
     {\mkbibbrackets{ca\adddot\addspace#1}}
     {\mkbibparens{#1}}}
 
+\newbibmacro*{noyear}{%
+  \ifnameundef{shortauthor}
+    {}
+    {\ifciteseen
+      {}
+      {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
+  \biblcstring{nodate}}
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1673,7 +1681,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 
-% Unchanged from authoryear-comp (biblatex v0.9)
+% Unchanged from authoryear-comp
 
 \DeclareBibliographyOption{dashed}[true]{%
   \ifstrequal{#1}{true}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index ed60ab45700..d55fd69db10 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.4
+%% apa.cbx v2.5
 %% Copyright 2010 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
@@ -137,21 +137,18 @@
   \iffieldequals{namehash}{\cbx@lasthash}
 % Multiple cites in one command
    {\setunit{\compcitedelim}%
-    \printtext[bibhyperref]{\usebibmacro{cite:plabelyear+extrayear}}}%
+    \usebibmacro{cite:plabelyear+extrayear}}%
 % Single cite
    {\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
 % No author/editor
-     {\printtext[bibhyperref]{%
-       \usebibmacro{cite:noname}%
+     {\usebibmacro{cite:noname}%
        \setunit{\nameyeardelim}%
       \iffieldundef{labelyear}
         {\usebibmacro{cite:noyear}}
         {\usebibmacro{cite:plabelyear+extrayear}%
-         \savefield{namehash}{\cbx@lasthash}}}}
+         \savefield{namehash}{\cbx@lasthash}}}
 % Normal cite
-     {\cbx@tempa
-      \printtext[bibhyperref]{%
-       \ifnameundef{shortauthor}
+     {\ifnameundef{shortauthor}
         {\printnames{labelname}}
         {\ifciteseen
           {\printnames{shortauthor}}
@@ -160,18 +157,16 @@
       \iffieldundef{labelyear}
         {\usebibmacro{cite:noyear}}
         {\usebibmacro{cite:plabelyear+extrayear}%
-         \savefield{namehash}{\cbx@lasthash}}%
-      \global\let\cbx@tempa=\multicitedelim}}}}
+         \savefield{namehash}{\cbx@lasthash}}}}%
+   \setunit{\multicitedelim}}
 
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
 % Compact cite - more than one thing for same author
-    {\compcitedelim%
-     \printtext[bibhyperref]{\bibopenparen\usebibmacro{cite:plabelyear+extrayear}\bibcloseparen\global\boolfalse{cbx:parens}}}
+    {\setunit{\compcitedelim}%
+     \usebibmacro{cite:plabelyear+extrayear}}
 % Single cite
-    {\cbx@tempa
-     \printtext[bibhyperref]{%
-      \ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
+    {\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
   % No author/editor or patent
        {\iffieldundef{shorthand}%
     % Cite using title
@@ -179,7 +174,7 @@
           \setunit{\ifbool{cbx:np}%
                    {\nameyeardelim}%
                    {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
-          \usebibmacro{cite:plabelyear+extrayear}\bibcloseparen\global\boolfalse{cbx:parens}}
+          \usebibmacro{cite:plabelyear+extrayear}}
     % Cite using shorthand
          {\usebibmacro{cite:shorthand}}}
   % Normal cite with author/editor
@@ -202,35 +197,31 @@
            {}
            {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
         \iffieldundef{labelyear}%
-          {\usebibmacro{cite:noyear}%
-           \ifbool{cbx:parens}
-             {\bibcloseparen\global\boolfalse{cbx:parens}}
-             {}}
+          {\usebibmacro{cite:noyear}}
   % Actual year printing
-          {\usebibmacro{cite:plabelyear+extrayear}%
-           \iffieldundef{postnote}
-             {}
-  % Postnote printing
-             {\postnotedelim\printfield{postnote}}%
-           \ifbool{cbx:parens}
-             {\bibcloseparen\global\boolfalse{cbx:parens}}
-             {}}%
-        \savefield{namehash}{\cbx@lasthash}}}}%
-  \global\let\cbx@tempa=\multicitedelim}
+          {\usebibmacro{cite:plabelyear+extrayear}}%
+        \savefield{namehash}{\cbx@lasthash}}}%
+  \setunit{%
+    \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}%
+    % multicitedelim semi-colon doesn't make much sense for textcites
+    \compcitedelim}}
 
 \newcommand{\apashortdash}{-}
 
 \newbibmacro*{cite:plabelyear+extrayear}{%
   \iffieldundef{labelyear}
     {}
-    {\printfield[noformat]{origyear}\setunit*{\addslash}%
+    {\printtext[bibhyperref]{%
+     \printfield[noformat]{origyear}\setunit*{\addslash}%
      \printfield{labelyear}%
      \iffieldequalstr{labelyear}{in press}
        {\iffieldundef{extrayear}
          {\setunit{\relax}}
          {\setunit{\apashortdash}}%
        \printfield{extrayear}}
-       {\printfield{extrayear}}}}%
+       {\printfield{extrayear}}}}}%
 
 \newbibmacro*{cite:shorthand}{%
   \ifciteseen
@@ -268,7 +259,7 @@
     {\ifciteseen
       {}
       {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
-  \printtext{\biblcstring{nodate}}}
+  \printtext[bibhyperref]{\biblcstring{nodate}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -301,16 +292,14 @@
 % 
 \newbibmacro*{citeyear}{%
   \iffieldundef{labelyear}
-    {\cbx@tempa
-     \usebibmacro{cite:noyear}%
+    {\usebibmacro{cite:noyear}%
      \usebibmacro{cite:init}}
     {\iffieldequals{namehash}{\cbx@lasthash}
        {\setunit{\compcitedelim}%
-        \usebibmacro{cite:labelyear+extrayear}}
-       {\cbx@tempa
-        \usebibmacro{cite:labelyear+extrayear}%
+        \usebibmacro{pcite:labelyear+extrayear}}
+       {\usebibmacro{pcite:labelyear+extrayear}%
         \savefield{namehash}{\cbx@lasthash}}}
-  \global\let\cbx@tempa=\multicitedelim}
+  \setunit{\multicitedelim}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -319,9 +308,23 @@
 \newbool{cbx:parens} % boolean to say we're inside parens
 \newbool{cbx:np} % boolean to say we're using a non-parentheses text cite
 
+\newbibmacro*{textcite:postnote}{%
+  \usebibmacro{postnote}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+    {\setunit{}%
+     \printtext{%
+       \ifbool{cbx:parens}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}}}
+    {\setunit{%
+       \ifbool{cbx:parens}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}%
+       \multicitedelim}}}
+
+
 \newbibmacro*{cite:init}{%
   \global\boolfalse{cbx:parens}%
-  \global\let\cbx@tempa=\empty
   \global\undef\cbx@lasthash}
 
 \newbibmacro*{cite:labelyear}{%
@@ -340,7 +343,7 @@
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\usebibmacro{cite:labelyear+extrayear}}
+  {\usebibmacro{cite:plabelyear+extrayear}}
   {\multinamedelim}
   {\usebibmacro{postnote}}
 
@@ -375,6 +378,6 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
-  {}
+  {\usebibmacro{textcite:postnote}}
 
 \endinput
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 cedb1e3e995..5ec02bb3c78 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.4
+% v2.5
 \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 cf967d6aa5b..67ba0a75b8a 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.4
+% v2.5
 \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 f22473b97d0..8ba8ff4323e 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.4
+% v2.5
 \ProvidesFile{german-apa.lbx}
 \InheritBibliographyExtras{german}
 
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 e4ea49c367f..2a309b895c2 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.4
+% v2.5
 \ProvidesFile{ngerman-apa.lbx}
 \InheritBibliographyExtras{ngerman}