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 | |
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')
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-apa/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf | bin | 337872 -> 337757 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf | bin | 313081 -> 314241 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 19 |
6 files changed, 23 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index 787f9c0b8c3..115ea29fcdd 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.2 +Version 1.4 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 4a732df971b..4f8205aa071 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 @@ -698,7 +698,7 @@ AUTHOR = {{lang}, {k.} {d.}}, TITLE = {Shadow and the Frame}, MAINTITLE = {Watershed}, - MAINTITLEADDON = {CD}, + MAINTITLEADDON = {{CD}}, LOCATION = {New York, NY}, PUBLISHER = {Nonesuch Records}, YEAR = {2008}, 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 Binary files differindex 14cf4d2955c..21734524353 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 Binary files differindex 6f17a744ae5..3490faf1840 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 5c68318642d..43003bb2c8f 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.2}, + revision={1.4}, date={\today}} \hypersetup{% @@ -320,6 +320,14 @@ to see how it was implemented. Some general notes: \begin{changelog} +\begin{release}{1.4}{2010-07-07} +\item Removed extra space after DOI +\end{release} + +\begin{release}{1.3}{2010-07-05} +\item Fixed Oxford comma bug +\end{release} + \begin{release}{1.2}{2010-06-18} \item Made style arguments more explicit in |.bbx| \item Fixed bad documentation due to beta |biblatex| version. 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}}} |