From b566914cb449cd85779f6346019604feb6c1a09f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Jul 2013 23:24:58 +0000 Subject: biblatex-apa (11jul13) git-svn-id: svn://tug.org/texlive/trunk@31164 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/biblatex-apa/README | 2 +- .../biblatex-apa/biblatex-apa-test-citations.bib | 64 ++++++++++++++++++++- .../biblatex-apa/biblatex-apa-test-references.bib | 4 +- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 101695 -> 110673 bytes .../doc/latex/biblatex-apa/biblatex-apa-test.tex | 20 ++++++- .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 76523 -> 76124 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 10 +++- 7 files changed, 92 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/doc/latex/biblatex-apa') diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index c1364cc9344..8f6b7512e66 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.9 +Version 6.0 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-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib index 6d60469cbf2..7c10adbf771 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib @@ -1,6 +1,6 @@ % (APA 6.11) @BOOK{6.11, - AUTHOR = {Kessler, Jr., A}, + AUTHOR = {Kessler, Jr., A.}, TITLE = {Title}, YEAR = {2003}, } @@ -412,3 +412,65 @@ PAGES = {1-17}, DATE = {1906} } + +% Suffix test for first-last (editor) +@INCOLLECTION{stest1, + AUTHOR = {Gring, III, Alan J.}, + EDITOR = {Greaves, Jr., Percy L.}, + TITLE = {A test of suffix 1}, + DATE = {1968}, + LOCATION = {New York, NY}, + PUBLISHER = {Wiley}, + PAGES = {1--34} +} + +% Suffix test for first-last (editor) +@INCOLLECTION{stest2, + EDITOR = {Greaves, Jr., Percy L.}, + TITLE = {A test of suffix 2}, + DATE = {1968}, + LOCATION = {New York, NY}, + PUBLISHER = {Wiley}, + PAGES = {1--34} +} + +% Don't forget that useprefix=false doesn't ignore the prefix completely - it is still used in +% hash and uniqueness generation and so there are two different "Greaves" here - one von and one not +% Prefix test (useprefix=true) +@BOOK{pretest, + AUTHOR = {Luis von Mises}, + TITLE = {A Title}, + YEAR = {2000} +} + +% Prefix test (useprefix=false) +@MISC{nopretest, + OPTIONS = {useprefix=false}, + AUTHOR = {Luis von Mises}, + TITLE = {Another Title}, + YEAR = {2001} +} + +% Prefix + suffix test (useprefix=true) first-last +@INCOLLECTION{presufftest, + EDITOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of prefix 2}, + DATE = {1969}, +} + +% Prefix + suffix test (useprefix=false) +@MISC{nopresufftest, + OPTIONS = {useprefix=false}, + AUTHOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of noprefix 2}, + TITLE = {Another Title}, + YEAR = {2001} +} + +% Prefix + suffix test (useprefix=true) +@BOOK{presufftest2, + AUTHOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of noprefix 2}, + TITLE = {Another Title}, + YEAR = {2001} +} 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 f853ddbf31a..64abca9ba5e 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 @@ -26,7 +26,7 @@ % (APA 7.01 Example 3) @ARTICLE{7.01:3a, AUTHOR = {T. J. Sillick and N. S. Schutte}, - TITLE = {Emotional Intelligence and Self-esteem Mediate Between Perceived Early Parental Love and Adult Happiness.}, + TITLE = {Emotional Intelligence and Self-esteem Mediate Between Perceived Early Parental Love and Adult Happiness}, JOURNALTITLE = {E-Journal of Applied Psychology}, VOLUME = {2}, NUMBER = {2}, @@ -49,7 +49,7 @@ @ARTICLE{7.01:4, AUTHOR = {P. Guimard and A. Florin}, ORIGTITLE = {Les évaluations des enseignants en grande section de maternelle sont-elles prédictives des difficultés de lecture au cours préparatoire?}, - TITLE = {Are Teacher Ratings in Kindergarten Predictive of Reading Dificulties in First Grade?}, + TITLE = {Are Teacher Ratings in Kindergarten Predictive of Reading Difficulties in First Grade?}, JOURNALTITLE = {Approche Neuropsychologique des Apprentissages chez l'Enfant}, VOLUME = {19}, PAGES = {5--17}, 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 7282e3b747f..cc4d3fe60b6 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-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex index 45c5ad7b3d4..7141db656aa 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex @@ -18,7 +18,7 @@ \usepackage[style=apa]{biblatex} % Custom settings for misc entries in order to format the table for 6.13* -% This table implies that the examples on each line are in a seperate +% This table implies that the examples on each line are in a separate % document but since we are generating the citations from a real data % source, we have to prevent the usual uniquelist processing by making % all of the examples MISC entrytypes and changing uniquelist @@ -366,6 +366,22 @@ these appear in references\\ \apaex{\textcite{6.27a}}\\ \apaex{\textcite{6.27b}} +\noindent Testing suffices\\ +\apaex{\textcite{stest1}}\\ +\apaex{\textcite{stest2}} + +\noindent Testing prefices\\ +\apaex{\textcite{pretest}}\\ +\apaex{\textcite{nopretest}} + +% presufftest2 and nopresufftest have same year but don't have extrayear +% because useprefix=false for MISC and this is taken account of in +% extrayear generation +\noindent Testing prefices plus suffices\\ +\apaex{\textcite{presufftest}}\\ +\apaex{\textcite{presufftest2}}\\ +\apaex{\textcite{nopresufftest}} + \end{refsection} \begin{refsection}[biblatex-apa-test-references] \nocite{*} @@ -376,5 +392,5 @@ these appear in references\\ \newpage % Include a references section for citation examples just so hyperref % targets can be checked -\printbibliography[section=1,title=Misc citation references for checking hyperref targets] +\printbibliography[section=1,title=Misc citation references] \end{document} 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 6ed3a853e90..aeb19cf34d4 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 2043635d231..078ea0e5114 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.9}, + revision={6.0}, date={\today}} \hypersetup{% @@ -158,7 +158,8 @@ Greek localisation. Thanks to Erikson Kaszubowski for the Brazilian localisation. Thanks to Braulio José Solano Rojas for the Spanish localisation. Thanks to Stefan Mayer for the |subtitlepunct| suggestion. Thanks to Håkon Malmedal for the Norwegian localisation. Thanks to -Johann Gründl for the Austrian localisation. +Johann Gründl for the Austrian localisation. Thanks to Svante Kvarnström +for the Swedish localisation. \section{Use}\label{ref:use} \label{use} @@ -373,6 +374,11 @@ general notes: \begin{changelog} +\begin{release}{6.0}{2013-07-10} +\item Added Swedish localisation +\item Fixed useprefix=false issue +\end{release} + \begin{release}{5.9}{2013-05-08} \item Compatibility with |biblatex| 2.6--«nodate» is now part of core \item autocite is set to inline -- cgit v1.2.3