diff options
| author | Karl Berry <karl@freefriends.org> | 2010-07-06 00:51:10 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-07-06 00:51:10 +0000 |
| commit | 32966f311a70a04afdd4d1d96806b789f07894ef (patch) | |
| tree | 9ed156431c3189a2d92daf33c062df775321d6e2 /Master/texmf-dist/tex/latex/biblatex-apa | |
| parent | 4631b9a200935cb69b604b1d7995fb0d85b229f2 (diff) | |
biblatex-apa update (4jul10)
git-svn-id: svn://tug.org/texlive/trunk@19253 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa')
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 9011eab518e..26ccf3eda55 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -212,11 +212,15 @@ \AtBeginBibliography{\renewcommand*{\finalnamedelim}{% \ifthenelse{\value{listcount}>7} {} - {\ifstrequal{\currentlist}{author} - {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} - {\ifthenelse{\boolean{bbx:editorinauthpos}} - {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} - {\addspace\&\space}}}}} + {\ifthenelse{\ifcurrentname{author}\OR\boolean{bbx:editorinauthpos}} + {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} + {\addspace\&\space}}}} + + % {\ifstrequal{\currentlist}{author} + % {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} + % {\ifthenelse{\boolean{bbx:editorinauthpos}} + % {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} + % {\addspace\&\space}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -472,6 +476,7 @@ \usebibmacro{author}}} \newbibmacro*{editorinauthpos}{% + \global\booltrue{bbx:editorinauthpos}% \printnames[editorinauthpos]{editor}% \setunit{\addspace}% \ifnameundef{editor} @@ -481,7 +486,7 @@ % But we also need to set a flag to say we did this so we % don't lose sight of the fact we once had an editor for % various year placement tests - \clearname{editor}\global\booltrue{bbx:editorinauthpos}% + \clearname{editor}% \setunit{\adddot\addspace}% \usebibmacro{labelyear+extrayear}% \setunit{\adddot\addspace}}} @@ -1599,7 +1604,7 @@ \DeclareFieldFormat{doi}{% - doi\addcolon\space + doi\addcolon \ifhyperref {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} |