From 4de8c125336c9f04a727c1457fd5cc9d03fc90cc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Oct 2013 22:00:56 +0000 Subject: biblatex-apa (20oct13) git-svn-id: svn://tug.org/texlive/trunk@31956 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/biblatex-apa/README | 2 +- .../biblatex-apa/biblatex-apa-test-citations.bib | 17 ++- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 111570 -> 104063 bytes .../doc/latex/biblatex-apa/biblatex-apa-test.tex | 5 + .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 78210 -> 79339 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 44 +++++-- .../tex/latex/biblatex-apa/american-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 19 ++- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 14 ++- Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx | 2 +- .../tex/latex/biblatex-apa/brazilian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/british-apa.lbx | 2 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 28 ++--- .../tex/latex/biblatex-apa/english-apa.lbx | 135 +++++++++++++++++++++ .../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 | Bin 4540 -> 4528 bytes .../tex/latex/biblatex-apa/nynorsk-apa.lbx | 2 +- .../tex/latex/biblatex-apa/spanish-apa.lbx | 2 +- .../tex/latex/biblatex-apa/swedish-apa.lbx | 2 +- 25 files changed, 247 insertions(+), 45 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx (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 d84c59b9041..ba480b5c10a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 6.1 +Version 6.2 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 e4d5f6ae1e7..6cecdfa7847 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 @@ -239,7 +239,7 @@ YEAR = {2007}, } -% PUBSTATE is not used as there is a year +% PUBSTATE is not used as there is a year - enforces by a style source map in .bbx @BOOK{6.16p, AUTHOR = {Steven Smidge}, TITLE = {Something 1}, @@ -475,7 +475,6 @@ OPTIONS = {useprefix=false}, AUTHOR = {von Greaves, Jr., Percy L.}, TITLE = {A test of noprefix 2}, - TITLE = {Another Title}, YEAR = {2001} } @@ -483,6 +482,18 @@ @BOOK{presufftest2, AUTHOR = {von Greaves, Jr., Percy L.}, TITLE = {A test of noprefix 2}, - TITLE = {Another Title}, YEAR = {2001} } + +% Oxford comma tests +@BOOK{oc1, + AUTHOR = {Hilarious, Hillary and Mirthful, Malcolm and Chuckles, Charles}, + TITLE = {Laughter Through the Ages}, + YEAR = {1987} +} + +@BOOK{oc2, + AUTHOR = {Miserable, Markus and Doleful, Derek and Bitter, Brian}, + TITLE = {Dictionary of Depressions}, + YEAR = {1987} +} \ No newline at end of file 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 ca2dfe75d4b..2fbcb962bc3 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 a5f6a309294..2827c69411d 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 @@ -110,6 +110,11 @@ demonstrated. \noindent Please see accompanying file |biblatex-apa-test-citations.bib| for the bibliographic entries which these examples use. +\noindent\apa{4.03}\\ +Oxford comma in citations for three or more names:\\ +\apaex{\textcite{oc1}}\\ +\apaex{\parencite{oc2}} + \noindent\apa{6.11}\\ Simple cite. «Jr.» suffix is not shown (bib entry for this example has a suffix):\\ \apaex{\textcite{6.11}} 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 8cd85f5ff86..6ee9941e10f 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 02e399375e9..02e1e466da5 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={6.1}, + revision={6.2}, date={\today}} \hypersetup{% @@ -159,7 +159,8 @@ 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. Thanks to Svante Kvarnström -for the Swedish localisation. +for the Swedish localisation. Thanks to Hendrik Maryns for further Dutch +localisation. \section{Use}\label{ref:use} \label{use} @@ -174,7 +175,8 @@ example), you can download it from CTAN and then, put the \path{.cbx}, \path{/tex/latex/biblatex/bbx/apa.bbx}\\ \path{/tex/latex/biblatex/lbx/-apa.lbx}\\ -\noindent Specify the style in the usual way when loading Bib\LaTeX. +\noindent Specify the style in the usual way when loading Bib\LaTeX. If you +are using \sty{babel}: \begin{ltxcode} \usepackage[american]{babel} @@ -183,6 +185,16 @@ example), you can download it from CTAN and then, put the \path{.cbx}, \DeclareLanguageMapping{american}{american-apa} \end{ltxcode} +or \sty{polyglossia}: + +\begin{ltxcode} +\usepackage{polyglossia} +\setdefaultlanguage[variant=american]{english} +\usepackage{csquotes} +\usepackage[style=apa]{biblatex} +\DeclareLanguageMapping{english}{english-apa} +\end{ltxcode} + \noindent Note that the APA manual requires the forcing of titles into «sentence case», that is, initial cap followed by lower case for sentence units, with the exception of names and material from languages which do not @@ -224,14 +236,26 @@ Localisation is provided for APA-specific strings in the accompanying |.lbx| files. To use these files, put an appropriate mapping in your document preamble, after loading Bib\LaTeX. -Normal use will invoke babel with the «american» babel language. After -loading babel and biblatex, put this in the preamble (see full preamble -example in section \ref{ref:use} above): +Normal use will invoke \sty{babel} with the «american» language or +\sty{polyglossia} with «american» variant of «english». After +loading \sty{babel}/\sty{polyglossia} and biblatex, put this in the +preamble if you are using \sty{babel} (see full preamble example in section +\ref{ref:use} above): \begin{ltxcode} \DeclareLanguageMapping{american}{american-apa} \end{ltxcode} +or for \sty{polyglossia} (since there is no language «american» in +\sty{polyglossia}---it's just an «english» variant: + +\begin{ltxcode} +\DeclareLanguageMapping{english}{english-apa} +\end{ltxcode} + +The \file{english-apa.lbx} is a copy of the \file{american-apa.lbx} since +the default is «American» English. + The APA manual does not mention nor sanction any non «American» English strings but it is quite common for non-English journals to ask for APA style bibliographies and so this must be supported. @@ -246,7 +270,7 @@ option: This loads the |german-apa.lbx| file which in turn, loads the |german.lbx| file and augments it with APA-specific strings. If you are not using the -babel «american» option, they you may need to set up the +\sty{babel} «american» option, they you may need to set up the |\DeclareQuotePunctuation| option as mentioned in section \ref{ref:req} above. You would only need to do this if, for some strange reason, a non-american journal required the (rather horrible) american practice of moving final @@ -401,6 +425,12 @@ applied to the data stream by |biber| and does not change your \file{.bib}. \begin{changelog} +\begin{release}{6.2}{2013-10-19} +\item Corrected Dutch translations +\item Fixed Norwegian lbx corruption +\item Misc bugfixes +\end{release} + \begin{release}{6.1}{2013-07-19} \item Corrected APA 6.12 error and switched to uniquelist=minyear \item Documented way of automating some APA 6.32 requirements 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 f355a98bab4..aa056527d3b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{american-apa.lbx}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index fc61fe29dd0..bafea99507f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2013/07/19\space v6.1\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2013/10/19\space v6.2\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -226,6 +226,21 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field +\DeclareStyleSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[fieldsource=year, final] + \step[fieldset=pubstate, null] + } + \map{ + \step[fieldsource=date, final] + \step[fieldset=pubstate, null] + } + } +} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % It is not APA standard to have backrefs in the bib % Some users might like it though. @@ -1299,7 +1314,7 @@ \usebibmacro{location+publisher}% \newunit\newblock \usebibmacro{doi+eprint+url}% - \setunit*{\addspace}\newblock + \newunit\newblock \usebibmacro{origyear}% \newunit\newblock \printfield{addendum}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index c3a517e0d42..b0878822110 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}[2013/07/19\space v6.1\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2013/10/19\space v6.2\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -93,11 +93,17 @@ \newbibmacro*{labelname:doname}[8]{% \ifcase\value{uniquename}% - \usebibmacro{name:last}{#1}{#3}{#5}{}% + \ifuseprefix + {\usebibmacro{name:last}{#1}{#3}{#5}{}} + {\usebibmacro{name:last}{#1}{#3}{}{}}% \or - \usebibmacro{name:first-last}{#1}{#4}{#5}{}% + \ifuseprefix + {\usebibmacro{name:first-last}{#1}{#4}{#5}{}} + {\usebibmacro{name:first-last}{#1}{#4}{}{}}% \or - \usebibmacro{name:first-last}{#1}{#3}{#5}{}% + \ifuseprefix + {\usebibmacro{name:first-last}{#1}{#3}{#5}{}} + {\usebibmacro{name:first-last}{#1}{#3}{}{}}% \fi \usebibmacro{name:andothers}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 8babfecf6d0..8cf8462a25c 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}[2013/07/19\space v6.1\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2013/10/19\space v6.2\space APA biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ 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 32714930418..182db160b8d 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2013/10/19\space v6.2\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 4fd6dc3d7fd..75e40012811 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2013/10/19\space v6.2\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 4810906557b..3f9478a8313 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations @@ -27,7 +27,7 @@ \DeclareBibliographyStrings{% inherit = {dutch}, - revisededition = {{Herziene\space editie}{Herz\adddotspace ed\adddot}}, + revisededition = {{Herziene\space editie}{herz\adddotspace ed\adddot}}, page = {{Pagina}{{}p\adddot}}, pages = {{Pagina's}{{}pp\adddot}}, on = {{op}{op}}, @@ -35,12 +35,12 @@ available = {{beschikbaar}{beschikbaar}}, from = {{van}{van}}, archivedat = {{gearchiveerd\space onder}{gearchiveerd\space onder}}, - reviewof = {{Bespreking\space van}{bespreking\space van}}, - producer = {{producer}{producer}}, - execproducer = {{executive producer}{executive producer}}, - director = {{director}{director}}, - writer = {{writer}{writer}}, - with = {{with}{with}}, + reviewof = {{bespreking\space van}{bespreking\space van}}, + producer = {{producent}{producent}}, + execproducer = {{uitvoerend producent}{uitvoerend producent}}, + director = {{regisseur}{regisseur}}, + writer = {{schrijver}{schrijver}}, + with = {{met}{met}},% FIXME: check paragraph = {{par\adddot}{par\adddot}}, paragraphs = {{par\adddot}{par\adddot}}, january = {{januari}{januari}}, @@ -60,12 +60,12 @@ origyear = {{origineel\space werk\space gepubliceerd}{origineel\space werk\space gepubliceerd}}, typechair = {{hoofd}{hoofd}}, typechairs = {{hoofden}{hoofden}}, - typevolume = {{Volume\space Redacteur}{Vol\adddot\space Red\adddot}}, - typevolumes = {{Volume\space Redacteuren}{Vol\adddot\space Red\adddot}}, - typeseries = {{Serie\space Redacteur}{Serie\space Red\adddot}}, - typeseriess = {{Serie\space Redacteuren}{Serie\space Red\adddot}}, - typevolseries = {{Serie\space en\space Volume\space Redacteur}{Serie\space\& Vol\adddot\space Red\adddot}}, - typevolseriess = {{Serie\space en\space Volume\space Redacteuren}{Serie\space\& Vol\adddot\space Red\adddot}}, + typevolume = {{Deelredacteur}{Deelred\adddot}}, + typevolumes = {{Deelredacteuren}{Deelred\adddot}}, + typeseries = {{Reeksredacteur}{Reeksred\adddot}}, + typeseriess = {{Reeksredacteuren}{Reeksred\adddot}}, + typevolseries = {{Reeks-\space en\space deelredacteur}{Reeks-\space\& deelred\adddot}}, + typevolseriess = {{Reeks-\space en\space deelredacteuren}{Reeks-\space\& deelred\adddot}}, } % diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx new file mode 100644 index 00000000000..050353d7714 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx @@ -0,0 +1,135 @@ +\ProvidesFile{english-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation] +\InheritBibliographyExtras{american} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {american}, + revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}}, + page = {{Page}{{}p\adddot}}, + pages = {{Pages}{{}pp\adddot}}, + on = {{on}{on}}, + retrieved = {{retrieved}{retrieved}}, + available = {{available}{available}}, + from = {{from}{from}}, + archivedat = {{archived\space at}{archived\space at}}, + with = {{with}{with}}, + reprintas = {{reprinted as}{reprinted as}}, + reprintfrom = {{reprinted from}{reprinted from}}, + reviewof = {{review\space of}{review\space of}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + january = {{January}{January}}, + february = {{February}{February}}, + march = {{March}{March}}, + april = {{April}{April}}, + may = {{May}{May}}, + june = {{June}{June}}, + july = {{July}{July}}, + august = {{August}{August}}, + september = {{September}{September}}, + october = {{October}{October}}, + november = {{November}{November}}, + december = {{December}{December}}, + mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}}, + phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, + origyear = {{original\space work\space published}{original\space work\space published}}, + typechair = {{Chair}{Chair}}, + typechairs = {{Chairs}{Chairs}}, + typevolume = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}}, + typevolumes = {{Volume\space Editors}{Vol\adddot\space Eds\adddot}}, + typeseries = {{Series\space Editor}{Series\space Ed\adddot}}, + typeseriess = {{Series\space Editors}{Series\space Eds\adddot}}, + typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddot\space Ed\adddot}}, + typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DefineBibliographyExtras{english}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#3}}% + {\ifthenelse{\iffieldundef{#2}}% + {}% + {\addspace}}% + {\addcomma\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput 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 dd03819663b..6e05a5c9f1d 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2013/10/19\space v6.2\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 34d2e98c038..1da42e87936 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2013/10/19\space v6.2\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 0c4dd2bd203..870f2837bcd 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2013/10/19\space v6.2\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 c24c84bf4b0..f0d8d8b2757 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2013/10/19\space v6.2\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 337f32f7176..754ca800c65 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2013/10/19\space v6.2\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 86d57bc7b48..dc430a38058 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2013/10/19\space v6.2\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 04284f18656..1bbf52a71a3 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2013/10/19\space v6.2\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 25d57ea3afd..eecef7ab6cc 100644 Binary files a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx and b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx differ 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 1c72e7bcb06..3525894e803 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2013/10/19\space v6.2\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 3b8d5351f50..a4d3418ffa6 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}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx index 46f845bdf6c..abec4476029 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swedish-apa.lbx}[2013/07/19\space v6.1\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation] \InheritBibliographyExtras{swedish} % (APA 6.22) The example abbreviations -- cgit v1.2.3