From eb7ec8e2f098581f0cbe27602115cdbb12043d4a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 17 Dec 2012 23:48:26 +0000 Subject: biblatex-apa (17dec12) git-svn-id: svn://tug.org/texlive/trunk@28562 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/biblatex-apa/README | 2 +- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 100619 -> 100613 bytes .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 74338 -> 75270 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 6 +++++- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 7 ++++--- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx | 2 +- .../tex/latex/biblatex-apa/austrian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/brazilian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/british-apa.lbx | 2 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 2 +- .../tex/latex/biblatex-apa/french-apa.lbx | 2 +- .../tex/latex/biblatex-apa/german-apa.lbx | 2 +- .../tex/latex/biblatex-apa/greek-apa.lbx | 2 +- .../tex/latex/biblatex-apa/italian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/naustrian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/ngerman-apa.lbx | 2 +- .../tex/latex/biblatex-apa/norsk-apa.lbx | 2 +- .../tex/latex/biblatex-apa/norwegian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/nynorsk-apa.lbx | 2 +- .../tex/latex/biblatex-apa/spanish-apa.lbx | 2 +- 21 files changed, 26 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index b1681aeffcc..527513bb63c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 5.4 +Version 5.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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf index 4f6e5658b6f..cece92692d6 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf and b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf differ 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 e72290c4a7c..476e4534578 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf and b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf differ 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 e5cb812e7f4..d3d0a0840d4 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -25,7 +25,7 @@ url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={5.4}, + revision={5.5}, date={\today}} \hypersetup{% @@ -373,6 +373,10 @@ general notes: \begin{changelog} +\begin{release}{5.5}{2012-12-17} +\item Fixed serial comma requirement (APA 4.03) +\end{release} + \begin{release}{5.4}{2012-11-28} \item Updated for |biblatex| 2.4 \end{release} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index dc0d5509b61..51ef2cfa9ee 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.bbx}[2012/11/28\space v5.4\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2012/12/17\space v5.5\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -387,12 +387,13 @@ % Needs to be in this hook otherwise it sets this for all % citations too. % (APA 6.27) Use blank for long lists +% (APA 4.03) Serial comma for lists of three or more \AtBeginBibliography{\renewcommand*{\finalnamedelim}{% \ifthenelse{\value{listcount}>\maxprtauth} {} - {\ifthenelse{\ifcurrentname{author}\OR\boolean{bbx:editorinauthpos}} - {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} + {\ifthenelse{\value{liststop}>2} + {\finalandcomma\addspace\&\space} {\addspace\&\space}}}} % diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index dc5e282e6d9..7b8e19fbe57 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.cbx}[2012/11/28\space 5.4\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2012/12/17\space 5.5\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 9ce763df46c..4b0491f24ae 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.dbx}[2012/11/28\space v5.4\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2012/12/17\space v5.5\space APA biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx index 0205a091a97..fa2a7e832cf 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{austrian-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx index 5cc50b73690..b291ea785f0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{brazilian-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx index 3c7ad97489c..9c99277295b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{british-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations 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 129b8952e31..17c18f9c4cb 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 @@ -\ProvidesFile{dutch-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations 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 25ffde7fec4..522de5e0a6d 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 @@ -\ProvidesFile{french-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations 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 b395cc4d286..22320b768ef 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 @@ -\ProvidesFile{german-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx index a7f62d11382..eedea34a610 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{greek-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx index 915eec99d9a..eb65d6654d5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{italian-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx index 1147a204c0c..e347a6c14c0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{naustrian-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations 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 5aa8da8970b..17aeb86bc6c 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 @@ -\ProvidesFile{ngerman-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx index 9958c0945b7..fb649fe9f68 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norsk-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{norsk} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx index 453169b381d..41d18c98a3c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norwegian-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx index 1b67c5017da..53e7a6a1c76 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nynorsk-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx index a0b6812d7ff..dc1d634b562 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{spanish-apa.lbx}[2012/11/28\space v5.4\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2012/12/17\space v5.5\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced -- cgit v1.2.3