texlive[54667] Master/texmf-dist: biblatex-apa (9apr20)
commits+karl at tug.org
commits+karl at tug.org
Sun Apr 12 00:41:19 CEST 2020
Revision: 54667
http://tug.org/svn/texlive?view=revision&revision=54667
Author: karl
Date: 2020-04-12 00:41:19 +0200 (Sun, 12 Apr 2020)
Log Message:
-----------
biblatex-apa (9apr20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2020-04-11 22:41:19 UTC (rev 54667)
@@ -779,7 +779,7 @@
@MISC{10.1:17,
AUTHOR = {M. Klymkowsky},
TITLE = {Can We Talk Scientifically About Free Will?},
- LOCATION = {Sci-Ed},
+ ORGANIZATION = {Sci-Ed},
DATE = {2018-09-15},
URL = {https://blogs.plos.org/scied/2018/09/15/can-we-talk-scientifically-about-free-will/},
}
@@ -1470,7 +1470,7 @@
SUBTITLE = {Using Music Therapy to Connect, Engage, and Motivate},
TITLEADDON = {Conference session},
EVENTTITLE = {Autism Society National Conference},
- LOCATION = {Milwaukee, WI, United States},
+ VENUE = {Milwaukee, WI, United States},
URL = {https://asa.confex.com/asa/2017/webprogramarchives/Session9517.html},
DATE = {2017-07-12/2017-07-15}
}
@@ -1483,7 +1483,7 @@
in Children},
TITLEADDON = {Paper presentation},
EVENTTITLE = {Southeastern Psychological Association 62nd Annual Meeting},
- LOCATION = {New Orleans, LA, United States},
+ VENUE = {New Orleans, LA, United States},
DATE = {2016-03-30/2016-04-02}
}
@@ -1493,7 +1493,7 @@
TITLE = {Fat Talk and its Effects on State-Based Body Image in Women},
TITLEADDON = {Poster presentation},
EVENTTITLE = {Australian Psychological Society Congress},
- LOCATION = {Sydney, NSW, Australia},
+ VENUE = {Sydney, NSW, Australia},
URL = {http://bit.ly/2XGSThP},
DATE = {2018-09-27/2018-09-30}
}
@@ -1512,7 +1512,7 @@
Measurement, and Enhancement},
MAINTITLEADDON = {Symposium},
EVENTTITLE = {Western Psychological Association 98th Annual Convention},
- LOCATION = {Portland, OR, United States},
+ VENUE = {Portland, OR, United States},
DATE = {2018-04-26/2018-04-29}
}
@@ -1608,7 +1608,7 @@
RELATED = {10.7:69r},
RELATEDTYPE = {reviewof},
RELATEDSTRING = {Review of the TV series episode},
- ORGANIZATION = {A.V. Club},
+ EPRINT = {A.V. Club},
DATE = {2018-02-01},
URL = {https://www.avclub.com/the-good-place-ends-its-remarkable-second-season-with-i-1822649316}
}
@@ -1632,7 +1632,7 @@
AUTHOR = {J. Yoo and Y. Miyamoto and A. Rigotti and C. Ryff},
TITLE = {Linking Positive Affect to Blood Lipids},
SUBTITLE = {A Cultural Perspective},
- LOCATION = {Department of Psychology},
+ VENUE = {Department of Psychology},
INSTITUTION = {University of Wisconsin-Madison},
HOWPUBLISHED = {manunpub},
DATE = {2016}
@@ -1643,7 +1643,7 @@
AUTHOR = {M. O'Shea},
TITLE = {Understanding Proactive Behaviour in the Workplace as a
Function of Gender},
- LOCATION = {Department of Management},
+ VENUE = {Department of Management},
INSTITUTION = {University of Kansas},
HOWPUBLISHED = {maninprep},
DATE = {2018}
@@ -1654,7 +1654,7 @@
AUTHOR = {T. Lippincott and E. K. Poindexter},
TITLE = {Emotion Recognition as a Function of Facial Cues},
SUBTITLE = {Implications for Practice},
- LOCATION = {Department of Psychology},
+ VENUE = {Department of Psychology},
INSTITUTION = {University of Washington},
HOWPUBLISHED = {mansub},
DATE = {2019}
@@ -1661,30 +1661,30 @@
}
% (APA 10.8 Example 73)
- at UNPUBLISHED{10.8:73a,
+ at ONLINE{10.8:73a,
AUTHOR = {C. Leuker and L. Samartzidis and R. Hertwig and T. J. Pleskac},
TITLE = {When Money Talks},
SUBTITLE = {Judging Risk and Coercion in High-Paying Clinical Trials},
- LOCATION = {PsyArXiv},
+ EPRINT = {PsyArXiv},
DOI = {10.17605/OSF.IO/9P7CB},
DATE = {2018}
}
- at UNPUBLISHED{10.8:73b,
+ at ONLINE{10.8:73b,
AUTHOR = {M. A. Stults-Kolehmainen and R. Sinha},
TITLE = {The Effects of Stress on Physical Activity and Exercise},
- LOCATION = {PubMed Central},
+ EPRINT = {PubMed Central},
URL = {https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3894304},
DATE = {2015}
}
% (APA 10.8 Example 74)
- at UNPUBLISHED{10.8:74,
+ at ONLINE{10.8:74,
AUTHOR = {H-K Ho},
TITLE = {Teacher Preparation for Early Childhood Special
Education in {Taiwan}},
- NUMBER = {ED545393},
- LOCATION = {ERIC},
+ VERSION = {ED545393},
+ EPRINT = {ERIC},
URL = {https://files.eric.ed.gov/fulltext/ED545393.pdf},
DATE = {2014}
}
@@ -2229,7 +2229,7 @@
TITLE = {College Students are Forming Mental-Health
Clubs--and They're Making a Difference @washingtonpost},
TITLEADDON = {Thumbnail with link attached},
- ORGANIZATION = {Twitter},
+ EPRINT = {Twitter},
DATE = {2018-06-29},
URL = {https://twitter.com/apaeducation/status/1012810490530140161}
}
@@ -2242,7 +2242,7 @@
TITLE = {Biologists Have Identified More Than 400
Different Plant Species Growing in
{@BadlandsNPS} \#{DYK} \#biodoversity},
- ORGANIZATION = {Twitter},
+ EPRINT = {Twitter},
DATE = {2018-02-26},
URL = {https://twitter.com/BadlandsNPS/status/968196500412133379}
}
@@ -2254,7 +2254,7 @@
AUTHOR+an:username = {1="@BettyMWhite"},
TITLE = {I Treasure Every Minute We Spent Together \#koko},
TITLEADDON = {Image attached},
- ORGANIZATION = {Twitter},
+ EPRINT = {Twitter},
DATE = {2018-06-21},
URL = {https://twitter.com/BettyMWhite/status/1009951892846227456}
}
@@ -2266,7 +2266,7 @@
GROUPAUTHOR = {{APA Style}},
GROUPAUTHOR+an:username = {1="@APA\_Style"},
TITLE = {Tweets},
- ORGANIZATION = {Twitter},
+ EPRINT = {Twitter},
URL = {https://twitter.com/APA_Style},
URLDATE = {2019-11-01}
}
@@ -2281,7 +2281,7 @@
Season. {My} Fellow {UNHCR} {Goodwill}
{Ambassador} {Cate} {Blanchett} is},
TITLEADDON = {Image attached},
- ORGANIZATION = {Facebook},
+ EPRINT = {Facebook},
URL = {http://bit.ly/2JQxPAD},
DATE = {2018-03-22}
}
@@ -2294,7 +2294,7 @@
Ethnicities. {Check} out These 5 {Action}
{Steps} for {Helping} {Someone} in {Emotional}
{Pain}},
- ORGANIZATION = {Facebook},
+ EPRINT = {Facebook},
URL = {http://bit.ly/321Qstq},
DATE = {2018-11-28}
}
@@ -2305,7 +2305,7 @@
GROUPAUTHOR = {{News From Science}},
TITLE = {These Frogs Walk Instead of Hop},
SUBTITLE = {{h}ttps://scimag.2{K}lriw{H}},
- ORGANIZATION = {Facebook},
+ EPRINT = {Facebook},
URL = {https://www.facebook.com/ScienceNOW/videos/10155508587605108},
DATE = {2018-06-26}
}
@@ -2317,7 +2317,7 @@
GROUPAUTHOR = {{Smithsonian's National Zoo and Conservation
Biology Institute}},
TITLE = {Home},
- ORGANIZATION = {Facebook},
+ EPRINT = {Facebook},
URL = {https://www.facebookcom/nationalzoo},
URLDATE = {2019-06-22}
}
@@ -2331,7 +2331,7 @@
TITLE = {Grade 6 Learners from {Parkfields} {Primary}
{School} in {Hanover} {Park} Visited the
Museum for a Tour and Workshop Hosted by},
- ORGANIZATION = {Instagram},
+ EPRINT = {Instagram},
URL = {https://www.instagram.com/p/BqpHpjFBs3b},
DATE = {2018-11-26}
}
@@ -2343,7 +2343,7 @@
GROUPAUTHOR = {{The New York Public Library}},
GROUPAUTHOR+an:username = {1="@nypl"},
TITLE = {The Raven},
- ORGANIZATION = {Instagram},
+ EPRINT = {Instagram},
URL = {https://bitly.com/2FV8bu3},
URLDATE = {2019-04-16}
}
@@ -2357,7 +2357,7 @@
TITLE = {I'm {NASA} Astronaut {Scott} {Tingle}. {Ask}
me anything about adjusting to being back on
{Earth} after my first spaceflight!},
- ORGANIZATION = {Reddit},
+ EPRINT = {Reddit},
URL = {https://www.reddit.com/r/IAmA/comments/9fagqy/im_nasa_astronaut_scott_tingle_ask_me_anything/},
DATE = {2018-09-12}
}
@@ -2366,7 +2366,7 @@
@ONLINE{10.16:110a,
AUTHOR = {N. Avramova},
TITLE = {The Secret to a Long, Happy, Health Life? {Think} Age-Positive},
- ORGANIZATION = {CNN},
+ EPRINT = {CNN},
DATE = {2019-01-03},
URL = {https://www.cnn.com/2019/01/03/health/respect-towards-elderly-leads-to-long-life-intl/index.html}
}
@@ -2374,7 +2374,7 @@
@ONLINE{10.16:110b,
AUTHOR = {C. Bologna},
TITLE = {What Happens to Your Mind and Body When you Feel Homesick?},
- ORGANIZATION = {HuffPost},
+ EPRINT = {HuffPost},
DATE = {2018-06-27},
URL = {https://www.huffingtonpost.com/entry/what-happens-mind-body-homesick_us_5b201ebde4b09d7a3d77eee1}
}
@@ -2399,7 +2399,7 @@
AUTHOR = {Martin Lillie, C. M.},
TITLE = {Be Kind To Yourself},
SUBTITLE = {How Self-Compassion can Improve Your Resiliency},
- ORGANIZATION = {Mayo Clinic},
+ EPRINT = {Mayo Clinic},
DATE = {2016-12-29},
URL = {https://www.mayoclinic.org/healthy-lifestyle/adult-health/in-depth/self-compassion-can-improve-your-resiliency/art-20267193}
}
@@ -2409,7 +2409,7 @@
AUTHOR = {J. Boddy and T. Neumann and S. Jennings and V. Morrow
and P. Alderson and R. Rees and W. Gibson},
TITLE = {Ethics Principles},
- ORGANIZATION = {The Research Ethics Guidebook: A Resource for Social Scientists},
+ EPRINT = {The Research Ethics Guidebook: A Resource for Social Scientists},
URL = {http://www.ethicsguidebook.ac.uk/EthicsPrinciples}
}
@@ -2423,7 +2423,7 @@
@ONLINE{10.16:114,
GROUPAUTHOR = {{U.S. Census Bureau}},
TITLE = {{U.S.} and World Population Clock},
- ORGANIZATION = {U.S. Department of Commerce},
+ EPRINT = {U.S. Department of Commerce},
URL = {https://www.census.gov/popclock/},
URLDATE = {2019-07-03}
}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2020-04-11 22:41:19 UTC (rev 54667)
@@ -24,7 +24,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip at kime.org.uk},
- revision={9.6},
+ revision={9.9},
date={\today}}
\hypersetup{%
@@ -397,6 +397,18 @@
\begin{changelog}
+\begin{release}{9.9}{2020-04-08}
+\item More consistency in use of venue vs location and eprint fields
+\end{release}
+
+\begin{release}{9.8}{2020-04-06}
+\item Bugfixes
+\end{release}
+
+\begin{release}{9.7}{2020-04-05}
+\item Bugfixes
+\end{release}
+
\begin{release}{9.6}{2020-02-22}
\item Bugfixes
\end{release}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{american}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2020/02/22\space v9.6\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2020/04/08\space v9.9\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -62,24 +62,45 @@
\fi
}
-\newrobustcmd{\mkbibparense}[1]{%
- \setbox0=\hbox{#1\foreverunspace}%
- \ifdim\wd0=0pt
- \else
- % Since we are evaluating the argument twice and it contains \setunit,
- % need to sanitise \setunit second time around. Can't just put in \box0
- % as it might be long and won't linebreak
- \mkbibparens{\setunit{}#1}%
- \fi}
+% we need a way to save the state of the punctuation buffer
+% cf. \blx at initunit in biblatex.sty for what we need to copy
-\newrobustcmd{\mkbibbracketse}[1]{%
- \setbox0=\hbox{#1\foreverunspace}%
+% this uses the internal implementation of etoolbox toggles
+% fingers crossed no one messes with it
+\newrobustcmd*{\apablx at savetoggle}[1]{%
+ \csletcs{apablx at savedtoggle@#1}{etb at tgl@#1}}
+
+\newrobustcmd*{\apablx at restoretoggle}[1]{%
+ \csletcs{etb at tgl@#1}{apablx at savedtoggle@#1}}
+
+\newrobustcmd*{\apablx at savepunctstate}{%
+ \apablx at savetoggle{blx at block}%
+ \apablx at savetoggle{blx at unit}%
+ \apablx at savetoggle{blx at insert}%
+ \apablx at savetoggle{blx at lastins}%
+ \apablx at savetoggle{blx at keepunit}%
+ \let\apablx at savd@unitpunct\blx at unitpunct
+ \let\apablx at savd@puncthook\abx at puncthook}
+
+\newrobustcmd*{\apablx at restorepunctstate}{%
+ \global\apablx at restoretoggle{blx at block}%
+ \global\apablx at restoretoggle{blx at unit}%
+ \global\apablx at restoretoggle{blx at insert}%
+ \global\apablx at restoretoggle{blx at lastins}%
+ \global\apablx at restoretoggle{blx at keepunit}%
+ \global\let\blx at unitpunct\apablx at savd@unitpunct
+ \global\let\abx at puncthook\apablx at savd@puncthook}
+
+% printtext that checks if it would print anything
+\newrobustcmd{\printtexte}[2][]{%
+ \apablx at savepunctstate
+ \setbox0=\hbox{#2\foreverunspace}%
+ \apablx at restorepunctstate
\ifdim\wd0=0pt
\else
- % Since we are evaluating the argument twice and it contains \setunit,
- % need to sanitise \setunit second time around. Can't just put in \box0
- % as it might be long and won't linebreak
- \mkbibbrackets{\setunit{}#1}%
+ \ifblank{#1}
+ {\printtext{#2}}
+ {\printtext[#1]{#2}}%
\fi}
%
@@ -433,8 +454,11 @@
% PART
\DeclareFieldFormat*{part}{#1}
+% ORGANIZATION
+\DeclareListFormat[misc]{organization}{\mkbibemph{#1}}
+
% LOCATION
-\DeclareListFormat[misc,periodical]{location}{\mkbibemph{#1}}
+\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
\DeclareListFormat{publisher}{%
\usebibmacro{publisher:delim}{#1}%
#1\isdot}
@@ -447,6 +471,7 @@
% VERSION
\DeclareFieldFormat[dataset,software]{version}{\bibcpstring{version}~#1}
+\DeclareFieldFormat[online]{version}{\mkbibparens{#1}}
% URL
\DeclareFieldFormat{url}{\url{#1}}
@@ -652,7 +677,7 @@
\newbibmacro*{eventinfo}{%
\printfield{eventtitle}%
\setunit{\addcomma\addspace}%
- \usebibmacro{location+publisher}}
+ \printfield{venue}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -701,36 +726,34 @@
\usebibmacro{addinfo2}}}%
\newbibmacro*{addinfo1}{%
- \printtext{%
- \mkbibparense{%
- \usebibmacro{editor+trans+narr}%
- \setunit*{\addsemicolon\addspace}%
- \printfield{edition}%
- \setunit*{\addcomma\addspace}%
- \ifthenelse{\ifentrytype{report}\OR%
- \ifentrytype{thesis}\OR%
- \ifentrytype{unpublished}\OR%
- \ifentrytype{dataset}\OR%
- \ifentrytype{software}\OR%
- \ifentrytype{audio}\OR%
- \ifentrytype{patent}\OR%
- \ifentrytype{image}}{\usebibmacro{addinfo3}}{}%
- \setunit*{\addcomma\addspace}%
- \ifentrytype{inbook}{\printfield{pages}}{}%
- \setunit*{\addcomma\addspace}%
- \ifentrytype{book}{\printfield{volumes}}{}%
- \setunit*{\addcomma\addspace}%
- \ifentrytype{book}{\printfield{volume}}{}}}}
+ \printtexte[parens]{%
+ \usebibmacro{editor+trans+narr}%
+ \setunit*{\addsemicolon\addspace}%
+ \printfield{edition}%
+ \setunit*{\addcomma\addspace}%
+ \ifthenelse{\ifentrytype{report}\OR%
+ \ifentrytype{thesis}\OR%
+ \ifentrytype{unpublished}\OR%
+ \ifentrytype{dataset}\OR%
+ \ifentrytype{software}\OR%
+ \ifentrytype{audio}\OR%
+ \ifentrytype{patent}\OR%
+ \ifentrytype{image}}{\usebibmacro{addinfo3}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{inbook}{\printfield{pages}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{book}{\printfield{volumes}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{book}{\printfield{volume}}{}}}
% Additional post title information in brackets
\newbibmacro*{addinfo2}{%
- \printtext{%
- \mkbibbracketse{%
- \iffieldbibstring{entrysubtype}
- {\bibcplstring{\thefield{entrysubtype}}}
- {\printfield{entrysubtype}}%
- \setunit*{\addsemicolon\addspace}%
- \printfield{note}}}}
+ \printtexte[brackets]{%
+ \iffieldbibstring{entrysubtype}
+ {\bibcplstring{\thefield{entrysubtype}}}
+ {\printfield{entrysubtype}}%
+ \setunit*{\addsemicolon\addspace}%
+ \printfield{note}}}
% number/issue information
\newbibmacro*{addinfo3}{%
@@ -1488,7 +1511,7 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{maintitle+title}%
\newunit\newblock
- \usebibmacro{location+publisher}%
+ \printlist{publisher}%
\newunit\newblock
\usebibmacro{doi+url}%
\newblock
@@ -1533,8 +1556,6 @@
\usebibmacro{title}%
\newunit\newblock
\printfield{type}%
- \newunit
- \printfield{note}%
\newunit\newblock
\printlist{organization}%
\newunit\newblock
@@ -1588,10 +1609,8 @@
\newblock
\usebibmacro{maintitle+booktitle}%
\newunit\newblock
- \printfield{note}%
+ \printlist{publisher}%
\newunit\newblock
- \usebibmacro{location+publisher}%
- \newunit\newblock
\usebibmacro{doi+url}%
\newblock
\usebibmacro{origyear}%
@@ -1621,11 +1640,7 @@
\newunit\newblock
\usebibmacro{eventinfo}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\printlist{organization}%
- \newunit
- \printfield{venue}%
\iffieldundef{pages}
{\setunit{\addcomma\addspace}}
{\newunit}%
@@ -1730,8 +1745,6 @@
\printfield{type}%
\newunit
\printfield{version}%
- \newunit
- \printfield{note}%
\newunit\newblock
\printlist{organization}%
\newunit
@@ -1758,7 +1771,7 @@
\setunit{\addspace}\newblock
\usebibmacro{apa:related}%
\newunit\newblock
- \usebibmacro{location+publisher}%
+ \printlist{organization}%
\newunit\newblock
\usebibmacro{doi+url}%
\newblock
@@ -1779,9 +1792,11 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
+ \printfield{version}%
+ \setunit{\addspace}\newblock
\usebibmacro{apa:related}%
\newunit\newblock
- \printlist{organization}%
+ \usebibmacro{eprint}%
\addperiod\addspace
\newunit\newblock
\usebibmacro{doi+url}%
@@ -1807,8 +1822,6 @@
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\usebibmacro{doi+url}%
\newunit\newblock
\printfield{addendum}%
@@ -1835,8 +1848,6 @@
\setunit{\addcomma\addspace}
\printfield{pages}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\usebibmacro{doi+url}%
\newunit\newblock
\printfield{addendum}%
@@ -1868,8 +1879,6 @@
\setunit{\addcomma\addspace}
\printfield{pages}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\printlist{organization}%
\newunit\newblock
\usebibmacro{doi+url}%
@@ -1895,8 +1904,6 @@
\newunit\newblock
\printlist{institution}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
\usebibmacro{doi+url}%
@@ -1944,8 +1951,6 @@
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\usebibmacro{doi+url}%
\newunit\newblock
\printfield{addendum}%
@@ -1969,12 +1974,10 @@
\setunit{\addspace}%
\printfield{howpublished}%
\newunit\newblock
- \printlist{location}%
+ \printfield{venue}%
\setunit{\addcomma\addspace}
\printlist{institution}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\usebibmacro{doi+url}%
\newblock
\printfield{addendum}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2020/02/22\space v9.6\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2020/04/08\space v9.9\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2020/02/22\space v9.6\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2020/04/08\space v9.9\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{british}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{english}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{french}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{galician-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{galician}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% Following DGPs guidlines for German/Austrian
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% Following DGPs guidlines for German/Austrian
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% Following DGPs guidlines for German/Austrian
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
\NewBibliographyString{revisededition}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2020-04-11 22:37:50 UTC (rev 54666)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2020-04-11 22:41:19 UTC (rev 54667)
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2020/04/08\space v9.9\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
More information about the tex-live-commits
mailing list.