From e9b1cf1cbeb6521132ab49705e472b9683c8f859 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Dec 2019 21:55:21 +0000 Subject: biblatex-apa (22dec19) git-svn-id: svn://tug.org/texlive/trunk@53209 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 10 ++++++++-- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx | 2 +- 27 files changed, 34 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-apa') 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 9e0ba4af83c..3d4c044114f 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2019/12/22\space v9.4\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 c06813da8b4..2195222875f 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}[2019/12/21\space v9.3\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2019/12/22\space v9.4\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -310,10 +310,16 @@ % Enforce ignoring of PUBSTATE if there is a YEAR or DATE field % (APA 10.2:32) Remove PUBLISHER if it is the same as GROUPAUTHOR -% Force @COLLECTION->@BOOK and @INCOLLECTION->@INBOOK +% Force @COLLECTION, @REFERENCE->@BOOK and @INCOLLECTION,@INREFERENCE->@INBOOK \DeclareStyleSourcemap{ \maps[datatype=bibtex]{ + \map{ + \step[typesource=reference, typetarget=book] + } + \map{ + \step[typesource=inreference, typetarget=inbook] + } \map{ \step[typesource=collection, typetarget=book] } diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 763feae4cc5..60bce4cd698 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}[2019/12/21\space v9.3\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2019/12/22\space v9.4\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 a2a194bad99..bdf8c528b47 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}[2019/12/21\space v9.3\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2019/12/22\space v9.4\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 3239720c314..2152e0653b9 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2019/12/22\space v9.4\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 41a423ab35c..32ea0349e4f 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2019/12/22\space v9.4\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 891e1e66acf..d33e390f928 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2019/12/22\space v9.4\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 f6799b9686d..5eb2430cf13 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{danish-apa.lbx}[2019/12/22\space v9.4\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 9706dbc323c..3f36d6331b9 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2019/12/22\space v9.4\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 7bc233ce07d..8d0e798320a 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{english-apa.lbx}[2019/12/22\space v9.4\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 08f3a3c8cc1..53ef923c6d1 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2019/12/22\space v9.4\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 19a6fb47f70..8d340301d27 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{galician-apa.lbx}[2019/12/22\space v9.4\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 904da6d644f..9262e8b2540 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2019/12/22\space v9.4\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 705a421f9d6..45d00c966bb 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2019/12/22\space v9.4\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 98271e6eb7a..dfed9697309 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2019/12/22\space v9.4\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 641582baee3..201cfa1c075 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2019/12/22\space v9.4\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 4e5c2ace5bd..fe72f9b8f6f 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2019/12/22\space v9.4\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 542b3909368..ac3f89d301a 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2019/12/22\space v9.4\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 addb0388d93..7578dcd0ddd 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2019/12/22\space v9.4\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 647dd4e47b3..e0bee5c83c0 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{nswissgerman-apa.lbx}[2019/12/22\space v9.4\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 e498fd59f3f..f06936bbfa4 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2019/12/22\space v9.4\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 371f7670441..6e80f0791bd 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{portuguese-apa.lbx}[2019/12/22\space v9.4\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 93f0cccd19b..7f0292a4a4f 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{russian-apa.lbx}[2019/12/22\space v9.4\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 fde7ab44b4a..128514c4de1 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2019/12/22\space v9.4\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 b33187b7756..1472a1f9ef6 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2019/12/22\space v9.4\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 0edc38cb971..691d202eecf 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2019/12/22\space v9.4\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 3614d8e5b2f..d48a68ad7cc 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}[2019/12/21\space v9.3\space APA biblatex localisation] +\ProvidesFile{swissgerman-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation] \InheritBibliographyExtras{swissgerman} % Following DGPs guidlines for German/Austrian/Swiss German -- cgit v1.2.3