From de84abc550685ebce971035c8072f02646c84759 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Thu, 1 Jul 2021 19:03:07 +0200
Subject: [PATCH] [Bot] Update CSL styles (#7865)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Squashed 'buildres/csl/csl-styles/' changes from e1acabea97..36ba508ff6

36ba508ff6 Update civilta-italiana.csl (#5531)
3ea7d02fa1 Only "page" locators are ommited in book citations in JuS journal. (#5532)
1851a54c07 Create alternatif-politika.csl (#5527)
f30aadb25c [norsk-henvisningsstandard] Fix wrong article title prefix (period to comma) (#5529)
e2f404ed46 PAIN: Remove book pages&label
b483372955 Create urad-za-makroekonomske-analize-in-razvoj.csl (#5520)
76ac3d72dd Bugfixes and improvements to the handling of the editors term for norsk-henvisningsstandard-for-rettsvitenskepelige-tekster.csl. (#5515)
afe5685d15 Create monograph-of-the-palaeontographical-society.csl (#5521)
03d40ad893 Create stellenbosch-university-harvard-2021.csl (#5524)
1112d83411 Update ios-press-books.csl (#5522)
5e5957d21c Create wirtschaftsuniversitat-wien-institut-fur-transportwirtschaft-u… (#5419)
fb9fe50ec5 update acta hydrotechnica (#5525)
c576359e7d Patch 4 (#5510)
a46174d027 Create social-anthropology.csl (#5512)
a91627c63b Create orthopaedic-journal-of-sports-medicine.csl (#5511)
315fd4c662 Create fundamental-and-applied-limnology.csl (#5514)
f4b3327eaf Create acta-hydrotechnica.csl (#5516)
ff9b2b55e9 Update ocean-and-coastal-research.csl (#5517)
52f9d99cc6 Improvements to norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl (#5507)
a3706b1e79 Fix ArchéoSciences (#5506)
daeadd371f Update hawaii-international-conference-on-system-sciences-proceedings… (#5505)
225b9c0c6d Create saglik-bilimleri-universitesi.csl (#5295)
7205734f7e Create health-education-england-harvard-citation-style.csl (#5345)
b2085cbbb9 Adicionar ponto e espaço antes de "Disponível em:" (#5367)
f3eb50a973 Create apa6-for-international-journal-of-learner-corpus-research.csl (#5430)
ff34f5c03a Update fachhochschule-vorarlberg-note.csl (#5502)
5aa48f744d Update fachhochschule-vorarlberg-author-date.csl (#5501)
717fba313b Create apa6-for-register-studies.csl (#5458)
147689b67f Update food-and-agriculture-organization-of-the-united-nations.csl  (#5492)
e35ae3915a New citation style: "Norsk henvisningsstandard for rettsvitenskapelige tekster" (validated) (#5494)
7ff938930e revise Manchester Univ. Press style (note-bib) (#5500)
9e97809eae move citation number outside first field (#5499)
b08e5d7632 Update APA disambiguation rules to only initials (#5498)
5d1629fbf3 Create arbok-hins-islenzka-fornleifafelags.csl (#5497)
3a2ff5f037 Create novasinergia.csl (#5489)
35920e2b9a Update din-1505-2.csl (#5491)
197486eeff Create zeitschrift-fuer-fantastikforschung.csl (#5490)
2cd6364de4 Create artificial-organs.csl (#5340)
5ea7955d28 Create society-of-biblical-literature-1st-edition-fullnote-bibliography (#5421)
d0de451a4e Create Journal of Move and Therapeutic Science (#5486)
899c2bce24 Update ACS documentation & date format
950f7309de Create ulua-revista-de-historia-sociedad-y-cultura.csl (#5478)
a1c34f568d Update wirtschaftsuniversitat-wien-institut-fur-bwl-des-aussenhandels.csl (#5470)
79fa66e537 Update gallia-prehistoire.csl (#5467)
2f1df1219b Update hochschule-bonn-rhein-sieg.csl (#5479)
06078c68a3 Update acta-universitatis-agriculturae-sueciae.csl (#5409)
36502065f6 Update ethnographiques-org.csl (#5480)
e06cc905af remove et-al from restoration-ecology.csl (#5485)
4e4e1f3080 Presses universitaires de Strasbourg – Fix op.cit and multiple items (#5484)
f8ff16065d Create UWE-Bristol-Harvard-2021.csl (#5482)
10a1d17358 Fix authors delimiter (#5483)
f53ff57ff4 Update stuttgart-media-university.csl (#5477)
c7a01e0824 Create worlds-veterinary-journal.csl (#5468)
ec923b214c Update experimental-biology-and-medicine.csl (#5469)
1d48cb79cf Create plant-species-biology.csl (#5471)
ea687659c7 Create ethnographiques-org.csl (#5472)
0e1c470f60 Update harvard-bournemouth-university.csl (#5476)
96e81147cc Use date issued in web documents if exists (#5418)
8377ec84c2 Create bibliothecae-it.csl (#5440)
a5707e7d36 Create bppb.csl (#5452)
dc0e509df3 Create babesch-annual-papers-on-mediterranean-archaeology.csl (#5424)
62aa81677b Bump nokogiri from 1.11.1 to 1.11.4 (#5460)
47a603c1b9 Update society-of-biblical-literature-fullnote-bibliography.csl (#5436)
1de799bc00 SAA: Update disambiguation
46da8c6329 Update iso690-author-date-cs.csl (#5443)
2a749919ef Exempt ISSNs for Topoi journal (#5444)
a0f313013a show test directories
f9ce5674fd Updates ( -> [ (#5347)
c3910ddf5d IEEE.csl - Add "I. Online Video (e.g., YouTube)" (#5365)
d37f39abfe Update estudios-hispanicos.csl (#5417)
931c057e5d Create topoi-orient-occident-classique.csl (#5427)
70ee747244 Create topoi-orient-occident-auteur-date.csl (#5426)
8ea5ed20f2 Update universite-de-montreal-apa.csl (#5428)
f0dcb04ad3 Update the-horticulture-journal.csl (#5437)
767df6db88 Update transnational-environmental-law.csl (#5435)
1e63dfef3b Update environmental-values.csl to match requirements (#5355)
94163d8dc0 Create studies-in-the-history-of-gardens-and-designed-landscapes.csl (#5425)
21dd881c85 Create journal-of-stroke.csl (#5429)
937ce4ba40 Update the-plant-genome.csl (#5432)
996e217006 Update springer-basic-author-date-no-et-al.csl (#5431)
7dd1f44e93 Update taylor-and-francis-council-of-science-editors-author-date.csl (#5433)
141be9bbe8 Update civilta-italiana.csl (#5434)
10b2222a95 small fixes for jopr.csl (#5422)
bf59a9fcf4 Create jci-insight.csl (#5423)
9aebd58b84 Update mammalia.csl (#5404)
77dcd74cb1 Update gost-r-7-0-5-2008 styles (#5412)
5d348ddf3e Update journal-of-oil-palm-research.csl (#5403)
55f6eda2ae Adds missing space after title and moves space from title prefix to author suffix. (#5407)
b5df1a8046 Fixed Mendeley bug (#5411)
49530b45d7 Create the-journal-of-laryngology-and-otology.csl (#5410)
6d95f75af5 Create college-research-libraries.csl (#5406)
9876e819af Create biostatistics.csl (#5372)
673db49376 Update revue-forestiere-francaise.csl (#5387)
474cc2e67a Create oil-shale.csl (#5389)
249ad6aafd Updating infoclio.ch styles (#5391)
6dc6742f12 Update ocean-and-coastal-research.csl (#5392)
1e75c74333 Update and rename dependent/experimental-biology-and-medicine.csl to … (#5398)
0a072f8ed4 Update universite-du-quebec-a-montreal.csl (#5399)
373d684c5f Create the-bovine-practitioner.csl (#5400)
cdbb6ed36a Create journal-of-oil-palm-research.csl (#5388)
a75cb35b30 Update south-african-medical-journal.csl (#5393)
a35360f8f2 Update journal-of-nutrition.csl (#5397)
ef215ac59d Update and rename journal-of-neurosurgery.csl to dependent/journal-of… (make AMA dependent) (#5359)
c435731114 Create ocean-and-coastal-research.csl (#5364)
561024e64a Create istanbul-medical-journal.csl (#5374)
21ba5d8d8f Update aquatic-conservation.csl (#5379)
c83c4a9397 Create endocrine-connections.csl (#5380)
7da88e9bbf Update society-of-biblical-literature-fullnote-bibliography.csl (#5381)
ca27bc185a Update university-of-york-harvard-environment.csl (#5384)
df5442294b Update university-of-york-harvard-archaeology.csl (#5385)
4439cdd04b Create revue-forestiere-francaise.csl (#5386)
c363e8f23d Update catholic-biblical-association.csl (#5360)
7e383b8400 Fix locators in PU Paris-Nanterre (#5376)
83cb24919d Update methods-of-information-in-medicine.csl (#5370)
5b19db4a93 Update taylor-and-francis-council-of-science-editors-author-date.csl (#5371)
27d116bceb Update harvard-cite-them-right-no-et-al.csl (#5373)
e2ef4080bb Update ageing-and-society.csl (#5375)
16098e4f9e Update triangle.csl (#5369)
133d633866 Create university-of-tasmania-simplified-author-date.csl (#5357)
b9ecf0718f Update revue-archeologique.csl (#5366)
6152ccea8b Update journal-of-consumer-research.csl (#5358)
93f66005c7 Create refugee-survey-quarterly.csl (#5354)
bfa3b6d80f Update canadian-biosystems-engineering.csl (#5362)
53e75ee13b update doi prefix (#5361)
5b3de987ec Create archives-of-hand-and-microsurgery.csl (#5363)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 36ba508ff61a5147c0038653e0e7b1fea5216a2d

* Squashed 'buildres/csl/csl-locales/' changes from 79c4dba80a..ec6d62a9e7

ec6d62a9e7 Merge pull request #231 from Pendzoncymisio/master
06c2693b7f Update locales-pl-PL.xml
75e95a1c92 Update of PL "accessed" translation
c6093128ac Update of PL "accessed" translation
bd8d2dbc85 Update spec_helper for pull-request testing (#220)
ed3fc7c9be Update to Ruby 3.0.0 (#218)

git-subtree-dir: buildres/csl/csl-locales
git-subtree-split: ec6d62a9e7c049001a55086a495022520989441c

Co-authored-by: github actions <jabrefmail+webfeedback@gmail.com>
---
 buildres/csl/csl-locales/locales-pl-PL.xml    |    5 +-
 .../acta-anaesthesiologica-scandinavica.csl   |    3 +
 .../csl/csl-styles/acta-hydrotechnica.csl     |  222 +++
 .../csl/csl-styles/alternatif-politika.csl    |  304 +++
 buildres/csl/csl-styles/civilta-italiana.csl  |   10 +-
 ...orthopaedic-journal-of-sports-medicine.csl |   16 +
 .../eksploatacja-i-niezawodnosc.csl           |    3 +-
 .../csl/csl-styles/ethnographiques-org.csl    |   21 +
 .../experimental-biology-and-medicine.csl     |    4 +
 .../fundamental-and-applied-limnology.csl     | 1645 +++++++++++++++++
 .../harvard-stellenbosch-university.csl       |   50 +-
 buildres/csl/csl-styles/ios-press-books.csl   |    3 -
 .../csl/csl-styles/juristische-schulung.csl   |   11 +-
 ...aphs-of-the-palaeontographical-society.csl |  208 +++
 ...andard-for-rettsvitenskapelige-tekster.csl |  125 ++
 .../csl-styles/ocean-and-coastal-research.csl |  633 +++++++
 buildres/csl/csl-styles/pain.csl              |    6 +-
 .../csl/csl-styles/social-anthropology.csl    |  232 +++
 ...lical-literature-fullnote-bibliography.csl |   15 +
 ...rs-za-makroekonomske-analize-in-razvoj.csl | 1484 +++++++++++++++
 ...t-fur-transportwirtschaft-und-logistik.csl |  314 ++++
 21 files changed, 5281 insertions(+), 33 deletions(-)
 create mode 100644 buildres/csl/csl-styles/acta-hydrotechnica.csl
 create mode 100644 buildres/csl/csl-styles/alternatif-politika.csl
 create mode 100644 buildres/csl/csl-styles/dependent/orthopaedic-journal-of-sports-medicine.csl
 create mode 100644 buildres/csl/csl-styles/fundamental-and-applied-limnology.csl
 create mode 100644 buildres/csl/csl-styles/monographs-of-the-palaeontographical-society.csl
 create mode 100644 buildres/csl/csl-styles/social-anthropology.csl
 create mode 100644 buildres/csl/csl-styles/urad-rs-za-makroekonomske-analize-in-razvoj.csl
 create mode 100644 buildres/csl/csl-styles/wirtschaftsuniversitat-wien-institut-fur-transportwirtschaft-und-logistik.csl

diff --git a/buildres/csl/csl-locales/locales-pl-PL.xml b/buildres/csl/csl-locales/locales-pl-PL.xml
index a58aa431c78..9f7a984ecf1 100644
--- a/buildres/csl/csl-locales/locales-pl-PL.xml
+++ b/buildres/csl/csl-locales/locales-pl-PL.xml
@@ -7,6 +7,9 @@
     <translator>
       <name>Michal</name>
     </translator>
+    <translator>
+      <name>Pendzoncymisio</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
     <updated>2012-07-04T23:31:02+00:00</updated>
   </info>
@@ -22,7 +25,7 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="accessed">udostępniono</term>
+    <term name="accessed">dostęp</term>
     <term name="and">i</term>
     <term name="and others">i inni</term>
     <term name="anonymous">anonim</term>
diff --git a/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl b/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl
index 6b875acf0f5..f8c09bf4d55 100644
--- a/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl
+++ b/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl
@@ -161,7 +161,10 @@
 =======
       <text variable="citation-number" suffix=". "/>
       <group delimiter=". " suffix=". ">
+<<<<<<< HEAD
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
         <text macro="author"/>
         <text macro="title"/>
       </group>
diff --git a/buildres/csl/csl-styles/acta-hydrotechnica.csl b/buildres/csl/csl-styles/acta-hydrotechnica.csl
new file mode 100644
index 00000000000..19ebb6c10b5
--- /dev/null
+++ b/buildres/csl/csl-styles/acta-hydrotechnica.csl
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="en-US">
+  <info>
+    <title>Acta hydrotechnica</title>
+    <id>http://www.zotero.org/styles/acta-hydrotechnica</id>
+    <link href="http://www.zotero.org/styles/acta-hydrotechnica" rel="self"/>
+    <link href="http://www.zotero.org/styles/elsevier-harvard" rel="template"/>
+    <link href="https://actahydrotechnica.fgg.uni-lj.si/en/instructions" rel="documentation"/>
+    <author>
+      <name>Libor Ansorge</name>
+      <email>libor.ansorge@gmail.com</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="engineering"/>
+    <issn>0352-3551</issn>
+    <eissn>1581-0267</eissn>
+    <updated>2022-06-18T07:30:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" prefix=", " suffix=": "/>
+        <names variable="editor translator" delimiter=", " suffix=", ">
+          <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+        </names>
+        <group delimiter=", ">
+          <text variable="container-title" text-case="title"/>
+          <text variable="collection-title" text-case="title"/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=", " delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </else-if>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <text variable="container-title" form="short" font-style="italic"/>
+          <text variable="collection-title"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/" text-decoration="underline" />
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <group delimiter=" ">
+          <text value="URL"/>
+          <text variable="URL" text-decoration="underline"/>
+          <group prefix="(" suffix=").">
+            <text term="accessed" suffix=" "/>
+            <date variable="accessed">
+              <date-part name="month" form="numeric" suffix="."/>
+              <date-part name="day" suffix="."/>
+              <date-part name="year" form="short"/>
+            </date>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <text variable="title"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="genre"/>
+          <text variable="number" prefix="No. "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
+        <text variable="title"/>
+        <text macro="edition" prefix=", "/>
+      </else-if>
+      <else-if type="webpage">
+        <text variable="title"/>
+        <text value="WWW Document" prefix=" [" suffix="]"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" text-case="capitalize-first" suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <number variable="edition" form="ordinal"/>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+      <text value="ed"/>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group prefix=" " delimiter=", ">
+          <group>
+            <text variable="volume" font-weight="bold"/>
+            <text variable="issue" font-weight="bold" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <group>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <text variable="number" prefix=". "/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued"/>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <text macro="author" suffix=" "/>
+        <text macro="issued" prefix="(" suffix=")"/>
+        <group prefix=". ">
+          <text macro="title"/>
+          <text macro="container"/>
+          <text macro="locators"/>
+        </group>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/alternatif-politika.csl b/buildres/csl/csl-styles/alternatif-politika.csl
new file mode 100644
index 00000000000..0e7c7ec4798
--- /dev/null
+++ b/buildres/csl/csl-styles/alternatif-politika.csl
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" name-as-sort-order="first" demote-non-dropping-particle="never">
+  <!-- Polyglot; journal publishes in Turkish and English -->
+  <info>
+    <title>Alternatif Politika</title>
+    <title-short>Altern. Polit.</title-short>
+    <id>http://www.zotero.org/styles/alternatif-politika</id>
+    <link href="http://www.zotero.org/styles/alternatif-politika" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-peace-research" rel="template"/>
+    <link href="https://alternatifpolitika.com/site/dosyalar/diger/yazarlar_icin_onemli_notlar.docx" rel="documentation"/>
+    <author>
+      <name>Kasım Timur</name>
+      <email>kasimtimur@hotmail.com</email>
+      <uri>https://alternatifpolitika.com</uri>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <category field="political_science"/>
+    <category field="humanities"/>
+    <eissn>1309-0593</eissn>
+    <summary>Alternatif Politika author-date style with full first names, https://alternatifpolitika.com/</summary>
+    <updated>2021-06-23T21:28:25+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editor" form="short">
+        <single>Ed.</single>
+        <multiple>Eds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="text" name-as-sort-order="first"/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="proceedings-editor">
+    <names variable="editor" delimiter=", " prefix="(" suffix=")">
+      <label form="short" suffix=" "/>
+      <name and="text" delimiter=", " sort-separator=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" et-al-min="7" et-al-use-first="6" name-as-sort-order="first"/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="container-title" font-style="normal"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-count">
+    <names variable="author">
+      <name form="count"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="container-title" font-style="normal"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI"/>
+      <else-if variable="URL">
+        <text variable="URL"/>
+        <group prefix=" (" delimiter=" " suffix=")">
+          <date variable="accessed">
+            <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+            <date-part name="month" form="numeric-leading-zeros" range-delimiter="" suffix="."/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+        <text variable="title" text-case="title" font-style="normal"/>
+      </if>
+      <else-if type="bill graphic legal_case motion_picture report song thesis" match="any">
+        <text variable="title" text-case="title" font-style="normal"/>
+      </else-if>
+      <else-if type="article" match="any"/>
+      <else>
+        <text variable="title" text-case="title" strip-periods="false" quotes="false" prefix="&quot;" suffix="&quot;,"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place" prefix="("/>
+          <text variable="publisher" suffix=")"/>
+        </group>
+      </if>
+      <else-if type="paper-conference" match="any">
+        <text variable="publisher"/>
+      </else-if>
+      <else>
+        <group delimiter=": " prefix="(" suffix=")">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume" suffix=" "/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="published-date">
+    <choose>
+      <if type="report" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" form="long"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="genre">
+    <choose>
+      <if type="webpage post-weblog" match="none">
+        <text variable="genre" text-case="title" prefix="("/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="chapter" match="any">
+        <group delimiter=" " prefix=": ">
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-journal">
+        <text variable="page" prefix=": "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number prefix="(" suffix="." variable="edition" form="ordinal"/>
+          <text term="edition" form="short" text-case="capitalize-first" suffix="),"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" form="short" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-details">
+    <choose>
+      <if type="chapter post-weblog post" match="any">
+        <group delimiter=", ">
+          <text macro="editor"/>
+          <choose>
+            <if type="chapter">
+              <text variable="container-title" text-case="title" font-style="normal"/>
+            </if>
+            <else>
+              <text variable="container-title" font-style="italic"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="paper-conference" match="any">
+        <group delimiter=", " prefix="In: ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="container-title" font-style="italic"/>
+              </if>
+              <else>
+                <text variable="event" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="proceedings-editor"/>
+          </group>
+          <text variable="publisher-place"/>
+          <date variable="issued">
+            <date-part name="day" suffix=" "/>
+            <date-part name="month" form="long" suffix=" "/>
+            <date-part name="year"/>
+          </date>
+          <group delimiter=" ">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="webpage" match="none">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text macro="editor"/>
+            <text variable="container-title" font-style="normal" suffix=","/>
+          </group>
+          <choose>
+            <if type="article-newspaper article-magazine" match="any">
+              <date variable="issued">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" form="long"/>
+              </date>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=": ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="3">
+    <sort>
+      <key macro="author" names-min="1" names-use-first="1"/>
+      <key macro="author-count" names-min="3" names-use-first="3"/>
+      <key macro="author" names-min="3" names-use-first="1"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+        <text macro="author"/>
+        <text macro="year-date" prefix="(" suffix="),"/>
+        <text macro="title"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="edition"/>
+          </if>
+        </choose>
+        <group delimiter=" ">
+          <group delimiter=" ">
+            <text macro="container-details"/>
+            <text macro="locator"/>
+          </group>
+          <choose>
+            <if variable="container-title" match="any">
+              <text macro="edition"/>
+            </if>
+          </choose>
+          <group suffix=")">
+            <group delimiter=" ">
+              <text variable="collection-title"/>
+              <text variable="collection-number"/>
+              <text variable="number"/>
+            </group>
+            <text macro="genre"/>
+            <text macro="published-date"/>
+          </group>
+          <text macro="publisher"/>
+        </group>
+      </group>
+      <text macro="pages"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/civilta-italiana.csl b/buildres/csl/csl-styles/civilta-italiana.csl
index 15ade9b4af7..13ecd5e328b 100644
--- a/buildres/csl/csl-styles/civilta-italiana.csl
+++ b/buildres/csl/csl-styles/civilta-italiana.csl
@@ -16,7 +16,11 @@
     <category citation-format="note"/>
     <category field="humanities"/>
     <summary>AIPI Style used in Civiltà Italiana series by Cesati (Italian), based on Ius Ecclesiae style and University of Bologna style, with added support for manuscripts and archive documents.</summary>
+<<<<<<< HEAD
     <updated>2021-03-22T00:00:00+01:00</updated>
+=======
+    <updated>2021-06-27T17:00:00+01:00</updated>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="it">
@@ -252,11 +256,15 @@
     <layout prefix="" suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
+<<<<<<< HEAD
           <text term="ibid" form="short" text-case="lowercase"/>
+=======
+          <text term="ibid" form="short"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
           <text macro="pageref" prefix=", "/>
         </if>
         <else-if position="ibid">
-          <text term="ibid" form="long" text-case="lowercase" font-style="italic"/>
+          <text term="ibid" form="long" font-style="italic"/>
         </else-if>
         <else-if position="subsequent">
           <group delimiter=", ">
diff --git a/buildres/csl/csl-styles/dependent/orthopaedic-journal-of-sports-medicine.csl b/buildres/csl/csl-styles/dependent/orthopaedic-journal-of-sports-medicine.csl
new file mode 100644
index 00000000000..dc78d8285b4
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/orthopaedic-journal-of-sports-medicine.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>Orthopaedic Journal of Sports Medicine</title>
+    <title-short>OJSM</title-short>
+    <id>http://www.zotero.org/styles/orthopaedic-journal-of-sports-medicine</id>
+    <link href="http://www.zotero.org/styles/orthopaedic-journal-of-sports-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-medical-association" rel="independent-parent"/>
+    <link href="https://journals.sagepub.com/author-instructions/OJS#References" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2325-9671</eissn>
+    <updated>2021-06-17T21:58:08+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/eksploatacja-i-niezawodnosc.csl b/buildres/csl/csl-styles/eksploatacja-i-niezawodnosc.csl
index ea6c2f0c31a..c3a2b7258e8 100644
--- a/buildres/csl/csl-styles/eksploatacja-i-niezawodnosc.csl
+++ b/buildres/csl/csl-styles/eksploatacja-i-niezawodnosc.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
-    <title>Eksploatacja i Niezawodność (Maintenance and Reliability) (English)</title>
+    <title>Eksploatacja i Niezawodnosc - Maintenance and Reliability</title>
     <id>http://www.zotero.org/styles/eksploatacja-i-niezawodnosc</id>
     <link href="http://www.zotero.org/styles/eksploatacja-i-niezawodnosc" rel="self"/>
     <link href="http://www.zotero.org/styles/annals-of-oncology" rel="template"/>
@@ -128,6 +128,7 @@
           </choose>
         </else>
       </choose>
+      <text variable="DOI" prefix=", https://doi.org/"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/ethnographiques-org.csl b/buildres/csl/csl-styles/ethnographiques-org.csl
index 77350ee67a7..55c28194ecf 100644
--- a/buildres/csl/csl-styles/ethnographiques-org.csl
+++ b/buildres/csl/csl-styles/ethnographiques-org.csl
@@ -12,11 +12,15 @@
     <category citation-format="author-date"/>
     <category field="social_science"/>
     <eissn>1961-9162</eissn>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <updated>2021-05-28T07:12:35+00:00</updated>
 =======
     <updated>2021-06-01T16:10:30+00:00</updated>
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+    <updated>2021-06-01T16:10:30+00:00</updated>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="fr">
@@ -43,6 +47,7 @@
     </names>
   </macro>
   <macro name="author-cite">
+<<<<<<< HEAD
 <<<<<<< HEAD
     <choose>
       <if variable="author">
@@ -59,6 +64,8 @@
       </else-if>
     </choose>
 =======
+=======
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
     <names variable="author">
       <name form="short" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal"/>
       <et-al font-style="italic"/>
@@ -67,7 +74,10 @@
         <text variable="title"/>
       </substitute>
     </names>
+<<<<<<< HEAD
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
   </macro>
   <macro name="editor">
     <names variable="editor">
@@ -178,6 +188,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
+<<<<<<< HEAD
 <<<<<<< HEAD
         <group font-style="normal" delimiter=" ">
           <text macro="volume"/>
@@ -187,6 +198,11 @@
           <text macro="volume"/>
           <text macro="issue"/>
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+        <group font-style="normal" delimiter=" " suffix=", ">
+          <text macro="volume"/>
+          <text macro="issue"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
         </group>
       </else-if>
     </choose>
@@ -203,6 +219,7 @@
   </macro>
   <macro name="issue">
     <choose>
+<<<<<<< HEAD
 <<<<<<< HEAD
       <if is-numeric="issue">
         <text variable="issue"/>
@@ -210,6 +227,10 @@
       <if is-numeric="volume">
         <text variable="issue" prefix="(" suffix=")"/>
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+      <if is-numeric="volume">
+        <text variable="issue" prefix="(" suffix=")"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
       </if>
       <else>
         <text variable="issue"/>
diff --git a/buildres/csl/csl-styles/experimental-biology-and-medicine.csl b/buildres/csl/csl-styles/experimental-biology-and-medicine.csl
index fe1703f8fe3..83a069942fa 100644
--- a/buildres/csl/csl-styles/experimental-biology-and-medicine.csl
+++ b/buildres/csl/csl-styles/experimental-biology-and-medicine.csl
@@ -187,6 +187,7 @@
             </group>
             <group delimiter=": ">
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
               <text variable="volume"/>
 =======
@@ -195,6 +196,9 @@
 =======
               <text variable="volume" font-weight="bold"/>
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+              <text variable="volume" font-weight="bold"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
               <text variable="page"/>
             </group>
           </group>
diff --git a/buildres/csl/csl-styles/fundamental-and-applied-limnology.csl b/buildres/csl/csl-styles/fundamental-and-applied-limnology.csl
new file mode 100644
index 00000000000..dd0fb721e5f
--- /dev/null
+++ b/buildres/csl/csl-styles/fundamental-and-applied-limnology.csl
@@ -0,0 +1,1645 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded" default-locale="en-US">
+  <info>
+    <title>Fundamental and Applied Limnology</title>
+    <title-short>FAL</title-short>
+    <id>http://www.zotero.org/styles/fundamental-and-applied-limnology</id>
+    <link href="http://www.zotero.org/styles/fundamental-and-applied-limnology" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://www.schweizerbart.de/journals/fal/instructions" rel="documentation"/>
+    <link href="https://www.schweizerbart.de/resources/downloads/instructions/fal_instructions_to_authors_en.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1863-9135</issn>
+    <eissn>2363-7110</eissn>
+    <updated>2021-06-17T13:09:49+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="circa" form="short">ca.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
+    </terms>
+  </locale>
+  <!-- General categories of item types:
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+                 personal_communication report song speech thesis post webpage
+       Legal: bill legal_case legislation treaty
+  -->
+  <!-- APA references contain four parts: author, date, title, source -->
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="container-title">
+            <choose>
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                <choose>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text macro="title-and-descriptions"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+        <!-- Test for editortranslator and put that first as that becomes available -->
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="title">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="parenthetical"/>
+            </group>
+          </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-intext">
+    <choose>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text macro="title-intext"/>
+      </if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <!-- These variables indicate that the letter is retrievable by the reader. 
+                If not, then use the APA in-text-only personal communication format -->
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text macro="title-intext"/>
+                </substitute>
+              </names>
+              <!-- Replace with term="personal-communication" if that becomes available -->
+              <text term="letter"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <text macro="title-intext"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="author"/>
+            <names variable="illustrator"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <text macro="title-intext"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
+      <choose>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
+        </if>
+      </choose>
+      <group>
+        <choose>
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
+            <choose>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
+              </if>
+              <else-if type="paper-conference">
+                <!-- Capture 'speech' stored as 'paper-conference' -->
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+                   manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
+            </choose>
+          </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
+          <else>
+            <group>
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
+    <choose>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
+      </else-if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-sort-date">
+    <choose>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <date variable="issued" form="numeric"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication" match="any">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                           If not, then use the in-text-only personal communication format -->
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- APA has two description elements following the title:
+       title (parenthetical) [bracketed]  -->
+  <macro name="title-and-descriptions">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized based on presence of container-title.
+             Assume that review and review-book are published in periodicals/blogs,
+             not just on a web page (ex. 69) -->
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <choose>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else-if type="paper-conference">
+            <choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
+            </choose>
+          </else-if>
+          <else>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short" text-case="title"/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <!-- Replace with label variable="number" as that becomes available -->
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case" match="any">
+        <!-- Cases are italicized -->
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="legislation treaty" match="any">
+        <!-- Legislation and treaties not italicized or quoted -->
+        <text variable="title" form="short" text-case="title"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
+        <text variable="title" form="short" quotes="true" text-case="title"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="parenthetical">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
+    <group prefix="(" suffix=")">
+      <choose>
+        <if type="patent">
+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <!-- Replace with label variable="number" if that becomes available -->
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage" match="any">
+          <!-- For post webpage, container-title is treated as publisher -->
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else-if>
+        <else-if variable="container-title">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <!-- [Descriptive information] -->
+    <!-- If there is a number, genre is already printed in macro="number" -->
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- Reviewed item -->
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!-- Assume that genre is entered as 'Review of the book' or similar -->
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <!-- Thesis type and institution -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <!-- Include the university in brackets if thesis is published -->
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <!-- Interview information -->
+          <choose>
+            <if variable="title">
+              <text macro="format"/>
+            </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
+            <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if variable="composer" type="song" match="all">
+          <!-- Performer of classical music works -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else-if variable="container-title" match="none">
+          <!-- Other description -->
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
+          <choose>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
+          </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- This should be localized -->
+          <text macro="reviewed-title-intext" prefix="Review of "/>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="symbol" delimiter=", "/>
+                </names>
+              </group>
+            </if>
+            <else>
+              <text macro="format-intext"/>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <text macro="format-intext"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-container">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if type="paper-conference speech" match="any">
+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="book" variable="version" match="all">
+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <!-- For chapters in reports, place bracketed after the container title -->
+          <text macro="format"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <text macro="secondary-contributors-periodical"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <choose>
+        <if type="post webpage" match="none">
+          <!-- Webpages treat container-title like publisher -->
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
+              </group>
+            </if>
+          </choose>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="database-location">
+    <choose>
+      <if variable="archive-place" match="none">
+        <!-- With `archive-place`: physical archives. Without: online archives. -->
+        <!-- Add archive_collection as that becomes available -->
+        <text variable="archive_location"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="number">
+    <choose>
+      <if variable="number">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
+          </group>
+          <choose>
+            <if type="thesis">
+              <choose>
+                <!-- Include the university in brackets if thesis is published -->
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <choose>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <!-- replace with label variable="version" if that becomes available -->
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
+        </group>
+      </if>
+      <else>
+        <text variable="version"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <!-- Report series [ex. 52] -->
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <!-- Non-numeric volumes are already printed as part of the book title -->
+            <if is-numeric="volume" match="none"/>
+            <else>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group>
+            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="reviewed-title">
+    <choose>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed 
+              works [Ex. 69] -->
+        <text variable="reviewed-title" font-style="italic"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="reviewed-title-intext">
+    <choose>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="format">
+    <choose>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="format-intext">
+    <choose>
+      <if variable="genre" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
+      </if>
+      <else-if variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA 'source' element contains four parts:
+       container, event, publisher, access -->
+  <macro name="container">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <!-- Periodical items -->
+        <text macro="container-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Determine if paper-conference is a periodical or booklike -->
+        <choose>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <text macro="container-periodical"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="post webpage" match="none">
+        <!-- post and webpage treat container-title like publisher -->
+        <text macro="container-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
+      </group>
+      <choose>
+        <if variable="issued">
+          <choose>
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <names variable="editor translator" delimiter=", &amp; ">
+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="post webpage" match="any">
+          <!-- For websites, treat container title like publisher -->
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference">
+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <text variable="publisher"/>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <!-- With `archive-place`: physical archives. Without: online archives. -->
+            <!-- For physical archives, print the location before the archive name.
+                For electronic archives, these are printed in macro="description". -->
+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- Must test for archive_collection:
+                With collection: archive_collection (archive_location), archive, archive-place
+                No collection: archive (archive_location), archive-place
+            -->
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <text variable="event"/>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
+    <choose>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- This provides the option for more elaborate description 
+                   of publication history, such as full "reprinted" references
+                   (examples 11, 43, 44) or retracted references -->
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
+                <choose>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
+                  </if>
+                </choose>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- Legal citations have their own rules -->
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else-if type="bill">
+        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number container-title" match="none">
+                <!-- If no number or container-title, then assume it is a hearing -->
+                <text variable="title" font-style="italic"/>
+              </if>
+              <else>
+                <text variable="title"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <!-- If no number or container-title, then assume it is a hearing -->
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <!-- Currently designed to handle statutes, codified regulations, executive orders.
+             For uncodified regulations, assume future code section is in status. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="date-legal">
+    <choose>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <!-- Print only year for cases published in reporters-->
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-legal">
+    <!-- Expect legal item container-titles to be stored in short form -->
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!-- Change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <!-- Replace with label variable="number" if that becomes available -->
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <!-- Replace with label variable="number" as that becomes available -->
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <!--There's a public law number-->
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <!-- Change to label variable="section" as that becomes available -->
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name-with-initials">
+    <sort>
+      <key macro="author-bib" names-min="3" names-use-first="1"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-intext"/>
+        <group delimiter=", ">
+          <text macro="date-intext"/>
+          <text macro="citation-locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author-bib"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <!-- Legal items have different orders and delimiters -->
+          <choose>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
+            </if>
+            <else>
+              <text macro="legal-cites" suffix="."/>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/harvard-stellenbosch-university.csl b/buildres/csl/csl-styles/harvard-stellenbosch-university.csl
index 7ac7671b557..a126f889fff 100644
--- a/buildres/csl/csl-styles/harvard-stellenbosch-university.csl
+++ b/buildres/csl/csl-styles/harvard-stellenbosch-university.csl
@@ -2,22 +2,23 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Stellenbosch University - Harvard</title>
+    <title-short>SU-Harvard</title-short>
     <id>http://www.zotero.org/styles/harvard-stellenbosch-university</id>
     <link href="http://www.zotero.org/styles/harvard-stellenbosch-university" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-cite-them-right" rel="template"/>
-    <link href="http://libguides.sun.ac.za/content.php?pid=344501&amp;sid=2818229" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/harvard-university-of-cape-town" rel="template"/>
+    <link href="https://libguides.sun.ac.za/c.php?g=742962&amp;p=5316902" rel="documentation"/>
+    <!-- Sample data: https://gist.github.com/aurimasv/14da71a5d1def6e6ed86 -->
     <author>
-      <name>Yusuf Ras</name>
-      <email>yr@sun.ac.za</email>
-      <uri>http://www.mendeley.com/profiles/yusuf-ras/</uri>
+      <name>Kirchner van Deventer</name>
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2015-09-01T08:01:34+00:00</updated>
+    <updated>2021-06-22T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en-GB">
     <terms>
+      <term name="volume" form="short">v.</term>
       <term name="available at">available</term>
       <term name="open-quote">“</term>
       <term name="close-quote">”</term>
@@ -30,7 +31,7 @@
       <if variable="editor">
         <names variable="editor">
           <name and="symbol" initialize-with="." delimiter=", "/>
-          <label form="short" prefix=" (" suffix=")"/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
         </names>
       </if>
     </choose>
@@ -45,7 +46,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="never"/>
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="never" et-al-min="9" et-al-use-first="8"/>
       <label form="short" prefix=" " text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
@@ -63,13 +64,13 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="symbol" delimiter-precedes-last="never" initialize-with="." sort-separator=" "/>
-      <et-al font-style="italic"/>
+      <name form="short" and="symbol" delimiter=", " initialize-with="." delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
         <choose>
           <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <!-- Note that webpage title is italicized in bibliography, but quoted in text -->
             <text variable="title" form="short" font-style="italic"/>
           </if>
           <else>
@@ -85,6 +86,10 @@
     </names>
   </macro>
   <macro name="date-issued">
+    <!--
+      Show "in press" for journal articles with non-numeric pages
+      (i.e. "in press" in page field)
+    -->
     <choose>
       <if type="article-journal" match="none">
         <text macro="date-issued-year"/>
@@ -101,6 +106,9 @@
     </choose>
   </macro>
   <macro name="date-issued-no-parentheses">
+    <!--
+      Same as date-issued, but no parentheses around "in press"
+    -->
     <choose>
       <if type="article-journal" match="none">
         <text macro="date-issued-year"/>
@@ -130,14 +138,13 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="DOI"/>
+      <if variable="DOI">
+        <text variable="DOI" prefix="DOI: "/>
+      </if>
       <else-if variable="URL">
         <group delimiter=" ">
-          <group delimiter=": ">
-            <group delimiter=", ">
-              <text term="online" prefix="[" suffix="]" text-case="capitalize-first"/>
-              <text term="available at" text-case="capitalize-first"/>
-            </group>
+          <group>
+            <text term="available at" suffix=": " text-case="capitalize-first"/>
             <text variable="URL"/>
           </group>
           <text macro="date-access"/>
@@ -195,10 +202,10 @@
       <text variable="publisher"/>
     </group>
   </macro>
-  <citation disambiguate-add-year-suffix="true" year-suffix-delimiter="," disambiguate-add-names="true" disambiguate-add-givenname="false" collapse="year-suffix" et-al-min="4" et-al-use-first="3" et-al-subsequent-min="3" et-al-subsequent-use-first="1">
+  <citation disambiguate-add-year-suffix="true" year-suffix-delimiter="," disambiguate-add-names="true" disambiguate-add-givenname="false" collapse="year-suffix">
     <sort>
-      <key macro="author"/>
       <key macro="date-issued-no-parentheses"/>
+      <key macro="author"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
@@ -218,7 +225,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="9" et-al-use-first="8">
+  <bibliography entry-spacing="0">
     <sort>
       <key macro="author-short" names-min="1" names-use-first="1"/>
       <key macro="author-count" names-min="3" names-use-first="3"/>
@@ -277,11 +284,10 @@
           <else-if type="chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
             <text macro="title"/>
             <group delimiter=" ">
-              <text term="in"/>
+              <text term="in" text-case="capitalize-first"/>
               <text variable="container-title" font-style="italic"/>
-              <text macro="book-details"/>
-              <text macro="editor-translator"/>
             </group>
+            <text macro="book-details"/>
             <text variable="page"/>
           </else-if>
           <else-if type="patent" match="any">
diff --git a/buildres/csl/csl-styles/ios-press-books.csl b/buildres/csl/csl-styles/ios-press-books.csl
index a2855d20612..677c8b4935b 100644
--- a/buildres/csl/csl-styles/ios-press-books.csl
+++ b/buildres/csl/csl-styles/ios-press-books.csl
@@ -82,9 +82,6 @@
     </layout>
   </citation>
   <bibliography and="text" second-field-align="flush" entry-spacing="0">
-    <sort>
-      <key variable="author"/>
-    </sort>
     <layout suffix=".">
       <text variable="citation-number" prefix="[" suffix="]"/>
       <text macro="author" suffix=", "/>
diff --git a/buildres/csl/csl-styles/juristische-schulung.csl b/buildres/csl/csl-styles/juristische-schulung.csl
index 7f7b7b81549..d9d903431a5 100644
--- a/buildres/csl/csl-styles/juristische-schulung.csl
+++ b/buildres/csl/csl-styles/juristische-schulung.csl
@@ -144,7 +144,16 @@
               <text macro="edition"/>
             </else>
           </choose>
-          <text variable="locator" prefix=", "/>
+          <choose>
+              <!-- "S." as a locator is ommited. Many books however are instead cited by § plus margin number. The § has to appear. -->
+              <if locator="page">
+                  <text variable="locator" prefix=", "/>
+              </if>
+              <else>
+                  <label variable="locator" form="symbol" prefix=", "/>
+                  <text variable="locator" prefix=" "/>
+              </else>
+          </choose>
         </else-if>
         <!-- Legal commentary or handbook should be of publication type "entry-encyclopedia"
         - The term "Bearbeiter" (author of a certain chapter) in the following examples should be added by you and is not governed by this stylesheet
diff --git a/buildres/csl/csl-styles/monographs-of-the-palaeontographical-society.csl b/buildres/csl/csl-styles/monographs-of-the-palaeontographical-society.csl
new file mode 100644
index 00000000000..0bbadb9c75f
--- /dev/null
+++ b/buildres/csl/csl-styles/monographs-of-the-palaeontographical-society.csl
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <info>
+    <title>Monographs of the Palaeontographical Society</title>
+    <title-short>Monogr. Palaeontogr. Soc.</title-short>
+    <id>http://www.zotero.org/styles/monographs-of-the-palaeontographical-society</id>
+    <link href="http://www.zotero.org/styles/monographs-of-the-palaeontographical-society" rel="self"/>
+    <link href="http://www.zotero.org/styles/palaeontology" rel="template"/>
+    <link href="https://www.tandfonline.com/action/authorSubmission?show=instructions&amp;journalCode=tmps20" rel="documentation"/>
+    <author>
+      <name>Benjamin Moon</name>
+      <email>ben@bcmoon.uk</email>
+      <uri>https://bcmoon.uk</uri>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>0269-3445</issn>
+    <eissn>2576-1900</eissn>
+    <summary>Some bibliography entries may need plate numbers added or indications of translated titles. Separate formatting for Monographs can be achieved from Zotero by adding 'Publisher Place: London' into the Extra field; this is used as the key to identify these. Similarly 'Number Of Pages' may be added in the Extra field too.</summary>
+    <updated>2021-06-21T13:18:47</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=", " initialize-with=". " and="symbol" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="never" form="long">
+        <name-part name="family" text-case="capitalize-first" font-variant="small-caps"/>
+      </name>
+      <substitute>
+        <text macro="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name sort-separator=", " initialize-with=". " and="symbol" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="never">
+        <name-part name="family" text-case="capitalize-first" font-variant="small-caps"/>
+      </name>
+      <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-count">
+    <names variable="author">
+      <name form="count"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+    <text variable="year-suffix"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="no-pages">
+    <group delimiter=" ">
+      <text variable="number-of-pages"/>
+      <label variable="number-of-pages" form="short" plural="always"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="false" collapse="year-suffix-ranged" year-suffix-delimiter=", ">
+    <sort>
+      <key macro="year-date"/>
+      <key macro="author-short"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group>
+        <text macro="author-short" suffix=" "/>
+        <text macro="year-date"/>
+      </group>
+      <group prefix=", " delimiter=" ">
+        <label variable="locator" form="short"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" hanging-indent="true" subsequent-author-substitute-rule="partial-each" subsequent-author-substitute="&#8212;&#8212;&#8212;">
+    <sort>
+      <key macro="author" names-min="1" names-use-first="1"/>
+      <key macro="author-count"/>
+      <key macro="year-date"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="thesis">
+          <group prefix="[" suffix=".]" delimiter=". ">
+            <group delimiter=" ">
+              <text macro="author"/>
+              <text macro="year-date"/>
+            </group>
+            <text variable="title" font-style="italic"/>
+            <group delimiter=", ">
+              <text variable="genre" prefix="Unpublished "/>
+              <text macro="publisher"/>
+            </group>
+          </group>
+        </if>
+        <else>
+          <group delimiter=". ">
+            <group delimiter=" ">
+              <text macro="author"/>
+              <text macro="year-date"/>
+            </group>
+            <choose>
+              <if type="bill book chapter graphic legal_case motion_picture report song" match="any">
+                <choose>
+                  <if type="chapter">
+                    <text variable="title" font-style="normal" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=" ">
+                  <label variable="page" form="short" text-case="capitalize-first"/>
+                  <text variable="page"/>
+                </group>
+                <group delimiter=" ">
+                  <group delimiter=" ">
+                    <text term="in" text-case="capitalize-first" font-style="italic"/>
+                    <text macro="editor"/>
+                  </group>
+                  <group delimiter=". ">
+                    <text variable="collection-title" text-case="capitalize-first" font-style="italic"/>
+                    <choose>
+                      <if is-numeric="volume">
+                        <group delimiter=" " suffix=".">
+                          <text term="volume" form="short" text-case="capitalize-first"/>
+                          <number variable="volume" font-weight="bold"/>
+                        </group>
+                      </if>
+                      <else>
+                        <text variable="volume" suffix="."/>
+                      </else>
+                    </choose>
+                    <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
+                  </group>
+                </group>
+                <group delimiter=", " suffix=".">
+                  <text macro="no-pages"/>
+                  <text macro="publisher"/>
+                </group>
+              </if>
+              <else-if type="webpage" match="any">
+                <group suffix=".">
+                  <text variable="title" font-style="italic" suffix=". "/>
+                  <text variable="container-title" form="long" suffix=". "/>
+                  <text variable="URL" prefix="Downloaded from " suffix=" "/>
+                  <date variable="accessed" prefix="on ">
+                    <date-part name="day" suffix=" "/>
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="year" suffix="."/>
+                  </date>
+                </group>
+                <text prefix=" " macro="publisher"/>
+              </else-if>
+              <else-if type="article-journal" variable="publisher-place">
+                <text variable="title"/>
+                <group>
+                  <text variable="container-title" form="long" font-style="italic" text-case="capitalize-first" suffix=", "/>
+                  <text variable="publisher-place" suffix=": "/>
+                  <text variable="page"/>
+                </group>
+                <group prefix="(" suffix=".)" delimiter=" ">
+                  <text variable="issue" prefix="Publ. No. " suffix=","/>
+                  <text variable="volume" prefix="part of Vol. "/>
+                  <text macro="year-date" prefix="for "/>
+                </group>
+              </else-if>
+              <else>
+                <text variable="title"/>
+                <group delimiter=", " suffix=".">
+                  <text variable="container-title" form="long" font-style="italic" text-case="capitalize-first"/>
+                  <text variable="collection-title" prefix="(" suffix=")"/>
+                  <text variable="volume" font-weight="bold"/>
+                  <text variable="page"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl b/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
index 076a40fb1e6..bc6ca0db9d4 100644
--- a/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
+++ b/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
@@ -28,12 +28,20 @@
       <term name="translator" form="verb-short">overs.</term>
       <term name="translator" form="short">overs.</term>
       <term name="editortranslator" form="verb-short">red. og overs.</term>
+<<<<<<< HEAD
       <term name="editortranslator" form="verb">Redigert og oversatt av</term>
+=======
+      <term name="editortranslator" form="verb">redigert og oversatt av</term>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
       <term name="translator" form="short">overs.</term>
       <term name="and others">et al.</term>
       <term name="open-quote">«</term>
       <term name="close-quote">»</term>
+<<<<<<< HEAD
       <term name="accessed">sitert</term>
+=======
+      <term name="accessed">lest</term>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
       <term name="no date">udatert</term>
       <term name="edition">utgave</term>
       <term name="edition" form="short">utg.</term>
@@ -76,15 +84,25 @@
       <name et-al-min="4" et-al-use-first="1" delimiter-precedes-last="never" name-as-sort-order="first" and="text"/>
       <et-al term="and others"/>
       <substitute>
+<<<<<<< HEAD
         <names variable="editor"/>
+=======
+        <text macro="editor"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
       </substitute>
     </names>
   </macro>
   <macro name="editor">
     <names variable="editor">
       <name et-al-min="4" et-al-use-first="1" delimiter-precedes-last="never" and="text"/>
+<<<<<<< HEAD
     </names>
     <text prefix=" (" suffix=")" term="editor" form="short"/>
+=======
+      <et-al term="and others"/>
+      <label prefix=" (" suffix=")" form="short"/>
+    </names>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
   </macro>
   <macro name="title-short">
     <choose>
@@ -94,9 +112,12 @@
       <else-if type="legislation">
         <text variable="title-short"/>
       </else-if>
+<<<<<<< HEAD
       <else-if type="legal_case">
         <text variable="title"/>
       </else-if>
+=======
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
       <else>
         <text font-style="italic" variable="title-short"/>
       </else>
@@ -107,7 +128,14 @@
       <if type="chapter article-journal article-newspaper article-magazine" match="any">
         <text quotes="true" variable="title"/>
       </if>
+<<<<<<< HEAD
       <else-if type="legal_case legislation" match="any">
+=======
+      <else-if type="legislation">
+        <text variable="container-title"/>
+        <text prefix=" " suffix=" " macro="issued-full-date"/>
+        <text prefix="nr. " suffix=" " variable="volume"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
         <text variable="title"/>
       </else-if>
       <else>
@@ -159,6 +187,7 @@
     </choose>
   </macro>
   <macro name="accessed-date">
+<<<<<<< HEAD
     <choose>
       <if type="personal_communication">
         <text variable="genre" prefix=", " suffix=", "/>
@@ -176,6 +205,16 @@
         </date>
       </else>
     </choose>
+=======
+    <group prefix=" (" suffix=")">
+      <text term="accessed"/>
+      <date variable="accessed" prefix=" ">
+        <date-part name="day" form="numeric" suffix=". "/>
+        <date-part name="month" form="long" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
   </macro>
   <macro name="locator">
     <choose>
@@ -186,7 +225,11 @@
         </group>
       </if>
       <else-if locator="section paragraph" match="any">
+<<<<<<< HEAD
         <text variable="locator" prefix=" § "/>
+=======
+        <text variable="locator" prefix=" §&#160;"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
       </else-if>
       <else>
         <group delimiter=" ">
@@ -218,13 +261,54 @@
       </else>
     </choose>
   </macro>
+<<<<<<< HEAD
+=======
+  <macro name="nor-case">
+    <choose>
+      <if variable="container-title" match="any">
+        <text variable="container-title"/>
+        <text prefix=" " variable="volume"/>
+        <text prefix=" s. " variable="page"/>
+        <text prefix=" (" suffix=")" variable="title-short"/>
+      </if>
+      <else-if variable="number" match="any">
+        <text variable="number"/>
+        <text prefix=" (" suffix=")" variable="title-short"/>
+      </else-if>
+      <else>
+        <text suffix="s dom av " macro="author-full"/>
+        <text macro="issued-full-date"/>
+        <text prefix=" (" suffix=")" variable="title-short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="nor-legislation">
+    <choose>
+      <if position="first">
+        <text macro="title"/>
+        <text prefix=" (" suffix=")" variable="title-short"/>
+      </if>
+      <else-if variable="title-short" match="any">
+        <text macro="title-short"/>
+      </else-if>
+      <else>
+        <text variable="container-title"/>
+        <text prefix=" " variable="title"/>
+      </else>
+    </choose>
+  </macro>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
   <citation disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" disambiguate-add-year-suffix="true" et-al-min="2" et-al-use-first="1">
     <sort>
       <key macro="author-short"/>
       <key macro="title-short"/>
       <key macro="issued"/>
     </sort>
+<<<<<<< HEAD
     <layout delimiter=", ">
+=======
+    <layout delimiter="; ">
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
       <group delimiter=" ">
         <choose>
           <if type="book thesis chapter article-journal article-newspaper article-magazine personal_communication" match="any">
@@ -232,10 +316,17 @@
             <text macro="issued"/>
           </if>
           <else-if type="legal_case">
+<<<<<<< HEAD
             <text macro="title"/>
           </else-if>
           <else-if type="legislation">
             <text macro="title-short"/>
+=======
+            <text macro="nor-case"/>
+          </else-if>
+          <else-if type="legislation">
+            <text macro="nor-legislation"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
           </else-if>
           <else-if type="report">
             <text macro="author-short"/>
@@ -261,7 +352,11 @@
         <if type="article-journal">
           <group suffix=".">
             <text macro="author-full"/>
+<<<<<<< HEAD
             <text prefix=". " macro="title"/>
+=======
+            <text prefix=", " macro="title"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
             <text prefix=" " font-style="italic" variable="container-title"/>
             <text prefix=" " macro="issued"/>
             <text prefix=" s. " variable="page"/>
@@ -272,6 +367,7 @@
         <else-if type="article-newspaper article-magazine" match="any">
           <group suffix=".">
             <text macro="author-full"/>
+<<<<<<< HEAD
             <text prefix=". " macro="issued"/>
             <text prefix=" " macro="title"/>
             <text prefix=", " font-style="italic" variable="container-title"/>
@@ -283,6 +379,20 @@
                 <text prefix=", " variable="URL"/>
                 <text macro="accessed-date"/>
               </else>
+=======
+            <text prefix=", " macro="title"/>
+            <text prefix=", " font-style="italic" variable="container-title"/>
+            <choose>
+              <if variable="issued" match="any">
+                <text prefix=", " macro="issued-full-date"/>
+              </if>
+            </choose>
+            <choose>
+              <if variable="URL" match="any">
+                <text prefix=", " variable="URL"/>
+                <text macro="accessed-date"/>
+              </if>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
             </choose>
           </group>
         </else-if>
@@ -299,7 +409,11 @@
         <else-if type="chapter paper-conference" match="any">
           <group suffix=".">
             <text macro="author-full"/>
+<<<<<<< HEAD
             <text prefix=". " macro="title"/>
+=======
+            <text prefix=", " macro="title"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
             <text prefix=" i " font-style="italic" variable="container-title"/>
             <text prefix=", " macro="editor"/>
             <text macro="volume"/>
@@ -311,6 +425,7 @@
           </group>
         </else-if>
         <else-if type="legislation bill" match="any">
+<<<<<<< HEAD
           <text macro="issued-no-parenthesis"/>
           <text macro="title"/>
         </else-if>
@@ -320,6 +435,16 @@
         <else-if type="personal_communication">
           <text macro="author-full"/>
           <text macro="accessed-date"/>
+=======
+          <text macro="title"/>
+        </else-if>
+        <else-if type="legal_case">
+          <text macro="nor-case"/>
+        </else-if>
+        <else-if type="personal_communication">
+          <text macro="author-full"/>
+          <text prefix=" " macro="issued"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
         </else-if>
         <else>
           <text variable="title"/>
diff --git a/buildres/csl/csl-styles/ocean-and-coastal-research.csl b/buildres/csl/csl-styles/ocean-and-coastal-research.csl
index c44a8b4ab3e..4a2f87164b8 100644
--- a/buildres/csl/csl-styles/ocean-and-coastal-research.csl
+++ b/buildres/csl/csl-styles/ocean-and-coastal-research.csl
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+=======
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" name-as-sort-order="all" names-delimiter="," demote-non-dropping-particle="sort-only" default-locale="en-GB">
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
   <info>
     <title>Ocean and Coastal Research</title>
     <title-short>OCR</title-short>
@@ -14,6 +18,7 @@
     <category field="science"/>
     <eissn>2675-2824</eissn>
     <summary>Ocean and Coastal Research style -  Harvard</summary>
+<<<<<<< HEAD
     <updated>2021-04-15T17:54:37+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
@@ -85,6 +90,420 @@
       </if>
       <else>
         <text variable="container-title" text-case="title" suffix=","/>
+=======
+    <updated>2021-06-19T20:55:01+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+        <group delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
+        <group delimiter=", " prefix=" (" suffix=")">
+          <names variable="container-author" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" text-case="title" prefix=", "/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" text-case="lowercase" prefix=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name font-variant="small-caps" and="symbol" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="report">
+            <text variable="publisher"/>
+            <text macro="title"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="article" match="any">
+        <names variable="author"/>
+      </if>
+      <else>
+        <names variable="author">
+          <name form="short" and="text" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+                <text variable="title" form="short" font-style="italic"/>
+              </if>
+              <else-if type="legal_case">
+                <text variable="title" font-style="italic"/>
+              </else-if>
+              <else-if type="book graphic  motion_picture song" match="any">
+                <text variable="title" form="short" font-style="italic"/>
+              </else-if>
+              <else-if type="bill legislation" match="any">
+                <text variable="title" form="short"/>
+              </else-if>
+              <else-if variable="reviewed-author">
+                <choose>
+                  <if variable="reviewed-title" match="none">
+                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" quotes="true"/>
+                  </else>
+                </choose>
+              </else-if>
+              <else>
+                <text variable="title" form="short" quotes="false"/>
+              </else>
+            </choose>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="patent-number">
+    <group delimiter=" ">
+      <group delimiter=" ">
+        <text variable="genre"/>
+        <text term="issue" form="short" text-case="capitalize-first"/>
+      </group>
+      <text variable="number"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="thesis report" match="any">
+        <choose>
+          <if variable="DOI" match="any">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+          <else-if variable="URL" match="any">
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="URL"/>
+            </group>
+          </else-if>
+          <else-if variable="archive" match="any">
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="archive" suffix="."/>
+              <text variable="archive_location" prefix=" (" suffix=")"/>
+            </group>
+          </else-if>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="DOI">
+            <text value="DOI: "/>
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+          <else>
+            <choose>
+              <if type="post post-weblog webpage" match="any">
+                <group delimiter=". ">
+                  <text variable="URL"/>
+                  <group>
+                    <text term="accessed" text-case="capitalize-first" suffix=": "/>
+                    <date form="text" variable="accessed" suffix=". "/>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <text term="accessed" text-case="capitalize-first" suffix=": "/>
+                  <text variable="URL"/>
+                </group>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+        <choose>
+          <if variable="version" type="book" match="all">
+            <text variable="title"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="reviewed-author">
+        <choose>
+          <if variable="reviewed-title">
+            <group delimiter=" ">
+              <text variable="title"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
+                <names variable="reviewed-author" delimiter=", ">
+                  <label form="verb-short" suffix=" "/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", " prefix="[" suffix="]">
+              <text variable="title" font-style="italic" prefix="Review of "/>
+              <names variable="reviewed-author" delimiter=", ">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-plus-extra">
+    <text macro="title"/>
+    <choose>
+      <if type="report thesis" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre"/>
+              </if>
+              <else>
+                <text variable="collection-title"/>
+              </else>
+            </choose>
+            <text variable="number" prefix="No. "/>
+          </group>
+          <group delimiter=" ">
+            <text term="version" text-case="capitalize-first"/>
+            <text variable="version"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+      <else-if type="post-weblog webpage" match="any">
+        <text variable="genre" prefix=" [" suffix="]"/>
+      </else-if>
+      <else-if variable="version">
+        <group delimiter=" " prefix=" (" suffix=")">
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+    </choose>
+    <text macro="format" prefix=" [" suffix="]"/>
+  </macro>
+  <macro name="format">
+    <choose>
+      <if match="any" variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </if>
+      <else-if type="dataset" match="any">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text value="Data set"/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="report" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+          <text variable="number-of-pages" suffix=" pp."/>
+        </group>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+          <text variable="number-of-pages" suffix=" pp."/>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <choose>
+            <if variable="publisher">
+              <text variable="publisher"/>
+            </if>
+            <else>
+              <text variable="authority"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="post-weblog webpage" match="none">
+        <group delimiter=", ">
+          <choose>
+            <if variable="event version" type="speech dataset motion_picture" match="none">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="article-journal article-magazine article-newspaper" match="none">
+              <group delimiter=": ">
+                <choose>
+                  <if variable="publisher-place">
+                    <text variable="publisher-place"/>
+                  </if>
+                  <else>
+                    <text variable="event-place"/>
+                  </else>
+                </choose>
+                <text variable="publisher"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="number-of-pages" suffix=" pp."/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="container-title" match="none">
+        <choose>
+          <if variable="event">
+            <choose>
+              <if variable="genre" match="none">
+                <text term="presented at" text-case="capitalize-first" suffix=" "/>
+                <text variable="event"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text term="presented at"/>
+                  <text variable="event"/>
+                </group>
+              </else>
+            </choose>
+          </if>
+          <else-if type="speech">
+            <text variable="genre" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill legal_case legislation" match="none">
+        <choose>
+          <if variable="issued">
+            <group prefix=" ">
+              <date date-parts="year" form="numeric" variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+            </group>
+          </if>
+          <else-if variable="status">
+            <group prefix=" (" suffix=")">
+              <text variable="status"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
+          <else>
+            <group prefix=" (" suffix=")">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song dataset" match="none">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <date variable="original-date" form="text"/>
+          <group>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
+          </group>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
       </else>
     </choose>
   </macro>
@@ -97,6 +516,7 @@
         </group>
       </if>
       <else>
+<<<<<<< HEAD
         <text variable="edition" suffix="."/>
       </else>
     </choose>
@@ -105,10 +525,193 @@
     <sort>
       <key macro="year-date"/>
       <key macro="author-short"/>
+=======
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+        <choose>
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=" " prefix=", ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <choose>
+            <if type="report" match="none">
+              <text macro="edition"/>
+            </if>
+          </choose>
+          <choose>
+            <if variable="volume" match="any">
+              <group>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </if>
+            <else>
+              <group>
+                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+              </group>
+            </else>
+          </choose>
+          <group>
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="legal_case">
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="bill legislation" match="any">
+        <date variable="issued" prefix=" (" suffix=")">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" form="long" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="post-weblog webpage" match="none">
+        <group>
+          <choose>
+            <if type="chapter paper-conference entry-encyclopedia" match="any">
+              <text term="in" text-case="capitalize-first" font-style="italic" suffix=": "/>
+            </if>
+          </choose>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+            <text macro="container-title"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper" match="any">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+      </if>
+      <else-if type="bill legal_case legislation" match="none">
+        <text variable="container-title" font-style="italic"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case" match="any">
+        <group prefix=", " delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <text variable="page"/>
+            </if>
+            <else>
+              <text variable="number" prefix="No. "/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", " prefix=", ">
+          <choose>
+            <if variable="number">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="original-date">
+    <choose>
+      <if variable="original-date">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text value="Original work published"/>
+          <date variable="original-date" form="text"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <citation and="text" et-al-min="3" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="issued-sort"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
+<<<<<<< HEAD
         <text macro="year-date"/>
       </group>
       <text variable="locator"/>
@@ -193,6 +796,36 @@
           </else>
         </choose>
       </group>
+=======
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="99" et-al-use-first="98" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group delimiter=". ">
+          <text macro="author" font-variant="normal"/>
+          <text macro="issued"/>
+          <text macro="title-plus-extra"/>
+          <text macro="container"/>
+        </group>
+        <text macro="legal-cites"/>
+        <text macro="locators"/>
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </group>
+      <text macro="access" prefix=" "/>
+      <text macro="original-date" prefix=" "/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/pain.csl b/buildres/csl/csl-styles/pain.csl
index 26b724645a8..c25b60be49b 100644
--- a/buildres/csl/csl-styles/pain.csl
+++ b/buildres/csl/csl-styles/pain.csl
@@ -4,7 +4,7 @@
     <title>PAIN</title>
     <id>http://www.zotero.org/styles/pain</id>
     <link href="http://www.zotero.org/styles/pain" rel="self"/>
-    <link href="http://www.elsevier.com/journals/pain/0304-3959/guide-for-authors" rel="documentation"/>
+    <link href="https://edmgr.ovid.com/pain/accounts/Clinical%20Basic%20Science%20Research%20Reports_PAIN.pdf" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
@@ -13,7 +13,7 @@
     <issn>0304-3959</issn>
     <eissn>1872-6623</eissn>
     <summary>Style for the Elsevier Journal PAIN - modified, alphabetical Vancouver</summary>
-    <updated>2018-09-26T19:28:25+00:00</updated>
+    <updated>2021-06-25T19:28:25+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
@@ -116,8 +116,6 @@
               <text macro="publisher"/>
               <text macro="year-date"/>
             </group>
-            <text variable="page"/>
-            <label variable="page" form="short"/>
           </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
diff --git a/buildres/csl/csl-styles/social-anthropology.csl b/buildres/csl/csl-styles/social-anthropology.csl
new file mode 100644
index 00000000000..69159d4dc48
--- /dev/null
+++ b/buildres/csl/csl-styles/social-anthropology.csl
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
+  <!-- Polyglot; journal publishes in English and French -->
+  <info>
+    <title>Social Anthropology/Anthropologie Sociale</title>
+    <id>http://www.zotero.org/styles/social-anthropology</id>
+    <link href="http://www.zotero.org/styles/social-anthropology" rel="self"/>
+    <link href="http://www.zotero.org/styles/ecological-restoration" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/14698676/homepage/forauthors.html" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="anthropology"/>
+    <issn>0964-0282</issn>
+    <eissn>1469-8676</eissn>
+    <updated>2021-06-17T08:37:04+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale>
+    <style-options punctuation-in-quote="false"/>
+    <terms>
+      <term name="open-quote">‘</term>
+      <term name="close-quote">’</term>
+      <term name="open-inner-quote">“</term>
+      <term name="close-inner-quote">”</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group delimiter=" ">
+          <text term="in"/>
+          <names variable="editor translator" delimiter=", ">
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <label form="short" strip-periods="false" prefix=" (" suffix=")"/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor translator" delimiter=", " prefix=" (" suffix=")">
+          <name and="text" initialize-with=". " delimiter=", "/>
+          <label prefix=", "/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="first" and="text" sort-separator=", " initialize-with=". " delimiter=", "/>
+      <label prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book report" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <group delimiter=" ">
+          <text variable="URL"/>
+          <group delimiter=" " prefix="(" suffix=")">
+            <text term="accessed"/>
+            <date form="numeric" variable="accessed"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="article-journal article-magazine" match="none">
+        <choose>
+          <if type="thesis" match="any">
+            <text variable="genre" suffix=", "/>
+            <text variable="publisher" prefix=": "/>
+          </if>
+          <else>
+            <text variable="publisher-place"/>
+            <text variable="publisher" prefix=": "/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <group prefix=" " suffix=".">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <choose>
+            <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+              <date variable="issued">
+                <date-part prefix=", " name="month"/>
+                <date-part prefix=" " name="day"/>
+              </date>
+            </if>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text prefix=" (" term="no date" suffix=")." form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <number variable="edition" form="long-ordinal" text-case="capitalize-first"/>
+            <text term="edition" form="long" prefix=" " suffix="."/>
+          </if>
+          <else>
+            <text variable="edition" suffix="."/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="container-title" prefix=" " font-style="italic"/>
+        <choose>
+          <if variable="page volume" match="all">
+            <text variable="volume" prefix=" "/>
+            <text variable="page" prefix=":"/>
+          </if>
+          <else>
+            <text variable="DOI" prefix=" DOI "/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="container-contributors"/>
+          <text variable="container-title" font-style="italic"/>
+          <text macro="secondary-contributors"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else>
+        <text variable="container-title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if match="none" locator="page">
+          <label variable="locator" form="short"/>
+        </if>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key variable="issued"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <group delimiter=": ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="issued-year"/>
+        </group>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author" suffix="."/>
+      <text macro="issued" suffix=" "/>
+      <group delimiter=", ">
+        <text macro="title"/>
+        <text macro="locators"/>
+      </group>
+      <group delimiter=". " prefix=". ">
+        <text macro="edition"/>
+        <text macro="publisher"/>
+        <text macro="access"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/society-of-biblical-literature-fullnote-bibliography.csl b/buildres/csl/csl-styles/society-of-biblical-literature-fullnote-bibliography.csl
index 695016e2bb9..4910227ff66 100644
--- a/buildres/csl/csl-styles/society-of-biblical-literature-fullnote-bibliography.csl
+++ b/buildres/csl/csl-styles/society-of-biblical-literature-fullnote-bibliography.csl
@@ -33,6 +33,7 @@
     <category field="theology"/>
     <summary>Society of Biblical Literature format with full notes and bibliography</summary>
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     <updated>2021-04-13T15:55:26+00:00</updated>
 =======
@@ -41,6 +42,9 @@
 =======
     <updated>2021-05-10T14:27:36+00:00</updated>
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+    <updated>2021-05-10T14:27:36+00:00</updated>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en-US">
@@ -693,6 +697,7 @@
                   <else>
                     <group delimiter=" ">
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                       <label variable="locator" form="short"/>
                       <text variable="locator"/>
@@ -704,6 +709,10 @@
                         <label variable="locator" form="short"/>
                         <text variable="locator"/>
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+                        <label variable="locator" form="short"/>
+                        <text variable="locator"/>
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
                     </group>
                   </else>
                 </choose>
@@ -957,6 +966,7 @@
         <!-- Support custom citations via the annote variable. For discussion, see https://forums.zotero.org/discussion/comment/317370 -->
         <if variable="annote">
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
           <group delimiter=" ">
             <text variable="annote"/>
@@ -965,6 +975,8 @@
 =======
 =======
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
           <choose>
             <if locator="section">
               <group delimiter=" ">
@@ -980,9 +992,12 @@
             </else>
           </choose>
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> fcf26b3f77925d7e99e703666dbe3c4b706403ac
 =======
 >>>>>>> dbb93e7d9be410a475814d5ae49aef83ce158191
+=======
+>>>>>>> 04a2d190cbad73582c84bbef9fd7ba9d0b982317
         </if>
         <!-- Lexicon/Dictionary/Encyclopedia -->
         <else-if type="entry-dictionary entry-encyclopedia" match="any">
diff --git a/buildres/csl/csl-styles/urad-rs-za-makroekonomske-analize-in-razvoj.csl b/buildres/csl/csl-styles/urad-rs-za-makroekonomske-analize-in-razvoj.csl
new file mode 100644
index 00000000000..693cfd2e159
--- /dev/null
+++ b/buildres/csl/csl-styles/urad-rs-za-makroekonomske-analize-in-razvoj.csl
@@ -0,0 +1,1484 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded" default-locale="sl-SL">
+  <info>
+    <title>Urad RS za makroekonomske analize in razvoj (Slovenščina)</title>
+    <title-short>UMAR</title-short>
+    <id>http://www.zotero.org/styles/urad-rs-za-makroekonomske-analize-in-razvoj</id>
+    <link href="http://www.zotero.org/styles/urad-rs-za-makroekonomske-analize-in-razvoj" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa-6th-edition-no-ampersand" rel="template"/>
+    <link href="https://github.com/majazaloznik/mendeley-word-collaboration-manual/blob/main/docs/UMAR_CITIRANJE%20MED%20BESEDILOM%20IN%20NAVAJANJE%20VIROV%20V%20SEZNAMU%20LITERATURE.docx" rel="documentation"/>
+    <author>
+      <name>Maja Založnik</name>
+      <email>maja.zaloznik@gov.si</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2021-06-22T11:22:34+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="container-contributors-booklike">
+    <choose>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="text" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="text" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="text" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="text" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="text" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="text" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" font-weight="normal" delimiter=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="patent" variable="number" match="all">
+        <text macro="patent-number"/>
+      </if>
+      <else-if type="treaty">
+        <text variable="title" form="short" text-case="title"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="text" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" text-case="title" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="text" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" text-case="title" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" text-case="title" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="text" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+            <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" text-case="title" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" text-case="title" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name form="short" and="text" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text variable="title" form="short" text-case="title" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <names variable="translator"/>
+            <choose>
+              <if type="report" variable="publisher" match="all">
+                <text variable="publisher"/>
+              </if>
+              <else-if type="legal_case">
+                <text variable="title" font-style="italic"/>
+              </else-if>
+              <else-if type="bill legislation" match="any">
+                <text variable="title" form="short" text-case="title"/>
+              </else-if>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </else-if>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
+                <text variable="title" form="short" text-case="title" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" text-case="title" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="patent-number">
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+    <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
+        <choose>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
+            <choose>
+              <if variable="archive-place" match="none">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <text term="from"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
+                </group>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
+        <choose>
+          <if variable="version" type="book" match="all">
+            <!---This is a hack until we have a software type -->
+            <text variable="title"/>
+          </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group>
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
+            </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" text-case="title" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" text-case="title" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text variable="title" form="short" text-case="title" quotes="true"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="description-report">
+    <choose>
+      <if variable="number">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
+          </group>
+          <text macro="locators"/>
+        </group>
+      </if>
+      <else>
+        <text macro="locators"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="format-report">
+    <choose>
+      <if variable="number">
+        <text variable="medium" text-case="capitalize-first"/>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-and-descriptions">
+    <group delimiter=" ">
+      <text macro="title"/>
+      <choose>
+        <if variable="title interviewer" type="interview" match="any">
+          <group delimiter=" ">
+            <text macro="description"/>
+            <text macro="format"/>
+          </group>
+        </if>
+        <else>
+          <group delimiter=" ">
+            <text macro="format"/>
+            <text macro="description"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <choose>
+          <if type="manuscript">
+            <text variable="genre"/>
+          </if>
+        </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
+          <choose>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
+            </if>
+            <else>
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+            </else>
+          </choose>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event" type="speech paper-conference" match="any">
+        <choose>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <group delimiter=" ">
+                <text term="presented at" text-case="capitalize-first"/>
+                <text variable="event"/>
+                <choose>
+                  <if match="any" variable="note">
+                    <group delimiter=" ">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <group>
+                        <text variable="note"/>
+                        <text variable="event-place" prefix=", "/>
+                      </group>
+                    </group>
+                  </if>
+                  <else>
+                    <group>
+                      <text variable="genre"/>
+                      <text variable="event-place" prefix=", "/>
+                    </group>
+                  </else>
+                </choose>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="issued">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text variable="year-suffix"/>
+          <choose>
+            <if type="speech">
+              <date variable="issued" delimiter=" ">
+                <date-part prefix=", " name="month"/>
+              </date>
+            </if>
+            <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
+              <date variable="issued">
+                <date-part prefix=", " name="month"/>
+                <date-part prefix=" " name="day"/>
+              </date>
+            </else-if>
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
+          </choose>
+        </group>
+      </else-if>
+      <else-if variable="status">
+        <group>
+          <text variable="status" text-case="lowercase"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else-if>
+      <else>
+        <group>
+          <text term="no date" form="short"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <choose>
+            <if is-uncertain-date="original-date">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </if>
+            <else>
+              <date variable="original-date">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+          <choose>
+            <if is-uncertain-date="issued">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <text macro="issued-year"/>
+              </group>
+            </if>
+            <else>
+              <text macro="issued-year"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-date">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="speech">
+        <date variable="original-date" delimiter=" ">
+          <date-part name="month"/>
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
+        <date variable="original-date" form="text"/>
+      </else-if>
+      <else>
+        <date variable="original-date">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-published">
+    <!--This should be localized -->
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="interview motion_picture song" match="any">
+        <text value="Original work recorded"/>
+      </else-if>
+      <else-if type="broadcast">
+        <text value="Original work broadcast"/>
+      </else-if>
+      <else>
+        <text value="Original work published"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <group>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
+            <else>
+              <group>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+          </group>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book">
+        <choose>
+          <!-- book and software should not cite collection-title, only container-title -->
+          <if variable="container-title">
+            <text macro="container-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+      </if>
+      <else-if type="paper-conference speech" match="any">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
+        <text variable="container-title" font-style="italic"/>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
+    <choose>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- This provides the option for more elaborate description 
+                   of publication history, such as full "reprinted" references
+                   (example 26) or retracted references -->
+              <text variable="references"/>
+            </if>
+            <else>
+              <choose>
+                <if variable="original-date">
+                  <group delimiter=" ">
+                    <text macro="original-published"/>
+                    <choose>
+                      <if is-uncertain-date="original-date">
+                        <group prefix="[" suffix="]" delimiter=" ">
+                          <text term="circa" form="short"/>
+                          <text macro="original-date"/>
+                        </group>
+                      </if>
+                      <else>
+                        <text macro="original-date"/>
+                      </else>
+                    </choose>
+                  </group>
+                </if>
+              </choose>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" " prefix=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=" ">
+          <group delimiter=". ">
+            <date variable="issued" prefix="(" suffix=")">
+              <date-part name="year"/>
+            </date>
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+    <sort>
+      <key macro="author" names-min="8" names-use-first="6"/>
+      <key macro="issued-sort"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued-citation"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <group delimiter=" ">
+        <group delimiter=". " suffix=".">
+          <text macro="author"/>
+          <choose>
+            <if is-uncertain-date="issued">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <text macro="issued"/>
+              </group>
+            </if>
+            <else>
+              <text macro="issued" prefix="(" suffix=")"/>
+            </else>
+          </choose>
+          <text macro="title-and-descriptions"/>
+          <text macro="container"/>
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+        <text macro="access"/>
+        <text macro="publication-history"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/wirtschaftsuniversitat-wien-institut-fur-transportwirtschaft-und-logistik.csl b/buildres/csl/csl-styles/wirtschaftsuniversitat-wien-institut-fur-transportwirtschaft-und-logistik.csl
new file mode 100644
index 00000000000..465cb265f18
--- /dev/null
+++ b/buildres/csl/csl-styles/wirtschaftsuniversitat-wien-institut-fur-transportwirtschaft-und-logistik.csl
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="de-AT" xmlns="http://purl.org/net/xbiblio/csl">
+  <info>
+    <title>Wirtschaftsuniversität Wien - Institut für Transportwirtschaft und Logistik (Deutsch - Österreich)</title>
+    <id>http://www.zotero.org/styles/wirtschaftsuniversitat-wien-institut-fur-transportwirtschaft-und-logistik</id>
+    <link href="http://www.zotero.org/styles/wirtschaftsuniversitat-wien-institut-fur-transportwirtschaft-und-logistik" rel="self"/>
+    <link href="http://www.zotero.org/styles/universitat-zu-koln-seminar-fur-abwl-und-finanzierungslehre" rel="template"/>
+    <link href="https://www.wu.ac.at/fileadmin/wu/d/i/itl/Lehre/210226_ITL_Richtlinien_zum_wissenschaftlichen_Arbeiten.pdf" rel="documentation"/>
+    <author>
+      <name>Daniel Kufner</name>
+      <email>daniel.kufner@wu.ac.at</email>
+      <uri>https://www.wu.ac.at/bibliothek</uri>
+    </author>
+    <contributor>
+      <name>Georg Mayr-Duffner</name>
+      <email>georg.mayr-duffner@wu.ac.at</email>
+      <uri>https://www.wu.ac.at/bibliothek</uri>
+    </contributor>
+    <category citation-format="note"/>
+    <category field="social_science"/>
+    <updated>2021-06-15T12:27:39+02:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="de">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="volume" form="short">Nr.</term>
+      <term name="retrieved">zugegriffen am</term>
+      <term name="anonymous">ohne VerfasserIn</term>
+      <term name="anonymous" form="short">o. V.</term>
+      <term name="accessed">Zugriff am</term>
+      <term name="section" form="short">
+        <single>Abs.</single>
+        <multiple>Abs.</multiple>
+      </term>
+      <term name="editor" form="short">Hrsg.</term>
+      <term name="edition">Aufl.</term>
+      <term name="issue" form="short">Jg.</term>
+      <term name="page" form="short">S.</term>
+      <term name="in press">vom</term>
+    </terms>
+  </locale>
+  <macro name="u__author">
+    <names variable="author">
+      <name delimiter="/" delimiter-precedes-last="never" et-al-min="11" et-al-use-first="10" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor author"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="u__author-short">
+    <choose>
+      <if type="bill legislation legal_case interview" match="any">
+        <text variable="title" form="short"/>
+      </if>
+      <else>
+        <names variable="author">
+          <name form="short" delimiter="/" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
+          <substitute>
+            <names variable="editor author"/>
+            <text macro="u__noauthor"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="u__edition-publisher-place-date">
+    <choose>
+      <if type="article-newspaper legislation webpage" match="none">
+        <group delimiter=" ">
+          <group delimiter=" ">
+            <group>
+              <choose>
+                <if match="any" is-numeric="edition">
+                  <number suffix=". " variable="edition"/>
+                  <text term="edition" suffix=", "/>
+                </if>
+                <else>
+                  <text variable="edition"/>
+                </else>
+              </choose>
+              <text variable="publisher-place"/>
+            </group>
+          </group>
+          <text macro="u__issued"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="b__access">
+    <choose>
+      <if type="broadcast post-weblog webpage" match="none">
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="DOI: "/>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="URL"/>
+              <date form="numeric" variable="accessed" prefix="(" suffix=")"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="u__noauthor">
+    <text value="o.V."/>
+  </macro>
+  <macro name="sort_key">
+    <choose>
+      <if type="interview" match="any">
+        <text value="1"/>
+      </if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="b__author">
+    <choose>
+      <if type="legislation bill legal_case" match="any">
+        <choose>
+          <if match="any" variable="author">
+            <group delimiter=" ">
+              <names variable="author"/>
+              <text term="editor" form="short" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" - ">
+              <text variable="title-short"/>
+              <text variable="title"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <text macro="u__author"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="b__label">
+    <group delimiter=" " suffix=":">
+      <text macro="u__author-short"/>
+      <text macro="u__date"/>
+    </group>
+  </macro>
+  <macro name="b__collection_container">
+    <choose>
+      <if type="article article-journal article-magazine" match="any">
+        <group delimiter=": ">
+          <text term="in"/>
+          <group delimiter=", ">
+            <text variable="container-title"/>
+            <text variable="collection-title"/>
+            <group delimiter=" ">
+              <text variable="issue" form="short" suffix="."/>
+              <text term="issue" form="short"/>
+              <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+            </group>
+            <group delimiter=" ">
+              <text term="volume" form="short"/>
+              <text variable="volume"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-newspaper" match="any">
+        <group delimiter=": ">
+          <text term="in"/>
+          <group delimiter=", ">
+            <group>
+              <text variable="container-title"/>
+              <text variable="collection-title"/>
+            </group>
+            <group delimiter=" ">
+              <choose>
+                <if match="any" variable="edition">
+                  <text value="Nr."/>
+                  <text variable="edition"/>
+                  <text term="in press"/>
+                </if>
+              </choose>
+              <date form="text" date-parts="year-month-day" variable="issued"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="broadcast post-weblog webpage" match="any">
+        <group delimiter=" ">
+          <group delimiter=": ">
+            <text term="in"/>
+            <text variable="URL"/>
+          </group>
+          <date form="text" variable="accessed" prefix="(" suffix=")"/>
+        </group>
+      </else-if>
+      <else-if type="bill legal_case legislation" match="any">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="container-title"/>
+            <text variable="volume"/>
+            <group delimiter="/">
+              <text variable="number"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+          <group delimiter=" ">
+            <text value="idF."/>
+            <text variable="references"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter" match="any">
+        <group delimiter=": ">
+          <text term="in"/>
+          <names variable="editor translator" delimiter=", ">
+            <name delimiter="/" delimiter-precedes-last="always" et-al-min="11" et-al-use-first="10" initialize-with="." name-as-sort-order="all"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+          <text variable="container-title"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="u__issued">
+    <choose>
+      <if match="any" variable="issued">
+        <date date-parts="year" form="text" variable="issued"/>
+      </if>
+      <else>
+        <text term="no date" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="b__locator">
+    <group delimiter=" ">
+      <text term="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="u__date">
+    <group prefix="(" suffix=")">
+      <choose>
+        <if match="any" variable="issued">
+          <date date-parts="year" form="text" variable="issued"/>
+          <text variable="year-suffix"/>
+        </if>
+        <else>
+          <text term="no date"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
+    <layout delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="u__author-short"/>
+          <text macro="u__date"/>
+        </group>
+        <choose>
+          <if type="broadcast post post-weblog webpage" match="any">
+            <text variable="container-title"/>
+          </if>
+        </choose>
+        <group delimiter=" ">
+          <label text-case="capitalize-first" variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="3" et-al-use-first="1">
+    <sort>
+      <key macro="sort_key"/>
+      <key macro="u__author-short"/>
+      <key variable="issued"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="interview" match="any">
+          <group delimiter=" ">
+            <text macro="b__label"/>
+            <group delimiter=", ">
+              <text macro="u__author"/>
+              <group delimiter=" ">
+                <text value="am"/>
+                <date form="numeric" variable="issued"/>
+              </group>
+            </group>
+          </group>
+        </if>
+        <else>
+          <group delimiter=" ">
+            <text macro="b__label" font-weight="bold"/>
+            <group delimiter=": ">
+              <text macro="b__author"/>
+              <group delimiter=", ">
+                <text variable="title"/>
+                <text macro="b__collection_container"/>
+                <text macro="u__edition-publisher-place-date"/>
+                <text macro="b__locator"/>
+                <text macro="b__access"/>
+              </group>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>