From b5027823bc9f2e1d2bdc165ac21a2eb735db0bad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Apr 2020 22:41:19 +0000 Subject: biblatex-apa (9apr20) git-svn-id: svn://tug.org/texlive/trunk@54667 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-apa/biblatex-apa-test-references.bib | 64 ++++----- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 221784 -> 221740 bytes .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 65642 -> 65817 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 14 +- .../tex/latex/biblatex-apa/american-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 149 +++++++++++---------- 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/danish-apa.lbx | 2 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 2 +- .../tex/latex/biblatex-apa/english-apa.lbx | 2 +- .../tex/latex/biblatex-apa/french-apa.lbx | 2 +- .../tex/latex/biblatex-apa/galician-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/nswissgerman-apa.lbx | 2 +- .../tex/latex/biblatex-apa/nynorsk-apa.lbx | 2 +- .../tex/latex/biblatex-apa/portuguese-apa.lbx | 2 +- .../tex/latex/biblatex-apa/russian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/slovene-apa.lbx | 2 +- .../tex/latex/biblatex-apa/spanish-apa.lbx | 2 +- .../tex/latex/biblatex-apa/swedish-apa.lbx | 2 +- .../tex/latex/biblatex-apa/swissgerman-apa.lbx | 2 +- 31 files changed, 147 insertions(+), 132 deletions(-) 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 66eb59f056b..9c6c3338438 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 @@ -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,37 +1654,37 @@ 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} } % (APA 10.8 Example 73) -@UNPUBLISHED{10.8:73a, +@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} } -@UNPUBLISHED{10.8:73b, +@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) -@UNPUBLISHED{10.8:74, +@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} } 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 646740c2056..7d50abc933a 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 e8b00af55a8..56e8c170a57 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 b98452893d9..c1f6f3c0a78 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -24,7 +24,7 @@ url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={9.6}, + revision={9.9}, date={\today}} \hypersetup{% @@ -397,6 +397,18 @@ the examples. \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} 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 b09f8bda780..f6440e06e60 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}[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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 2e17e6b3f8e..01a96b6c802 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}[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}% +% we need a way to save the state of the punctuation buffer +% cf. \blx@initunit in biblatex.sty for what we need to copy + +% this uses the internal implementation of etoolbox toggles +% fingers crossed no one messes with it +\newrobustcmd*{\apablx@savetoggle}[1]{% + \csletcs{apablx@savedtoggle@#1}{etb@tgl@#1}} + +\newrobustcmd*{\apablx@restoretoggle}[1]{% + \csletcs{etb@tgl@#1}{apablx@savedtoggle@#1}} + +\newrobustcmd*{\apablx@savepunctstate}{% + \apablx@savetoggle{blx@block}% + \apablx@savetoggle{blx@unit}% + \apablx@savetoggle{blx@insert}% + \apablx@savetoggle{blx@lastins}% + \apablx@savetoggle{blx@keepunit}% + \let\apablx@savd@unitpunct\blx@unitpunct + \let\apablx@savd@puncthook\abx@puncthook} + +\newrobustcmd*{\apablx@restorepunctstate}{% + \global\apablx@restoretoggle{blx@block}% + \global\apablx@restoretoggle{blx@unit}% + \global\apablx@restoretoggle{blx@insert}% + \global\apablx@restoretoggle{blx@lastins}% + \global\apablx@restoretoggle{blx@keepunit}% + \global\let\blx@unitpunct\apablx@savd@unitpunct + \global\let\abx@puncthook\apablx@savd@puncthook} + +% printtext that checks if it would print anything +\newrobustcmd{\printtexte}[2][]{% + \apablx@savepunctstate + \setbox0=\hbox{#2\foreverunspace}% + \apablx@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 - \mkbibparens{\setunit{}#1}% - \fi} - -\newrobustcmd{\mkbibbracketse}[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 - \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,9 +1609,7 @@ \newblock \usebibmacro{maintitle+booktitle}% \newunit\newblock - \printfield{note}% - \newunit\newblock - \usebibmacro{location+publisher}% + \printlist{publisher}% \newunit\newblock \usebibmacro{doi+url}% \newblock @@ -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}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 5402613ff04..2aa1ecd96fb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -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] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 41b5f27814c..026091c6895 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -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{ 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 80f3cebcbe8..fe4cc72eca6 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}[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 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 dca61ac5830..2faea07f2e7 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}[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} 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 e25ea7aa574..de70166802d 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}[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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx index 4687e1e7687..82f4e7c79f3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx @@ -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} 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 50df0232564..ee4d52bd3f6 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}[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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx index 9beefcdda6e..e76ae3ac0f5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx @@ -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} 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 7cf11289202..e0545554a2c 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}[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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx index f748b01fc6c..9d1c63d9756 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx @@ -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 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 d15e8684965..a1d4c9f3850 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}[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 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 05d4e2eee7c..30aa3e764ce 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}[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} 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 4ca83ae13e0..7d095615aa5 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}[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} 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 c01d9dd092b..0d35d17fcc2 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}[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 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 cf25c6e5d75..4c25fec3496 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}[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 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 eaccd6ab9e3..8c7fde6667a 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}[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} 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 6cf00a509be..f4cf807b596 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}[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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx index e2734bce625..47dd3703e10 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx @@ -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 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 d12084810df..98d5fcf75f0 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}[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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx index 8b4e9d6d316..fec40f460b7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx @@ -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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx index 85a886a8e68..9c8275b33d6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx @@ -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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx index 58e628fc8da..c9af87acf03 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx @@ -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} 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 fb2ef37e307..215459dbc58 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}[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 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 e2c9f5a31d9..e3be6826923 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}[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} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx index a6a27faa2a0..bea3324a289 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx @@ -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 -- cgit v1.2.3