biblatex-apa (5nov10)

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

7 files changed, 61 insertions, 55 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 6df2e0a4619..90849369e29 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
 \ProvidesFile{american-apa.lbx}
 \InheritBibliographyExtras{american}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index d99360ea55d..f5f499f4c71 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
+%% apa.bbx v2.3
 %% Copyright 2010 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
@@ -381,12 +381,12 @@
 \newbibmacro*{bookaddinfo}{%
   \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}}
     {}
-    {\printtext{\bibleftparen}%
+    {\printtext{\bibopenparen}%
      \printfield{edition}%
      \setunit*{\addcomma\addspace}%
      \printfield{volumes}%
      \setunit{}%
-     \printtext{\bibrightparen}}%
+     \printtext{\bibcloseparen}}%
 }
 
 \renewbibmacro*{title}{%
@@ -483,7 +483,7 @@
               \iffieldundef{number}\AND%
               \(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)}
   {}
-  {\printtext{\bibleftparen}%
+  {\printtext{\bibopenparen}%
    \printfield{edition}%
    \setunit*{\addcomma\addspace}%
    \printfield{chapter}%
@@ -499,7 +499,7 @@
    \setunit*{\addcomma\addspace}%
    \printfield{pages}%
    \setunit{}%
-   \printtext{\bibrightparen}%
+   \printtext{\bibcloseparen}%
    \newunit}}
 
 %
@@ -620,14 +620,14 @@
               \ifnameundef{translator}}%
     {}%
     {\ifnamesequal{editor}{translator}%
-       {\printtext{\bibleftparen}\global\booltrue{bbx:parens}%
+       {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
         \printnames[apaeditor]{editor}%
         \setunit*{\addcomma\addspace}%
         \usebibmacro{apaeditorstrg}{editor}%
         \setunit*{\addspace\&\space}%
         \printtext{\bibcpstring{translator}}%
-        \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}
-       {\printtext{\bibleftparen}\global\booltrue{bbx:parens}%
+        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+       {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
         \ifnameundef{editor}%
           {}%
           {\printnames[apaeditor]{editor}%
@@ -643,7 +643,7 @@
            \printtext{\bibcpstring{translator}}%
            \clearname{translator}%
            \setunit{\adddot}}%
-        \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}}}
+        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}}
  
 \newbibmacro*{editor+trans}{%
   \ifthenelse{\ifnameundef{editor}\AND%
@@ -655,11 +655,11 @@
     {\ifnamesequal{editor}{translator}%
       {\usebibmacro{in}%
        \printnames[apaeditor]{editor}%
-       \setunit{\addspace\bibleftparen\global\booltrue{bbx:parens}}%
+       \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}%
        \usebibmacro{apaeditorstrg}{editor}%
        \setunit*{\addspace\&\space}%
        \printtext{\bibcpstring{translator}}%
-       \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}
+       \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
       {\ifnameundef{translator}%
         {}%
         {\setunit{\relax}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 282d58067fe..27555b41b3b 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
+%% apa.cbx v2.3
 %% Copyright 2010 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
@@ -51,7 +51,7 @@
    \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \printtext[bibhyperref]{\usebibmacro{cite}}}
+   \usebibmacro{cite}}
   {}
   {\usebibmacro{postnote}}
 
@@ -60,7 +60,7 @@
    \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \printtext[bibhyperref]{\usebibmacro{citeyear}}}
+   \usebibmacro{citeyear}}
   {}
   {\usebibmacro{postnote}}
 
@@ -137,19 +137,21 @@
   \iffieldequals{namehash}{\cbx@lasthash}
 % Multiple cites in one command
    {\setunit{\compcitedelim}%
-    \usebibmacro{cite:plabelyear+extrayear}}%
+    \printtext[bibhyperref]{\usebibmacro{cite:plabelyear+extrayear}}}%
 % Single cite
    {\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
 % No author/editor
-     {\usebibmacro{cite:noname}%
+     {\printtext[bibhyperref]{%
+       \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
-      \ifnameundef{shortauthor}
+      \printtext[bibhyperref]{%
+       \ifnameundef{shortauthor}
         {\printnames{labelname}}
         {\ifciteseen
           {\printnames{shortauthor}}
@@ -159,29 +161,30 @@
         {\usebibmacro{cite:noyear}}
         {\usebibmacro{cite:plabelyear+extrayear}%
          \savefield{namehash}{\cbx@lasthash}}%
-      \global\let\cbx@tempa=\multicitedelim}}}
+      \global\let\cbx@tempa=\multicitedelim}}}}
 
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
 % Compact cite - more than one thing for same author
-    {\setunit{\compcitedelim}%
-     \usebibmacro{cite:plabelyear+extrayear}}
+    {\compcitedelim%
+     \printtext[bibhyperref]{\bibopenparen\usebibmacro{cite:plabelyear+extrayear}\bibcloseparen\global\boolfalse{cbx:parens}}}
 % Single cite
     {\cbx@tempa
+     \printtext[bibhyperref]{%
       \ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
   % No author/editor or patent
-       {\iffieldundef{shorthand}
+       {\iffieldundef{shorthand}%
     % Cite using title
          {\usebibmacro{cite:noname}%
           \setunit{\ifbool{cbx:np}%
                    {\nameyeardelim}%
-                   {\global\booltrue{cbx:parens}\addspace\bibleftparen}}%
-          \usebibmacro{cite:plabelyear+extrayear}}
+                   {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
+          \usebibmacro{cite:plabelyear+extrayear}\bibcloseparen\global\boolfalse{cbx:parens}}
     % Cite using shorthand
          {\usebibmacro{cite:shorthand}}}
   % Normal cite with author/editor
   % Normal full cite
-       {\ifnameundef{shortauthor}
+       {\ifnameundef{shortauthor}%
     % Normal full cite
          {\printnames{labelname}}
     % Cite using short author
@@ -191,7 +194,7 @@
   % Year
         \setunit{\ifbool{cbx:np}
                   {\nameyeardelim}
-                  {\global\booltrue{cbx:parens}\addspace\bibleftparen}}%
+                  {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
   % Put the shortauthor inside the year brackets if necessary
         \ifnameundef{shortauthor}
          {}
@@ -199,15 +202,16 @@
            {}
            {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
         \iffieldundef{labelyear}%
-          {\usebibmacro{cite:noyear}}%
-          {\usebibmacro{cite:plabelyear+extrayear}}%
-        \savefield{namehash}{\cbx@lasthash}}}%
-  \gdef\cbx@tempa{\ifboolexpr{bool {cbx:parens} and not bool {cbx:np}}
-                   {\bibrightparen\global\boolfalse{cbx:parens}}
-                   {}%
-                  \multicitedelim}}
-
-
+          {\usebibmacro{cite:noyear}%
+           \ifbool{cbx:parens}
+             {\bibcloseparen\global\boolfalse{cbx:parens}}
+             {}}
+          {\usebibmacro{cite:plabelyear+extrayear}%
+           \ifbool{cbx:parens}
+             {\bibcloseparen\global\boolfalse{cbx:parens}}
+             {}}%
+        \savefield{namehash}{\cbx@lasthash}}}}%
+  \global\let\cbx@tempa=\multicitedelim}
 
 \newcommand{\apashortdash}{-}
 
@@ -215,13 +219,13 @@
   \iffieldundef{labelyear}
     {}
     {\printfield[noformat]{origyear}\setunit*{\addslash}%
-       \printfield{labelyear}%
-       \iffieldequalstr{labelyear}{in press}
-         {\iffieldundef{extrayear}
-           {\setunit{\relax}}
-           {\setunit{\apashortdash}}%
-         \printfield{extrayear}}
-         {\printfield{extrayear}}}}%
+     \printfield{labelyear}%
+     \iffieldequalstr{labelyear}{in press}
+       {\iffieldundef{extrayear}
+         {\setunit{\relax}}
+         {\setunit{\apashortdash}}%
+       \printfield{extrayear}}
+       {\printfield{extrayear}}}}%
 
 \newbibmacro*{cite:shorthand}{%
   \ifciteseen
@@ -276,7 +280,7 @@
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \global\booltrue{cbx:np}%
-   \printtext[bibhyperref]{\usebibmacro{textcite}}%
+   \usebibmacro{textcite}%
    \global\boolfalse{cbx:np}}%
   {}
   {\iffieldundef{postnote}
@@ -307,8 +311,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\newbool{cbx:parens}
-\newbool{cbx:np} % variable to say we're using a non-parentheses text cite
+\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*{cite:init}{%
   \global\boolfalse{cbx:parens}%
@@ -339,7 +343,7 @@
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \printtext[bibhyperref]{\usebibmacro{cite}}}
+   \usebibmacro{cite}}
   {}
   {\usebibmacro{postnote}}
 
@@ -347,7 +351,7 @@
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \printtext[bibhyperref]{\usebibmacro{citeyear}}}
+   \usebibmacro{citeyear}}
   {}
   {\usebibmacro{postnote}}
 
@@ -356,24 +360,21 @@
    \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \printtext[bibhyperref]{\usebibmacro{cite}}}
+   \usebibmacro{cite}}
   {}
   {\usebibmacro{postnote}}
 
-
 \DeclareCiteCommand{\textcite}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \printtext[bibhyperref]{\usebibmacro{textcite}}}%
+   \usebibmacro{textcite}}
   {}
   {\iffieldundef{postnote}
-     {\ifbool{cbx:parens}
-        {\bibrightparen}
-  {}}
+     {}
      {\ifbool{cbx:parens}
         {\postnotedelim}
-  {\addspace\bibleftparen}%
-      \printfield{postnote}\bibrightparen}}
+        {\addspace\bibopenparen}%
+      \printfield{postnote}\bibcloseparen}}
 
 \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 94c63729525..99a7d568fe0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
 \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 3bd468be530..417e0154ec4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
 \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 48bbd593fcf..e24146686e3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
 \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 dfb2d08dbf0..64982309900 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
 \ProvidesFile{ngerman-apa.lbx}
 \InheritBibliographyExtras{ngerman}