From 188e1e34873c5bbdfde83bf2fa69cd213c4a3b35 Mon Sep 17 00:00:00 2001
From: github actions <jabrefmail+webfeedback@gmail.com>
Date: Sun, 15 Nov 2020 02:19:45 +0000
Subject: [PATCH] Squashed 'src/main/resources/csl-styles/' changes from
 5297abd6fc..55200d0378
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

55200d0378 Create computational-intelligence.csl (#5102)
6d2efc3dc0 Merge branch 'master' of github.com:citation-style-language/styles
60ab0fb5b4 Add Steinbeis SMI
d5e0130c51 Add AAQR Style
d964f9b354 Create bitonline-publikationen.csl (#5090)
0dc1a5623a Add "APA 7th edition" to Norsk APA style titles (#5098)
3b6aaf7f08 Update norsk-apa-manual.csl (#5095)
0139c6394f Create technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl (#5034)
fdc4497faa Update universidade-estadual-de-alagoas-abnt (#5085)
afdc2ea9d5 Create revista-espanola-de-nutricion-humana-y-dietetica.csl (#5082)
939189d7fd Create citation-compass-apa-note-no.csl (#5060)
414f5e601d  brazilian-journal-of-veterinary-research: add bib sorting (#5091)
dbae9d7041 Add DOI to Thieme German
f4399aa413 APA: match="any" bugfixes (#5092)
d0cc2c434e Add APA numeric and update BioEssays (#5089)
5c376b838b Create karlstad-universitet-kau-harvard-swedish.csl (#5083)
6a62c24862 Create ucl-institute-of-education-harvard.csl (#5084)
4d1bbb009b Update ferdinand-porsche-fern-fachhochschule.csl (#5073)
3a9f494d57 Update cureus.csl (#5087)
181c0ddd82 Create apa-no.csl (#5059)
651ce48c1a Some fixes for Advanced Functional Materials (#5080)
4e3297ad48 Acta Zoologica Hungarica: Don't demote nd particles
c659df790b Create medicina-delle-dipendenze-italian-journal-of-the-addictions.csl (#5078)
d243055098 Update geografia-fisica-e-dinamica-quaternaria.csl (#5079)
1ee380933c Update mcgill-en.csl (#5076)
949cdc6c19 Update mcgill-fr.csl (#5075)
ee7d4e1647 Create chem-catalysis.csl (#5074)
ec9faec562 Switch Molecular Therapy to Cell (#5070)
cf6034cd3a Switch Elsevier to their own ad-vancouver (#5072)
78cca139cd Updates in research-institute-for-nature-and-forest.csl (#4958)
68b747879b Update journal-of-neolithic-archaeology.csl (#5065)
524ba934ca Create offa.csl (#5066)
9713a82e96 Update associacao-brasileira-de-normas-tecnicas-ufrgs-note-initials-with-ibid (#5067)
44449df8e5 Uodate associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl (#5061)
baf9efa56f Create İstanbul Üniversitesi Sosyal Bilimler Enstitüsü Ali Ekber Çına… (#5064)
c5c3531066 Fix CORR
853a8049bb Major Update mcgill-fr.csl to 9th ed. (#5057)
d3e2cd9b90 Update mcgill-en.csl (#5056)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 55200d037850d0848b22cd1839c0d3b11165e3ac
---
 ...ogica-academiae-scientiarum-hungaricae.csl |    2 +-
 advanced-functional-materials.csl             |   86 +-
 aerosol-and-air-quality-research.csl          |  212 ++
 apa-6th-edition-no-ampersand.csl              |    6 +-
 apa-6th-edition.csl                           |    6 +-
 apa-annotated-bibliography.csl                |   10 +-
 apa-cv.csl                                    |    6 +-
 apa-no-ampersand.csl                          |   10 +-
 apa-no-doi-no-issue.csl                       |    6 +-
 apa-numeric-superscript-brackets.csl          | 1711 +++++++++++++++++
 apa-numeric-superscript.csl                   | 1711 +++++++++++++++++
 apa-old-doi-prefix.csl                        |    6 +-
 apa-single-spaced.csl                         |   10 +-
 apa-with-abstract.csl                         |   10 +-
 apa.csl                                       |   10 +-
 ...eira-de-normas-tecnicas-ufrgs-initials.csl |  970 ++++++----
 ...tecnicas-ufrgs-note-initials-with-ibid.csl | 1679 ++++++++++------
 bioessays.csl                                 |   81 -
 bitonline.csl                                 |  479 +++++
 ...veterinary-research-and-animal-science.csl |    6 +-
 ...ical-orthopaedics-and-related-research.csl |    6 +-
 cureus.csl                                    |    2 +-
 dependent/animal-nutrition.csl                |    4 +-
 dependent/bioessays.csl                       |   16 +
 dependent/biotechnology-journal.csl           |   17 +
 dependent/chem-catalysis.csl                  |   16 +
 dependent/clinical-neurophysiology.csl        |    4 +-
 dependent/computational-intelligence.csl      |   15 +
 ...journal-of-technology-law-and-practice.csl |    6 +-
 dependent/computers-and-security.csl          |    4 +-
 ...ic-microbiology-and-infectious-disease.csl |    4 +-
 ...ational-journal-of-infectious-diseases.csl |    4 +-
 ...national-journal-of-womens-dermatology.csl |    4 +-
 ...tive-dermatology-symposium-proceedings.csl |    4 +-
 dependent/journal-of-orthopaedic-science.csl  |    4 +-
 ...mechanics-and-geotechnical-engineering.csl |    4 +-
 ...erapy-methods-and-clinical-development.csl |    4 +-
 dependent/molecular-therapy-nucleic-acids.csl |    4 +-
 dependent/molecular-therapy-oncolytics.csl    |    4 +-
 dependent/molecular-therapy.csl               |   17 +
 ...ista-brasileira-de-ciencias-do-esporte.csl |    4 +-
 dependent/sexologies.csl                      |    4 +-
 ...atial-and-spatio-temporal-epidemiology.csl |    4 +-
 dependent/spine-deformity.csl                 |   11 +-
 ferdinand-porsche-fern-fachhochschule.csl     |   93 +-
 geografia-fisica-e-dinamica-quaternaria.csl   |    6 +-
 ...-polymer-analysis-and-characterization.csl |    2 +-
 ...universitesi-sosyal-bilimler-enstitusu.csl | 1536 +++++++++++++++
 journal-of-neolithic-archaeology.csl          |   65 +-
 karlstad-universitet-harvard.csl              |  360 ++++
 mcgill-en.csl                                 |  235 ++-
 mcgill-fr.csl                                 | 1475 +++++---------
 ...enze-italian-journal-of-the-addictions.csl |  183 ++
 molecular-therapy.csl                         |  116 --
 norsk-apa-manual-note.csl                     | 1623 ++++++++++++++++
 norsk-apa-manual.csl                          | 1652 ++++++++++++++++
 offa.csl                                      |  425 ++++
 research-institute-for-nature-and-forest.csl  |  166 +-
 ...panola-de-nutricion-humana-y-dietetica.csl |  214 +++
 spec/spec_helper.rb                           |    5 +
 ...le-school-of-management-and-innovation.csl |  236 +++
 ...chaftslehre-rechnungswesen-controlling.csl | 1657 ++++++++++++++++
 thieme-german.csl                             |   32 +-
 ucl-institute-of-education-harvard.csl        |  305 +++
 universidade-estadual-de-alagoas-abnt.csl     |   14 +-
 65 files changed, 15101 insertions(+), 2482 deletions(-)
 create mode 100644 aerosol-and-air-quality-research.csl
 create mode 100644 apa-numeric-superscript-brackets.csl
 create mode 100644 apa-numeric-superscript.csl
 delete mode 100644 bioessays.csl
 create mode 100644 bitonline.csl
 create mode 100644 dependent/bioessays.csl
 create mode 100644 dependent/biotechnology-journal.csl
 create mode 100644 dependent/chem-catalysis.csl
 create mode 100644 dependent/computational-intelligence.csl
 create mode 100644 dependent/molecular-therapy.csl
 create mode 100644 istanbul-universitesi-sosyal-bilimler-enstitusu.csl
 create mode 100644 karlstad-universitet-harvard.csl
 create mode 100644 medicina-delle-dipendenze-italian-journal-of-the-addictions.csl
 delete mode 100644 molecular-therapy.csl
 create mode 100644 norsk-apa-manual-note.csl
 create mode 100644 norsk-apa-manual.csl
 create mode 100644 offa.csl
 create mode 100644 revista-espanola-de-nutricion-humana-y-dietetica.csl
 create mode 100644 steinbeis-hochschule-school-of-management-and-innovation.csl
 create mode 100644 technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
 create mode 100644 ucl-institute-of-education-harvard.csl

diff --git a/acta-zoologica-academiae-scientiarum-hungaricae.csl b/acta-zoologica-academiae-scientiarum-hungaricae.csl
index 5d79a65202e..f28ad88a18a 100644
--- a/acta-zoologica-academiae-scientiarum-hungaricae.csl
+++ b/acta-zoologica-academiae-scientiarum-hungaricae.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="symbol" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="symbol" default-locale="en-GB" demote-non-dropping-particle="never">
   <info>
     <title>Acta Zoologica Academiae Scientiarum Hungaricae</title>
     <id>http://www.zotero.org/styles/acta-zoologica-academiae-scientiarum-hungaricae</id>
diff --git a/advanced-functional-materials.csl b/advanced-functional-materials.csl
index a38105d070b..e831f791acb 100644
--- a/advanced-functional-materials.csl
+++ b/advanced-functional-materials.csl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-US">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Advanced Functional Materials</title>
     <id>http://www.zotero.org/styles/advanced-functional-materials</id>
@@ -15,6 +14,9 @@
       <name>Ivan Bushmarinov</name>
       <email>ib@ineos.ac.ru</email>
     </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="chemistry"/>
     <issn>1616-301X</issn>
@@ -24,19 +26,23 @@
     <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">
-    <names variable="editor">
+    <names variable="editor" prefix="(" suffix=")">
+      <label form="short" suffix=": " text-case="capitalize-first"/>
       <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter="; " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="capitalize-first"/>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
       <name delimiter=", " delimiter-precedes-last="always" initialize-with=". "/>
       <label form="short" prefix=", " text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
     </names>
   </macro>
   <macro name="publisher">
-    <group delimiter=": ">
+    <group delimiter=", ">
       <text variable="publisher"/>
       <text variable="publisher-place"/>
     </group>
@@ -47,12 +53,16 @@
       <text variable="volume"/>
     </group>
   </macro>
-  <macro name="series">
-    <text variable="collection-title"/>
-  </macro>
   <macro name="pages">
-    <label variable="page" form="short" suffix=" "/>
-    <text variable="page"/>
+    <choose>
+      <if variable="page" match="any">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </if>
+      <else-if type="article-journal">
+        <text variable="DOI" prefix="DOI "/>
+      </else-if>
+    </choose>
   </macro>
   <macro name="book-container">
     <group delimiter=" ">
@@ -61,7 +71,7 @@
     </group>
   </macro>
   <macro name="issued">
-    <date variable="issued" delimiter=" ">
+    <date variable="issued" delimiter=" " font-weight="bold">
       <date-part name="year"/>
     </date>
   </macro>
@@ -119,58 +129,38 @@
             <text macro="pages"/>
           </group>
         </else-if>
-        <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-          <group delimiter="; ">
-            <text variable="title" font-style="italic"/>
-            <text macro="editor" prefix=" "/>
-            <text macro="series"/>
-            <text macro="edition"/>
-            <group delimiter=", ">
-              <text macro="publisher"/>
-              <text macro="issued"/>
-            </group>
-            <group delimiter=", ">
-              <text macro="volume"/>
-              <text macro="pages"/>
-            </group>
-          </group>
-        </else-if>
         <else-if type="chapter paper-conference" match="any">
-          <group delimiter="; ">
-            <text macro="book-container"/>
-            <text macro="editor"/>
-            <text macro="series"/>
-            <group delimiter=", ">
-              <text macro="publisher"/>
-              <text macro="issued"/>
-            </group>
-            <group delimiter=", ">
-              <text macro="volume"/>
-              <text macro="pages"/>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text macro="book-container"/>
+              <text macro="editor"/>
             </group>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="pages"/>
           </group>
         </else-if>
-        <else-if type="article-journal">
+        <else-if type="article-journal article-magazine" match="any">
           <group delimiter=" ">
             <text variable="container-title" font-style="italic" form="short"/>
             <group delimiter=", ">
-              <text macro="issued" font-weight="bold"/>
+              <text macro="issued"/>
               <text variable="volume" font-style="italic"/>
               <text variable="page-first" form="long"/>
             </group>
           </group>
         </else-if>
         <else>
-          <group delimiter=" ">
-            <group delimiter=". ">
-              <text variable="title"/>
-              <text variable="container-title" font-style="italic" form="short"/>
-            </group>
-            <group delimiter=", ">
-              <text macro="issued" font-weight="bold"/>
-              <text variable="volume" font-style="italic"/>
-              <text variable="page"/>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text variable="title" font-style="italic"/>
+              <text macro="editor"/>
             </group>
+            <text macro="edition"/>
+            <text macro="volume"/>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="pages"/>
           </group>
         </else>
       </choose>
diff --git a/aerosol-and-air-quality-research.csl b/aerosol-and-air-quality-research.csl
new file mode 100644
index 00000000000..775c7133d72
--- /dev/null
+++ b/aerosol-and-air-quality-research.csl
@@ -0,0 +1,212 @@
+<?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>Aerosol and Air Quality Research</title>
+    <title-short>AAQR</title-short>
+    <id>http://www.zotero.org/styles/aerosol-and-air-quality-research</id>
+    <link href="http://www.zotero.org/styles/aerosol-and-air-quality-research" rel="self"/>
+    <link href="http://www.zotero.org/styles/elsevier-harvard" rel="template"/>
+    <link href="https://aaqr.org/page/instructions-for-authors" rel="documentation"/>
+    <author>
+      <name>Sebastian Karcher</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="engineering"/>
+    <issn>1680-8584</issn>
+    <eissn>2071-1409</eissn>
+    <updated>2020-11-12T00:09: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>
+        <text variable="container-title"/>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="container-title" prefix=", "/>
+      </else-if>
+      <else-if type="article-journal" match="any">
+        <text variable="container-title" form="short" prefix=". "/>
+      </else-if>
+      <else>
+        <text variable="container-title" prefix=". "/>
+      </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/"/>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <group delimiter=" ">
+          <text value="URL"/>
+          <text variable="URL"/>
+          <group prefix="(" suffix=").">
+            <text term="accessed" suffix=" "/>
+            <date variable="accessed" delimiter=" ">
+              <date-part name="day"/>
+              <date-part name="month"/>
+              <date-part name="year"/>
+            </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>
+        <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"/>
+          </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>
+            <label variable="page" form="short" suffix=" "/>
+            <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" et-al-min="21" et-al-use-first="20">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <text macro="author"/>
+        <text macro="issued" prefix=" (" suffix=")"/>
+        <group>
+          <text macro="title" prefix=". "/>
+          <text macro="container"/>
+          <text macro="locators"/>
+        </group>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl
index c3b16aabf24..3b4d4b6f42a 100644
--- a/apa-6th-edition-no-ampersand.csl
+++ b/apa-6th-edition-no-ampersand.csl
@@ -290,7 +290,7 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                     <text macro="title"/>
                   </if>
                   <else>
@@ -401,7 +401,7 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                     <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
@@ -1381,7 +1381,7 @@
       <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">
+      <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"/>
diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
index f49c6b13532..4114521112b 100644
--- a/apa-6th-edition.csl
+++ b/apa-6th-edition.csl
@@ -289,7 +289,7 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                     <text macro="title"/>
                   </if>
                   <else>
@@ -400,7 +400,7 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                     <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
@@ -1380,7 +1380,7 @@
       <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">
+      <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"/>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index fc8408bc01a..2ea93096231 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -387,7 +387,7 @@
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
       </if>
-      <else-if type="interview personal_communication">
+      <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 -->
@@ -543,7 +543,7 @@
             </choose>
             <group>
               <choose>
-                <if type="interview personal_communication">
+                <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. 
@@ -611,7 +611,7 @@
       </else-if>
       <else>
         <choose>
-          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+          <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">
@@ -728,7 +728,7 @@
             </group>
           </group>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For post webpage, container-title is treated as publisher -->
           <group delimiter="; ">
             <text macro="secondary-contributors"/>
@@ -1508,7 +1508,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For websites, treat container title like publisher -->
           <group delimiter="; ">
             <text variable="container-title" text-case="title"/>
diff --git a/apa-cv.csl b/apa-cv.csl
index a04e8b77942..3c5a048c148 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -499,7 +499,7 @@
       </else-if>
       <else>
         <choose>
-          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+          <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">
@@ -565,7 +565,7 @@
             </group>
           </group>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For post webpage, container-title is treated as publisher -->
           <group delimiter="; ">
             <text macro="secondary-contributors"/>
@@ -1255,7 +1255,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For websites, treat container title like publisher -->
           <group delimiter="; ">
             <text variable="container-title" text-case="title"/>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 4743fc42f36..70d3b885695 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -387,7 +387,7 @@
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
       </if>
-      <else-if type="interview personal_communication">
+      <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 -->
@@ -543,7 +543,7 @@
             </choose>
             <group>
               <choose>
-                <if type="interview personal_communication">
+                <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. 
@@ -611,7 +611,7 @@
       </else-if>
       <else>
         <choose>
-          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+          <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">
@@ -728,7 +728,7 @@
             </group>
           </group>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For post webpage, container-title is treated as publisher -->
           <group delimiter="; ">
             <text macro="secondary-contributors"/>
@@ -1508,7 +1508,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For websites, treat container title like publisher -->
           <group delimiter="; ">
             <text variable="container-title" text-case="title"/>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 03ca7ff86be..38fdd454a98 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -290,7 +290,7 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                     <text macro="title"/>
                   </if>
                   <else>
@@ -401,7 +401,7 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                     <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
@@ -1394,7 +1394,7 @@
       <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">
+      <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"/>
diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
new file mode 100644
index 00000000000..836b4a003e3
--- /dev/null
+++ b/apa-numeric-superscript-brackets.csl
@@ -0,0 +1,1711 @@
+<?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">
+  <info>
+    <title>American Psychological Association 7th edition (numeric, brackets)</title>
+    <title-short>APA (numeric, superscript, brackets)</title-short>
+    <summary>APA style, with numeric in-text citations in brackets</summary>
+    <id>http://www.zotero.org/styles/apa-numeric-superscript-brackets</id>
+    <link href="http://www.zotero.org/styles/apa-numeric-superscript-brackets" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
+    <author>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <updated>2019-12-04T13: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>
+  <locale xml:lang="af">
+    <terms>
+      <term name="letter">persoonlike kommunikasie</term>
+      <term name="letter" form="short">brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ar">
+    <terms>
+      <term name="letter">اتصال شخصي</term>
+      <term name="letter" form="short">خطاب</term>
+    </terms>
+  </locale>
+  <locale xml:lang="da">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikation</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">persönliche Kommunikation</term>
+      <term name="letter" form="short">Brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="es">
+    <terms>
+      <term name="from">de</term>
+      <term name="letter">comunicación personal</term>
+      <term name="letter" form="short">carta</term>
+    </terms>
+  </locale>
+  <locale xml:lang="fr">
+    <terms>
+      <term name="letter">communication personnelle</term>
+      <term name="letter" form="short">lettre</term>
+      <term name="editor" form="short">
+        <single>éd.</single>
+        <multiple>éds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <locale xml:lang="nb">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikasjon</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nl">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">persoonlijke communicatie</term>
+      <term name="letter" form="short">brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nn">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikasjon</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ru">
+    <terms>
+      <term name="letter">личная переписка</term>
+      <term name="letter" form="short">письмо</term>
+    </terms>
+  </locale>
+  <locale xml:lang="tr">
+    <terms>
+      <term name="letter">kişisel iletişim</term>
+      <term name="letter" form="short">mektup</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 and title case -->
+        <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"/>
+          </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"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic"/>
+      </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"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic"/>
+      </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"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic"/>
+      </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 collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," prefix="[" suffix="]" vertical-align="sup">
+      <group>
+        <text variable="citation-number"/>
+        <text macro="citation-locator" prefix="(" suffix=")"/>
+      </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">
+    <layout>
+      <group delimiter=". ">
+        <text variable="citation-number"/>
+        <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>
+      </group>
+    </layout>
+  </bibliography>
+</style>
\ No newline at end of file
diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
new file mode 100644
index 00000000000..f1398664d5d
--- /dev/null
+++ b/apa-numeric-superscript.csl
@@ -0,0 +1,1711 @@
+<?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">
+  <info>
+    <title>American Psychological Association 7th edition (numeric, superscript)</title>
+    <title-short>APA (numeric)</title-short>
+    <summary>APA style, with superscript numeric in-text citations</summary>
+    <id>http://www.zotero.org/styles/apa-numeric-superscript</id>
+    <link href="http://www.zotero.org/styles/apa-numeric-superscript" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
+    <author>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <updated>2019-12-04T13: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>
+  <locale xml:lang="af">
+    <terms>
+      <term name="letter">persoonlike kommunikasie</term>
+      <term name="letter" form="short">brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ar">
+    <terms>
+      <term name="letter">اتصال شخصي</term>
+      <term name="letter" form="short">خطاب</term>
+    </terms>
+  </locale>
+  <locale xml:lang="da">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikation</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">persönliche Kommunikation</term>
+      <term name="letter" form="short">Brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="es">
+    <terms>
+      <term name="from">de</term>
+      <term name="letter">comunicación personal</term>
+      <term name="letter" form="short">carta</term>
+    </terms>
+  </locale>
+  <locale xml:lang="fr">
+    <terms>
+      <term name="letter">communication personnelle</term>
+      <term name="letter" form="short">lettre</term>
+      <term name="editor" form="short">
+        <single>éd.</single>
+        <multiple>éds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <locale xml:lang="nb">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikasjon</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nl">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">persoonlijke communicatie</term>
+      <term name="letter" form="short">brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nn">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikasjon</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ru">
+    <terms>
+      <term name="letter">личная переписка</term>
+      <term name="letter" form="short">письмо</term>
+    </terms>
+  </locale>
+  <locale xml:lang="tr">
+    <terms>
+      <term name="letter">kişisel iletişim</term>
+      <term name="letter" form="short">mektup</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 and title case -->
+        <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"/>
+          </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"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic"/>
+      </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"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic"/>
+      </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"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic"/>
+      </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 collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <group>
+        <text variable="citation-number"/>
+        <text macro="citation-locator" prefix="(" suffix=")"/>
+      </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">
+    <layout>
+      <group delimiter=". ">
+        <text variable="citation-number"/>
+        <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>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index a7ef73be8aa..1c1dec0426a 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -290,7 +290,7 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                     <text macro="title"/>
                   </if>
                   <else>
@@ -401,7 +401,7 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
                     <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
@@ -1381,7 +1381,7 @@
       <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">
+      <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"/>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index 0b5a864b3aa..6f8d6b58238 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -387,7 +387,7 @@
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
       </if>
-      <else-if type="interview personal_communication">
+      <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 -->
@@ -543,7 +543,7 @@
             </choose>
             <group>
               <choose>
-                <if type="interview personal_communication">
+                <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. 
@@ -611,7 +611,7 @@
       </else-if>
       <else>
         <choose>
-          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+          <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">
@@ -728,7 +728,7 @@
             </group>
           </group>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For post webpage, container-title is treated as publisher -->
           <group delimiter="; ">
             <text macro="secondary-contributors"/>
@@ -1508,7 +1508,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For websites, treat container title like publisher -->
           <group delimiter="; ">
             <text variable="container-title" text-case="title"/>
diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
index 491f4463c81..de72d5c31ca 100644
--- a/apa-with-abstract.csl
+++ b/apa-with-abstract.csl
@@ -387,7 +387,7 @@
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
       </if>
-      <else-if type="interview personal_communication">
+      <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 -->
@@ -543,7 +543,7 @@
             </choose>
             <group>
               <choose>
-                <if type="interview personal_communication">
+                <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. 
@@ -611,7 +611,7 @@
       </else-if>
       <else>
         <choose>
-          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+          <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">
@@ -728,7 +728,7 @@
             </group>
           </group>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For post webpage, container-title is treated as publisher -->
           <group delimiter="; ">
             <text macro="secondary-contributors"/>
@@ -1508,7 +1508,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For websites, treat container title like publisher -->
           <group delimiter="; ">
             <text variable="container-title" text-case="title"/>
diff --git a/apa.csl b/apa.csl
index a5841ca76f9..3389918a90a 100644
--- a/apa.csl
+++ b/apa.csl
@@ -387,7 +387,7 @@
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
       </if>
-      <else-if type="interview personal_communication">
+      <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 -->
@@ -543,7 +543,7 @@
             </choose>
             <group>
               <choose>
-                <if type="interview personal_communication">
+                <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. 
@@ -611,7 +611,7 @@
       </else-if>
       <else>
         <choose>
-          <if type="article-journal article-magazine article-newspaper post-weblog review review-book">
+          <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">
@@ -728,7 +728,7 @@
             </group>
           </group>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For post webpage, container-title is treated as publisher -->
           <group delimiter="; ">
             <text macro="secondary-contributors"/>
@@ -1508,7 +1508,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="post webpage">
+        <else-if type="post webpage" match="any">
           <!-- For websites, treat container title like publisher -->
           <group delimiter="; ">
             <text variable="container-title" text-case="title"/>
diff --git a/associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl b/associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl
index 11f56c43d7a..1347d01a892 100644
--- a/associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl
+++ b/associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl
@@ -1,13 +1,28 @@
 <?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="pt-BR">
+<!-- XML Declaration: não é preciso alterar -->
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" demote-non-dropping-particle="never" page-range-format="expanded" default-locale="pt-BR">
   <info>
     <title>Universidade Federal do Rio Grande do Sul - ABNT (autoria abreviada) (Portuguese - Brazil)</title>
     <title-short>UFRGS-ABNT</title-short>
     <id>http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs-initials</id>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs-initials" rel="self"/>
-    <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs" rel="template"/>
+    <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ipea" rel="template"/>
+    <!-- Estilo original utilizado como modelo -->
+    <!-- Para autor ficar com nome completo, é necessário preencher com nome completo dos autores na biblioteca. Ver documentação sobre preenchimento dos campos básicos para ABNT -->
     <link href="https://www.ufrgs.br/bibliotecas/campos-basicos-abnt-mendeley" rel="documentation"/>
+    <!-- Para alguns itens do Mendeley é necessário incluir novos campos -->
     <link href="https://www.ufrgs.br/bibliotecas/campos-basicos-abnt-zotero" rel="documentation"/>
+    <!-- Para alguns itens do Zotero é necessário utilizar o campo "extra". Exemplo: incluir "publisher-place:" para artigos de periódico.  -->
+    <author>
+      <name>Priscila Saraiva Jacobsen</name>
+      <email>jacobsen@bc.ufrgs.br</email>
+      <uri>https://www.ufrgs.br/bibliotecas/</uri>
+    </author>
+    <author>
+      <name>Luísia Feichas Alves</name>
+      <email>luisia.alves@bc.ufrgs.br</email>
+      <uri>https://www.zotero.org/luisiafalves</uri>
+    </author>
     <author>
       <name>José Antonio Meira da Rocha</name>
       <email>joseantoniorocha@gmail.com</email>
@@ -18,14 +33,6 @@
       <email>fernando.bruno@ufrgs.br</email>
       <uri>http://www.pgdesign.ufrgs.br/</uri>
     </author>
-    <author>
-      <name>Priscila Saraiva Jacobsen</name>
-      <email>jacobsen@bc.ufrgs.br</email>
-    </author>
-    <author>
-      <name>Luísia Alves</name>
-      <email>luisia.alves@bc.ufrgs.br</email>
-    </author>
     <author>
       <name>Kelson Anthony de Menezes</name>
       <email>kanthony@ebsco.com</email>
@@ -43,196 +50,291 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>The Brazilian Standard Style in accordance with ABNT-NBR 10520.2002 and ABNT-NBR 6023.2018</summary>
-    <updated>2020-03-06T09:31:45+00:00</updated>
+    <updated>2020-10-06T01:42:52+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="pt-BR">
     <terms>
-      <term name="month-01" form="short">jan.</term>
-      <term name="month-02" form="short">fev.</term>
-      <term name="month-03" form="short">mar.</term>
-      <term name="month-04" form="short">abr.</term>
-      <term name="month-05" form="short">maio</term>
-      <term name="month-06" form="short">jun.</term>
-      <term name="month-07" form="short">jul.</term>
-      <term name="month-08" form="short">ago.</term>
-      <term name="month-09" form="short">set.</term>
-      <term name="month-10" form="short">out.</term>
-      <term name="month-11" form="short">nov.</term>
-      <term name="month-12" form="short">dez.</term>
-      <!--ABNT 6023:2018 - 8.1.1.4 sempre no singular-->
-      <term name="editor" form="short">org.</term>
-      <!--usando editor de coleção para quando for editor do livro-->
-      <term name="collection-editor" form="short">ed.</term>
+      <term name="editor" form="short">org</term>
+      <!-- ABNT 6023:2018 - 8.1.1.4 sempre no singular -->
+      <term name="collection-editor" form="short">ed</term>
+      <!-- usando editor de coleção para quando for editor do livro -->
+      <term name="accessed">acesso</term>
+      <term name="composer">compositor</term>
+      <term name="recipient">destinatário</term>
+      <term name="interviewer">entrevistador</term>
+      <term name="director">direção</term>
+      <term name="translator">tradução</term>
+      <term name="volume" form="short">
+        <single>v.</single>
+        <multiple>v.</multiple>
+      </term>
+      <term name="issue" form="short">n.</term>
     </terms>
   </locale>
   <macro name="container-contributors">
+    <!-- Macro responsavel por mostrar os nomes dos organizadores ou editores -->
     <choose>
-      <if type="chapter">
+      <if type="chapter entry-dictionary entry-encyclopedia">
         <names variable="container-author" delimiter=", ">
           <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
             <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
           </name>
           <label form="short" prefix=" (" suffix=".)"/>
           <et-al font-style="italic"/>
           <substitute>
-            <!--ABNT 6023:2018 - quando for organizador-->
             <names variable="editor"/>
-            <!--ABNT 6023:2018 - quando for editor, mesmo que apenas do livro no todo-->
+            <!-- ABNT 6023:2018 - quando for organizador -->
             <names variable="collection-editor"/>
+            <!-- ABNT 6023:2018 - quando for editor, mesmo que apenas do livro no todo -->
           </substitute>
         </names>
       </if>
     </choose>
   </macro>
   <macro name="secondary-contributors">
+    <!-- Macro responsavel por mostrar os nomes dos organizadores do livro no todo quando um capítulo de livro -->
     <choose>
       <if type="chapter" match="none">
         <names variable="editor" delimiter="; " prefix=" (" suffix=")">
-          <name initialize-with=". " delimiter=", "/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
           <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
         </names>
       </if>
     </choose>
   </macro>
-  <macro name="translator">
-    <text value="Tradução "/>
-    <names variable="translator" delimiter="; ">
-      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
-      <et-al font-style="italic"/>
-    </names>
+  <macro name="author">
+    <!-- Macro responsavel por mostrar o autor -->
+    <choose>
+      <if type="broadcast" match="any">
+        <!-- para transmissões é apresentador -->
+        <text value="Apresentado por "/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </if>
+      <else-if type="motion_picture" match="any">
+        <!-- para filmes é o diretor -->
+        <text term="director" suffix=": " text-case="capitalize-first"/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </else-if>
+      <else-if type="song" match="any">
+        <!-- para músicas é o intérprete -->
+        <text value="Intérprete: "/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </else-if>
+      <else-if type="entry-dictionary entry-encyclopedia" match="any">
+        <names variable="author">
+          <!-- para outros tipos de documentos mantém a posição original -->
+          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
+          <substitute>
+            <!-- na ausência de um autor, utiliza organizador, editor, tradutor ou título  -->
+            <text variable="title" text-case="uppercase"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else>
+        <names variable="author">
+          <!-- para outros tipos de documentos mantém a posição original -->
+          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
+          <substitute>
+            <!-- na ausência de um autor, utiliza organizador, editor, tradutor ou título  -->
+            <names variable="editor"/>
+            <names variable="collection-editor"/>
+            <names variable="translator"/>
+            <text variable="title" text-case="uppercase"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="composer">
-    <text value="Compositor: "/>
+    <!-- Macro responsavel por mostrar o nome do compositor -->
+    <text term="composer" suffix=": " text-case="capitalize-first"/>
     <names variable="composer" delimiter="; ">
       <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
+  <macro name="interviewer">
+    <!-- Macro responsavel por mostrar o nome do entrevistador -->
+    <text term="interviewer" suffix=": " text-case="capitalize-first"/>
+    <names variable="interviewer" delimiter="; ">
+      <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+    </names>
+  </macro>
   <macro name="recipient">
-    <text value="Destinatário: "/>
+    <!-- Macro responsavel por mostrar o nome do destinatário -->
+    <text term="recipient" suffix=": " text-case="capitalize-first"/>
     <names variable="recipient" delimiter="; ">
       <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
-  <macro name="interviewer">
-    <text value="Entrevistador: "/>
-    <names variable="interviewer" delimiter="; ">
-      <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
+  <macro name="translator">
+    <!-- Macro responsavel por mostrar o nome do tradutor -->
+    <text term="translator" suffix=": " text-case="capitalize-first"/>
+    <names variable="translator" delimiter=", ">
+      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
-  <macro name="author">
+  <macro name="author-short">
+    <!-- Macro responsável por mostrar o autor na citação -->
     <choose>
-      <if type="motion_picture broadcast song" match="any">
-        <names variable="author">
-          <name/>
-        </names>
+      <if type="broadcast motion_picture song" match="any">
+        <text variable="title" form="short" text-case="uppercase" quotes="false"/>
       </if>
       <else>
         <names variable="author">
-          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all">
+          <name form="short" delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
             <name-part name="family" text-case="uppercase"/>
+            <name-part name="given" text-case="capitalize-first"/>
           </name>
           <et-al font-style="italic"/>
-          <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
           <substitute>
             <names variable="editor"/>
-            <names variable="collection-editor"/>
             <names variable="translator"/>
-            <text macro="title"/>
+            <choose>
+              <if type="book">
+                <!-- uso do título quando não houver autor -->
+                <text variable="title" form="short" text-case="uppercase"/>
+              </if>
+              <else>
+                <text variable="title" form="short" text-case="uppercase" quotes="false"/>
+              </else>
+            </choose>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
-        <name-part name="family" text-case="uppercase"/>
-        <name-part name="given" text-case="uppercase"/>
-      </name>
-      <et-al font-style="italic"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <choose>
-          <if type="book">
-            <text variable="title" form="short"/>
-          </if>
-          <else-if type="broadcast song motion_picture" match="any">
-            <text variable="title"/>
-          </else-if>
-          <else>
-            <text variable="title" form="short" text-case="uppercase" quotes="false"/>
-          </else>
-        </choose>
-      </substitute>
-    </names>
-  </macro>
   <macro name="access">
-    <choose>
-      <if type="book chapter">
-        <text value="E-book" font-style="italic" suffix="."/>
-      </if>
-    </choose>
+    <!-- Macro utilizada para apresentar a URL do site utilizado e data de acesso -->
     <choose>
       <if variable="DOI" match="any">
-        <text variable="DOI" prefix=" Disponível em: https://doi.org/"/>
-        <group prefix=". Acesso em: " suffix=".">
-          <date variable="accessed">
-            <date-part name="day" suffix=" "/>
-            <date-part name="month" form="short" suffix=". "/>
-            <date-part name="year"/>
-          </date>
+        <!-- Quando houver DOI, utilizá-lo no lugar do link -->
+        <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="DOI" prefix="https://doi.org/"/>
+        <group>
+          <text term="accessed" text-case="capitalize-first" prefix=". " suffix=" "/>
+          <text term="at" text-case="lowercase" suffix=": "/>
+          <text macro="accessed"/>
         </group>
       </if>
       <else-if variable="URL">
-        <text variable="URL" prefix=" Disponível em: "/>
-        <group prefix=". Acesso em: " suffix=".">
-          <date variable="accessed">
-            <date-part name="day" suffix=" "/>
-            <date-part name="month" form="short" suffix=". "/>
-            <date-part name="year"/>
-          </date>
-        </group>
+        <choose>
+          <if type="book chapter">
+            <!-- Quando for livro, incluir a expressão e-book em itálico -->
+            <text value="E-book" font-style="italic" suffix="."/>
+          </if>
+          <else>
+            <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+            <text variable="URL"/>
+            <group>
+              <!-- formato de acesso utiliza a macro accessed -->
+              <text term="accessed" text-case="capitalize-first" prefix=". " suffix=" "/>
+              <text term="at" text-case="lowercase" suffix=": "/>
+              <text macro="accessed"/>
+            </group>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
+  <macro name="accessed">
+    <!-- Macro utilizada para a data de acesso -->
+    <date variable="accessed" suffix="." delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="short"/>
+      <date-part name="year"/>
+    </date>
+  </macro>
   <macro name="title">
+    <!-- Macro responsável por mostrar o título principal de um documento dependendo do tipo. Ainda não é possível diferenciar título de subtítulo -->
     <choose>
-      <if type="chapter article-newspaper article-magazine article-journal paper-conference post-weblog" match="any">
+      <if type="article-journal article-magazine article-newspaper chapter paper-conference post-weblog" match="any">
         <text variable="title" font-weight="normal"/>
       </if>
-      <else-if type="book thesis patent report" match="any">
+      <else-if type="book entry-dictionary entry-encyclopedia patent report thesis" match="any">
         <text variable="title" font-weight="bold"/>
       </else-if>
-      <else-if type="entry-encyclopedia entry-dictionary" match="any">
-        <text variable="title" text-case="uppercase"/>
-      </else-if>
       <else-if type="dataset" match="any">
         <text variable="title" suffix=". "/>
       </else-if>
-      <else-if type="legislation bill legal_case" match="any">
+      <else-if type="bill legal_case legislation" match="any">
         <text variable="title" font-weight="bold"/>
       </else-if>
-      <else-if type="motion_picture broadcast song" match="any">
+      <else-if type="broadcast motion_picture song" match="any">
         <text variable="title" text-case="uppercase" suffix=". "/>
       </else-if>
       <else>
-        <text variable="title" font-weight="bold" suffix=". "/>
+        <text variable="title" font-weight="bold" text-case="capitalize-first" suffix=". "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <!-- Macro responsável por mostrar o título de evento -->
+    <choose>
+      <if type="paper-conference" match="any">
+        <group suffix=". ">
+          <text term="in" text-case="capitalize-first" prefix=" " suffix=": " font-style="italic"/>
+          <choose>
+            <if variable="event" match="any">
+              <text variable="event" text-case="uppercase"/>
+            </if>
+            <else>
+              <text variable="title-short" text-case="uppercase"/>
+              <!--title-short utilizado para nome do evento no Mendeley-->
+            </else>
+          </choose>
+          <text variable="number" prefix=", " suffix="."/>
+          <text macro="issued-year" prefix=", "/>
+          <text macro="event-place" prefix=", "/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event-place">
+    <!-- Macro responsável por mostrar o local do evento. No Zotero utilizar o campo extra quando local de evento e de publicação forem diferentes -->
+    <choose>
+      <if variable="event-place" match="any">
+        <text variable="event-place"/>
+      </if>
+      <else>
+        <text variable="publisher-place"/>
       </else>
     </choose>
   </macro>
   <macro name="container-title">
+    <!-- Macro responsável por mostrar o título do todo, quando parte de um documento -->
     <choose>
       <if type="paper-conference" match="any">
-        <text variable="event" text-case="uppercase"/>
-        <text variable="title-short" text-case="uppercase"/>
-        <text variable="number" prefix=", " suffix=". , "/>
-        <text macro="issued-year" prefix=" " suffix=", "/>
-        <text variable="publisher-place" suffix=". "/>
         <choose>
           <if match="any" variable="container-title">
             <text variable="container-title" font-weight="bold" suffix=". "/>
@@ -245,105 +347,134 @@
       <else-if type="legal_case" match="any">
         <text variable="container-title"/>
       </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
+        <choose>
+          <if variable="container-author editor collection-editor" match="any">
+            <text variable="container-title" font-weight="bold"/>
+          </if>
+          <else>
+            <text variable="container-title" text-case="uppercase"/>
+          </else>
+        </choose>
+      </else-if>
       <else>
         <text variable="container-title" font-weight="bold"/>
       </else>
     </choose>
   </macro>
   <macro name="publisher">
+    <!-- Macro responsável por mostrar os responsáveis pela publicação. No caso de ausência deles, incluir expressões para sem local ou sem editor -->
     <choose>
-      <if match="any" variable="publisher-place publisher">
+      <if variable="publisher-place publisher" match="any">
         <choose>
           <if variable="publisher-place">
             <text variable="publisher-place"/>
           </if>
-          <else-if type="entry-encyclopedia thesis" match="any"/>
-          <else-if type="paper-conference" match="any">
-            <text variable="publisher-place" suffix=". "/>
-          </else-if>
-          <else>
-            <text value="[S. l.]" font-style="italic"/>
-          </else>
-        </choose>
-        <choose>
-          <if variable="publisher">
-            <text variable="publisher" prefix=": " suffix=","/>
-            <text macro="issued"/>
-          </if>
           <else>
-            <text value=" [s. n.]" font-style="italic" prefix=": " suffix=","/>
-            <text macro="issued"/>
+            <text value="s. l." font-style="italic" prefix="[" suffix="]" text-case="capitalize-first"/>
           </else>
         </choose>
+        <group prefix=": " suffix=",">
+          <choose>
+            <if variable="publisher">
+              <text variable="publisher"/>
+            </if>
+            <else>
+              <text value="s. n." font-style="italic" prefix="[" suffix="]"/>
+            </else>
+          </choose>
+        </group>
+        <text macro="issued" prefix=" "/>
       </if>
       <else>
-        <text value="[S. l.: s. n.]" font-style="italic"/>
+        <text value="s. l.: s. n." font-style="italic" prefix="[" suffix="]" text-case="capitalize-first"/>
+        <text macro="issued" prefix=", "/>
       </else>
     </choose>
   </macro>
-  <macro name="event">
-    <choose>
-      <if variable="genre" match="none">
-        <text term="in" text-case="capitalize-first" prefix=" " suffix=": " font-style="italic"/>
-        <text variable="event" text-case="uppercase"/>
-      </if>
-    </choose>
-  </macro>
   <macro name="issued">
+    <!-- Macro responsável por mostrar a data completa de um documento -->
+    <group suffix=". ">
+      <choose>
+        <if is-uncertain-date="issued">
+          <date variable="issued">
+            <date-part name="year" prefix="[" suffix="]"/>
+          </date>
+        </if>
+        <else-if variable="issued" match="any">
+          <choose>
+            <if type="article-newspaper bill interview manuscript patent personal_communication post-weblog song" match="any">
+              <date variable="issued">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" form="short" suffix=" "/>
+              </date>
+            </if>
+          </choose>
+          <date variable="issued" date-parts="year" form="numeric" prefix=" "/>
+        </else-if>
+        <else-if type="article-journal paper-conference" match="any">
+          <choose>
+            <if variable="status" match="any">
+              <text variable="status" font-style="italic"/>
+            </if>
+            <else>
+              <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="issued-year">
+    <!-- Macro responsável por mostrar apenas o ano -->
     <choose>
-      <if variable="issued" match="any">
+      <if variable="event-date" match="any">
+        <date date-parts="year" form="numeric" variable="event-date" prefix=" "/>
+      </if>
+      <else-if is-uncertain-date="issued">
+        <date variable="issued">
+          <date-part name="year" prefix="[" suffix="]"/>
+        </date>
+      </else-if>
+      <else-if variable="issued" match="any">
+        <date date-parts="year" form="numeric" variable="issued" prefix=" "/>
+      </else-if>
+      <else-if type="article-journal">
         <choose>
-          <if type="patent song post-weblog article-newspaper personal_communication" match="any">
-            <date variable="issued" prefix=" " suffix=".">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month" form="short" suffix=" "/>
-              <date-part name="year"/>
-            </date>
+          <if variable="status" match="any">
+            <text variable="status" font-style="italic"/>
           </if>
           <else>
-            <date variable="issued" suffix=".">
-              <date-part name="year" prefix=" "/>
-            </date>
+            <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
           </else>
         </choose>
-      </if>
-      <else>
-        <text value=" [s. d.]" font-style="italic"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="issued-year">
-    <choose>
-      <if variable="issued" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else-if type="paper-conference" match="all">
-        <date date-parts="year" form="numeric" variable="issued">
-          <date-part name="year"/>
-        </date>
       </else-if>
       <else>
-        <text value=" [s. d.]" font-style="italic"/>
+        <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
       </else>
     </choose>
   </macro>
   <macro name="issued-legislation">
-    <date variable="issued">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
+    <!-- Macro responsável por mostrar a data para documentos legislativos -->
+    <date variable="issued" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="short" text-case="lowercase"/>
       <date-part name="year"/>
     </date>
   </macro>
   <macro name="submitted">
-    <date variable="submitted" prefix=" " suffix=".">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" form="short" suffix=" "/>
+    <!-- Macro responsável por mostrar a data de submissão de um documento. Utilizado para patente como data de depósito -->
+    <date variable="submitted" delimiter=" " prefix=" " suffix=".">
+      <date-part name="day"/>
+      <date-part name="month" form="short"/>
       <date-part name="year"/>
     </date>
   </macro>
   <macro name="edition">
+    <!-- Macro responsável por mostrar o número da edição. Atualmente sem diferenciar a língua do documento para apresentar as edições -->
     <choose>
       <if type="book chapter" match="any">
         <choose>
@@ -354,120 +485,214 @@
             </group>
           </if>
           <else>
-            <text variable="edition" suffix=" ed."/>
+            <group>
+              <text variable="edition"/>
+              <text term="edition" form="short" suffix="."/>
+            </group>
           </else>
         </choose>
       </if>
     </choose>
   </macro>
   <macro name="locators">
+    <!-- Macro responsável por mostrar os dados complementares do documento -->
     <choose>
       <if type="bill">
+        <!-- Se for legislação utilizará o que foi definido nas macros "issued" e "section" adicionará a variável "page" -->
         <group prefix=". " delimiter=", ">
-          <date variable="issued">
-            <date-part name="day"/>
-            <date-part prefix=" " name="month" form="short"/>
-            <date-part prefix=" " name="year"/>
-          </date>
+          <text macro="issued"/>
           <text macro="section"/>
-          <text variable="page" prefix="p. " suffix="."/>
+          <group>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page" suffix="."/>
+          </group>
         </group>
       </if>
       <else-if match="any" type="article-journal article-magazine">
+        <!-- Se for artigo de periódigo ou revista, utiliza os termos padrões para volume e número -->
         <group delimiter=", ">
-          <group delimiter=", ">
-            <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix="n. "/>
+          <group>
+            <text term="volume" form="short" suffix=" "/>
+            <text variable="volume"/>
+          </group>
+          <group>
+            <text term="issue" form="short" suffix=" "/>
+            <text variable="issue"/>
           </group>
           <text variable="collection-title"/>
-          <text variable="page" prefix="p. "/>
-        </group>
-      </else-if>
-      <else-if match="any" type="book chapter">
-        <group delimiter=", ">
           <group>
-            <text variable="volume" prefix="v. "/>
-            <text variable="page" prefix="p. "/>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page"/>
           </group>
         </group>
       </else-if>
       <else-if type="article-newspaper" match="any">
+        <!-- Se for artigo de jornal, utiliza termo específico para volume -->
         <group>
-          <text variable="volume" prefix="ano " suffix=", "/>
-          <text variable="issue" prefix="n. " suffix=", "/>
-          <text macro="issued-legislation"/>
+          <group delimiter=", ">
+            <text variable="volume" prefix="ano "/>
+            <group>
+              <text term="issue" form="short" suffix=" "/>
+              <text variable="issue"/>
+            </group>
+            <text macro="issued"/>
+          </group>
+          <group delimiter=", " suffix=".">
+            <text variable="section"/>
+            <text variable="collection-title"/>
+            <group>
+              <text term="page" form="short" suffix=" "/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if match="any" type="book chapter">
+        <!-- Se for livro ou capítulo, utiliza os termos padrões para volume e página -->
+        <group delimiter=", ">
+          <group>
+            <text term="volume" form="short" suffix=" "/>
+            <text variable="volume"/>
+          </group>
+          <group>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
         </group>
-        <text variable="section" prefix=". "/>
-        <text variable="collection-title" prefix=". "/>
-        <text variable="page" prefix=", p. " suffix="."/>
       </else-if>
     </choose>
   </macro>
   <macro name="collection-title">
+    <!-- Macro responsável por mostrar os dados de coleção para livro e capítulo -->
     <text variable="collection-title"/>
-    <text variable="collection-number" prefix=" "/>
+    <text variable="collection-number" prefix=", v. "/>
   </macro>
   <macro name="genre">
+    <!-- Macro responsável por mostrar as informações de tipo para carta, e-mail e mensagem -->
     <text variable="genre" suffix=". "/>
   </macro>
   <macro name="section">
+    <!-- Macro responsável por mostrar a seção quando houver -->
     <choose>
-      <if match="any" variable="section issue">
+      <if variable="section issue" match="any">
         <text variable="section"/>
         <text variable="issue"/>
       </if>
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- Macro responsável por mostrar os localizadores (página, seção, capítulo, etc.) em uma citação  -->
     <group>
       <label variable="locator" form="short"/>
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
   <macro name="place">
+    <!-- Macro responsável por utilizar local de publicação como local e, em sua ausência, utilizar o termo padrão s. l.  -->
     <choose>
       <if variable="publisher-place" match="any">
         <text variable="publisher-place" suffix=", "/>
       </if>
-      <else-if type="paper-conference" variable="publisher-place">
-        <text variable="publisher-place" suffix=". "/>
-      </else-if>
       <else>
-        <text value="[s. l.]" suffix=", " font-style="italic"/>
+        <choose>
+          <if type="graphic post webpage" match="any">
+            <text value="s. l." prefix="[" suffix="], " font-style="italic" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text value="s. l." prefix="[" suffix="], " font-style="italic"/>
+          </else>
+        </choose>
       </else>
     </choose>
   </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" delimiter-precedes-et-al="never">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" delimiter-precedes-et-al="never">
+    <!-- CITAÇÃO: uso de sufixo para desambiguação de anos e de prenome ativos -->
     <sort>
       <key macro="author"/>
+      <!-- ordena primeiro pela macro autor -->
       <key variable="issued"/>
+      <!-- em seguida pela data -->
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
+      <!-- citações entre parênteses, separando mais de um documento com ponto-e-vírgula -->
       <choose>
         <if type="broadcast motion_picture song" match="any">
+          <!-- documentos em que citação é pelo título -->
           <group>
             <text variable="title" text-case="uppercase" suffix=", "/>
             <text macro="issued-year"/>
           </group>
         </if>
         <else>
+          <!-- do contrário é o formato padrão de autor e data separados por vírgula -->
           <group>
-            <text suffix=", " macro="author-short"/>
+            <text macro="author-short" suffix=", "/>
             <text macro="issued-year"/>
-            <text prefix=", " macro="citation-locator"/>
+            <text macro="citation-locator" prefix=", "/>
           </group>
         </else>
       </choose>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="1">
+  <bibliography et-al-min="4" et-al-use-first="1" line-spacing="1" entry-spacing="1">
+    <!--REFERÊNCIAS: a partir de 4 autores utiliza et al., alinhamento a esquerda, espaçamento simples e uma linha entre referências-->
     <sort>
-      <key macro="author"/>
+      <key macro="author-short"/>
+      <key macro="title"/>
+      <!-- ordena primeiro pela macro autor -->
       <key variable="issued"/>
+      <!-- em seguida pela data -->
     </sort>
     <layout>
       <choose>
-        <if type="bill">
+        <if type="article">
+          <!-- Documento (Zotero) e Programa de computador (Mendeley) -->
+          <group>
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=" "/>
+            <text variable="medium" suffix=". "/>
+            <!--incluído para ter a versão de programa de computador no mendeley-->
+            <text variable="number" prefix="Versão " suffix=". "/>
+            <text macro="publisher" suffix="  "/>
+            <text variable="genre" suffix="."/>
+            <text macro="access"/>
+          </group>
+        </if>
+        <else-if type="article-journal article-magazine" match="any">
+          <!-- Artigo de periódico e Artigo de revista  -->
+          <group>
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text macro="place"/>
+            <text macro="edition" suffix=", "/>
+            <text macro="locators" suffix=", "/>
+            <choose>
+              <if variable="issued" match="none">
+                <text macro="issued"/>
+              </if>
+              <else>
+                <text macro="issued"/>
+                <text variable="status" suffix=". " font-style="italic" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper">
+          <!-- Artigo de jornal -->
+          <group>
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text macro="place" prefix=" "/>
+            <text macro="locators"/>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="bill">
+          <!-- Audiência e Legislação -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
@@ -481,141 +706,123 @@
             <text variable="page" prefix="p. " suffix="."/>
             <text macro="access"/>
           </group>
-        </if>
-        <else-if type="map">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="publisher" suffix=". "/>
-            <text variable="genre" suffix=". "/>
-            <text variable="scale" prefix="Escala " suffix=". "/>
-            <text macro="access"/>
-          </group>
         </else-if>
         <else-if type="book">
+          <!-- Livro e, no Zotero, também Programa de computador -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="translator" suffix=". "/>
             <text variable="genre" suffix=". "/>
             <text macro="edition" suffix=". "/>
-            <text variable="version" prefix="Versão " suffix=". "/>
-            <text macro="publisher" suffix=". "/>
+            <choose>
+              <if variable="version" match="any">
+                <text term="version" text-case="capitalize-first" suffix=" "/>
+                <text variable="version" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="publisher"/>
+            <text variable="ISSN" prefix="ISSN " suffix="."/>
             <text macro="collection-title" prefix="(" suffix=")."/>
             <text macro="locators"/>
             <text variable="medium" suffix=". "/>
+            <choose>
+              <if variable="genre" match="any">
+                <!--incluido title-short para funcionar o que seria medium no Mendeley-->
+                <text variable="title-short" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="broadcast motion_picture" match="any">
+          <!-- Transmissão de rádio, Transmissão de televisão, Filme e Gravação de vídeo -->
+          <group>
+            <text macro="title"/>
+            <choose>
+              <if type="motion_picture" match="any">
+                <text macro="author" text-case="capitalize-first" suffix=". "/>
+              </if>
+              <else-if type="broadcast" match="any">
+                <text macro="author" suffix=". "/>
+              </else-if>
+            </choose>
+            <text macro="publisher"/>
+            <text variable="medium" prefix=" "/>
+            <text variable="genre" prefix=" "/>
+            <text variable="dimensions" prefix=" (" suffix="). "/>
             <text macro="access"/>
           </group>
         </else-if>
         <else-if type="chapter">
+          <!-- Capítulo -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": " font-style="italic"/>
+            <text term="in" text-case="capitalize-first" prefix=" " suffix=": " font-style="italic"/>
             <text macro="container-contributors" suffix=". "/>
             <text macro="container-title" suffix=". "/>
             <text macro="translator" suffix=". "/>
             <text macro="edition" suffix=". "/>
-            <text macro="publisher" suffix=". "/>
+            <text macro="publisher"/>
             <text macro="collection-title" prefix="(" suffix=")."/>
             <text macro="locators" suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="article-magazine article-journal" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text variable="genre" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <choose>
-              <if match="any" variable="publisher-place">
-                <text variable="publisher-place" suffix=", "/>
-              </if>
-              <else>
-                <text value="[S. l.]" font-style="italic" suffix=", "/>
-              </else>
-            </choose>
-            <text macro="edition" suffix=", "/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="article-newspaper" match="any">
+        <else-if type="entry-dictionary entry-encyclopedia" match="any">
+          <!-- verbetes -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text macro="place" prefix=" "/>
-            <text macro="locators"/>
+            <text term="in" text-case="capitalize-first" font-style="italic" prefix=" " suffix=": "/>
+            <text macro="container-contributors" suffix="."/>
+            <text macro="container-title" prefix=" " suffix=". "/>
+            <text macro="publisher"/>
+            <text variable="page" prefix=" p. " suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="thesis">
+        <else-if type="graphic">
+          <!-- Obra de arte -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="issued-year" suffix=". "/>
-            <text variable="genre"/>
-            <text variable="publisher" prefix=" - " suffix=", "/>
+            <text macro="title"/>
             <text macro="place"/>
-            <text macro="issued" suffix="."/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="medium" suffix=", "/>
+            <text variable="dimensions" suffix=". "/>
+            <text variable="genre" suffix="."/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="webpage post">
+        <else-if type="interview">
+          <!-- Entrevista -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=" "/>
-            <text macro="place"/>
-            <text macro="issued-year" suffix=". "/>
+            <text macro="title"/>
+            <text macro="interviewer" suffix=". "/>
             <text variable="genre" suffix=". "/>
-            <text macro="access" suffix=". "/>
+            <text macro="publisher"/>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="report">
+        <else-if type="legal_case">
+          <!-- Jurisprudência -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": "/>
-            <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <!--incluido genre para funcionar manuscript no Mendeley-->
-            <text variable="genre" prefix=" " suffix="."/>
-            <text macro="access" suffix="."/>
-          </group>
-        </else-if>
-        <else-if type="entry-encyclopedia entry-dictionary">
-          <group>
-            <text macro="title" suffix=". "/>
-            <text term="in" text-case="capitalize-first" font-style="italic" suffix=": "/>
-            <text macro="author" suffix="."/>
-            <text macro="container-title" prefix=" " suffix="."/>
-            <text variable="publisher-place" prefix=". " suffix=": "/>
-            <text variable="publisher"/>
-            <text macro="issued" prefix="," suffix=". "/>
-            <text variable="page" prefix="p. " suffix=". "/>
+            <text variable="abstract" prefix=". " suffix=". "/>
+            <text macro="container-title" prefix="Relator: " suffix=", "/>
+            <text variable="publisher-place" suffix=", "/>
+            <text macro="issued-legislation" suffix=". "/>
+            <text macro="section" prefix="Seção " suffix=", "/>
+            <text variable="page" prefix="p. " suffix="."/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="paper-conference">
-          <text macro="author" suffix=". "/>
-          <text macro="title" suffix=". "/>
-          <text term="in" text-case="capitalize-first" font-style="italic" suffix=": "/>
-          <text macro="container-contributors" text-case="uppercase"/>
-          <text macro="secondary-contributors"/>
-          <text macro="container-title"/>
-          <text macro="locators"/>
-          <text macro="publisher"/>
-          <text variable="page" prefix=" p. " suffix="."/>
-          <text macro="access"/>
-        </else-if>
-        <else-if type="legislation" match="any">
+        <else-if type="legislation">
+          <!-- Estatuto -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
@@ -627,20 +834,66 @@
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="legal_case" match="any">
+        <else-if type="manuscript">
+          <!-- Manuscrito e Partitura -->
+          <group>
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=" "/>
+            <choose>
+              <if variable="medium" match="any">
+                <group>
+                  <text variable="genre" suffix=". "/>
+                  <text macro="publisher"/>
+                  <text variable="medium" suffix="."/>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <text variable="publisher-place" suffix=", "/>
+                  <text variable="publisher" suffix=", "/>
+                  <text macro="issued"/>
+                  <text variable="genre" prefix=" " suffix="."/>
+                </group>
+              </else>
+            </choose>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="map">
+          <!-- Mapa -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text variable="abstract" prefix=". " suffix=". "/>
-            <text macro="container-title" prefix="Relator: " suffix=", "/>
-            <text variable="publisher-place" suffix=", "/>
-            <text macro="issued-legislation" suffix=". "/>
-            <text macro="section" prefix="Seção " suffix=", "/>
-            <text variable="page" prefix="p. " suffix="."/>
+            <text macro="publisher"/>
+            <text variable="genre" suffix=". "/>
+            <text variable="scale" prefix="Escala " suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="patent" match="any">
+        <else-if type="paper-conference">
+          <!-- trabalho em evento -->
+          <text macro="author" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text macro="event"/>
+          <text macro="container-contributors" text-case="uppercase"/>
+          <text macro="secondary-contributors"/>
+          <text macro="container-title"/>
+          <text macro="locators"/>
+          <choose>
+            <if variable="issued" match="none">
+              <text macro="publisher"/>
+              <text variable="page" prefix=" p. " suffix="."/>
+            </if>
+            <else>
+              <text macro="publisher"/>
+              <text variable="page" prefix=" p. " suffix=". "/>
+              <text variable="status" suffix=". " font-style="italic" text-case="capitalize-first"/>
+            </else>
+          </choose>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="patent">
+          <!-- Patente -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" prefix=" " suffix=". "/>
@@ -652,118 +905,103 @@
             <text variable="note"/>
           </group>
         </else-if>
-        <else-if type="interview" match="any">
+        <else-if type="personal_communication">
+          <!-- E-mail, Carta e Mensagem -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text macro="interviewer" suffix=". "/>
-            <text variable="genre" suffix=". "/>
-            <text macro="publisher"/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="motion_picture broadcast song" match="any">
-          <group>
-            <text macro="title"/>
-            <choose>
-              <if type="motion_picture" match="any">
-                <text macro="author" text-case="capitalize-first" prefix=" Direção: " suffix=". "/>
-              </if>
-              <else-if type="song" match="any">
-                <text value="Intérprete" suffix=": "/>
-              </else-if>
-              <else-if type="broadcast" match="any">
-                <text value="Apresentado por "/>
-                <text macro="author" suffix=". "/>
-              </else-if>
-            </choose>
-            <text macro="composer" suffix=". "/>
-            <text macro="publisher"/>
-            <text variable="medium" prefix=" "/>
-            <text variable="genre" prefix=" "/>
-            <text variable="dimensions" prefix=" (" suffix="). "/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="article map" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" text-case="capitalize-first" suffix=" "/>
-            <text variable="medium" suffix=". "/>
-            <!--incluído para ter a versão de programa de computador no mendeley-->
-            <text variable="edition" suffix=". "/>
-            <text macro="publisher" suffix="  "/>
-            <text variable="genre" suffix="."/>
-            <text variable="scale" suffix=". "/>
+            <text macro="recipient" suffix=". "/>
+            <text variable="publisher-place" suffix=", "/>
+            <text macro="issued"/>
             <text macro="access"/>
+            <text macro="genre" prefix=" "/>
           </group>
         </else-if>
-        <else-if type="speech" match="any">
+        <else-if type="post webpage">
+          <!-- Página web e Fórum -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="issued"/>
-            <text macro="access"/>
+            <text macro="title" suffix=" "/>
+            <text macro="place"/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="access" suffix=". "/>
           </group>
         </else-if>
-        <else-if type="manuscript" match="any">
+        <else-if type="post-weblog">
+          <!-- Post -->
           <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" text-case="capitalize-first" suffix=" "/>
+            <text macro="author"/>
+            <text macro="title" prefix=". "/>
+            <text term="in" font-style="italic" text-case="capitalize-first" prefix=". " suffix=": "/>
+            <text variable="container-title" text-case="uppercase" suffix=". "/>
             <text variable="publisher-place" suffix=", "/>
             <text macro="issued"/>
-            <text variable="genre" prefix=" " suffix="."/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="graphic" match="any">
+        <else-if type="report">
+          <!-- Relatório -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text macro="publisher" suffix=". "/>
-            <text variable="medium" suffix=", "/>
-            <text variable="dimensions" suffix="."/>
-            <text variable="genre" suffix="."/>
-            <text macro="access"/>
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+            <text macro="container-title"/>
+            <text variable="collection-title" prefix=": "/>
+            <text macro="locators"/>
+            <text macro="publisher" prefix=". "/>
+            <!--incluido genre para funcionar manuscript no Mendeley-->
+            <text variable="genre" prefix=" " suffix="."/>
+            <text macro="access" suffix="."/>
           </group>
         </else-if>
-        <else-if type="post-weblog" match="any">
+        <else-if type="song">
+          <!-- Áudio, Música e Podcast -->
+          <text macro="title"/>
+          <text macro="author" text-case="capitalize-first" suffix=". "/>
+          <text macro="composer" suffix=". "/>
+          <text macro="publisher"/>
+          <text variable="medium" prefix=" "/>
+          <text variable="genre" prefix=" "/>
+          <text variable="dimensions" prefix=" (" suffix="). "/>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="speech">
+          <!-- Apresentação -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text term="in" font-style="italic" text-case="capitalize-first" prefix=". " suffix=": "/>
-            <text variable="container-title" text-case="capitalize-first" suffix=". "/>
-            <text variable="publisher-place" suffix=", "/>
-            <text macro="issued"/>
+            <text macro="publisher"/>
             <text macro="access"/>
           </group>
         </else-if>
-        <!--ABNT 6023:2018 - usado para e-mails, cartas-->
-        <else-if type="personal_communication" match="any">
+        <else-if type="thesis">
+          <!-- Dissertação, Tese e TCC -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="recipient" suffix=". "/>
-            <text variable="publisher-place" suffix=", "/>
+            <text macro="title" suffix=". "/>
+            <text variable="number-of-pages" suffix=" f. "/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="genre"/>
+            <text variable="publisher" prefix=" - " suffix=", "/>
+            <text macro="place"/>
             <text macro="issued"/>
             <text macro="access"/>
-            <text macro="genre" prefix=" "/>
           </group>
         </else-if>
         <else>
+          <!-- Formato padrão para documentos não previstos -->
           <text macro="author" suffix=". "/>
-          <text macro="title" text-case="capitalize-first"/>
+          <text macro="title"/>
           <text macro="container-contributors"/>
           <text macro="secondary-contributors"/>
           <text macro="container-title"/>
           <text variable="collection-title" prefix=": " suffix="."/>
           <text macro="locators"/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
-          </group>
           <text variable="publisher-place"/>
           <text variable="publisher" suffix=", "/>
-          <text macro="issued" prefix=", " suffix=". "/>
+          <text macro="issued" prefix=", "/>
           <text macro="access"/>
           <text variable="medium"/>
           <text variable="genre"/>
diff --git a/associacao-brasileira-de-normas-tecnicas-ufrgs-note-initials-with-ibid.csl b/associacao-brasileira-de-normas-tecnicas-ufrgs-note-initials-with-ibid.csl
index 5d83fd8bfff..4ab56532edd 100644
--- a/associacao-brasileira-de-normas-tecnicas-ufrgs-note-initials-with-ibid.csl
+++ b/associacao-brasileira-de-normas-tecnicas-ufrgs-note-initials-with-ibid.csl
@@ -1,24 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="never" default-locale="pt-BR">
+<!-- XML Declaration: não é preciso alterar -->
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="never" page-range-format="expanded" default-locale="pt-BR">
   <info>
     <title>Universidade Federal do Rio Grande do Sul - ABNT (autoria abreviada, nota, com Ibid.) (Portuguese - Brazil)</title>
-    <title-short>UFRGS-ABNT-nota</title-short>
+    <title-short>UFRGS-ABNT</title-short>
     <id>http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs-note-initials-with-ibid</id>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs-note-initials-with-ibid" rel="self"/>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs-initials" rel="template"/>
-    <link href="https://www.ufrgs.br/bibliotecas/estilo-abnt-sbufrgs-para-gerenciadores-de-referencias/" rel="documentation"/>
+    <!-- Estilo original utilizado como modelo -->
+    <!-- Ver documentação sobre preenchimento dos campos básicos para ABNT -->
+    <link href="https://www.ufrgs.br/bibliotecas/campos-basicos-abnt-mendeley" rel="documentation"/>
+    <!-- Para alguns itens do Mendeley é necessário incluir novos campos -->
+    <link href="https://www.ufrgs.br/bibliotecas/campos-basicos-abnt-zotero" rel="documentation"/>
+    <!-- Para alguns itens do Zotero é necessário utilizar o campo "extra". Exemplo: incluir "publisher-place:" para artigos de periódico.  -->
+    <author>
+      <name>Priscila Saraiva Jacobsen</name>
+      <email>jacobsen@bc.ufrgs.br</email>
+      <uri>https://www.ufrgs.br/bibliotecas/</uri>
+    </author>
+    <author>
+      <name>Luísia Feichas Alves</name>
+      <email>luisia.alves@bc.ufrgs.br</email>
+      <uri>https://www.zotero.org/luisiafalves</uri>
+    </author>
     <author>
       <name>Barbara Ieger Vianna</name>
       <email>barbara.vianna@ufrgs.br</email>
       <uri>http://www.ufrgs.br/bibdir/</uri>
     </author>
+    <author>
+      <name>José Antonio Meira da Rocha</name>
+      <email>joseantoniorocha@gmail.com</email>
+      <uri>http://meiradarocha.jor.br</uri>
+    </author>
+    <author>
+      <name>Fernando Bruno</name>
+      <email>fernando.bruno@ufrgs.br</email>
+      <uri>http://www.pgdesign.ufrgs.br/</uri>
+    </author>
+    <author>
+      <name>Kelson Anthony de Menezes</name>
+      <email>kanthony@ebsco.com</email>
+      <uri>https://www.mendeley.com/profiles/kelson-anthony/</uri>
+    </author>
+    <author>
+      <name>Michelangelo Viana</name>
+      <email>mviana@ebsco.com</email>
+      <uri>http://www.mendeley.com/profiles/michelangelo-viana/</uri>
+    </author>
     <contributor>
-      <name>Priscila Saraiva Jacobsen</name>
-      <email>jacobsen@bc.ufrgs.br</email>
-    </contributor>
-    <contributor>
-      <name>Luísia Alves</name>
-      <email>luisia.alves@bc.ufrgs.br</email>
+      <name>Leticia Strehl</name>
+      <uri>http://www.mendeley.com/profiles/leticia-strehl/</uri>
     </contributor>
     <contributor>
       <name>Julian Onions</name>
@@ -26,250 +58,424 @@
     </contributor>
     <category citation-format="note"/>
     <category field="generic-base"/>
-    <summary>The Brazilian Standard Style of citation and bibliography (ABNT-NBR 10520.2002 and ABNT-NBR 6023.2018) adapted to the footnote format, using as a base the Chicago style of notes with ibid</summary>
-    <updated>2019-10-17T14:43:40+00:00</updated>
+    <summary>An adaptation of the Brazilian Standard Style (ABNT-NBR 10520.2002 and ABNT-NBR 6023.2018) for footnote.</summary>
+    <updated>2020-10-17T01:42:52+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="pt-BR">
-    <!-- terms -->
     <terms>
-      <!-- Forma abreviada dos meses em português -->
-      <term name="month-01" form="short">jan.</term>
-      <term name="month-02" form="short">fev.</term>
-      <term name="month-03" form="short">mar.</term>
-      <term name="month-04" form="short">abr.</term>
-      <term name="month-05" form="short">maio</term>
-      <term name="month-06" form="short">jun.</term>
-      <term name="month-07" form="short">jul.</term>
-      <term name="month-08" form="short">ago.</term>
-      <term name="month-09" form="short">set.</term>
-      <term name="month-10" form="short">out.</term>
-      <term name="month-11" form="short">nov.</term>
-      <term name="month-12" form="short">dez.</term>
-      <!-- organizadores (Editor) -->
-      <term name="editor" form="short">
-        <single>ed</single>
-        <multiple>eds</multiple>
-      </term>
-      <term name="container-author" form="short">
-        <single>ed</single>
-        <multiple>eds</multiple>
-      </term>
-      <term name="collection-editor" form="short">
-        <single>ed</single>
-        <multiple>eds</multiple>
+      <term name="editor" form="short">org</term>
+      <!-- ABNT 6023:2018 - 8.1.1.4 sempre no singular -->
+      <term name="collection-editor" form="short">ed</term>
+      <!-- usando editor de coleção para quando for editor do livro -->
+      <term name="accessed">acesso</term>
+      <term name="available at">disponível em</term>
+      <term name="composer">compositor</term>
+      <term name="recipient">destinatário</term>
+      <term name="interviewer">entrevistador</term>
+      <term name="director">direção</term>
+      <term name="translator">tradução</term>
+      <term name="volume" form="short">
+        <single>v.</single>
+        <multiple>v.</multiple>
       </term>
+      <term name="issue" form="short">n.</term>
+      <term name="ibid" form="short">ibid.</term>
     </terms>
   </locale>
-  <!-- :: M A C R O S :: -->
-  <!-- :: Entrada Principal - indicacao de responsabilidade :: -->
   <macro name="container-contributors">
+    <!-- Macro responsavel por mostrar os nomes dos organizadores ou editores -->
     <choose>
-      <if type="chapter">
+      <if type="chapter entry-dictionary entry-encyclopedia">
         <names variable="container-author" delimiter=", ">
           <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
             <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
           </name>
-          <label form="short" text-case="capitalize-first" prefix=" (" suffix=".)"/>
+          <label form="short" prefix=" (" suffix=".)"/>
+          <et-al font-style="italic"/>
           <substitute>
             <names variable="editor"/>
+            <!-- ABNT 6023:2018 - quando for organizador -->
             <names variable="collection-editor"/>
+            <!-- ABNT 6023:2018 - quando for editor, mesmo que apenas do livro no todo -->
           </substitute>
         </names>
       </if>
     </choose>
   </macro>
-  <!-- :: Responsabilidade secundária - Tradutor, editor :: -->
   <macro name="secondary-contributors">
+    <!-- Macro responsavel por mostrar os nomes dos organizadores do livro no todo quando um capítulo de livro -->
     <choose>
       <if type="chapter" match="none">
         <names variable="editor" delimiter="; " prefix=" (" suffix=")">
-          <name initialize-with=". " delimiter=", "/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
           <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
         </names>
       </if>
     </choose>
   </macro>
-  <macro name="translator">
-    <text value="Traducao "/>
-    <names variable="translator" delimiter="; ">
+  <macro name="author">
+    <!-- Macro responsavel por mostrar o autor -->
+    <choose>
+      <if type="broadcast" match="any">
+        <!-- para transmissões é apresentador -->
+        <text value="Apresentado por "/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </if>
+      <else-if type="motion_picture" match="any">
+        <!-- para filmes é o diretor -->
+        <text term="director" suffix=": " text-case="capitalize-first"/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </else-if>
+      <else-if type="song" match="any">
+        <!-- para músicas é o intérprete -->
+        <text value="Intérprete: "/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </else-if>
+      <else-if type="entry-dictionary entry-encyclopedia" match="any">
+        <names variable="author">
+          <!-- para outros tipos de documentos mantém a posição original -->
+          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
+          <substitute>
+            <!-- na ausência de um autor, utiliza organizador, editor, tradutor ou título  -->
+            <text variable="title" text-case="uppercase"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else>
+        <names variable="author">
+          <!-- para outros tipos de documentos mantém a posição original -->
+          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
+          <substitute>
+            <!-- na ausência de um autor, utiliza organizador, editor, tradutor ou título  -->
+            <names variable="editor"/>
+            <names variable="collection-editor"/>
+            <names variable="translator"/>
+            <text variable="title" text-case="uppercase"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="composer">
+    <!-- Macro responsavel por mostrar o nome do compositor -->
+    <text term="composer" suffix=": " text-case="capitalize-first"/>
+    <names variable="composer" delimiter="; ">
       <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
     </names>
   </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
-        <name-part name="family" text-case="uppercase"/>
-      </name>
-      <label form="short" prefix=" (" suffix=".)" text-case="uppercase"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="title"/>
-      </substitute>
+  <macro name="interviewer">
+    <!-- Macro responsavel por mostrar o nome do entrevistador -->
+    <text term="interviewer" suffix=": " text-case="capitalize-first"/>
+    <names variable="interviewer" delimiter="; ">
+      <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
     </names>
   </macro>
-  <!-- :: Endereço html :: -->
-  <macro name="access">
-    <text variable="URL" prefix=" Disponível em: &lt;" suffix="&gt;"/>
-    <date variable="accessed" prefix=". Acesso em: " suffix=".">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
-      <date-part name="year"/>
-    </date>
+  <macro name="recipient">
+    <!-- Macro responsavel por mostrar o nome do destinatário -->
+    <text term="recipient" suffix=": " text-case="capitalize-first"/>
+    <names variable="recipient" delimiter="; ">
+      <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+    </names>
   </macro>
-  <!-- :: Área do título :: -->
-  <macro name="title">
+  <macro name="translator">
+    <!-- Macro responsavel por mostrar o nome do tradutor -->
+    <text term="translator" suffix=": " text-case="capitalize-first"/>
+    <names variable="translator" delimiter=", ">
+      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <!-- Macro responsável por mostrar o autor na citação -->
     <choose>
-      <if type="chapter article-newspaper legislation article-magazine article-journal bill entry-encyclopedia paper-conference" match="any">
-        <text variable="title"/>
+      <if type="broadcast motion_picture song" match="any">
+        <text variable="title" form="short" text-case="uppercase"/>
       </if>
-      <else-if type="book thesis patent report" match="any">
-        <text variable="title" font-weight="bold"/>
-      </else-if>
-      <else-if type="dataset" match="any">
-        <text variable="title" suffix=". "/>
-      </else-if>
       <else>
-        <text variable="title" font-weight="bold"/>
+        <names variable="author">
+          <name form="short" delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given" text-case="capitalize-first"/>
+          </name>
+          <et-al font-style="italic"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <!-- uso do título quando não houver autor -->
+            <text variable="title" form="short" text-case="uppercase"/>
+          </substitute>
+        </names>
       </else>
     </choose>
-    <text value=""/>
   </macro>
-  <macro name="title-short">
+  <macro name="access">
+    <!-- Macro utilizada para apresentar a URL do site utilizado e data de acesso -->
     <choose>
-      <if variable="title" match="none">
+      <if variable="DOI">
+        <!-- Quando houver DOI, utilizá-lo no lugar do link -->
+        <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="DOI" prefix="https://doi.org/"/>
+        <group>
+          <text term="accessed" text-case="capitalize-first" prefix=". " suffix=" "/>
+          <text term="at" text-case="lowercase" suffix=": "/>
+          <text macro="accessed"/>
+        </group>
+      </if>
+      <else-if variable="URL">
         <choose>
-          <if type="interview">
-            <text term="interview"/>
+          <if type="book chapter" match="any">
+            <!-- Quando for livro, incluir a expressão e-book em itálico -->
+            <text value="E-book" font-style="italic" suffix="."/>
           </if>
-          <else-if type="manuscript speech" match="any">
-            <text variable="genre" form="short"/>
-          </else-if>
+          <else>
+            <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+            <text variable="URL"/>
+            <group>
+              <!-- formato de acesso utiliza a macro accessed -->
+              <text term="accessed" text-case="capitalize-first" prefix=". " suffix=" "/>
+              <text term="at" text-case="lowercase" suffix=": "/>
+              <text macro="accessed"/>
+            </group>
+          </else>
         </choose>
-      </if>
-      <else-if type="book graphic motion_picture song" match="any">
-        <text variable="title" text-case="title" form="short" font-style="italic"/>
       </else-if>
-      <else-if type="legal_case" variable="title-short" match="all">
-        <text variable="title" font-style="italic" form="short"/>
+    </choose>
+  </macro>
+  <macro name="accessed">
+    <!-- Macro utilizada para a data de acesso -->
+    <date variable="accessed" suffix="." delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="short"/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="title">
+    <!-- Macro responsável por mostrar o título principal de um documento dependendo do tipo. Ainda não é possível diferenciar título de subtítulo -->
+    <choose>
+      <if type="article-journal article-magazine article-newspaper chapter paper-conference post-weblog" match="any">
+        <text variable="title" font-weight="normal"/>
+      </if>
+      <else-if type="bill book entry-dictionary entry-encyclopedia legal_case legislation patent report thesis" match="any">
+        <text variable="title" font-weight="bold"/>
       </else-if>
-      <else-if type="patent interview" match="any">
-        <text variable="title" form="short"/>
+      <else-if type="dataset" match="any">
+        <text variable="title" suffix=". "/>
       </else-if>
-      <else-if type="legal_case bill legislation" match="any">
-        <text variable="title"/>
+      <else-if type="broadcast motion_picture song" match="any">
+        <text variable="title" text-case="uppercase" suffix=". "/>
       </else-if>
       <else>
-        <text variable="title" text-case="title" form="short" quotes="true"/>
+        <text variable="title" font-weight="bold" text-case="capitalize-first" suffix=". "/>
       </else>
     </choose>
   </macro>
-  <!-- :: Título da obra no todo no caso de parte de obra :: -->
-  <macro name="container-title">
+  <macro name="event">
+    <!-- Macro responsável por mostrar o título de evento -->
     <choose>
       <if type="paper-conference" match="any">
-        <text variable="container-title" text-case="uppercase"/>
-        <text variable="number" prefix=", " suffix=". , "/>
-        <text macro="issued-year" prefix=" " suffix=", "/>
-        <text variable="publisher-place" suffix=". "/>
-        <text value="Anais" font-weight="bold"/>
-        <text value="... "/>
+        <group suffix=". ">
+          <text term="in" text-case="capitalize-first" prefix=" " suffix=": " font-style="italic"/>
+          <choose>
+            <if variable="event" match="any">
+              <text variable="event" text-case="uppercase"/>
+            </if>
+            <else>
+              <text variable="title-short" text-case="uppercase"/>
+              <!--title-short utilizado para nome do evento no Mendeley-->
+            </else>
+          </choose>
+          <text variable="number" prefix=", " suffix="."/>
+          <text macro="issued-year" prefix=", "/>
+          <text macro="event-place" prefix=", "/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event-place">
+    <!-- Macro responsável por mostrar o local do evento. No Zotero utilizar o campo extra quando local de evento e de publicação forem diferentes -->
+    <choose>
+      <if variable="event-place" match="any">
+        <text variable="event-place"/>
       </if>
       <else>
-        <text variable="container-title" font-weight="bold"/>
+        <text variable="publisher-place"/>
       </else>
     </choose>
   </macro>
-  <macro name="publisher">
+  <macro name="container-title">
+    <!-- Macro responsável por mostrar o título do todo, quando parte de um documento -->
     <choose>
-      <if match="any" variable="publisher-place publisher">
+      <if type="paper-conference" match="any">
         <choose>
-          <if variable="publisher-place">
-            <text variable="publisher-place"/>
+          <if match="any" variable="container-title">
+            <text variable="container-title" font-weight="bold" suffix=". "/>
           </if>
-          <else-if type="entry-encyclopedia thesis" match="any"/>
-          <else-if type="paper-conference" match="any">
-            <text variable="publisher-place" suffix=". "/>
-          </else-if>
           <else>
-            <text value="[s.l.] "/>
+            <text value="Anais [...]" font-weight="bold" suffix=". "/>
           </else>
         </choose>
+      </if>
+      <else-if type="legal_case" match="any">
+        <text variable="container-title"/>
+      </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <choose>
-          <if variable="publisher">
-            <text variable="publisher" prefix=": " suffix=","/>
-            <text macro="issued"/>
+          <if variable="container-author editor collection-editor" match="any">
+            <text variable="container-title" font-weight="bold"/>
           </if>
+          <else>
+            <text variable="container-title" text-case="uppercase"/>
+          </else>
         </choose>
-      </if>
+      </else-if>
       <else>
-        <text value="[s.l: s.n.]"/>
+        <text variable="container-title" font-weight="bold"/>
       </else>
     </choose>
   </macro>
-  <macro name="event">
+  <macro name="publisher">
+    <!-- Macro responsável por mostrar os responsáveis pela publicação. No caso de ausência deles, incluir expressões para sem local ou sem editor -->
     <choose>
-      <if variable="event">
+      <if variable="publisher-place publisher" match="any">
         <choose>
-          <if variable="genre" match="none">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text variable="event" text-case="uppercase"/>
+          <if variable="publisher-place">
+            <text variable="publisher-place"/>
           </if>
           <else>
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <text term="presented at"/>
-              <text variable="event"/>
-            </group>
+            <text value="s. l." font-style="italic" prefix="[" suffix="]" text-case="capitalize-first"/>
           </else>
         </choose>
+        <group prefix=": " suffix=",">
+          <choose>
+            <if variable="publisher">
+              <text variable="publisher"/>
+            </if>
+            <else>
+              <text value="s. n." font-style="italic" prefix="[" suffix="]"/>
+            </else>
+          </choose>
+        </group>
+        <text macro="issued" prefix=" "/>
       </if>
-      <else-if type="paper-conference" match="any"/>
+      <else>
+        <text value="s. l.: s. n." font-style="italic" prefix="[" suffix="]" text-case="capitalize-first"/>
+        <text macro="issued" prefix=", "/>
+      </else>
     </choose>
   </macro>
   <macro name="issued">
-    <choose>
-      <if variable="issued" match="any">
-        <group>
+    <!-- Macro responsável por mostrar a data completa de um documento -->
+    <group suffix=". ">
+      <choose>
+        <if is-uncertain-date="issued">
           <date variable="issued">
-            <date-part name="year" prefix=" " suffix="."/>
+            <date-part name="year" prefix="[" suffix="]"/>
           </date>
-        </group>
-      </if>
-      <else-if type="patent" match="any">
-        <date form="numeric" variable="issued" suffix="."/>
-      </else-if>
-      <else>
-        <text value="[s.d.]"/>
-      </else>
-    </choose>
+        </if>
+        <else-if variable="issued" match="any">
+          <choose>
+            <if type="article-newspaper bill interview manuscript patent personal_communication post-weblog song" match="any">
+              <date variable="issued">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" form="short" suffix=" "/>
+              </date>
+            </if>
+          </choose>
+          <date variable="issued" date-parts="year" form="numeric" prefix=" "/>
+        </else-if>
+        <else-if type="article-journal paper-conference" match="any">
+          <choose>
+            <if variable="status" match="any">
+              <text variable="status" font-style="italic"/>
+            </if>
+            <else>
+              <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
+        </else>
+      </choose>
+    </group>
   </macro>
   <macro name="issued-year">
+    <!-- Macro responsável por mostrar apenas o ano -->
     <choose>
-      <if variable="issued" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+      <if variable="event-date" match="any">
+        <date date-parts="year" form="numeric" variable="event-date" prefix=" "/>
       </if>
-      <else-if type="paper-conference" match="all">
-        <date date-parts="year" form="numeric" variable="issued">
-          <date-part name="year"/>
+      <else-if is-uncertain-date="issued">
+        <date variable="issued">
+          <date-part name="year" prefix="[" suffix="]"/>
         </date>
       </else-if>
+      <else-if variable="issued" match="any">
+        <date date-parts="year" form="numeric" variable="issued" prefix=" "/>
+      </else-if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="status" match="any">
+            <text variable="status" font-style="italic"/>
+          </if>
+          <else>
+            <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
+          </else>
+        </choose>
+      </else-if>
       <else>
-        <text value="[s.d.]"/>
+        <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
       </else>
     </choose>
   </macro>
   <macro name="issued-legislation">
-    <date variable="issued">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
+    <!-- Macro responsável por mostrar a data para documentos legislativos -->
+    <date variable="issued" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="short"/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="submitted">
+    <!-- Macro responsável por mostrar a data de submissão de um documento. Utilizado para patente como data de depósito -->
+    <date variable="submitted" prefix=" " delimiter=" " suffix=".">
+      <date-part name="day"/>
+      <date-part name="month" form="short"/>
       <date-part name="year"/>
     </date>
   </macro>
   <macro name="edition">
+    <!-- Macro responsável por mostrar o número da edição. Atualmente sem diferenciar a língua do documento para apresentar as edições -->
     <choose>
       <if type="book chapter" match="any">
         <choose>
@@ -280,369 +486,722 @@
             </group>
           </if>
           <else>
-            <text variable="edition" suffix=" ed."/>
+            <text variable="edition"/>
+            <text term="edition" form="short" suffix="."/>
           </else>
         </choose>
       </if>
     </choose>
   </macro>
   <macro name="locators">
+    <!-- Macro responsável por mostrar os dados complementares do documento -->
     <choose>
       <if type="bill">
+        <!-- Se for legislação utilizará o que foi definido nas macros "issued" e "section" adicionará a variável "page" -->
         <group prefix=". " delimiter=", ">
-          <date variable="issued">
-            <date-part name="day"/>
-            <date-part prefix=" " name="month" form="short"/>
-            <date-part prefix=" " name="year"/>
-          </date>
+          <text macro="issued"/>
           <text macro="section"/>
-          <text variable="page" prefix="p. " suffix="."/>
+          <group>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page" suffix="."/>
+          </group>
         </group>
       </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper">
+      <else-if match="any" type="article-journal article-magazine">
+        <!-- Se for artigo de periódigo ou revista, utiliza os termos padrões para volume e número -->
         <group delimiter=", ">
-          <group delimiter=", ">
-            <text variable="volume" prefix="v. "/>
-            <text variable="edition" prefix="v. "/>
-            <text variable="issue" prefix="n. "/>
+          <group>
+            <text term="volume" form="short" suffix=" "/>
+            <text variable="volume"/>
+          </group>
+          <group>
+            <text term="issue" form="short" suffix=" "/>
+            <text variable="issue"/>
           </group>
           <text variable="collection-title"/>
-          <text variable="page" prefix="p. "/>
+          <group>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper" match="any">
+        <!-- Se for artigo de jornal, utiliza termo específico para volume -->
+        <group>
+          <group delimiter=", ">
+            <text variable="volume" prefix="ano "/>
+            <group>
+              <text term="issue" form="short" suffix=" "/>
+              <text variable="issue"/>
+            </group>
+            <text macro="issued"/>
+          </group>
+          <group delimiter=", " suffix=".">
+            <text variable="section"/>
+            <text variable="collection-title"/>
+            <group>
+              <text term="page" form="short" suffix=" "/>
+              <text variable="page"/>
+            </group>
+          </group>
         </group>
       </else-if>
       <else-if match="any" type="book chapter">
+        <!-- Se for livro ou capítulo, utiliza os termos padrões para volume e página -->
         <group delimiter=", ">
           <group>
-            <text variable="volume" prefix="v. "/>
-            <text variable="page" prefix="p. "/>
+            <text term="volume" form="short" suffix=" "/>
+            <text variable="volume"/>
+          </group>
+          <group>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page"/>
           </group>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="collection-title">
+    <!-- Macro responsável por mostrar os dados de coleção para livro e capítulo -->
     <text variable="collection-title"/>
-    <text variable="collection-number" prefix=" "/>
+    <text variable="collection-number" prefix=", v. "/>
   </macro>
   <macro name="genre">
-    <text variable="genre"/>
+    <!-- Macro responsável por mostrar as informações de tipo para carta, e-mail e mensagem -->
+    <text variable="genre" suffix=". "/>
   </macro>
   <macro name="section">
+    <!-- Macro responsável por mostrar a seção quando houver -->
     <choose>
-      <if match="any" variable="section issue">
+      <if variable="section issue" match="any">
         <text variable="section"/>
         <text variable="issue"/>
       </if>
     </choose>
   </macro>
+  <macro name="citation-locator">
+    <!-- Macro responsável por mostrar os localizadores (página, seção, capítulo, etc.) em uma citação  -->
+    <group>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
   <macro name="place">
+    <!-- Macro responsável por utilizar local de publicação como local e, em sua ausência, utilizar o termo padrão s. l.  -->
     <choose>
       <if variable="publisher-place" match="any">
         <text variable="publisher-place" suffix=", "/>
       </if>
-      <else-if type="paper-conference" variable="publisher-place">
-        <text variable="publisher-place" suffix=". "/>
-      </else-if>
       <else>
-        <text value="[s. l.]" suffix=", "/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="archive">
-    <group>
-      <text variable="archive" prefix=" "/>
-    </group>
-  </macro>
-  <macro name="point-locators-subsequent">
-    <choose>
-      <if type="legal_case" variable="locator" match="all">
-        <choose>
-          <if locator="page">
-            <group delimiter=":">
-              <number variable="volume"/>
-              <text variable="locator"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <label variable="locator" form="short"/>
-              <text variable="locator"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-      <else-if variable="locator">
         <choose>
-          <if locator="page" match="none">
-            <group delimiter=" ">
-              <choose>
-                <if type="book graphic motion_picture report song" match="any">
-                  <choose>
-                    <if variable="volume">
-                      <group delimiter=", ">
-                        <group delimiter=" ">
-                          <text term="volume" form="short"/>
-                          <number variable="volume" form="numeric"/>
-                        </group>
-                        <label variable="locator" form="short"/>
-                      </group>
-                    </if>
-                    <else>
-                      <label variable="locator" form="short"/>
-                    </else>
-                  </choose>
-                </if>
-                <else>
-                  <label variable="locator" form="short"/>
-                </else>
-              </choose>
-              <text variable="locator"/>
-            </group>
+          <if type="graphic post webpage" match="any">
+            <text value="s. l." prefix="[" suffix="], " font-style="italic" text-case="capitalize-first"/>
           </if>
-          <else-if type="book graphic motion_picture report song" match="any">
-            <group delimiter=":">
-              <number variable="volume" form="numeric"/>
-              <text variable="locator"/>
-            </group>
-          </else-if>
           <else>
-            <text variable="locator"/>
+            <text value="s. l." prefix="[" suffix="], " font-style="italic"/>
           </else>
         </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <!-- :: Macros do Chicago Style :: -->
-  <macro name="contributors-short">
-    <group delimiter=" ">
-      <names variable="author">
-        <name form="short" and="text" delimiter=", "/>
-        <substitute>
-          <names variable="editor"/>
-          <names variable="translator"/>
-        </substitute>
-      </names>
-      <text macro="recipient-short"/>
-    </group>
-  </macro>
-  <macro name="recipient-short">
-    <names variable="recipient">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name form="short" and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="case-locator-subsequent">
-    <choose>
-      <if type="legal_case">
-        <group delimiter=" ">
-          <text variable="volume"/>
-          <text variable="container-title"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="case-pinpoint-subsequent">
-    <choose>
-      <if type="legal_case">
-        <group delimiter=" ">
-          <choose>
-            <if locator="page">
-              <text term="at"/>
-              <text variable="locator"/>
-            </if>
-            <else>
-              <label variable="locator"/>
-              <text variable="locator"/>
-            </else>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="name-disambiguate">
-    <choose>
-      <if disambiguate="true" type="personal_communication" match="any">
-        <text macro="issued"/>
-      </if>
+      </else>
     </choose>
   </macro>
-  <!-- :: C I T A T I O N   S T Y L E :: -->
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true">
-    <layout suffix="." delimiter="; ">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" delimiter-precedes-et-al="never">
+    <!-- CITAÇÃO: uso de sufixo para desambiguação de anos e de prenome ativos -->
+    <sort>
+      <key macro="author"/>
+      <!-- ordena primeiro pela macro autor -->
+      <key variable="issued"/>
+      <!-- em seguida pela data -->
+    </sort>
+    <layout delimiter="; ">
+      <!-- separando mais de um documento com ponto-e-vírgula -->
       <choose>
         <if position="ibid-with-locator">
-          <group delimiter=", ">
-            <text term="ibid"/>
-            <text macro="point-locators-subsequent"/>
+          <group suffix=".">
+            <text term="ibid" form="short"/>
+            <text macro="citation-locator" prefix=", "/>
           </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid"/>
+          <text term="ibid" form="short"/>
         </else-if>
         <else-if position="subsequent">
-          <group delimiter=", ">
-            <text macro="contributors-short"/>
-            <group delimiter=" ">
-              <group delimiter=", ">
-                <text macro="title-short"/>
-                <!--if title & author are the same: -->
-                <text macro="name-disambiguate"/>
-                <text macro="case-locator-subsequent"/>
+          <!-- citações no formato autor data -->
+          <choose>
+            <if type="broadcast motion_picture song" match="any">
+              <!-- documentos em que citação é pelo título -->
+              <group suffix=".">
+                <text variable="title" text-case="uppercase" suffix=", "/>
+                <text macro="issued-year"/>
+                <text macro="citation-locator" prefix=", "/>
               </group>
-              <text macro="case-pinpoint-subsequent"/>
-            </group>
-          </group>
-        </else-if>
+            </if>
+            <else>
+              <!-- do contrário é o formato padrão de autor e data separados por vírgula -->
+              <group suffix="." delimiter=", ">
+                <text macro="author-short"/>
+                <text macro="issued-year"/>
+                <text macro="citation-locator"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <group>
+            <!-- START Repeat what is in bibliography -->
+            <choose>
+              <if type="article">
+                <!-- Documento (Zotero) e Programa de computador (Mendeley) -->
+                <group suffix=".">
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=" "/>
+                  <text variable="medium" suffix=". "/>
+                  <!--incluído para ter a versão de programa de computador no mendeley-->
+                  <text variable="number" prefix="Versão " suffix=". "/>
+                  <text macro="publisher" suffix="  "/>
+                  <text variable="genre" suffix="."/>
+                  <text macro="access"/>
+                </group>
+              </if>
+              <else-if type="article-journal article-magazine" match="any">
+                <!-- Artigo de periódico e Artigo de revista  -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text variable="genre" suffix=". "/>
+                  <text macro="container-title" suffix=", "/>
+                  <text macro="place"/>
+                  <text macro="edition" suffix=", "/>
+                  <text macro="locators" suffix=", "/>
+                  <choose>
+                    <if variable="issued" match="none">
+                      <text macro="issued"/>
+                    </if>
+                    <else>
+                      <text macro="issued"/>
+                      <text variable="status" suffix=". " font-style="italic" text-case="capitalize-first"/>
+                    </else>
+                  </choose>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="article-newspaper">
+                <!-- Artigo de jornal -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text macro="container-title" suffix=", "/>
+                  <text macro="place" prefix=" "/>
+                  <text macro="locators"/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="bill">
+                <!-- Audiência e Legislação -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text variable="abstract" suffix=". "/>
+                  <text macro="container-title" suffix=", "/>
+                  <text variable="publisher-place" suffix=": "/>
+                  <text variable="publisher" suffix=", "/>
+                  <text variable="authority" suffix=", "/>
+                  <text macro="issued-legislation" suffix=". "/>
+                  <text macro="section" prefix="Seção " suffix=", "/>
+                  <text variable="page" prefix="p. " suffix="."/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="book">
+                <!-- Livro e, no Zotero, também Programa de computador -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text macro="translator" suffix=". "/>
+                  <text variable="genre" suffix=". "/>
+                  <text macro="edition" suffix=". "/>
+                  <choose>
+                    <if variable="version" match="any">
+                      <text term="version" text-case="capitalize-first" suffix=" "/>
+                      <text variable="version" suffix=". "/>
+                    </if>
+                  </choose>
+                  <text macro="publisher"/>
+                  <text variable="ISSN" prefix="ISSN " suffix="."/>
+                  <text macro="collection-title" prefix="(" suffix=")."/>
+                  <text macro="locators"/>
+                  <text variable="medium" suffix=". "/>
+                  <choose>
+                    <if variable="genre" match="any">
+                      <!--incluido title-short para funcionar o que seria medium no Mendeley-->
+                      <text variable="title-short" suffix=". "/>
+                    </if>
+                  </choose>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="broadcast motion_picture" match="any">
+                <!-- Transmissão de rádio, Transmissão de televisão, Filme e Gravação de vídeo -->
+                <group>
+                  <text macro="title"/>
+                  <choose>
+                    <if type="motion_picture" match="any">
+                      <text macro="author" text-case="capitalize-first" suffix=". "/>
+                    </if>
+                    <else-if type="broadcast" match="any">
+                      <text macro="author" suffix=". "/>
+                    </else-if>
+                  </choose>
+                  <text macro="publisher"/>
+                  <text variable="medium" prefix=" "/>
+                  <text variable="genre" prefix=" "/>
+                  <text variable="dimensions" prefix=" (" suffix="). "/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="chapter">
+                <!-- Capítulo -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text term="in" text-case="capitalize-first" suffix=": " font-style="italic"/>
+                  <text macro="container-contributors" suffix=". "/>
+                  <text macro="container-title" suffix=". "/>
+                  <text macro="translator" suffix=". "/>
+                  <text macro="edition" suffix=". "/>
+                  <text macro="publisher"/>
+                  <text macro="collection-title" prefix="(" suffix=")."/>
+                  <text macro="locators" suffix=". "/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="entry-dictionary entry-encyclopedia" match="any">
+                <!-- verbetes -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text term="in" text-case="capitalize-first" font-style="italic" prefix=" " suffix=": "/>
+                  <text macro="container-contributors" suffix="."/>
+                  <text macro="container-title" prefix=" " suffix=". "/>
+                  <text macro="publisher"/>
+                  <text variable="page" prefix=" p. " suffix=". "/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="graphic">
+                <!-- Obra de arte -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title"/>
+                  <text macro="place"/>
+                  <text macro="issued-year" suffix=". "/>
+                  <text variable="medium" suffix=", "/>
+                  <text variable="dimensions" suffix=". "/>
+                  <text variable="genre" suffix="."/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="interview">
+                <!-- Entrevista -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title"/>
+                  <text macro="interviewer" suffix=". "/>
+                  <text variable="genre" suffix=". "/>
+                  <text macro="publisher"/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="legal_case">
+                <!-- Jurisprudência -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text variable="abstract" suffix=". "/>
+                  <text macro="container-title" prefix="Relator: " suffix=", "/>
+                  <text variable="publisher-place" suffix=", "/>
+                  <text macro="issued-legislation" suffix=". "/>
+                  <text macro="section" prefix="Seção " suffix=", "/>
+                  <text variable="page" prefix="p. " suffix="."/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="legislation">
+                <!-- Estatuto -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text variable="abstract" suffix=". "/>
+                  <text macro="container-title" suffix=", "/>
+                  <text macro="publisher"/>
+                  <text macro="section" prefix="Seção " suffix=", "/>
+                  <text variable="page" prefix="p. " suffix="."/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="manuscript">
+                <!-- Manuscrito e Partitura -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=" "/>
+                  <choose>
+                    <if variable="medium" match="any">
+                      <group>
+                        <text variable="genre" suffix=". "/>
+                        <text macro="publisher"/>
+                        <text variable="medium" suffix="."/>
+                      </group>
+                    </if>
+                    <else>
+                      <group>
+                        <text variable="publisher-place" suffix=", "/>
+                        <text variable="publisher" suffix=", "/>
+                        <text macro="issued"/>
+                        <text variable="genre" prefix=" " suffix="."/>
+                      </group>
+                    </else>
+                  </choose>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="map">
+                <!-- Mapa -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title"/>
+                  <text macro="publisher"/>
+                  <text variable="genre" suffix=". "/>
+                  <text variable="scale" prefix="Escala " suffix=". "/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="paper-conference">
+                <!-- trabalho em evento -->
+                <text macro="author" suffix=". "/>
+                <text macro="title" suffix=". "/>
+                <text macro="event"/>
+                <text macro="container-contributors" text-case="uppercase"/>
+                <text macro="secondary-contributors"/>
+                <text macro="container-title"/>
+                <text macro="locators"/>
+                <choose>
+                  <if variable="issued" match="none">
+                    <text macro="publisher"/>
+                    <text variable="page" prefix=" p. " suffix="."/>
+                  </if>
+                  <else>
+                    <text macro="publisher"/>
+                    <text variable="page" prefix=" p. " suffix=". "/>
+                    <text variable="status" suffix=". " font-style="italic" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <text macro="access"/>
+              </else-if>
+              <else-if type="patent">
+                <!-- Patente -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text variable="authority" prefix="Depositante: " suffix=". "/>
+                  <text variable="number" suffix=". "/>
+                  <text macro="submitted" prefix="Depósito: " suffix=". "/>
+                  <text variable="genre" suffix=". "/>
+                  <text macro="issued" prefix="Concessão: "/>
+                  <text variable="note"/>
+                </group>
+              </else-if>
+              <else-if type="personal_communication">
+                <!-- E-mail, Carta e Mensagem -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title"/>
+                  <text macro="recipient" suffix=". "/>
+                  <text variable="publisher-place" suffix=", "/>
+                  <text macro="issued"/>
+                  <text macro="access"/>
+                  <text macro="genre" prefix=" "/>
+                </group>
+              </else-if>
+              <else-if type="post webpage">
+                <!-- Página web e Fórum -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=" "/>
+                  <text macro="place"/>
+                  <text macro="issued-year" suffix=". "/>
+                  <text variable="genre" suffix=". "/>
+                  <text macro="access" suffix=". "/>
+                </group>
+              </else-if>
+              <else-if type="post-weblog">
+                <!-- Post -->
+                <group>
+                  <text macro="author"/>
+                  <text macro="title" prefix=". "/>
+                  <text term="in" font-style="italic" text-case="capitalize-first" prefix=". " suffix=": "/>
+                  <text variable="container-title" text-case="uppercase" suffix=". "/>
+                  <text variable="publisher-place" suffix=", "/>
+                  <text macro="issued"/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="report">
+                <!-- Relatório -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title"/>
+                  <text macro="container-contributors"/>
+                  <text macro="secondary-contributors"/>
+                  <text macro="container-title"/>
+                  <text variable="collection-title" prefix=": "/>
+                  <text macro="locators"/>
+                  <text macro="publisher" prefix=". "/>
+                  <!--incluido genre para funcionar manuscript no Mendeley-->
+                  <text variable="genre" prefix=" " suffix="."/>
+                  <text macro="access" suffix="."/>
+                </group>
+              </else-if>
+              <else-if type="song">
+                <!-- Áudio, Música e Podcast -->
+                <text macro="title"/>
+                <text macro="author" text-case="capitalize-first" suffix=". "/>
+                <text macro="composer" suffix=". "/>
+                <text macro="publisher"/>
+                <text variable="medium" prefix=" "/>
+                <text variable="genre" prefix=" "/>
+                <text variable="dimensions" prefix=" (" suffix="). "/>
+                <text macro="access"/>
+              </else-if>
+              <else-if type="speech">
+                <!-- Apresentação -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title"/>
+                  <text macro="publisher"/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else-if type="thesis">
+                <!-- Dissertação, Tese e TCC -->
+                <group>
+                  <text macro="author" suffix=". "/>
+                  <text macro="title" suffix=". "/>
+                  <text variable="number-of-pages" suffix=" f. "/>
+                  <text macro="issued-year" suffix=". "/>
+                  <text variable="genre"/>
+                  <text variable="publisher" prefix=" - " suffix=", "/>
+                  <text macro="place"/>
+                  <text macro="issued"/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+              <else>
+                <!-- Formato padrão para documentos não previstos -->
+                <text macro="author" suffix=". "/>
+                <text macro="title"/>
+                <text macro="container-contributors"/>
+                <text macro="secondary-contributors"/>
+                <text macro="container-title"/>
+                <text variable="collection-title" prefix=": " suffix="."/>
+                <text macro="locators"/>
+                <text variable="publisher-place"/>
+                <text variable="publisher" suffix=", "/>
+                <text macro="issued" prefix=", "/>
+                <text macro="access"/>
+                <text variable="medium"/>
+                <text variable="genre"/>
+              </else>
+            </choose>
+            <!-- END Repeat what is in bibliography -->
+            <choose>
+              <if variable="locator">
+                <text macro="citation-locator" suffix="."/>
+              </if>
+            </choose>
+          </group>
+        </else>
       </choose>
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="1" line-spacing="1" entry-spacing="1">
+    <!--REFERÊNCIAS: a partir de 4 autores utiliza et al., alinhamento a esquerda, espaçamento simples e uma linha entre referências-->
+    <sort>
+      <key macro="author-short"/>
+      <key macro="title"/>
+      <!-- ordena primeiro pela macro autor -->
+      <key variable="issued"/>
+      <!-- em seguida pela data -->
+    </sort>
+    <layout>
       <choose>
-        <if type="bill">
-          <group>
+        <if type="article">
+          <!-- Documento (Zotero) e Programa de computador (Mendeley) -->
+          <group suffix=".">
             <text macro="author" suffix=". "/>
-            <text variable="number" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text variable="references" font-weight="bold"/>
-            <text variable="note"/>
-            <text macro="locators" suffix=". "/>
+            <text macro="title" suffix=" "/>
+            <text variable="medium" suffix=". "/>
+            <!--incluído para ter a versão de programa de computador no mendeley-->
+            <text variable="number" prefix="Versão " suffix=". "/>
+            <text macro="publisher" suffix="  "/>
+            <text variable="genre" suffix="."/>
+            <text macro="access"/>
           </group>
         </if>
-        <else-if type="map">
+        <else-if type="article-journal article-magazine" match="any">
+          <!-- Artigo de periódico e Artigo de revista  -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text variable="note" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text macro="place"/>
+            <text macro="edition" suffix=", "/>
+            <text macro="locators" suffix=", "/>
+            <choose>
+              <if variable="issued" match="none">
+                <text macro="issued"/>
+              </if>
+              <else>
+                <text macro="issued"/>
+                <text variable="status" suffix=". " font-style="italic" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="book">
+        <else-if type="article-newspaper">
+          <!-- Artigo de jornal -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text macro="translator" suffix=". "/>
-            <text macro="edition" suffix=". "/>
-            <text macro="publisher" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text macro="place" prefix=" "/>
             <text macro="locators"/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="chapter">
+        <else-if type="bill">
+          <!-- Audiência e Legislação -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text macro="container-contributors" suffix=". "/>
-            <text macro="container-title" suffix=". "/>
-            <text variable="collection-title"/>
-            <text macro="translator" suffix=". "/>
-            <text macro="edition" suffix=". "/>
-            <text macro="publisher" suffix=". "/>
-            <text macro="locators" suffix=". "/>
+            <text variable="abstract" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text variable="publisher-place" suffix=": "/>
+            <text variable="publisher" suffix=", "/>
+            <text variable="authority" suffix=", "/>
+            <text macro="issued-legislation" suffix=". "/>
+            <text macro="section" prefix="Seção " suffix=", "/>
+            <text variable="page" prefix="p. " suffix="."/>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="article-newspaper article-magazine article-journal" match="any">
+        <else-if type="book">
+          <!-- Livro e, no Zotero, também Programa de computador -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text macro="collection-title" suffix=". "/>
-            <text macro="place"/>
-            <text macro="edition" suffix=", "/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued" suffix=". "/>
+            <text macro="translator" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="edition" suffix=". "/>
+            <choose>
+              <if variable="version" match="any">
+                <text term="version" text-case="capitalize-first" suffix=" "/>
+                <text variable="version" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="publisher"/>
+            <text variable="ISSN" prefix="ISSN " suffix="."/>
+            <text macro="collection-title" prefix="(" suffix=")."/>
+            <text macro="locators"/>
+            <text variable="medium" suffix=". "/>
+            <choose>
+              <if variable="genre" match="any">
+                <!--incluido title-short para funcionar o que seria medium no Mendeley-->
+                <text variable="title-short" suffix=". "/>
+              </if>
+            </choose>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="thesis">
+        <else-if type="broadcast motion_picture" match="any">
+          <!-- Transmissão de rádio, Transmissão de televisão, Filme e Gravação de vídeo -->
           <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="issued-year" suffix=". "/>
-            <text macro="genre" suffix=" - "/>
-            <text variable="publisher" suffix=", "/>
-            <text macro="place"/>
-            <text macro="issued" suffix="."/>
+            <text macro="title"/>
+            <choose>
+              <if type="motion_picture" match="any">
+                <text macro="author" text-case="capitalize-first" suffix=". "/>
+              </if>
+              <else-if type="broadcast" match="any">
+                <text macro="author" suffix=". "/>
+              </else-if>
+            </choose>
+            <text macro="publisher"/>
+            <text variable="medium" prefix=" "/>
+            <text variable="genre" prefix=" "/>
+            <text variable="dimensions" prefix=" (" suffix="). "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="manuscript">
+        <else-if type="chapter">
+          <!-- Capítulo -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
+            <text term="in" text-case="capitalize-first" suffix=": " font-style="italic"/>
+            <text macro="container-contributors" suffix=". "/>
+            <text macro="container-title" suffix=". "/>
+            <text macro="translator" suffix=". "/>
             <text macro="edition" suffix=". "/>
-            <text macro="place" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text macro="access" suffix=". "/>
-            <text macro="archive" suffix=". "/>
+            <text macro="publisher"/>
+            <text macro="collection-title" prefix="(" suffix=")."/>
+            <text macro="locators" suffix=". "/>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="webpage">
+        <else-if type="entry-dictionary entry-encyclopedia" match="any">
+          <!-- verbetes -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text macro="genre" suffix=". "/>
-            <text macro="issued-year" suffix="."/>
-            <text macro="access" suffix=". "/>
+            <text term="in" text-case="capitalize-first" font-style="italic" prefix=" " suffix=": "/>
+            <text macro="container-contributors" suffix="."/>
+            <text macro="container-title" prefix=" " suffix=". "/>
+            <text macro="publisher"/>
+            <text variable="page" prefix=" p. " suffix=". "/>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="report">
+        <else-if type="graphic">
+          <!-- Obra de arte -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": "/>
-            <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <text macro="access" suffix="."/>
+            <text macro="place"/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="medium" suffix=", "/>
+            <text variable="dimensions" suffix=". "/>
+            <text variable="genre" suffix="."/>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="entry-dictionary">
+        <else-if type="interview">
+          <!-- Entrevista -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": " suffix=". "/>
-            <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <text macro="collection-title" prefix="(Texto para discussao, n. " suffix=")."/>
+            <text macro="interviewer" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="publisher"/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="entry-encyclopedia">
+        <else-if type="legal_case">
+          <!-- Jurisprudência -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text macro="container-title" suffix="."/>
-            <text variable="publisher-place" prefix=". " suffix=": "/>
-            <text variable="publisher"/>
-            <text macro="issued" prefix="," suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="paper-conference">
-          <text macro="author" suffix=". "/>
-          <text macro="title" suffix="."/>
-          <text term="in" text-case="capitalize-first" prefix=" " suffix=": "/>
-          <text macro="container-contributors" text-case="uppercase"/>
-          <text macro="secondary-contributors"/>
-          <text macro="container-title"/>
-          <text macro="locators"/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
-          </group>
-          <text macro="publisher"/>
-          <text macro="access"/>
-        </else-if>
-        <else-if type="legislation legal_case" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text variable="abstract" prefix=". " suffix=". "/>
-            <text macro="container-title" suffix=", "/>
+            <text variable="abstract" suffix=". "/>
+            <text macro="container-title" prefix="Relator: " suffix=", "/>
             <text variable="publisher-place" suffix=", "/>
             <text macro="issued-legislation" suffix=". "/>
             <text macro="section" prefix="Seção " suffix=", "/>
@@ -650,172 +1209,127 @@
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="patent" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" prefix=" "/>
-            <text variable="number" prefix=", " suffix=", "/>
-            <text macro="issued" suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="interview song speech" match="any">
+        <else-if type="legislation">
+          <!-- Estatuto -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
+            <text variable="abstract" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
             <text macro="publisher"/>
-            <text variable="medium"/>
+            <text macro="section" prefix="Seção " suffix=", "/>
+            <text variable="page" prefix="p. " suffix="."/>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="broadcast motion_picture" match="any">
+        <else-if type="manuscript">
+          <!-- Manuscrito e Partitura -->
           <group>
-            <text macro="title"/>
-            <text value="Direção" text-case="capitalize-first" prefix=". " suffix=": "/>
             <text macro="author" suffix=". "/>
-            <text macro="publisher"/>
-            <text variable="medium"/>
+            <text macro="title" suffix=" "/>
+            <choose>
+              <if variable="medium" match="any">
+                <group>
+                  <text variable="genre" suffix=". "/>
+                  <text macro="publisher"/>
+                  <text variable="medium" suffix="."/>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <text variable="publisher-place" suffix=", "/>
+                  <text variable="publisher" suffix=", "/>
+                  <text macro="issued"/>
+                  <text variable="genre" prefix=" " suffix="."/>
+                </group>
+              </else>
+            </choose>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="dataset" match="any">
+        <else-if type="map">
+          <!-- Mapa -->
           <group>
-            <text macro="author"/>
-            <text macro="title" suffix=". "/>
-            <text variable="version" prefix=". "/>
+            <text macro="author" suffix=". "/>
+            <text macro="title"/>
             <text macro="publisher"/>
-            <text variable="medium"/>
+            <text variable="genre" suffix=". "/>
+            <text variable="scale" prefix="Escala " suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else>
+        <else-if type="paper-conference">
+          <!-- trabalho em evento -->
           <text macro="author" suffix=". "/>
-          <text macro="title"/>
-          <text macro="container-contributors"/>
+          <text macro="title" suffix=". "/>
+          <text macro="event"/>
+          <text macro="container-contributors" text-case="uppercase"/>
           <text macro="secondary-contributors"/>
           <text macro="container-title"/>
-          <text variable="collection-title" prefix=": " suffix="."/>
           <text macro="locators"/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
-          </group>
-          <text variable="publisher-place"/>
-          <text variable="publisher" suffix=", "/>
-          <text macro="issued" prefix=", " suffix=". "/>
+          <choose>
+            <if variable="issued" match="none">
+              <text macro="publisher"/>
+              <text variable="page" prefix=" p. " suffix="."/>
+            </if>
+            <else>
+              <text macro="publisher"/>
+              <text variable="page" prefix=" p. " suffix=". "/>
+              <text variable="status" suffix=". " font-style="italic" text-case="capitalize-first"/>
+            </else>
+          </choose>
           <text macro="access"/>
-          <text variable="medium"/>
-        </else>
-      </choose>
-    </layout>
-  </citation>
-  <!-- :: biblipgraphy   style :: -->
-  <bibliography hanging-indent="false" et-al-min="4" et-al-use-first="1" entry-spacing="1">
-    <sort>
-      <key macro="author"/>
-      <key variable="issued"/>
-    </sort>
-    <layout>
-      <choose>
-        <if type="bill">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text variable="number" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text variable="references" font-weight="bold"/>
-            <text variable="note"/>
-            <text macro="locators" suffix=". "/>
-          </group>
-        </if>
-        <else-if type="map">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text variable="note" suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="book">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="translator" suffix=". "/>
-            <text macro="edition" suffix=". "/>
-            <text variable="version" suffix=". "/>
-            <text macro="publisher" suffix=". "/>
-            <text macro="locators"/>
-            <text variable="note" suffix=". "/>
-            <text macro="access"/>
-          </group>
         </else-if>
-        <else-if type="chapter">
+        <else-if type="patent">
+          <!-- Patente -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text macro="container-contributors" suffix=". "/>
-            <text macro="container-title" suffix=". "/>
-            <text variable="collection-title"/>
-            <text macro="translator" suffix=". "/>
-            <text macro="edition" suffix=". "/>
-            <text macro="publisher" suffix=". "/>
-            <text macro="locators" suffix=". "/>
+            <text variable="authority" prefix="Depositante: " suffix=". "/>
+            <text variable="number" suffix=". "/>
+            <text macro="submitted" prefix="Depósito: " suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="issued" prefix="Concessão: "/>
+            <text variable="note"/>
           </group>
         </else-if>
-        <else-if type="article-magazine article-journal" match="any">
+        <else-if type="personal_communication">
+          <!-- E-mail, Carta e Mensagem -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text macro="collection-title" suffix=". "/>
-            <text macro="place"/>
-            <text macro="edition" suffix=", "/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued" suffix=". "/>
+            <text macro="title"/>
+            <text macro="recipient" suffix=". "/>
+            <text variable="publisher-place" suffix=", "/>
+            <text macro="issued"/>
             <text macro="access"/>
+            <text macro="genre" prefix=" "/>
           </group>
         </else-if>
-        <else-if type="article-newspaper" match="any">
+        <else-if type="post webpage">
+          <!-- Página web e Fórum -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
+            <text macro="title" suffix=" "/>
             <text macro="place"/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued-legislation" suffix=". "/>
-            <text macro="section" suffix=". "/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
             <text macro="issued-year" suffix=". "/>
-            <text macro="genre" suffix=" - "/>
-            <text variable="publisher" suffix=", "/>
-            <text macro="place"/>
-            <text macro="issued" suffix="."/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="manuscript">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="edition" suffix=". "/>
-            <text macro="place" suffix=", "/>
-            <text macro="issued" suffix=". "/>
+            <text variable="genre" suffix=". "/>
             <text macro="access" suffix=". "/>
-            <text macro="archive" suffix=". "/>
           </group>
         </else-if>
-        <else-if type="webpage">
+        <else-if type="post-weblog">
+          <!-- Post -->
           <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="genre" suffix=". "/>
-            <text macro="issued-year" suffix="."/>
-            <text macro="access" suffix=". "/>
+            <text macro="author"/>
+            <text macro="title" prefix=". "/>
+            <text term="in" font-style="italic" text-case="capitalize-first" prefix=". " suffix=": "/>
+            <text variable="container-title" text-case="uppercase" suffix=". "/>
+            <text variable="publisher-place" suffix=", "/>
+            <text macro="issued"/>
+            <text macro="access"/>
           </group>
         </else-if>
         <else-if type="report">
+          <!-- Relatório -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
@@ -824,124 +1338,61 @@
             <text macro="container-title"/>
             <text variable="collection-title" prefix=": "/>
             <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
+            <text macro="publisher" prefix=". "/>
+            <!--incluido genre para funcionar manuscript no Mendeley-->
+            <text variable="genre" prefix=" " suffix="."/>
             <text macro="access" suffix="."/>
           </group>
         </else-if>
-        <else-if type="entry-dictionary">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": " suffix=". "/>
-            <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <text macro="collection-title" prefix="(Texto para discussao, n. " suffix=")."/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="entry-encyclopedia">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text macro="container-title" suffix="."/>
-            <text variable="publisher-place" prefix=". " suffix=": "/>
-            <text variable="publisher"/>
-            <text macro="issued" prefix="," suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="paper-conference">
-          <text macro="author" suffix=". "/>
-          <text macro="title" suffix="."/>
-          <text term="in" text-case="capitalize-first" prefix=" " suffix=": "/>
-          <text macro="container-contributors" text-case="uppercase"/>
-          <text macro="secondary-contributors"/>
-          <text macro="container-title"/>
-          <text macro="locators"/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
-          </group>
+        <else-if type="song">
+          <!-- Áudio, Música e Podcast -->
+          <text macro="title"/>
+          <text macro="author" text-case="capitalize-first" suffix=". "/>
+          <text macro="composer" suffix=". "/>
           <text macro="publisher"/>
+          <text variable="medium" prefix=" "/>
+          <text variable="genre" prefix=" "/>
+          <text variable="dimensions" prefix=" (" suffix="). "/>
           <text macro="access"/>
         </else-if>
-        <else-if type="legislation legal_case" match="any">
+        <else-if type="speech">
+          <!-- Apresentação -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text variable="abstract" prefix=". " suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text variable="publisher-place" suffix=", "/>
-            <text macro="issued-legislation" suffix=". "/>
-            <text macro="section" prefix="Seção " suffix=", "/>
-            <text variable="page" prefix="p. " suffix="."/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="patent" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" prefix=" "/>
-            <text variable="number" prefix=", " suffix=", "/>
-            <text macro="issued" suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="interview song speech" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
             <text macro="publisher"/>
-            <text variable="dimensions" prefix=" "/>
-          </group>
-        </else-if>
-        <else-if type="broadcast motion_picture" match="any">
-          <group>
-            <text macro="title"/>
-            <text value="Direção" text-case="capitalize-first" prefix=". " suffix=": "/>
-            <text macro="author" suffix=". "/>
-            <text macro="publisher"/>
-            <text variable="dimensions" prefix=" "/>
-          </group>
-        </else-if>
-        <else-if type="dataset" match="any">
-          <group>
-            <text macro="author"/>
-            <text macro="title" suffix=". "/>
-            <text variable="version" prefix=". "/>
-            <text macro="publisher"/>
-            <text variable="medium"/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="article" match="any">
+        <else-if type="thesis">
+          <!-- Dissertação, Tese e TCC -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" text-case="capitalize-first" suffix=", "/>
-            <text variable="publisher" suffix=", "/>
-            <text macro="issued" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text variable="number-of-pages" suffix=" f. "/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="genre"/>
+            <text variable="publisher" prefix=" - " suffix=", "/>
+            <text macro="place"/>
+            <text macro="issued"/>
             <text macro="access"/>
           </group>
         </else-if>
         <else>
+          <!-- Formato padrão para documentos não previstos -->
           <text macro="author" suffix=". "/>
-          <text macro="title" text-case="capitalize-first"/>
+          <text macro="title"/>
           <text macro="container-contributors"/>
           <text macro="secondary-contributors"/>
           <text macro="container-title"/>
           <text variable="collection-title" prefix=": " suffix="."/>
           <text macro="locators"/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
-          </group>
           <text variable="publisher-place"/>
           <text variable="publisher" suffix=", "/>
-          <text macro="issued" prefix=", " suffix=". "/>
+          <text macro="issued" prefix=", "/>
           <text macro="access"/>
           <text variable="medium"/>
+          <text variable="genre"/>
         </else>
       </choose>
     </layout>
diff --git a/bioessays.csl b/bioessays.csl
deleted file mode 100644
index 0160c3bc9f3..00000000000
--- a/bioessays.csl
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="en-US" page-range-format="minimal" demote-non-dropping-particle="sort-only">
-  <info>
-    <title>BioEssays</title>
-    <id>http://www.zotero.org/styles/bioessays</id>
-    <link href="http://www.zotero.org/styles/bioessays" rel="self"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1002/%28ISSN%291521-1878/homepage/detailed_manuscript_instructions_and_author_support.htm" rel="documentation"/>
-    <author>
-      <name>Dan Dickinson</name>
-    </author>
-    <contributor>
-      <name>Xiaodong Dang</name>
-      <email>dangxdong@gmail.com</email>
-    </contributor>
-    <contributor>
-      <name>Charles Parnot</name>
-      <email>charles.parnot@gmail.com</email>
-    </contributor>
-    <category citation-format="numeric"/>
-    <category field="biology"/>
-    <issn>0265-9247</issn>
-    <eissn>1521-1878</eissn>
-    <updated>2012-09-09T21: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>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " font-weight="bold" delimiter-precedes-last="always"/>
-      <et-al font-weight="normal"/>
-    </names>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout prefix="[" suffix="]" delimiter=", ">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography second-field-align="flush" et-al-min="5" et-al-use-first="4">
-    <layout>
-      <choose>
-        <if type="book">
-          <text variable="citation-number" suffix=". "/>
-          <text macro="author"/>
-          <date variable="issued" suffix=" ">
-            <date-part name="year" form="long" prefix=". " suffix=". "/>
-          </date>
-          <text variable="title" suffix=".  " font-style="italic"/>
-          <text variable="publisher-place" suffix=": "/>
-          <text variable="publisher" suffix=". "/>
-        </if>
-        <else-if type="chapter">
-          <text variable="citation-number" suffix=". "/>
-          <text macro="author"/>
-          <date variable="issued" suffix=" ">
-            <date-part name="year" form="long" prefix=". " suffix=". "/>
-          </date>
-          <text variable="title" suffix=".  In "/>
-          <names variable="editor" suffix=". ed; ">
-            <name et-al-min="4" et-al-use-first="3" delimiter="," name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
-          </names>
-          <text variable="container-title" suffix=". " font-style="italic"/>
-          <text variable="publisher" suffix=". "/>
-          <text variable="page" prefix="p " suffix=". "/>
-        </else-if>
-        <else>
-          <text variable="citation-number" suffix=". "/>
-          <text macro="author"/>
-          <date variable="issued" suffix=" ">
-            <date-part name="year" form="long" prefix=". " suffix=". "/>
-          </date>
-          <text variable="title" suffix=". "/>
-          <text variable="container-title" form="short" suffix=" " font-style="italic"/>
-          <text variable="volume" font-weight="bold"/>
-          <text variable="page" prefix=": " suffix=". "/>
-        </else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
diff --git a/bitonline.csl b/bitonline.csl
new file mode 100644
index 00000000000..498d39928c8
--- /dev/null
+++ b/bitonline.csl
@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" default-locale="de-DE">
+  <info>
+    <title>b.i.t.online (note, German)</title>
+    <id>http://www.zotero.org/styles/bitonline</id>
+    <link href="http://www.zotero.org/styles/bitonline" rel="self"/>
+    <link href="http://www.zotero.org/styles/technische-universitat-dresden-historische-musikwissenschaft-note" rel="template"/>
+    <link href="https://www.b-i-t-online.de/heft/Autorenhinweise_und_Zitierrichtlinien_2015.pdf" rel="documentation"/>
+    <author>
+      <name>Jens Mittelbach</name>
+      <uri>http://www.jensmittelbach.de</uri>
+      <email>mail@jensmittelbach.de</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="humanities"/>
+    <issn>1435-7607</issn>
+    <eissn>2193-4193</eissn>
+    <summary>Zitierstil entsprechend den Vorgaben des Verlages b.i.t.online</summary>
+    <updated>2020-10-31T14:59:20+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="de">
+    <terms>
+      <term name="editor" form="verb-short">
+        <single>Hrsg.</single>
+        <multiple>Hrsg.</multiple>
+      </term>
+      <term name="editor" form="short">hg. von</term>
+      <term name="editorial-director" form="verb-short">
+        <single>Hrsg.</single>
+        <multiple>Hrsg.</multiple>
+      </term>
+      <term name="editortranslator" form="verb-short">
+        <single>Hrsg./Übers.</single>
+        <multiple>Hrsg./Übers.</multiple>
+      </term>
+      <term name="editortranslator" form="short">hg. u. übers. von</term>
+      <term name="number-of-volumes" form="short">Bde.</term>
+      <term name="translator" form="short">übers. von</term>
+      <term name="presented at">gehalten auf</term>
+      <term name="no date" form="short">o.&#8239;J.</term>
+      <term name="et-al">u.&#8239;a.</term>
+    </terms>
+  </locale>
+  <macro name="contributors-bib">
+    <names variable="author">
+      <name delimiter="/ " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="composer"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="contributors-long">
+    <names variable="author">
+      <name delimiter="/ " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="composer"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name form="short" delimiter="/ " delimiter-precedes-last="always" initialize="false" name-as-sort-order="first"/>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if type="bill book graphic legal_case motion_picture report song" match="any">
+            <names variable="editor">
+              <name form="short" delimiter="/ " delimiter-precedes-last="always" initialize="false" name-as-sort-order="first"/>
+              <label form="short" prefix=" (" suffix=")"/>
+            </names>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <names variable="editor translator" delimiter=", ">
+          <label form="short" plural="never" suffix=" "/>
+          <name delimiter-precedes-last="never" initialize="false"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if variable="container-author">
+        <names variable="container-author">
+          <name delimiter="/  " and="text" delimiter-precedes-last="never" initialize="false" name-as-sort-order="first"/>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if type="chapter paper-conference entry-encyclopedia" match="any">
+            <choose>
+              <if match="any" variable="editor">
+                <names variable="editor">
+                  <name delimiter="/ " delimiter-precedes-last="never" initialize="false"/>
+                  <et-al term="et-al"/>
+                  <label form="verb-short" prefix=" (" suffix=")"/>
+                </names>
+              </if>
+              <else>
+                <text value="o.&#8239;Hg."/>
+              </else>
+            </choose>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-container-contributors">
+    <choose>
+      <if type="chapter paper-conference entry-encyclopedia" match="any">
+        <choose>
+          <if variable="container-author" match="all">
+            <names variable="editor">
+              <label form="short" plural="never" text-case="lowercase" suffix=" "/>
+              <name and="text" delimiter-precedes-last="never" initialize="false"/>
+            </names>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-collection-contributors">
+    <names variable="collection-editor">
+      <name delimiter="/ " and="text" delimiter-precedes-last="never" initialize="false">
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+    </names>
+  </macro>
+  <macro name="title-long">
+    <group delimiter=", ">
+      <choose>
+        <if type="bill book webpage graphic legal_case motion_picture report song article" match="any">
+          <group delimiter=" ">
+            <text variable="title"/>
+            <text variable="version" prefix="(Version " suffix=") [Software]"/>
+          </group>
+        </if>
+        <else>
+          <text variable="title"/>
+        </else>
+      </choose>
+      <choose>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <choose>
+            <if variable="volume">
+              <group delimiter=" ">
+                <text term="volume" form="short"/>
+                <number variable="volume"/>
+              </group>
+            </if>
+          </choose>
+        </if>
+      </choose>
+      <text macro="secondary-contributors"/>
+    </group>
+    <group delimiter=" " prefix=" (" suffix=")">
+      <text macro="collection"/>
+    </group>
+  </macro>
+  <macro name="title-short">
+    <text variable="title" form="short"/>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference entry-encyclopedia entry-dictionary song musical_score" match="any">
+        <text term="in" text-case="lowercase" suffix=": "/>
+        <group>
+          <text macro="container-contributors" suffix=": "/>
+          <text variable="container-title" suffix=", "/>
+          <text macro="volume" suffix=", "/>
+          <text macro="secondary-container-contributors" suffix=", "/>
+        </group>
+      </if>
+      <else-if type="article-journal article-magazine broadcast manuscript map patent personal_communication thesis article" match="any">
+        <text term="in" text-case="lowercase" suffix=": "/>
+        <choose>
+          <if match="any" variable="container-title-short">
+            <text variable="container-title" form="short"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="normal"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="speech" match="any">
+        <group delimiter=" ">
+          <text term="presented at" text-case="lowercase" suffix=": "/>
+          <text variable="event" suffix=", "/>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper webpage" match="any">
+        <group delimiter=" ">
+          <choose>
+            <if match="any" variable="title">
+              <text term="in" text-case="lowercase" suffix=":"/>
+            </if>
+          </choose>
+          <text variable="container-title"/>
+        </group>
+      </else-if>
+      <else-if type="interview" match="any">
+        <group delimiter=" " suffix=" ">
+          <text term="interview"/>
+          <text term="by"/>
+          <names variable="interviewer">
+            <name delimiter="/ "/>
+          </names>
+        </group>
+        <group>
+          <text term="in" suffix=": "/>
+          <text variable="medium"/>
+        </group>
+      </else-if>
+      <else-if type="post-weblog" match="any">
+        <group delimiter=" ">
+          <text term="in" suffix=":"/>
+          <text value="Blog"/>
+          <text variable="container-title" suffix=", "/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="collection">
+    <text variable="collection-title"/>
+    <choose>
+      <if is-numeric="collection-number">
+        <text variable="collection-number" prefix=" "/>
+      </if>
+      <else>
+        <text variable="collection-number" prefix=", "/>
+      </else>
+    </choose>
+    <choose>
+      <if variable="collection-editor">
+        <text term="editor" form="short" text-case="lowercase" prefix=", "/>
+        <text macro="secondary-collection-contributors" prefix=" "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <text macro="publisher" suffix=" "/>
+        <number vertical-align="sup" variable="edition"/>
+      </if>
+      <else-if variable="edition">
+        <text variable="edition" vertical-align="baseline" suffix=", "/>
+        <text macro="publisher" suffix=" "/>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix=" "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if match="none" variable="publisher-place issued">
+        <text value="o.&#8239;O.&#8239;u.&#8239;J."/>
+      </if>
+      <else-if match="none" variable="publisher-place">
+        <text value="o.&#8239;O."/>
+      </else-if>
+      <else>
+        <text variable="publisher-place"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
+        <group>
+          <text macro="edition"/>
+        </group>
+        <text macro="year-date"/>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=" " suffix=" ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+        <text macro="year-date"/>
+      </else-if>
+      <else-if type="article manuscript" match="any">
+        <text variable="genre"/>
+        <text macro="publisher" suffix=" "/>
+        <text macro="year-date"/>
+      </else-if>
+      <else-if type="article-journal broadcast map patent personal_communication" match="any">
+        <group prefix=" ">
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text macro="year-date" prefix="(" suffix=")"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="speech" match="any">
+        <group delimiter=" " prefix=" ">
+          <text value="am"/>
+          <date form="text" variable="issued"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper post-weblog article-magazine interview" match="any">
+        <group delimiter=" " prefix=" ">
+          <text value="Datum" suffix=": "/>
+          <date form="numeric" variable="issued"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <group>
+      <choose>
+        <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis article webpage chapter paper-conference" match="any">
+          <label suffix=" " variable="page" form="short"/>
+          <text variable="page"/>
+        </if>
+        <else-if type="entry-encyclopedia" match="any">
+          <label suffix=" " variable="locator" form="short"/>
+          <text variable="page"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <text macro="e-resource"/>
+    <choose>
+      <if match="any" variable="URL DOI">
+        <date form="numeric" variable="accessed" prefix=" [" suffix="]"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <label suffix=" " variable="locator" form="short"/>
+    <text variable="locator"/>
+  </macro>
+  <macro name="sort-key">
+    <text macro="contributors-bib" suffix=" "/>
+    <text macro="title-long" suffix=" "/>
+    <text macro="issued"/>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if match="any" variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if match="all" variable="publisher-place">
+        <text term="no date" form="short"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="e-resource">
+    <group delimiter=": ">
+      <choose>
+        <if match="any" variable="DOI">
+          <text value="DOI"/>
+          <group>
+            <text value="https://doi.org/"/>
+            <text variable="DOI"/>
+          </group>
+        </if>
+        <else>
+          <text variable="URL"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" " suffix=", ">
+      <number suffix=" " variable="number-of-volumes"/>
+      <text term="number-of-volumes" form="short"/>
+    </group>
+    <group delimiter=" ">
+      <choose>
+        <if match="any" is-numeric="volume">
+          <text term="volume" form="short" suffix=" "/>
+          <number variable="volume"/>
+        </if>
+        <else>
+          <text term="volume"/>
+          <text variable="volume" font-style="italic"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <citation name-delimiter="/" et-al-min="4" et-al-use-first="1" initialize="false" disambiguate-add-names="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <text term="ibid"/>
+          <text macro="citation-locator" prefix=", "/>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid"/>
+        </else-if>
+        <else-if position="subsequent">
+          <text macro="contributors-short" suffix=", "/>
+          <text macro="title-short"/>
+          <text macro="citation-locator" prefix=", "/>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <group delimiter=": ">
+              <text macro="contributors-long"/>
+              <text macro="title-long"/>
+            </group>
+            <group delimiter=", ">
+              <group>
+                <text macro="container"/>
+                <text macro="issued"/>
+              </group>
+            </group>
+            <text macro="pages"/>
+            <choose>
+              <if type="chapter paper-conference entry-encyclopedia" match="any">
+                <choose>
+                  <if variable="page" match="all">
+                    <text macro="citation-locator" prefix=" "/>
+                  </if>
+                </choose>
+              </if>
+              <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech webpage" match="any">
+                <choose>
+                  <if variable="page" match="all">
+                    <text macro="citation-locator" prefix=" "/>
+                  </if>
+                </choose>
+              </else-if>
+              <else>
+                <text macro="citation-locator"/>
+              </else>
+            </choose>
+          </group>
+          <group prefix=". ">
+            <text macro="access"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography name-delimiter="/" et-al-min="4" et-al-use-first="1" initialize="false" subsequent-author-substitute="&#8212;" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="sort-key"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=", ">
+        <group delimiter=", ">
+          <group delimiter=": ">
+            <text macro="contributors-bib"/>
+            <text macro="title-long"/>
+          </group>
+          <group>
+            <text macro="container"/>
+            <text macro="issued"/>
+          </group>
+        </group>
+        <text macro="pages"/>
+      </group>
+      <group>
+        <text macro="access" prefix=". "/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/brazilian-journal-of-veterinary-research-and-animal-science.csl b/brazilian-journal-of-veterinary-research-and-animal-science.csl
index e3d6c161706..3127466f190 100644
--- a/brazilian-journal-of-veterinary-research-and-animal-science.csl
+++ b/brazilian-journal-of-veterinary-research-and-animal-science.csl
@@ -15,7 +15,7 @@
     <category field="medicine"/>
     <issn>1413-9596</issn>
     <eissn>1678-4456</eissn>
-    <updated>2020-03-30T16:23:02+00:00</updated>
+    <updated>2020-11-03T17:03:19+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">
@@ -305,6 +305,10 @@
     </layout>
   </citation>
   <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
     <layout>
       <group delimiter=". " suffix=". ">
         <text macro="author"/>
diff --git a/clinical-orthopaedics-and-related-research.csl b/clinical-orthopaedics-and-related-research.csl
index 6ae7d7b1e92..f0507271a37 100644
--- a/clinical-orthopaedics-and-related-research.csl
+++ b/clinical-orthopaedics-and-related-research.csl
@@ -57,7 +57,7 @@
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
         <text variable="title"/>
@@ -119,7 +119,7 @@
           <group prefix=" ">
             <text term="in" text-case="capitalize-first" suffix=": "/>
             <text macro="editor"/>
-            <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
+            <text variable="container-title" font-style="italic" prefix=" " suffix="." text-case="title"/>
             <text variable="volume" prefix="Vol " suffix="."/>
             <text macro="edition" prefix=" "/>
             <text variable="collection-title" prefix=" " suffix="."/>
@@ -140,7 +140,7 @@
             <text macro="editor" prefix=" "/>
           </group>
           <group prefix=" " suffix=".">
-            <text variable="container-title" font-style="italic" form="short" suffix="."/>
+            <text variable="container-title" font-style="italic" form="short" strip-periods="true" suffix="."/>
             <group delimiter=";" prefix=" ">
               <date variable="issued">
                 <date-part name="year"/>
diff --git a/cureus.csl b/cureus.csl
index b9a78f94bd2..241736b6cec 100644
--- a/cureus.csl
+++ b/cureus.csl
@@ -137,7 +137,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush">
+  <bibliography et-al-min="8" et-al-use-first="3" second-field-align="flush">
     <layout>
       <text variable="citation-number" suffix="."/>
       <text macro="author"/>
diff --git a/dependent/animal-nutrition.csl b/dependent/animal-nutrition.csl
index 2abe81bec94..a90eb1ff568 100644
--- a/dependent/animal-nutrition.csl
+++ b/dependent/animal-nutrition.csl
@@ -5,10 +5,10 @@
     <title>Animal Nutrition</title>
     <id>http://www.zotero.org/styles/animal-nutrition</id>
     <link href="http://www.zotero.org/styles/animal-nutrition" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>2405-6545</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/bioessays.csl b/dependent/bioessays.csl
new file mode 100644
index 00000000000..3b0baaf197d
--- /dev/null
+++ b/dependent/bioessays.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>BioEssays</title>
+    <id>http://www.zotero.org/styles/bioessays</id>
+    <link href="http://www.zotero.org/styles/bioessays" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa-numeric-superscript-brackets" rel="independent-parent"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/15211878/homepage/2487_for_authors.html" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>0265-9247</issn>
+    <eissn>1521-1878</eissn>
+    <updated>2014-05-10T12: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>
+</style>
diff --git a/dependent/biotechnology-journal.csl b/dependent/biotechnology-journal.csl
new file mode 100644
index 00000000000..fadacd1f586
--- /dev/null
+++ b/dependent/biotechnology-journal.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>Biotechnology Journal</title>
+    <title-short>BJT</title-short>
+    <id>http://www.zotero.org/styles/biotechnology-journal</id>
+    <link href="http://www.zotero.org/styles/biotechnology-journal" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa-numeric-superscript-brackets" rel="independent-parent"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/18607314/homepage/2446_for_authors.html" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1860-6768</issn>
+    <eissn>1860-7314</eissn>
+    <updated>2014-05-10T12: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>
+</style>
diff --git a/dependent/chem-catalysis.csl b/dependent/chem-catalysis.csl
new file mode 100644
index 00000000000..a9f989fb74a
--- /dev/null
+++ b/dependent/chem-catalysis.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">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Chem Catalysis</title>
+    <id>http://www.zotero.org/styles/chem-catalysis</id>
+    <link href="http://www.zotero.org/styles/chem-catalysis" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="http://www.cell.com/chem-catalysis/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="chemistry"/>
+    <eissn>2667-1093</eissn>
+    <updated>2020-10-20T12: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>
+</style>
diff --git a/dependent/clinical-neurophysiology.csl b/dependent/clinical-neurophysiology.csl
index 28a02508edb..b432a5b61f2 100644
--- a/dependent/clinical-neurophysiology.csl
+++ b/dependent/clinical-neurophysiology.csl
@@ -5,10 +5,10 @@
     <title>Clinical Neurophysiology</title>
     <id>http://www.zotero.org/styles/clinical-neurophysiology</id>
     <link href="http://www.zotero.org/styles/clinical-neurophysiology" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>1388-2457</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/computational-intelligence.csl b/dependent/computational-intelligence.csl
new file mode 100644
index 00000000000..13811de8cf4
--- /dev/null
+++ b/dependent/computational-intelligence.csl
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>Computational Intelligence</title>
+    <id>http://www.zotero.org/styles/computational-intelligence</id>
+    <link href="http://www.zotero.org/styles/computational-intelligence" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-medical-association" rel="independent-parent"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/14678640/homepage/forauthors.html" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <issn>0824-7935</issn>
+    <eissn>1467-8640</eissn>
+    <updated>2020-11-13T12: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>
+</style>
diff --git a/dependent/computer-law-and-security-review-the-international-journal-of-technology-law-and-practice.csl b/dependent/computer-law-and-security-review-the-international-journal-of-technology-law-and-practice.csl
index 1e74667efd0..ba3e2f0aa02 100644
--- a/dependent/computer-law-and-security-review-the-international-journal-of-technology-law-and-practice.csl
+++ b/dependent/computer-law-and-security-review-the-international-journal-of-technology-law-and-practice.csl
@@ -5,10 +5,10 @@
     <title>Computer Law &amp; Security Review: The International Journal of Technology Law and Practice</title>
     <id>http://www.zotero.org/styles/computer-law-and-security-review-the-international-journal-of-technology-law-and-practice</id>
     <link href="http://www.zotero.org/styles/computer-law-and-security-review-the-international-journal-of-technology-law-and-practice" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
-    <category citation-format="author-date"/>
+    <link href="http://www.zotero.org/styles/oscola" rel="independent-parent"/>
+    <category citation-format="note"/>
     <issn>0267-3649</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/computers-and-security.csl b/dependent/computers-and-security.csl
index b863fc0a93d..07a2b2e7eb6 100644
--- a/dependent/computers-and-security.csl
+++ b/dependent/computers-and-security.csl
@@ -5,10 +5,10 @@
     <title>Computers &amp; Security</title>
     <id>http://www.zotero.org/styles/computers-and-security</id>
     <link href="http://www.zotero.org/styles/computers-and-security" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>0167-4048</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/diagnostic-microbiology-and-infectious-disease.csl b/dependent/diagnostic-microbiology-and-infectious-disease.csl
index 628f044d452..5774df37be3 100644
--- a/dependent/diagnostic-microbiology-and-infectious-disease.csl
+++ b/dependent/diagnostic-microbiology-and-infectious-disease.csl
@@ -5,10 +5,10 @@
     <title>Diagnostic Microbiology &amp; Infectious Disease</title>
     <id>http://www.zotero.org/styles/diagnostic-microbiology-and-infectious-disease</id>
     <link href="http://www.zotero.org/styles/diagnostic-microbiology-and-infectious-disease" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>0732-8893</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/international-journal-of-infectious-diseases.csl b/dependent/international-journal-of-infectious-diseases.csl
index 5a27d4c606b..9e3a446ab83 100644
--- a/dependent/international-journal-of-infectious-diseases.csl
+++ b/dependent/international-journal-of-infectious-diseases.csl
@@ -5,10 +5,10 @@
     <title>International Journal of Infectious Diseases</title>
     <id>http://www.zotero.org/styles/international-journal-of-infectious-diseases</id>
     <link href="http://www.zotero.org/styles/international-journal-of-infectious-diseases" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>1201-9712</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/international-journal-of-womens-dermatology.csl b/dependent/international-journal-of-womens-dermatology.csl
index dab6266f6c1..801a7283c6a 100644
--- a/dependent/international-journal-of-womens-dermatology.csl
+++ b/dependent/international-journal-of-womens-dermatology.csl
@@ -5,10 +5,10 @@
     <title>International Journal of Women's Dermatology</title>
     <id>http://www.zotero.org/styles/international-journal-of-womens-dermatology</id>
     <link href="http://www.zotero.org/styles/international-journal-of-womens-dermatology" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>2352-6475</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/journal-of-investigative-dermatology-symposium-proceedings.csl b/dependent/journal-of-investigative-dermatology-symposium-proceedings.csl
index db11d73afa4..f611c16537c 100644
--- a/dependent/journal-of-investigative-dermatology-symposium-proceedings.csl
+++ b/dependent/journal-of-investigative-dermatology-symposium-proceedings.csl
@@ -5,10 +5,10 @@
     <title>Journal of Investigative Dermatology Symposium Proceedings</title>
     <id>http://www.zotero.org/styles/journal-of-investigative-dermatology-symposium-proceedings</id>
     <link href="http://www.zotero.org/styles/journal-of-investigative-dermatology-symposium-proceedings" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>1087-0024</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/journal-of-orthopaedic-science.csl b/dependent/journal-of-orthopaedic-science.csl
index dba9ff20ddc..24885d013db 100644
--- a/dependent/journal-of-orthopaedic-science.csl
+++ b/dependent/journal-of-orthopaedic-science.csl
@@ -5,10 +5,10 @@
     <title>Journal of Orthopaedic Science</title>
     <id>http://www.zotero.org/styles/journal-of-orthopaedic-science</id>
     <link href="http://www.zotero.org/styles/journal-of-orthopaedic-science" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/vancouver-brackets-no-et-al" rel="independent-parent"/>
     <category citation-format="numeric"/>
     <issn>0949-2658</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/journal-of-rock-mechanics-and-geotechnical-engineering.csl b/dependent/journal-of-rock-mechanics-and-geotechnical-engineering.csl
index 52e9374f693..0e1de996433 100644
--- a/dependent/journal-of-rock-mechanics-and-geotechnical-engineering.csl
+++ b/dependent/journal-of-rock-mechanics-and-geotechnical-engineering.csl
@@ -5,10 +5,10 @@
     <title>Journal of Rock Mechanics and Geotechnical Engineering</title>
     <id>http://www.zotero.org/styles/journal-of-rock-mechanics-and-geotechnical-engineering</id>
     <link href="http://www.zotero.org/styles/journal-of-rock-mechanics-and-geotechnical-engineering" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>1674-7755</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/molecular-therapy-methods-and-clinical-development.csl b/dependent/molecular-therapy-methods-and-clinical-development.csl
index 924f29eb55e..41348ff90ee 100644
--- a/dependent/molecular-therapy-methods-and-clinical-development.csl
+++ b/dependent/molecular-therapy-methods-and-clinical-development.csl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Elsevier, generated from "elsevier" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Molecular Therapy - Methods &amp; Clinical Development</title>
     <id>http://www.zotero.org/styles/molecular-therapy-methods-and-clinical-development</id>
     <link href="http://www.zotero.org/styles/molecular-therapy-methods-and-clinical-development" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="https://www.cell.com/molecular-therapy-family/home" rel="documentation"/>
     <category citation-format="numeric"/>
     <issn>2329-0501</issn>
     <updated>2018-02-16T12:00:00+00:00</updated>
diff --git a/dependent/molecular-therapy-nucleic-acids.csl b/dependent/molecular-therapy-nucleic-acids.csl
index 01f2d3190cf..f4dbbb2dc0f 100644
--- a/dependent/molecular-therapy-nucleic-acids.csl
+++ b/dependent/molecular-therapy-nucleic-acids.csl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Elsevier, generated from "elsevier" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Molecular Therapy - Nucleic Acids</title>
     <id>http://www.zotero.org/styles/molecular-therapy-nucleic-acids</id>
     <link href="http://www.zotero.org/styles/molecular-therapy-nucleic-acids" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="https://www.cell.com/molecular-therapy-family/home" rel="documentation"/>
     <category citation-format="numeric"/>
     <issn>2162-2531</issn>
     <updated>2018-02-16T12:00:00+00:00</updated>
diff --git a/dependent/molecular-therapy-oncolytics.csl b/dependent/molecular-therapy-oncolytics.csl
index df53be3706b..0d305e55f50 100644
--- a/dependent/molecular-therapy-oncolytics.csl
+++ b/dependent/molecular-therapy-oncolytics.csl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Elsevier, generated from "elsevier" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Molecular Therapy - Oncolytics</title>
     <id>http://www.zotero.org/styles/molecular-therapy-oncolytics</id>
     <link href="http://www.zotero.org/styles/molecular-therapy-oncolytics" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="https://www.cell.com/molecular-therapy-family/home" rel="documentation"/>
     <category citation-format="numeric"/>
     <issn>2372-7705</issn>
     <updated>2018-02-16T12:00:00+00:00</updated>
diff --git a/dependent/molecular-therapy.csl b/dependent/molecular-therapy.csl
new file mode 100644
index 00000000000..c8776b07346
--- /dev/null
+++ b/dependent/molecular-therapy.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>Molecular Therapy</title>
+    <id>http://www.zotero.org/styles/molecular-therapy</id>
+    <link href="http://www.zotero.org/styles/molecular-therapy" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="https://www.cell.com/molecular-therapy-family/home" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <category field="biology"/>
+    <issn>1525-0016</issn>
+    <eissn>1525-0024</eissn>
+    <updated>2018-02-16T12: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>
+</style>
diff --git a/dependent/revista-brasileira-de-ciencias-do-esporte.csl b/dependent/revista-brasileira-de-ciencias-do-esporte.csl
index 98032282ac3..b8aded24875 100644
--- a/dependent/revista-brasileira-de-ciencias-do-esporte.csl
+++ b/dependent/revista-brasileira-de-ciencias-do-esporte.csl
@@ -5,10 +5,10 @@
     <title>Revista Brasileira de Ciências do Esporte</title>
     <id>http://www.zotero.org/styles/revista-brasileira-de-ciencias-do-esporte</id>
     <link href="http://www.zotero.org/styles/revista-brasileira-de-ciencias-do-esporte" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>0101-3289</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/sexologies.csl b/dependent/sexologies.csl
index 500f8b2c85f..078ea1e534c 100644
--- a/dependent/sexologies.csl
+++ b/dependent/sexologies.csl
@@ -5,10 +5,10 @@
     <title>Sexologies</title>
     <id>http://www.zotero.org/styles/sexologies</id>
     <link href="http://www.zotero.org/styles/sexologies" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>1158-1360</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/spatial-and-spatio-temporal-epidemiology.csl b/dependent/spatial-and-spatio-temporal-epidemiology.csl
index 07c66e18896..43fc3932a3f 100644
--- a/dependent/spatial-and-spatio-temporal-epidemiology.csl
+++ b/dependent/spatial-and-spatio-temporal-epidemiology.csl
@@ -5,10 +5,10 @@
     <title>Spatial and Spatio-temporal Epidemiology</title>
     <id>http://www.zotero.org/styles/spatial-and-spatio-temporal-epidemiology</id>
     <link href="http://www.zotero.org/styles/spatial-and-spatio-temporal-epidemiology" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="independent-parent"/>
     <category citation-format="author-date"/>
     <issn>1877-5845</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-06-04T12: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>
 </style>
diff --git a/dependent/spine-deformity.csl b/dependent/spine-deformity.csl
index 0eed83b209c..5df186e8f6f 100644
--- a/dependent/spine-deformity.csl
+++ b/dependent/spine-deformity.csl
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Elsevier, generated from "elsevier" metadata at https://github.com/citation-style-language/journals -->
+  <!-- Springer, generated from "springer" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Spine Deformity</title>
     <id>http://www.zotero.org/styles/spine-deformity</id>
     <link href="http://www.zotero.org/styles/spine-deformity" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="independent-parent"/>
-    <category citation-format="author-date"/>
+    <link href="http://www.zotero.org/styles/springer-basic-brackets-no-et-al" rel="independent-parent"/>
+    <link href="http://www.springer.com/cda/content/document/cda_downloaddocument/Key_Style_Points_1.0.pdf" rel="documentation"/>
+    <link href="http://www.springer.com/cda/content/document/cda_downloaddocument/manuscript-guidelines-1.0.pdf" rel="documentation"/>
+    <category citation-format="numeric"/>
     <issn>2212-134X</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <eissn>2212-1358</eissn>
+    <updated>2014-05-15T12: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>
 </style>
diff --git a/ferdinand-porsche-fern-fachhochschule.csl b/ferdinand-porsche-fern-fachhochschule.csl
index 721482bf22a..49f485b0304 100644
--- a/ferdinand-porsche-fern-fachhochschule.csl
+++ b/ferdinand-porsche-fern-fachhochschule.csl
@@ -1,14 +1,18 @@
 <?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="de-AT">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
-    <title>Ferdinand Porsche Fern-Fachhochschule (German - Austria)</title>
-    <title-short>Ferdinand Porsche FernFH (German - Austria)</title-short>
+    <title>Ferdinand Porsche Fernfachhochschule (German - Austria)</title>
+    <title-short>Ferdinand Porsche FFH (German - Austria)</title-short>
     <id>http://www.zotero.org/styles/ferdinand-porsche-fern-fachhochschule</id>
     <link href="http://www.zotero.org/styles/ferdinand-porsche-fern-fachhochschule" rel="self"/>
     <link href="http://www.zotero.org/styles/harvard-cite-them-right" rel="template"/>
-    <link href="https://onlinecampus.fernfh.ac.at/mod/resource/view.php?id=37791" rel="documentation"/>
-    <link href="https://github.com/citation-style-language/styles/files/73468/Richtlinien.wissenschaftliche.Arbeiten_04_2015.pdf" rel="documentation"/>
+    <link href="https://github.com/christoph425/ffh_csl_styles/raw/main/Richtlinien_wissenschaftliche_Arbeiten_WP.pdf" rel="documentation"/>
+    <link href="http://fernfh.ac.at/" rel="documentation"/>
+    <author>
+      <name>Christoph Jungbauer</name>
+      <email>christoph.jungbauer@fernfh.ac.at</email>
+    </author>
     <author>
       <name>Christian Focke</name>
       <email>christian.focke@mail.fernfh.ac.at</email>
@@ -19,8 +23,8 @@
     </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>Based on the Harvard author-date style</summary>
-    <updated>2015-12-28T11:38:29+00:00</updated>
+    <summary>CSL Style definition based on author-date style</summary>
+    <updated>2020-10-20T07:09:15+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="de-AT">
@@ -35,12 +39,20 @@
         <single>vortrag auf der</single>
         <multiple>vorträge auf der</multiple>
       </term>
+      <term name="editor">
+        <single>Herausgeber</single>
+        <multiple>Herausgeber</multiple>
+      </term>
+      <term name="editor" form="short">
+        <single>Hrsg.</single>
+        <multiple>Hrsg.</multiple>
+      </term>
     </terms>
   </locale>
   <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name and="symbol" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="lowercase"/>
+    <names variable="editor" delimiter=",">
+      <name delimiter="/" initialize="false" initialize-with=". " sort-separator=","/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")."/>
     </names>
   </macro>
   <macro name="anon">
@@ -78,6 +90,11 @@
             <date-part name="month" form="numeric-leading-zeros" suffix="."/>
             <date-part name="year"/>
           </date>
+          <choose>
+            <if match="any" variable="medium">
+              <text variable="medium" prefix="; Gelesen mit "/>
+            </if>
+          </choose>
         </group>
       </if>
     </choose>
@@ -88,7 +105,7 @@
   <macro name="publisher">
     <group delimiter=": ">
       <text macro="ffh-place"/>
-      <text variable="publisher"/>
+      <text macro="ffh-publisher"/>
     </group>
   </macro>
   <macro name="year-date">
@@ -112,7 +129,7 @@
         </group>
       </if>
       <else>
-        <text variable="edition" suffix="."/>
+        <text variable="edition" prefix="(" suffix=")"/>
       </else>
     </choose>
   </macro>
@@ -128,11 +145,31 @@
         <text variable="publisher-place"/>
       </if>
       <else>
-        <text value="o. O."/>
+        <text value="unveröffentlicht"/>
       </else>
     </choose>
   </macro>
+  <macro name="ffh-publisher">
+    <choose>
+      <if match="any" variable="publisher">
+        <text variable="publisher"/>
+      </if>
+      <else>
+        <text value="o.V."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume">
+    <choose>
+      <if match="any" variable="volume">
+        <text variable="volume" prefix="(" suffix=")"/>
+      </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-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true">
+    <sort>
+      <key variable="author"/>
+    </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
@@ -154,8 +191,9 @@
       <text macro="year-date" prefix=" (" suffix=")."/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group prefix=" " delimiter=" " suffix=",">
+          <group delimiter=" " prefix=" " suffix=".">
             <text macro="title"/>
+            <text macro="volume"/>
             <text macro="edition"/>
             <text macro="editor"/>
           </group>
@@ -166,37 +204,42 @@
           <group prefix=" " delimiter=" ">
             <text term="in" text-case="capitalize-first"/>
             <text macro="editor"/>
-            <text variable="container-title" font-style="italic" suffix="."/>
+            <text variable="container-title" font-style="italic"/>
             <text variable="collection-title" suffix="."/>
+            <text macro="volume"/>
+            <text macro="edition"/>
+            <text macro="pages" prefix="(" suffix=")."/>
             <text variable="event" suffix=","/>
             <group suffix="." delimiter=", ">
               <text macro="publisher" prefix=" "/>
-              <text macro="pages"/>
             </group>
           </group>
         </else-if>
         <else-if type="paper-conference">
           <text macro="title" prefix=" " suffix="."/>
           <group prefix=" " delimiter=" ">
-            <text term="presented at" text-case="capitalize-first"/>
             <text variable="container-title" suffix="."/>
             <text variable="collection-title" suffix="."/>
             <text variable="event" suffix=","/>
             <group suffix="." delimiter=", ">
               <text macro="publisher"/>
-              <date variable="issued">
-                <date-part name="day" range-delimiter="-" suffix=". "/>
-                <date-part name="month" range-delimiter="-" suffix=" "/>
-                <date-part name="year" range-delimiter="-"/>
-              </date>
             </group>
           </group>
         </else-if>
         <else-if type="thesis">
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="title"/>
+          <group prefix=" " suffix=".">
+            <text macro="title" suffix=". "/>
+            <text variable="genre" prefix="Unveröffentlichte " suffix=" an der "/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="speech" match="any">
+          <group delimiter=" " prefix=" " suffix=".">
+            <text variable="title" suffix="."/>
             <text variable="genre"/>
-            <text macro="publisher"/>
+            <text variable="event" prefix="auf der " suffix=", "/>
+            <text variable="event-place" suffix=", "/>
+            <date form="text" date-parts="year-month-day" variable="issued"/>
           </group>
         </else-if>
         <else>
diff --git a/geografia-fisica-e-dinamica-quaternaria.csl b/geografia-fisica-e-dinamica-quaternaria.csl
index 198e7c33a5e..b507d907b5d 100644
--- a/geografia-fisica-e-dinamica-quaternaria.csl
+++ b/geografia-fisica-e-dinamica-quaternaria.csl
@@ -19,7 +19,7 @@
     <category field="geology"/>
     <issn>0391-9838</issn>
     <eissn>1724-4781</eissn>
-    <updated>2020-03-28T09:24:47+00:00</updated>
+    <updated>2020-10-26T14:17: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>
   <locale>
@@ -118,6 +118,9 @@
       </else>
     </choose>
   </macro>
+  <macro name="DOI">
+    <text variable="DOI"/>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=",">
     <sort>
       <key macro="issued-short"/>
@@ -219,6 +222,7 @@
           </else>
         </choose>
       </group>
+      <text macro="DOI" prefix=" doi: "/>
     </layout>
   </bibliography>
 </style>
diff --git a/international-journal-of-polymer-analysis-and-characterization.csl b/international-journal-of-polymer-analysis-and-characterization.csl
index 9eb53315fa0..d1ace27cb0d 100644
--- a/international-journal-of-polymer-analysis-and-characterization.csl
+++ b/international-journal-of-polymer-analysis-and-characterization.csl
@@ -5,7 +5,7 @@
     <title-short>IJPAC</title-short>
     <id>http://www.zotero.org/styles/international-journal-of-polymer-analysis-and-characterization</id>
     <link href="http://www.zotero.org/styles/international-journal-of-polymer-analysis-and-characterization" rel="self"/>
-    <link href="http://www.zotero.org/styles/molecular-therapy" rel="template"/>
+    <link href="http://www.zotero.org/styles/nature" rel="template"/>
     <link href="https://www.tandfonline.com/action/authorSubmission?journalCode=gpac20&amp;page=instructions#refs" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
diff --git a/istanbul-universitesi-sosyal-bilimler-enstitusu.csl b/istanbul-universitesi-sosyal-bilimler-enstitusu.csl
new file mode 100644
index 00000000000..df960811c66
--- /dev/null
+++ b/istanbul-universitesi-sosyal-bilimler-enstitusu.csl
@@ -0,0 +1,1536 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" delimiter-precedes-et-al="never" page-range-format="expanded" default-locale="tr-TR">
+  <info>
+    <title>İstanbul Üniversitesi Sosyal Bilimler Enstitüsü (Turkish)</title>
+    <id>http://www.zotero.org/styles/istanbul-universitesi-sosyal-bilimler-enstitusu</id>
+    <link href="http://www.zotero.org/styles/istanbul-universitesi-sosyal-bilimler-enstitusu" rel="self"/>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
+    <link href="http://cdn.istanbul.edu.tr/FileHandler2.ashx?f=tez.hazirlama.yonergesi.pdf" xml:lang="tr" rel="documentation"/>
+    <author>
+      <name>Ali Ekber ÇINAR</name>
+      <email>aliekbercinar45@gmail.com</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="social_science"/>
+    <summary xml:lang="tr">Ansiklopedi maddesi, internet sayfası, kitap, makale ve tez ögeleri İstanbul Üniversitesi Sosyal Bilimler Enstitüsü Tez Hazırlama Yönergesi'ne uygun olarak oluşturulmuştur.</summary>
+    <updated>2020-07-08T18:25: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 xml:lang="tr">
+    <terms>
+      <term name="editortranslator" form="verb">ed. &amp; çev.</term>
+      <term name="ibid">a.y.</term>
+      <term name="issue" form="short">No:</term>
+      <term name="volume" form="short">C.</term>
+      <term name="number-of-volumes">cilt</term>
+      <term name="cited">a.g.e.</term>
+      <term name="editorial-director">nşr.</term>
+      <term name="editorial-director" form="short">nşr.</term>
+      <term name="editorial-director" form="verb-short">nşr.</term>
+      <term name="collection-editor">thk.</term>
+      <term name="collection-editor" form="short">thk.</term>
+      <term name="collection-editor" form="verb-short">thk.</term>
+      <term name="director" form="short">haz.</term>
+      <term name="director" form="verb-short">haz.</term>
+    </terms>
+  </locale>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="container-author reviewed-author" match="any">
+            <group>
+              <names variable="container-author reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </group>
+      <names variable="editor collection-editor editorial-director director translator" delimiter=", " suffix=",">
+        <label form="verb-short" text-case="lowercase" suffix=" "/>
+        <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-note">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors-note">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor collection-editor editorial-director director translator" delimiter=", ">
+          <label form="short" text-case="lowercase" suffix=" "/>
+          <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if variable="author">
+              <choose>
+                <if variable="container-author" match="any">
+                  <names variable="container-author">
+                    <label form="verb-short" text-case="lowercase" suffix=" "/>
+                    <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+                  </names>
+                </if>
+              </choose>
+              <choose>
+                <if variable="container-author author" match="all">
+                  <group delimiter=". ">
+                    <names variable="editor collection-editor editorial-director director translator" delimiter=", ">
+                      <label form="short" suffix=" "/>
+                      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+                    </names>
+                  </group>
+                </if>
+                <else>
+                  <names variable="editor collection-editor editorial-director director translator" delimiter=", ">
+                    <label form="short" text-case="lowercase" suffix=" "/>
+                    <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+                  </names>
+                </else>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="contributors-note">
+    <group delimiter=" ">
+      <names variable="author">
+        <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+        <label form="short" prefix=" (" suffix=")"/>
+        <substitute>
+          <names variable="editor collection-editor director editorial-director"/>
+          <names variable="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="editor">
+    <names variable="editor collection-editor editorial-director director">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=" "/>
+      <label form="short" prefix=", (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=" "/>
+      <label form="verb-short" prefix=", (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <group delimiter=" ">
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="letter" text-case="capitalize-first"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="contributors">
+    <group delimiter=". ">
+      <names variable="author">
+        <name delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", ">
+          <name-part name="family" text-case="capitalize-first"/>
+        </name>
+        <substitute>
+          <text macro="editor"/>
+          <text macro="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name form="short" delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <group delimiter=" ">
+      <names variable="author">
+        <name form="short" delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+        <substitute>
+          <names variable="editor collection-editor director editorial-director"/>
+          <names variable="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient-short"/>
+    </group>
+  </macro>
+  <macro name="contributors-sort">
+    <names variable="author">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="all"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer-note">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" text-case="capitalize-first" suffix=" "/>
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if variable="title" match="none">
+        <text variable="genre"/>
+      </if>
+      <else-if type="thesis" match="any">
+        <text variable="title" text-case="title" font-style="normal" quotes="true"/>
+        <group delimiter=" " prefix=", ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>      <else-if type="book graphic motion_picture song manuscript" match="any">
+        <text variable="title" text-case="title" font-style="normal" font-weight="bold"/>
+        <group delimiter=" " prefix=", ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true"/>
+      </else>
+    </choose>
+
+         <choose>
+        <if type="entry-encyclopedia" match="any">
+          <text variable="container-title" prefix=", " text-case="title" font-style="normal" font-weight="bold"/>
+        </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="thesis" match="any">
+        <text variable="title" text-case="title" quotes="true" font-style="normal"/>
+        <group delimiter=" " prefix=", ">
+          <number variable="number-of-volumes" form="numeric"/>
+          <text term="volume"/>
+        </group>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="book graphic motion_picture song manuscript" match="any">
+        <text variable="title" text-case="title" font-style="normal" font-weight="bold"/>
+        <group delimiter=" " prefix=", ">
+          <number variable="number-of-volumes" form="numeric"/>
+          <text term="volume"/>
+        </group>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <group delimiter=", ">
+          <text variable="title" font-style="italic"/>
+          <names variable="reviewed-author">
+            <label form="verb-short" text-case="lowercase" suffix=" "/>
+            <name delimiter-precedes-et-al="never" delimiter-precedes-last="always"/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true" suffix=","/>
+      </else>
+    </choose>
+    <choose>
+        <if type="entry-encyclopedia" match="any">
+          <text variable="container-title" prefix=" " text-case="title" font-style="normal" font-weight="bold"/>
+        </if>
+    </choose>
+        <group>
+
+          <choose>
+            <if match="any" variable="volume">
+          <choose>
+                <if type="article-journal" variable="volume" match="all">
+                </if>
+                <else>
+        <label plural="never" prefix=", " suffix=" " variable="volume" form="short"/>
+              <text variable="volume"/>
+                </else>
+          </choose>
+            </if>
+          </choose>
+        </group>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="interview">
+            <text term="interview"/>
+          </if>
+          <else-if type="manuscript speech" match="any">
+            <text variable="genre" form="short"/>
+          </else-if>
+          <else-if type="personal_communication">
+            <text macro="issued"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="book graphic motion_picture song manuscript" match="any">
+        <text variable="title" text-case="title" form="short" font-style="normal" font-weight="bold"/>
+      </else-if>
+      <else-if type="legal_case" variable="title-short" match="all">
+        <text variable="title" font-style="italic" form="short"/>
+      </else-if>
+      <else-if type="patent interview" match="any">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="legal_case bill legislation" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="description-note">
+        <group>
+          <choose>
+            <if match="any" variable="volume">
+          <choose>
+                              <if type="article-journal" variable="volume" match="all">
+                </if>
+                <else>
+        <label plural="never" prefix="" suffix=" " variable="volume" form="short"/>
+              <text variable="volume"/>
+                </else>
+          </choose>
+            </if>
+          </choose>
+        </group>
+    <group delimiter=", ">
+      <text macro="interviewer-note"/>
+      <text variable="medium"/>
+      <choose>
+        <if variable="title" match="none"/>
+        <else-if type="manuscript thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
+        <else>
+          <text variable="genre" suffix=","/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="description">
+    <group delimiter=", ">
+      <group delimiter=". ">
+        <text macro="interviewer"/>
+        <text variable="medium" text-case="capitalize-first"/>
+      </group>
+      <choose>
+        <if variable="title" match="none"/>
+        <else-if type="thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
+        <else>
+          <text variable="genre" text-case="capitalize-first"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-title-note">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter paper-conference" match="any"/>
+      </choose>
+      <choose>
+        <if type="bill entry-encyclopedia legislation legal_case" match="none">
+          <text variable="container-title" text-case="title" font-style="normal" font-weight="bold"/>
+        </if>
+
+        <else-if type="entry-encyclopedia" match="any">
+        </else-if>
+
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <group>
+      <choose>
+        <if type="chapter paper-conference" match="any"/>
+      </choose>
+      <choose>
+        <if type="bill entry-encyclopedia legislation legal_case book" match="none">
+          <text variable="container-title" text-case="title" font-style="normal" font-weight="bold"/>
+          <group prefix=", ">
+            <choose>
+              <if match="any" variable="number-of-volumes">
+                <text variable="number-of-volumes"/>
+                <text term="number-of-volumes" prefix=" "/>
+              </if>
+            </choose>
+          </group>
+        </if>
+
+<else-if type="entry-encyclopedia" match="any">
+</else-if>
+
+      </choose>
+    </group>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal book">
+        <choose>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", " suffix=",">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-title-journal">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=" ">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition-note">
+    <choose>
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" text-case="lowercase" suffix=","/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" suffix="."/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note-join-with-space">
+    <choose>
+      <if type="article-journal" variable="volume" match="all">
+        <choose>
+          <if match="none" variable="collection-title">
+            <text macro="locators-note"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note-join-with-comma">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="locators-note"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume" match="none">
+            <text macro="locators-note"/>
+          </if>
+          <else-if match="any" variable="collection-title">
+            <text macro="locators-note"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-note">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", " suffix=",">
+          <group>
+            <label plural="never" suffix=" " variable="volume" form="short"/>
+            <number variable="volume"/>
+          </group>
+          <text macro="collection-title-journal"/>
+          <group delimiter=" ">
+            <label plural="never" variable="issue" form="short"/>
+            <number variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+      <else-if type="book chapter graphic motion_picture report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition-note"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case" match="any">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <label plural="never" variable="volume" form="short"/>
+              <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"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if variable="number">
+              <text variable="number"/>
+              <group delimiter=" ">
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <group delimiter=" ">
+                <label plural="never" variable="volume" form="short"/>
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <label plural="never" variable="volume" form="short"/>
+                <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="locators-join-with-space">
+    <choose>
+      <if type="article-journal" variable="volume" match="all">
+        <choose>
+          <if match="none" variable="collection-title">
+            <text macro="locators"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-join-with-comma">
+    <choose>
+      <if type="bill chapter legislation legal_case paper-conference" match="any">
+        <text macro="locators"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume" match="none">
+            <text macro="locators"/>
+          </if>
+          <else-if match="any" variable="collection-title">
+            <text macro="locators"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-join-with-period">
+    <choose>
+      <if type="bill legislation legal_case article-journal chapter paper-conference" match="none">
+        <text macro="locators"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", " suffix=",">
+          <text macro="collection-title-journal"/>
+          <group delimiter=" ">
+            <label plural="never" variable="volume" form="short"/>
+            <number variable="volume"/>
+          </group>
+          <group delimiter=" ">
+            <label plural="never" variable="issue" form="short"/>
+            <number variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+      <else-if type="book graphic motion_picture report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition"/>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=". ">
+          <text macro="edition"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-newspaper">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <number variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group delimiter=" ">
+            <text term="section" form="short"/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event-note">
+    <choose>
+      <if match="none" variable="container-title">
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text variable="event"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text term="presented at" text-case="capitalize-first"/>
+          <text variable="event"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="originally-published">
+    <group delimiter=", ">
+      <group delimiter=", ">
+        <text variable="original-publisher-place"/>
+        <text variable="original-publisher"/>
+      </group>
+      <date variable="original-date" form="text" date-parts="year"/>
+    </group>
+  </macro>
+  <macro name="reprint-note">
+    <choose>
+      <if variable="original-date issued" match="all">
+        <choose>
+          <if variable="original-publisher original-publisher-place" match="none">
+            <text value="repr."/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="reprint">
+    <choose>
+      <if variable="original-date issued" match="all">
+        <text value="reprint" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=", ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="speech">
+        <text variable="event-place"/>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <choose>
+          <if type="graphic report" match="any">
+            <date form="numeric" variable="issued"/>
+          </if>
+          <else-if type="legal_case">
+            <group 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="book bill chapter graphic legislation motion_picture paper-conference report song thesis" match="any">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text value="filed"/>
+                <date variable="submitted" form="text"/>
+              </group>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="issued submitted" match="all">
+                    <text term="and"/>
+                  </if>
+                </choose>
+                <date form="numeric" variable="issued" prefix="(" suffix=")"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper article-magazine" match="any">
+            <date form="numeric" variable="issued" prefix="(" suffix=")"/>
+          </else-if>
+          <else-if type="article-journal" match="any">
+            <date date-parts="year" form="text" variable="issued"/>
+          </else-if>
+          <else-if type="manuscript" match="any">
+            <date form="text" date-parts="year-month-day" variable="issued">
+              <date-part name="year"/>
+            </date>
+          </else-if>
+          <else>
+            <date form="numeric" variable="issued"/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else-if variable="accessed URL" match="all"/>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators-subsequent">
+    <choose>
+      <if type="legal_case" variable="locator" match="all">
+        <choose>
+          <if locator="page">
+            <group>
+              <choose>
+                <if match="any" variable="volume">
+                  <label plural="never" suffix=" " variable="volume" form="short"/>
+                  <number suffix=", " variable="volume"/>
+                </if>
+              </choose>
+            </group>
+            <label plural="never" suffix=" " variable="locator" form="short"/>
+            <text variable="locator"/>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <label variable="locator" form="short"/>
+              <text variable="locator"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <group delimiter=" ">
+              <choose>
+                <if type="book graphic motion_picture report song" match="any">
+                  <choose>
+                    <if variable="volume">
+                      <group delimiter=", ">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" suffix=" "/>
+                          <number variable="volume" form="numeric"/>
+                        </group>
+                        <label variable="locator" form="short"/>
+                      </group>
+                    </if>
+                    <else>
+                      <label variable="locator" form="short"/>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <label variable="locator" form="short"/>
+                </else>
+              </choose>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else-if type="book graphic motion_picture report song" match="any">
+            <group>
+              <choose>
+                <if match="any" variable="volume">
+                  <label plural="never" suffix=" " variable="volume" form="short"/>
+                  <number suffix=", " variable="volume"/>
+                </if>
+              </choose>
+              <label plural="never" suffix=" " variable="locator" form="short"/>
+              <text variable="locator"/>
+            </group>
+          </else-if>
+          <else>
+            <label plural="never" suffix=" " variable="locator" form="short"/>
+            <text variable="locator"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if match="none" variable="locator">
+        <group>
+          <label plural="never" suffix=" " variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators-join-with-colon">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="locator page" match="any">
+            <choose>
+              <if variable="volume issue" match="any">
+                <text macro="point-locators"/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="point-locators-join-with-comma">
+    <choose>
+      <if type="article-journal chapter" match="none">
+        <text macro="point-locators"/>
+      </if>
+
+      <else-if type="chapter" match="any">
+          <label plural="never" suffix=" " variable="locator" form="short"/>
+          <text variable="locator"/>
+      </else-if>
+
+      <else-if variable="volume issue" match="none">
+        <text macro="point-locators"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator" match="none">
+        <choose>
+          <if type="article-journal paper-conference" match="any">
+            <label plural="never" suffix=" " variable="page" form="short"/>
+            <text variable="page"/>
+          </if>
+          <else-if type="entry-dictionary" match="any">
+            <group>
+              <choose>
+                <if variable="volume">
+                  <group delimiter=", ">
+                    <group delimiter=" ">
+                      <label plural="never" variable="volume" form="short"/>
+                      <text variable="volume"/>
+                    </group>
+                    <group delimiter=" ">
+                      <label plural="never" variable="page" form="short"/>
+                      <text variable="page"/>
+                    </group>
+                  </group>
+                </if>
+                <else>
+                  <label plural="never" suffix=" " variable="page" form="short"/>
+                  <text variable="page"/>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+
+          <else-if type="chapter entry-encyclopedia" match="any">
+            <group>
+              <choose>
+                <if variable="volume">
+                  <group delimiter=", ">
+                    <group delimiter=" ">
+                      <label plural="never" variable="page" form="short"/>
+                      <text variable="page"/>
+                    </group>
+                  </group>
+                </if>
+                <else>
+                  <label plural="never" suffix=" " variable="page" form="short"/>
+                  <text variable="page"/>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+
+        </choose>
+      </if>
+      <else-if type="article-journal">
+        <group delimiter=" ">
+          <choose>
+            <if locator="page" match="none">
+            </if>
+          </choose>
+          <label plural="never" suffix=" " variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case"/>
+      <else-if type="entry-dictionary chapter paper-conference report" match="any">
+        <group>
+          <choose>
+            <if match="any" variable="volume">
+              <label plural="never" suffix=" " variable="volume" form="short"/>
+              <text variable="volume" suffix=", "/>
+            </if>
+          </choose>
+          <label plural="never" suffix=" " variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+
+
+
+          <label plural="never" suffix=" " variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="paper-conference" match="any">
+        <choose>
+          <if variable="author container-author" match="all"/>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-journal-join-with-colon">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <group>
+              <label plural="never" prefix=", " suffix=" " variable="page" form="short"/>
+              <text variable="page"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+      <else-if type="entry-dictionary " match="any">
+        <group>
+          <choose>
+            <if match="any" variable="volume">
+              <label plural="never" prefix=", " suffix=" " variable="volume" form="short"/>
+              <text variable="volume" suffix=", "/>
+            </if>
+          </choose>
+        </group>
+        <label plural="never" suffix=" " variable="page" form="short"/>
+        <text variable="page"/>
+      </else-if>
+
+      <else-if type="chapter entry-encyclopedia" match="any">
+        <label plural="never" prefix=", " suffix=" " variable="page" form="short"/>
+        <text variable="page"/>
+      </else-if>
+
+
+      <else-if type="paper-conference" match="any">
+        <group>
+          <choose>
+            <if match="any" variable="volume">
+              <label plural="never" prefix=", " suffix=" " variable="volume" form="short"/>
+              <text variable="volume"/>
+            </if>
+          </choose>
+        </group>
+        <label plural="never" prefix=", " suffix=" " variable="page" form="short"/>
+        <text variable="page"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-journal-join-with-comma">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="none">
+            <text variable="page"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="archive-note">
+    <choose>
+      <if type="manuscript">
+        <group delimiter=" ">
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+          <text variable="archive-place"/>
+          <text variable="call-number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <choose>
+      <if type="manuscript">
+        <group>
+          <text variable="archive" prefix=", "/>
+          <text variable="archive_location" prefix=": "/>
+          <text variable="archive-place"/>
+          <text variable="call-number" prefix=", "/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue-note-join-with-space">
+    <choose>
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
+        <choose>
+          <if type="article-newspaper" match="none">
+            <choose>
+              <if type="article-journal" match="none">
+                <text macro="issue-note"/>
+              </if>
+              <else-if variable="issue volume" match="any">
+                <text macro="issue-note"/>
+              </else-if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue-note-join-with-comma">
+    <choose>
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
+        <text macro="issue-note"/>
+      </if>
+      <else-if type="article-newspaper">
+        <text macro="issue-note"/>
+      </else-if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="none">
+            <text macro="issue-note"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="bill legislation legal_case" match="any">
+        <text macro="issued" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text macro="issued"/>
+          </if>
+          <else>
+            <text macro="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="article-newspaper">
+        <text macro="issued"/>
+      </else-if>
+      <else-if variable="publisher-place event-place publisher genre" match="any">
+        <group delimiter=", ">
+
+          <text macro="event-note"/>
+          <group delimiter=", ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint-note"/>
+              <text macro="publisher"/>
+            </group>
+          <choose>
+            <if variable="title" match="none"/>
+            <else-if type="thesis" match="any">
+              <text variable="genre" prefix="" suffix=" Tezi"/>
+            </else-if>
+            <else-if type="manuscript speech" match="any">
+              <text variable="genre" prefix="(" suffix=")"/>
+            </else-if>
+          </choose>
+          </group>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue-join-with-space">
+    <choose>
+      <if type="article-journal" match="any">
+        <choose>
+          <if variable="issue volume" match="any">
+            <text macro="issue"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="issue"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-join-with-period">
+    <choose>
+      <if type="article-journal bill legislation legal_case" match="none">
+        <choose>
+          <if type="speech" variable="publisher publisher-place" match="any">
+            <text macro="issue"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue-join-with-comma">
+    <choose>
+      <if type="bill legislation legal_case" match="none">
+        <choose>
+          <if type="article-journal" match="none">
+            <choose>
+              <if type="speech" variable="publisher publisher-place" match="none">
+                <text macro="issue"/>
+              </if>
+            </choose>
+          </if>
+          <else-if variable="volume issue" match="none">
+            <text macro="issue"/>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="bill legislation legal_case" match="any">
+        <text macro="issued" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="issue volume" match="any">
+            <text macro="issued"/>
+          </if>
+          <else>
+            <text macro="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter=", ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="title" match="none"/>
+              <else>
+                <text variable="genre" text-case="capitalize-first" prefix="(" suffix=")"/>
+              </else>
+            </choose>
+            <text macro="event"/>
+          </group>
+          <text variable="event-place"/>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper">
+        <text macro="issued"/>
+      </else-if>
+      <else-if variable="publisher-place publisher" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="title" prefix="" suffix=" Tezi"/>
+            </if>
+            <else-if match="none" variable="container-title">
+              <text variable="event"/>
+            </else-if>
+          </choose>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive-note"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive-note"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <date form="numeric" variable="accessed" prefix="(" suffix=")"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="article-journal legal_case book thesis" match="none">
+          <choose>
+            <if match="any" variable="DOI">
+              <text variable="DOI" prefix="doi:"/>
+            </if>
+            <else>
+          <group delimiter="">
+              <text variable="URL" prefix="(Çevrimiçi) "/>
+            <date form="numeric" variable="accessed" prefix=", "/>
+          </group>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <group>
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <date form="numeric" variable="accessed" prefix=" (" suffix=")"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="article-journal legal_case book thesis" match="none">
+          <choose>
+            <if match="any" variable="DOI">
+              <text variable="DOI" prefix=", doi:"/>
+            </if>
+            <else>
+          <group delimiter="">
+              <text variable="URL" prefix=", (Çevrimiçi) "/>
+            <date form="numeric" variable="accessed" prefix=", "/>
+          </group>
+            </else>
+
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="case-locator-subsequent">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <text variable="volume"/>
+          <text variable="container-title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="case-pinpoint-subsequent">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if locator="page">
+              <text term="at"/>
+              <text variable="locator"/>
+            </if>
+            <else>
+              <label variable="locator"/>
+              <text variable="locator"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <text term="cited" text-case="lowercase" font-weight="bold"/>
+            <text macro="point-locators-subsequent"/>
+          </group>
+        </if>
+
+        <else-if position="ibid">
+ <choose>
+<if variable="container-author author" match="none">
+         <group delimiter=", ">
+          <text term="ibid" text-case="lowercase" font-weight="bold"/>
+          </group>
+</if>
+<else>
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+          <text term="ibid" text-case="lowercase" font-weight="bold"/>
+          </group>
+</else>
+</choose>
+        </else-if>
+
+<else-if position="near-note">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <text macro="title-short"/>
+
+                <text macro="case-locator-subsequent"/>
+              </group>
+              <text macro="case-pinpoint-subsequent"/>
+            </group>
+            <choose>
+              <if match="none" type="legal_case">
+                <text macro="point-locators-subsequent"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+
+        <else-if position="subsequent">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <text macro="title-short"/>
+
+                <text macro="case-locator-subsequent"/>
+              </group>
+              <text macro="case-pinpoint-subsequent"/>
+            </group>
+            <choose>
+              <if match="none" type="legal_case">
+                <text macro="point-locators-subsequent"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <group delimiter=", ">
+              <group delimiter=", ">
+                <group delimiter=", ">
+                  <group delimiter=", ">
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <group delimiter=", ">
+                          <text macro="contributors-note"/>
+                          <text macro="title-note" suffix=","/>
+                        </group>
+                        <text macro="description-note"/>
+                        <text macro="secondary-contributors-note"/>                        <text macro="container-title-note" suffix=","/>
+
+                        <text macro="container-contributors-note"/>
+                      </group>
+                      <text macro="locators-note-join-with-space"/>
+                    </group>
+                    <text macro="locators-note-join-with-comma"/>
+                    <text macro="collection-title"/>
+                    <text macro="issue-note-join-with-comma"/>
+                  </group>
+                  <text macro="issue-note-join-with-space"/>
+                </group>
+                <text macro="locators-newspaper"/>
+                <text macro="point-locators-join-with-comma"/>
+              </group>
+              <text macro="point-locators-join-with-colon"/>
+            </group>
+            <text macro="access-note"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography delimiter-precedes-et-al="never" delimiter-precedes-last="always" et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="contributors-sort"/>
+      <key variable="title"/>
+      <key variable="genre"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group>
+        <group>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group delimiter=", ">
+                      <group delimiter=": ">
+                        <text macro="contributors"/>
+                        <text macro="title"/>
+                      </group>
+                      <text macro="description"/>
+                      <group delimiter=", ">
+                        <text macro="secondary-contributors" suffix=","/>
+                        <text macro="container-title" suffix=","/>
+                        <text macro="container-contributors"/>
+                      </group>
+                      <text macro="locators-join-with-period"/>
+                    </group>
+                    <text macro="locators-join-with-comma"/>
+                    <text macro="locators-chapter"/>
+                  </group>
+                  <text macro="locators-join-with-space"/>
+                </group>
+                <text macro="collection-title"/>
+                <text macro="issue-join-with-period"/>
+              </group>
+              <text macro="issue-join-with-space"/>
+            </group>
+            <text macro="issue-join-with-comma"/>
+            <text macro="locators-journal-join-with-comma"/>
+            <text macro="locators-newspaper"/>
+          </group>
+          <text macro="locators-journal-join-with-colon"/>
+        </group>
+        <text macro="access"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/journal-of-neolithic-archaeology.csl b/journal-of-neolithic-archaeology.csl
index bf39c55d5bb..2eb459d526a 100644
--- a/journal-of-neolithic-archaeology.csl
+++ b/journal-of-neolithic-archaeology.csl
@@ -25,19 +25,21 @@
     <issn>2364-3676</issn>
     <eissn>2197-649X</eissn>
     <summary>Author-date style meeting citation specifications provided by JNA. Based on the DAI style.</summary>
-    <updated>2019-11-10T12:54:34+00:00</updated>
+    <updated>2020-10-11T23:58: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>
   <locale xml:lang="en">
     <terms>
       <term name="reviewed-author" form="verb">rev. of</term>
       <term name="presented at">talk</term>
+      <term name="accessed">accessed: </term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="reviewed-author" form="verb">Rez. zu</term>
       <term name="presented at">Vortrag</term>
+      <term name="accessed">Zugriff: </term>
     </terms>
   </locale>
   <locale xml:lang="it">
@@ -111,25 +113,18 @@
     </choose>
   </macro>
   <macro name="contributors">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". "/>
-        </names>
-      </if>
-      <else-if variable="editor">
-        <text macro="editor"/>
-      </else-if>
-    </choose>
-    <choose>
-      <if match="any" variable="title">
-        <choose>
-          <if match="any" variable="editor author">
-            <text value=", "/>
-          </if>
-        </choose>
-      </if>
-    </choose>
+    <group suffix=", ">
+      <choose>
+        <if variable="author">
+          <names variable="author">
+            <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". "/>
+          </names>
+        </if>
+        <else-if variable="editor">
+          <text macro="editor"/>
+        </else-if>
+      </choose>
+    </group>
   </macro>
   <macro name="contributors-short-citation">
     <choose>
@@ -317,11 +312,14 @@
   <macro name="url">
     <choose>
       <if match="any" variable="URL">
-        <group display="block" prefix=".&amp;#10;">
-          <text variable="URL" text-case="lowercase"/>
+        <group>
+          <text variable="URL" text-case="lowercase" prefix=". "/>
           <choose>
             <if match="none" is-uncertain-date="accessed">
-              <date form="text" variable="accessed" prefix=" [" suffix="]"/>
+              <group>
+                <text term="accessed" prefix=" ("/>
+                <date form="numeric" variable="accessed" suffix=")"/>
+              </group>
             </if>
           </choose>
         </group>
@@ -329,14 +327,7 @@
     </choose>
   </macro>
   <macro name="doi">
-    <choose>
-      <if match="any" variable="DOI">
-        <group display="block" prefix=".&amp;#10;">
-          <text value="doi: "/>
-          <text variable="DOI"/>
-        </group>
-      </if>
-    </choose>
+    <text variable="DOI" prefix=". DOI: https://doi.org/"/>
   </macro>
   <macro name="review">
     <choose>
@@ -408,7 +399,7 @@
     </sort>
     <layout>
       <group suffix=".">
-        <group display="left-margin" suffix=": ">
+        <group suffix=": ">
           <text macro="contributors-short-biblio" suffix=" "/>
           <text macro="date"/>
         </group>
@@ -437,8 +428,14 @@
               <text macro="locators-article"/>
             </else>
           </choose>
-          <text macro="url"/>
-          <text macro="doi"/>
+          <choose>
+            <if variable="DOI" match="any">
+              <text macro="doi"/>
+            </if>
+            <else>
+              <text macro="url"/>
+            </else>
+          </choose>
         </group>
       </group>
     </layout>
diff --git a/karlstad-universitet-harvard.csl b/karlstad-universitet-harvard.csl
new file mode 100644
index 00000000000..dc48e5de7f1
--- /dev/null
+++ b/karlstad-universitet-harvard.csl
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" delimiter-precedes-et-al="always" delimiter-precedes-last="always" demote-non-dropping-particle="never" default-locale="sv-SE">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Karlstad Universitet - Harvard (Swedish)</title>
+    <title-short>KAU Harvard</title-short>
+    <id>http://www.zotero.org/styles/karlstad-universitet-harvard</id>
+    <link href="http://www.zotero.org/styles/karlstad-universitet-harvard" rel="self"/>
+    <link href="http://www.zotero.org/styles/taylor-and-francis-harvard-x" rel="template"/>
+    <link href="https://www.zotero.org/styles/kth-royal-institute-of-technology-school-of-computer-science-and-communication-sv" rel="template"/>
+    <link href="https://www.libguides.kau.se/harvard" rel="documentation"/>
+    <author>
+      <name>Kurt Berndt</name>
+      <email>kurt.berndt@sh.se</email>
+    </author>
+    <author>
+      <name>Per Renstrom</name>
+      <email>thehypermedia@gmail.com</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>Harvard</summary>
+    <updated>2020-10-29T07:56:06+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="sv-SE">
+    <terms>
+      <term name="page" form="short">
+        <single>s.</single>
+        <multiple>ss.</multiple>
+      </term>
+      <term name="number-of-pages" form="short">
+        <single>s.</single>
+        <multiple>ss.</multiple>
+      </term>
+      <term name="available at">tillgänglig</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <choose>
+      <if type="motion_picture broadcast" match="none">
+        <names variable="author">
+          <name and="symbol" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+          <label form="short" prefix=" (" suffix=")."/>
+          <et-al font-style="italic"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text macro="anon"/>
+          </substitute>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+    <choose>
+      <if type="article-newspaper entry-dictionary entry-encyclopedia" match="any">
+        <choose>
+          <if variable="author editor" match="none">
+            <text variable="container-title"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="motion_picture broadcast" match="none">
+        <names variable="author">
+          <name form="short" delimiter=" " and="symbol" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text macro="anon"/>
+          </substitute>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+    <choose>
+      <if type="article-newspaper entry-dictionary entry-encyclopedia" match="any">
+        <choose>
+          <if variable="author editor" match="none">
+            <text variable="container-title"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="anon">
+    <choose>
+      <if type="motion_picture broadcast article-newspaper entry-dictionary entry-encyclopedia" match="none">
+        <text term="anonymous" form="short" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage" variable="URL" match="all">
+        <group>
+          <text variable="URL"/>
+        </group>
+        <group prefix=" [" suffix="]" delimiter=" ">
+          <date variable="accessed">
+            <date-part name="year"/>
+            <date-part name="month" form="numeric-leading-zeros" strip-periods="true" prefix="-"/>
+            <date-part name="day" prefix="-"/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis" match="any">
+        <group delimiter=". ">
+          <text variable="title" font-style="italic"/>
+          <group>
+            <text variable="genre"/>
+            <text variable="number" prefix=" No. "/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation map report song speech webpage" match="any">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text variable="title" font-style="italic"/>
+            </group>
+            <text variable="scale"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </else-if>
+      <else-if type="motion_picture broadcast" match="any"/>
+      <else-if type="patent" match="any">
+        <text variable="title" font-style="italic" suffix=". "/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" text-case="capitalize-first" font-style="normal" suffix=" "/>
+        <group delimiter=". ">
+          <names variable="editor translator" delimiter=", ">
+            <name and="symbol" initialize-with=". " name-as-sort-order="all"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+          <group delimiter=" ">
+            <text variable="container-title" font-style="italic"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation map motion_picture report song" match="any">
+        <text variable="container-title"/>
+      </else-if>
+      <else-if type="broadcast">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text variable="number" prefix="Episode "/>
+              <text variable="title"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="webpage">
+        <text variable="container-title"/>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <group>
+          <text variable="genre"/>
+          <text variable="number" prefix=" No. "/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="report-details"/>
+        </group>
+      </else>
+    </choose>
+  </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-if variable="accessed">
+        <choose>
+          <if type="webpage">
+            <date variable="accessed">
+              <date-part name="year"/>
+            </date>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <group>
+            <number suffix="." variable="edition"/>
+            <text value="uppl."/>
+          </group>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group delimiter=" " prefix=", ">
+          <group delimiter="">
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix="),"/>
+          </group>
+          <group>
+            <label variable="collection-number" form="short"/>
+            <text variable="page" suffix="."/>
+          </group>
+          <group>
+            <text variable="DOI" prefix="doi:"/>
+          </group>
+        </group>
+      </if>
+      <else-if type=" article-newspaper" match="any">
+        <date variable="issued" prefix=", " form="text"/>
+        <group delimiter=" " prefix=". ">
+          <label plural="always" variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="bill  book graphic legal_case legislation map motion_picture report song thesis" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </else-if>
+      <else-if type="broadcast">
+        <group delimiter=". " prefix=", ">
+          <text variable="publisher"/>
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <group>
+            <text variable="page" prefix="ss."/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="patent" match="any">
+        <group>
+          <text variable="authority" suffix=": "/>
+          <text variable="number" suffix=", "/>
+          <date form="numeric" variable="issued"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation and="symbol" et-al-min="3" et-al-use-first="1" sort-separator="  " near-note-distance="0" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year" cite-group-delimiter="  ">
+    <sort>
+      <key macro="issued"/>
+      <key macro="author"/>
+    </sort>
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="issued"/>
+        </group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography sort-separator=",  " entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="ascending"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author"/>
+      <group delimiter=". " prefix=" ">
+        <text macro="issued" prefix="(" suffix=")"/>
+        <text macro="title"/>
+        <text macro="container"/>
+        <text variable="medium"/>
+      </group>
+      <text macro="locators"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/mcgill-en.csl b/mcgill-en.csl
index ba9caaf08b9..bb827ad478e 100644
--- a/mcgill-en.csl
+++ b/mcgill-en.csl
@@ -24,7 +24,7 @@
     </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2020-01-06T22:32:01+00:00</updated>
+    <updated>2020-10-21T20:45:43+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">
@@ -42,9 +42,14 @@
         <single>at para</single>
         <multiple>at paras</multiple>
       </term>
-      <!-- the usual workaround for inserting "Art" or "Arts" (article) pinpointers is to type the term directly into the pinpoint box and to use sub verbo for a blank pinpointer. However for clarity and compliance this functionality needs to be activated by the user by taking the element below out of documentation
-      <term name="sub verbo" form="short"><single/><multiple/></term>
-      -->
+      <term name="sub verbo" form="short">
+        <single>sub verbo</single>
+        <multiple>sub verbis</multiple>
+      </term>
+      <term name="part" form="short">
+        <single>Art</single>
+        <multiple>Arts</multiple>
+      </term>
       <term name="section" form="short">
         <single>s</single>
         <multiple>ss</multiple>
@@ -59,7 +64,7 @@
     <names variable="editor">
       <name and="symbol" delimiter-precedes-last="never"/>
       <et-al term="et-al"/>
-      <label form="short" prefix=", "/>
+      <label form="short" prefix=", " strip-periods="true"/>
     </names>
   </macro>
   <macro name="translator">
@@ -159,6 +164,28 @@ all the other tests should have been done... -->
     <text macro="publisher-place-year"/>
     <text variable="page-first" prefix=" "/>
   </macro>
+  <macro name="render-dictionary">
+    <group delimiter=", ">
+      <text macro="editor" strip-periods="true" suffix=","/>
+      <text variable="title" font-style="italic"/>
+    </group>
+    <text macro="series-info" prefix=" "/>
+    <text macro="edition" prefix=", "/>
+    <text macro="publisher-place-year"/>
+    <text variable="page-first" prefix=" "/>
+  </macro>
+  <macro name="render-encyclopedia">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text term="in" form="short"/>
+      <text macro="editor" strip-periods="true" suffix=","/>
+      <text macro="container-title" font-style="italic"/>
+    </group>
+    <text macro="series-info" prefix=" "/>
+    <text macro="edition" prefix=", "/>
+    <text macro="publisher-place-year"/>
+    <text variable="page-first" prefix=" "/>
+  </macro>
   <macro name="render-article-journal">
     <group delimiter=" ">
       <text variable="title" quotes="true"/>
@@ -252,7 +279,6 @@ all the other tests should have been done... -->
             <text variable="references" prefix="(" suffix=")"/>
           </group>
           <text variable="number-of-volumes"/>
-          <text variable="number"/>
           <group delimiter=" ">
             <text variable="number"/>
             <text macro="issued-long" prefix="(" suffix=")"/>
@@ -275,18 +301,22 @@ all the other tests should have been done... -->
     </group>
   </macro>
   <macro name="render-legislation">
-    <group delimiter=", ">
-      <!-- if no volume, assume bill -->
-      <group delimiter=" ">
-        <text variable="title" font-style="italic"/>
-        <text variable="references" prefix="(" suffix=")"/>
-      </group>
-      <group delimiter=" ">
-        <text variable="container-title"/>
-        <date form="text" variable="issued" date-parts="year"/>
-      </group>
-      <text variable="section"/>
-    </group>
+    <choose>
+      <if variable="references" match="any">
+        <text variable="title"/>
+        <date form="text" variable="issued" date-parts="year" prefix=" (" suffix=")"/>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="title" font-style="italic"/>
+          <group delimiter=" ">
+            <text macro="container-title"/>
+            <date form="text" variable="issued" date-parts="year"/>
+          </group>
+          <text variable="section"/>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="render-patent">
     <group delimiter=" ">
@@ -318,54 +348,21 @@ all the other tests should have been done... -->
     </group>
   </macro>
   <macro name="render-case">
+    <text variable="title" font-style="italic" suffix=", " strip-periods="true"/>
     <choose>
-      <if variable="author">
-        <group delimiter=", ">
+      <if variable="container-title" match="none">
+        <group delimiter=" ">
+          <date form="text" variable="issued" date-parts="year"/>
           <text variable="authority" strip-periods="true"/>
-          <date form="numeric" variable="issued"/>
-          <text variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <text variable="volume"/>
           <text variable="page"/>
         </group>
       </if>
-      <else-if variable="title" match="none">
-        <group delimiter=", ">
-          <text variable="authority" strip-periods="true"/>
-          <date form="numeric" variable="issued"/>
-          <text variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" form="short" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <text variable="volume"/>
-          <text variable="page"/>
-        </group>
-      </else-if>
       <else>
-        <text variable="title" font-style="italic" suffix=", " strip-periods="true"/>
-        <choose>
-          <if variable="container-title" match="none">
-            <group delimiter=" ">
-              <date form="text" variable="issued" date-parts="year"/>
-              <text variable="authority" strip-periods="true"/>
-              <text variable="page"/>
-            </group>
-          </if>
-          <else>
-            <date form="text" variable="issued" date-parts="year" prefix="[" suffix="] "/>
-            <text variable="volume" suffix=" "/>
-            <text variable="container-title" suffix=" " strip-periods="true"/>
-            <text variable="page"/>
-            <!-- COMMENTED OUT FOR 9TH ED  <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/> -->
-          </else>
-        </choose>
-        <!-- <text variable="references" prefix=", "/> -->
+        <date form="text" variable="issued" date-parts="year" prefix="[" suffix="] "/>
+        <text variable="volume" suffix=" "/>
+        <text variable="container-title" suffix=" " strip-periods="true"/>
+        <text variable="page"/>
+        <!-- COMMENTED OUT FOR 9TH ED  <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/> -->
       </else>
     </choose>
     <!-- COMMENTED OUT FOR 9TH ED  <text variable="URL" prefix=" (available on " suffix=")"/> -->
@@ -377,14 +374,23 @@ all the other tests should have been done... -->
           <choose>
             <if variable="locator">
               <text term="at" prefix=" "/>
+              <text variable="locator"/>
             </if>
           </choose>
         </if>
+        <else-if locator="section">
+          <label variable="locator" plural="contextual" form="short" strip-periods="true" prefix=", "/>
+          <text variable="locator"/>
+        </else-if>
+        <else-if locator="sub-verbo">
+          <label variable="locator" plural="contextual" form="short" strip-periods="true" font-style="italic" prefix=" "/>
+          <text variable="locator" quotes="true"/>
+        </else-if>
         <else>
           <label variable="locator" plural="contextual" form="short" strip-periods="true" prefix=" "/>
+          <text variable="locator"/>
         </else>
       </choose>
-      <text variable="locator"/>
     </group>
   </macro>
   <macro name="short-form">
@@ -462,54 +468,112 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar
         </else-if>
         <else>
           <group>
-            <group delimiter=", ">
+            <group delimiter=" ">
               <choose>
                 <if type="legislation" match="any">
-                  <text macro="render-legislation"/>
+                  <choose>
+                    <if variable="references" match="any">
+                      <group delimiter=" ">
+                        <text macro="pinpoint"/>
+                        <text macro="render-legislation"/>
+                        <text variable="note"/>
+                      </group>
+                    </if>
+                    <else>
+                      <group delimiter="">
+                        <text macro="render-legislation"/>
+                        <text macro="pinpoint"/>
+                        <text variable="note"/>
+                      </group>
+                    </else>
+                  </choose>
                 </if>
                 <else-if type="bill" match="any">
                   <text macro="render-bill"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note"/>
                 </else-if>
                 <else-if type="song" match="any">
                   <text macro="render-song"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note"/>
                 </else-if>
                 <else-if type="patent" match="any">
-                  <text macro="render-patent"/>
+                  <group delimiter="">
+                    <text macro="render-patent"/>
+                    <text macro="pinpoint"/>
+                    <text variable="note"/>
+                  </group>
                 </else-if>
                 <else-if type="manuscript" match="any">
                   <text macro="render-manuscript"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note"/>
                 </else-if>
                 <else-if type="legal_case">
-                  <text macro="render-case"/>
+                  <group delimiter="">
+                    <text macro="render-case"/>
+                    <text macro="pinpoint"/>
+                    <text variable="note" prefix=", "/>
+                  </group>
                 </else-if>
                 <else-if type="report">
                   <text macro="render-report"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note"/>
                 </else-if>
                 <else>
-                  <text macro="author-note" strip-periods="true"/>
+                  <text macro="author-note" strip-periods="true" suffix=", "/>
                   <choose>
                     <if type="article-journal">
-                      <text macro="render-article-journal"/>
+                      <group delimiter=" ">
+                        <text macro="render-article-journal"/>
+                        <text macro="pinpoint"/>
+                        <text variable="note"/>
+                      </group>
                     </if>
                     <else-if type="chapter">
-                      <text macro="render-chapter"/>
+                      <group delimiter=" ">
+                        <text macro="render-chapter"/>
+                        <text macro="pinpoint"/>
+                        <text variable="note"/>
+                      </group>
+                    </else-if>
+                    <else-if type="entry-dictionary">
+                      <text macro="render-dictionary"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note"/>
+                    </else-if>
+                    <else-if type="entry-encyclopedia">
+                      <text macro="render-encyclopedia"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note"/>
                     </else-if>
                     <else-if type="thesis">
                       <text macro="render-thesis"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note"/>
                     </else-if>
                     <else-if type="article-newspaper" match="any">
                       <text macro="render-article-newspaper"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note"/>
                     </else-if>
                     <else-if type="article-magazine">
                       <text macro="render-article-magazine"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note"/>
                     </else-if>
                     <else-if type="webpage post-weblog" match="any">
                       <text macro="render-webpage"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note"/>
                     </else-if>
                     <else-if type="book">
                       <text macro="render-book"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note"/>
                     </else-if>
-                    <!--                    <else-if type="song" match="any"><text macro="render-song"/></else-if><else-if type="patent" match="any"><text macro="render-patent"/></else-if><else-if type="manuscript" match="any"><text macro="render-manuscript"/></else-if> -->
                     <else>
                       <group delimiter=" ">
                         <group delimiter=", ">
@@ -519,13 +583,13 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar
                         </group>
                         <text macro="publisher-place-year"/>
                       </group>
+                      <text macro="pinpoint"/>
+                      <text variable="note"/>
                     </else>
                   </choose>
                 </else>
               </choose>
             </group>
-            <text macro="pinpoint"/>
-            <text variable="note" prefix=", "/>
             <choose>
               <if type="legal_case" match="any">
                 <text variable="references" prefix=", "/>
@@ -548,40 +612,59 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar
       <choose>
         <if type="bill legal_case legislation" match="any">
           <choose>
-            <if type="bill legislation" match="any">
-              <text macro="render-bill"/>
+            <if type="legislation" match="any">
+              <text macro="render-legislation"/>
             </if>
+            <else-if type="bill">
+              <text macro="render-bill"/>
+            </else-if>
             <else-if type="legal_case">
               <text macro="render-case"/>
+              <text variable="note" prefix=", "/>
             </else-if>
           </choose>
         </if>
         <else>
-          <group delimiter=". ">
-            <text macro="author-bib" strip-periods="true"/>
+          <group delimiter=", ">
             <choose>
               <if type="article-journal">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-article-journal"/>
               </if>
               <else-if type="chapter">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-chapter"/>
               </else-if>
               <else-if type="thesis">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-thesis"/>
               </else-if>
               <else-if type="article-newspaper">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-article-newspaper"/>
               </else-if>
               <else-if type="article-magazine">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-article-magazine"/>
               </else-if>
               <else-if type="book">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-book"/>
               </else-if>
               <else-if type="webpage post-weblog" match="any">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-webpage"/>
               </else-if>
+              <else-if type="entry-dictionary">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-dictionary"/>
+              </else-if>
+              <else-if type="entry-encyclopedia">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-encyclopedia"/>
+              </else-if>
               <else-if type="report">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-report"/>
               </else-if>
               <else-if type="patent">
@@ -591,9 +674,11 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar
                 <text macro="render-song"/>
               </else-if>
               <else-if type="manuscript">
+                <text macro="author-bib" strip-periods="true"/>
                 <text macro="render-manuscript"/>
               </else-if>
               <else>
+                <text macro="author-bib" strip-periods="true"/>
                 <group>
                   <group delimiter=", ">
                     <text variable="title" font-style="italic"/>
diff --git a/mcgill-fr.csl b/mcgill-fr.csl
index 0d4737f34e9..c824096a50e 100644
--- a/mcgill-fr.csl
+++ b/mcgill-fr.csl
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" default-locale="fr-CA">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" default-locale="fr-CA">
   <info>
-    <title>Manuel canadien de la référence juridique 7e édition (Guide McGill, French - Canada)</title>
-    <title-short>Guide McGill FR v7</title-short>
+    <title>Manuel canadien de la référence juridique 9e édition (Guide McGill, French - Canada)</title>
     <id>http://www.zotero.org/styles/mcgill-fr</id>
     <link href="http://www.zotero.org/styles/mcgill-fr" rel="self"/>
-    <link href="http://f-mb.github.io/cslegal/" rel="documentation"/>
-    <link href="http://www.lawjournal.mcgill.ca/fr/text/22" rel="documentation"/>
+    <link href="https://lawjournal.mcgill.ca/cite-guide" rel="documentation"/>
     <author>
       <name>Philippe Tousignant</name>
       <email>philippe.tousignant@gmail.com</email>
@@ -22,22 +20,50 @@
     <contributor>
       <name>Jean-Sebastien Sauve</name>
     </contributor>
+    <contributor>
+      <name>Gareth Spanglett</name>
+      <email>gspanglett@gmail.com</email>
+      <uri>https://gspanglett.github.io</uri>
+    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <summary>This style may require use of specific fields in the reference manager. More infos: http://f-mb.github.io/cslegal/
-      Ce style peut demander un usage particulier des champs du logiciel de gestion bibliographique. Plus d'infos: http://f-mb.github.io/cslegal/</summary>
-    <updated>2014-06-28T19:18:00+00:00</updated>
+    <updated>2020-10-21T23:45:43+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="fr">
+    <style-options punctuation-in-quote="false"/>
     <terms>
+      <term name="et-al">et al</term>
+      <term name="ordinal">&#7497;</term>
+      <term name="ordinal-01">ʳ&#7497;</term>
+      <term name="ordinal-02">&#7497;</term>
       <term name="page" form="short">
         <single>à la p</single>
         <multiple>aux pp</multiple>
       </term>
+      <term name="at" form="short">
+        <single>à la p</single>
+        <multiple>aux pp</multiple>
+      </term>
       <term name="paragraph" form="short">
         <single>au para</single>
-        <multiple>aux paras</multiple>
+        <multiple>aux para</multiple>
+      </term>
+      <term name="sub verbo" form="short">
+        <single>sub verbo</single>
+        <multiple>sub verbis</multiple>
+      </term>
+      <term name="part" form="short">
+        <single>Art</single>
+        <multiple>Arts</multiple>
+      </term>
+      <term name="section" form="short">
+        <single>art</single>
+        <multiple>arts</multiple>
+      </term>
+      <term name="chapter" form="short">
+        <single>c</single>
+        <multiple>cs</multiple>
       </term>
       <term name="chapter" form="short">ch</term>
       <term name="editor" form="verb-short">dir</term>
@@ -47,1083 +73,628 @@
       <term name="in">dans</term>
     </terms>
   </locale>
-  <macro name="contributors-note">
-    <names variable="author">
-      <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      <substitute>
-        <text macro="editor-note"/>
-        <text macro="translator-note"/>
-      </substitute>
-    </names>
-    <text macro="recipient-note"/>
-  </macro>
-  <macro name="editor-note">
-    <names variable="editor">
-      <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      <label form="short" prefix=", " strip-periods="true"/>
-    </names>
-  </macro>
-  <macro name="translator-note">
-    <names variable="translator">
-      <label form="verb" suffix=" " strip-periods="true"/>
-      <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-    </names>
-  </macro>
-  <macro name="recipient-note">
-    <names variable="recipient" delimiter=", ">
-      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter-precedes-last="never"/>
-    </names>
-  </macro>
-  <macro name="interviewer-note">
-    <names variable="interviewer" delimiter=", ">
-      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-    </names>
-  </macro>
-  <macro name="contributors">
-    <names variable="author">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      <substitute>
-        <text macro="editor"/>
-        <text macro="translator"/>
-      </substitute>
-    </names>
-    <text macro="recipient" prefix=". "/>
-  </macro>
   <macro name="editor">
     <names variable="editor">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <name and="symbol" delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
       <label form="short" prefix=", " strip-periods="true"/>
     </names>
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <label form="verb-short" suffix=" " strip-periods="true"/>
-      <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <label form="verb" suffix=" "/>
+      <name and="symbol"/>
     </names>
   </macro>
-  <macro name="recipient">
-    <choose>
-      <if type="personal_communication">
-        <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
-          </if>
-          <else>
-            <text term="letter" text-case="capitalize-first"/>
-          </else>
-        </choose>
-      </if>
-    </choose>
-    <text macro="recipient-note" prefix=" "/>
+  <macro name="container-title">
+    <text strip-periods="true" variable="container-title" form="short"/>
   </macro>
-  <macro name="contributors-short">
+  <macro name="author-note">
     <names variable="author">
-      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never"/>
+      <name and="symbol" delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
       <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+        <text macro="editor"/>
       </substitute>
     </names>
-    <text macro="recipient-short"/>
-  </macro>
-  <macro name="recipient-short">
-    <names variable="recipient">
-      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never"/>
-    </names>
   </macro>
-  <macro name="interviewer">
-    <names variable="interviewer" delimiter=", ">
-      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
-      <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-    </names>
-  </macro>
-  <macro name="contributors-sort">
+  <macro name="author-bib">
     <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <name name-as-sort-order="first" and="symbol" sort-separator=", " delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
+      <label form="short" prefix=", "/>
       <substitute>
         <names variable="editor"/>
-        <names variable="translator"/>
       </substitute>
     </names>
   </macro>
-  <macro name="description-note">
-    <group delimiter=", ">
-      <text macro="interviewer-note"/>
-      <text variable="medium"/>
-      <choose>
-        <if variable="title" match="none"/>
-        <else-if type="speech" match="any"/>
-        <else>
-          <text variable="genre"/>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="description">
-    <group delimiter=", ">
-      <group delimiter=". ">
-        <text macro="interviewer"/>
-        <text variable="medium" text-case="capitalize-first"/>
-      </group>
-      <choose>
-        <if variable="title" match="none"/>
-        <else-if type="speech" match="any"/>
-        <else>
-          <text variable="genre" text-case="capitalize-first"/>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="URL">
+  <macro name="internet-location">
     <choose>
-      <if variable="DOI">
-        <text value=", doi&#160;: " font-variant="small-caps"/>
-        <text variable="DOI"/>
+      <if variable="URL">
+        <text term="online" prefix=", " suffix=": &lt;"/>
+        <text variable="URL" suffix="&gt;"/>
       </if>
-      <else-if variable="URL">
-        <text value=", en ligne&#160;: "/>
-        <choose>
-          <if variable="archive" match="any">
-            <text variable="archive" text-case="capitalize-first"/>
-          </if>
-          <else>
-            <text variable="container-title" text-case="capitalize-first"/>
-          </else>
-        </choose>
-        <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-        <date variable="accessed" prefix=" (consulté le " suffix=")">
-          <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=" "/>
-          <date-part name="year"/>
-        </date>
-      </else-if>
     </choose>
   </macro>
-  <macro name="collection-title">
-    <text variable="collection-title" prefix="coll "/>
+  <macro name="genre">
+    <text variable="genre"/>
   </macro>
-  <macro name="collection-number">
-    <text variable="collection-number" prefix="n°"/>
+  <macro name="issued-long">
+    <date variable="issued" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="long"/>
+      <date-part name="year" form="long"/>
+    </date>
   </macro>
-  <macro name="issued-year">
-    <date variable="issued">
+  <macro name="submitted-long">
+    <date variable="submitted" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="long"/>
       <date-part name="year" form="long"/>
     </date>
   </macro>
   <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" strip-periods="true"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition" text-case="capitalize-first"/>
-      </else>
-    </choose>
+    <number variable="edition" form="ordinal" text-case="lowercase" suffix=" "/>
+    <text term="edition" form="short" strip-periods="true"/>
   </macro>
-  <macro name="issued">
-    <date variable="issued" font-style="normal" font-weight="normal">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" suffix=" "/>
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="editor-translator">
-    <group delimiter=", ">
-      <choose>
-        <if variable="author">
-          <names variable="editor" delimiter=", ">
-            <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-            <label form="verb-short" text-case="lowercase" prefix=", " strip-periods="true"/>
-          </names>
-          <choose>
-            <if variable="container-author">
-              <group>
-                <names variable="container-author">
-                  <label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
-                  <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-                </names>
-              </group>
-            </if>
-          </choose>
-        </if>
-      </choose>
-      <choose>
-        <if variable="author editor" match="any">
-          <names variable="translator" delimiter=", ">
-            <label form="verb-short" text-case="lowercase" suffix=" " strip-periods="true"/>
-            <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-          </names>
-        </if>
-      </choose>
+  <macro name="series-info">
+    <group delimiter=" ">
+      <text variable="collection-title" strip-periods="true"/>
+      <text variable="collection-number"/>
     </group>
   </macro>
-  <macro name="secondary-contributors-note">
-    <choose>
-      <if type="chapter paper-conference" match="none">
-        <text macro="editor-translator"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-contributors-note">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <text macro="editor-translator"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <if type="chapter paper-conference" match="none">
-        <group delimiter=". ">
-          <choose>
-            <if variable="author">
-              <names variable="editor" delimiter=". ">
-                <label form="verb" text-case="capitalize-first" suffix=" "/>
-                <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-              </names>
-            </if>
-          </choose>
-          <choose>
-            <if variable="author editor" match="any">
-              <names variable="translator" delimiter=". ">
-                <label form="verb" text-case="capitalize-first" suffix=" "/>
-                <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-              </names>
-            </if>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-contributors">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <group delimiter=", ">
-          <choose>
-            <if variable="author">
-              <names variable="editor" delimiter=", ">
-                <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-                <label form="verb" text-case="lowercase" prefix=", "/>
-              </names>
-              <choose>
-                <if variable="container-author">
-                  <group>
-                    <names variable="container-author">
-                      <label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
-                      <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-                    </names>
-                  </group>
-                </if>
-              </choose>
-            </if>
-          </choose>
-          <choose>
-            <if variable="author editor" match="any">
-              <names variable="translator" delimiter=", ">
-                <label form="verb" text-case="lowercase" suffix=" "/>
-                <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-              </names>
-            </if>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="title-chapter-special">
+  <macro name="sort-by-type">
     <choose>
-      <if variable="container-title" match="any">
-        <text variable="title" quotes="true"/>
-        <text term="in" text-case="lowercase" suffix=" " prefix=" "/>
+      <if type="bill legislation" match="any">
+        <text value="1"/>
       </if>
+      <else-if type="legal_case">
+        <text value="2"/>
+      </else-if>
+      <else-if type="book thesis" match="any">
+        <text value="3"/>
+      </else-if>
+      <else-if type="article-journal chapter article-newspaper article-magazine" match="any">
+        <text value="4"/>
+      </else-if>
       <else>
-        <text variable="title" font-style="italic" suffix=", "/>
+        <text value="5"/>
       </else>
     </choose>
   </macro>
-  <macro name="container-title-note">
-    <choose>
-      <if type="bill legal_case legislation" match="none">
-        <text variable="container-title" font-style="italic"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-title">
-    <choose>
-      <if type="legal_case" match="none">
-        <text variable="container-title" font-style="italic"/>
-      </if>
-    </choose>
+  <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
+    right. Only actually need to check for 'first' because w/i cite
+all the other tests should have been done... -->
+  <macro name="render-chapter">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text term="in" form="short"/>
+      <text macro="editor" strip-periods="true" suffix=","/>
+      <text macro="container-title" font-style="italic"/>
+    </group>
+    <text macro="series-info" prefix=" "/>
+    <text macro="edition" prefix=", "/>
+    <text macro="publisher-place-year"/>
+    <text variable="page-first" prefix=" "/>
   </macro>
-  <macro name="note-chapter">
-    <text macro="contributors-note" suffix=", " strip-periods="true"/>
-    <text macro="title-chapter-special"/>
+  <macro name="render-dictionary">
     <group delimiter=", ">
-      <text macro="secondary-contributors-note" strip-periods="true"/>
-      <text macro="container-contributors-note" strip-periods="true"/>
-      <text variable="container-title" font-style="italic"/>
-      <text macro="edition"/>
-      <text macro="translator"/>
-      <text variable="volume"/>
-      <text macro="collection-title"/>
-      <text macro="collection-number" strip-periods="true"/>
-      <text variable="publisher-place" strip-periods="true"/>
-      <text variable="publisher" strip-periods="true"/>
-      <text macro="issued-year"/>
-      <text variable="page"/>
+      <text macro="editor" strip-periods="true" suffix=","/>
+      <text variable="title" font-style="italic"/>
     </group>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
+    <text macro="series-info" prefix=" "/>
+    <text macro="edition" prefix=", "/>
+    <text macro="publisher-place-year"/>
+    <text variable="page-first" prefix=" "/>
   </macro>
-  <macro name="chapter">
-    <group delimiter=". ">
-      <text macro="contributors"/>
-      <text macro="title-chapter-special"/>
+  <macro name="render-encyclopedia">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text term="in" form="short"/>
+      <text macro="editor" strip-periods="true" suffix=","/>
+      <text macro="container-title" font-style="italic"/>
     </group>
+    <text macro="series-info" prefix=" "/>
+    <text macro="edition" prefix=", "/>
+    <text macro="publisher-place-year"/>
+    <text variable="page-first" prefix=" "/>
+  </macro>
+  <macro name="render-article-journal">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
+      <group delimiter=":">
+        <text variable="volume"/>
+        <text variable="issue"/>
+      </group>
+      <text macro="container-title"/>
+      <text variable="collection-title" prefix="(" suffix=") "/>
+      <text variable="page"/>
+    </group>
+    <text macro="internet-location"/>
+  </macro>
+  <macro name="render-book">
     <group delimiter=", ">
-      <text macro="secondary-contributors" strip-periods="true"/>
-      <text macro="container-contributors" strip-periods="true"/>
-      <text variable="container-title" font-style="italic"/>
+      <text variable="title" font-style="italic"/>
       <text macro="edition"/>
       <text macro="translator"/>
-      <text variable="volume"/>
-      <text macro="collection-title"/>
-      <text macro="collection-number" strip-periods="true"/>
-      <text variable="publisher-place" strip-periods="true"/>
-      <text variable="publisher" strip-periods="true"/>
-      <text macro="issued-year"/>
-      <text variable="page"/>
+      <text macro="editor"/>
+      <text macro="series-info"/>
     </group>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
+    <text macro="publisher-place-year"/>
   </macro>
-  <macro name="note-thesis">
+  <macro name="render-report">
     <group delimiter=", ">
-      <text macro="contributors-note" strip-periods="true"/>
+      <text variable="archive_location"/>
+      <text variable="archive"/>
       <text variable="title" font-style="italic"/>
       <text variable="genre"/>
-      <text variable="publisher" strip-periods="true"/>
-      <text macro="issued-year"/>
-    </group>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
-  </macro>
-  <macro name="thesis">
-    <group delimiter=". ">
-      <text macro="contributors"/>
-      <group delimiter=", ">
-        <text variable="title" font-style="italic"/>
-        <text variable="genre"/>
-        <text variable="publisher" strip-periods="true"/>
-        <text macro="issued-year"/>
+      <text macro="author-note" strip-periods="true" prefix="by "/>
+      <text variable="source"/>
+      <text variable="call-number"/>
+      <group delimiter=" ">
+        <text variable="collection-title" strip-periods="true"/>
+        <text macro="genre"/>
+        <text variable="number"/>
       </group>
     </group>
-    <text macro="URL"/>
+    <text macro="publisher-place-year"/>
   </macro>
-  <macro name="note-bill">
-    <group delimiter=", ">
-      <text macro="contributors-note"/>
-      <choose>
-        <if variable="volume chapter-number" match="any">
-          <text variable="number" prefix="PL "/>
-        </if>
-      </choose>
+  <macro name="render-thesis">
+    <group delimiter=" ">
       <text variable="title" font-style="italic"/>
-      <choose>
-        <if variable="volume chapter-number" match="none">
-          <text variable="number"/>
-        </if>
-      </choose>
-      <choose>
-        <if variable="chapter-number">
-          <text variable="chapter-number" strip-periods="true"/>
-          <text variable="authority" strip-periods="true"/>
-        </if>
-        <else>
-          <text variable="volume"/>
-          <text variable="container-title" strip-periods="true"/>
-        </else>
-      </choose>
-      <text variable="section" strip-periods="true"/>
-      <text macro="issued" strip-periods="true"/>
+      <text macro="genre" prefix="(" suffix=","/>
+      <text variable="publisher" suffix=","/>
+      <date form="text" variable="issued" date-parts="year" suffix=") [unpublished]"/>
     </group>
-    <text macro="point-locators"/>
-    <text variable="references" prefix=" (" suffix=")"/>
-    <text variable="title-short" prefix=" [" suffix="]" font-style="italic"/>
-    <text macro="URL"/>
   </macro>
-  <macro name="bill">
-    <group delimiter=", ">
-      <text macro="contributors" strip-periods="true"/>
-      <choose>
-        <if variable="volume chapter-number" match="any">
-          <text variable="number" prefix="PL "/>
-        </if>
-      </choose>
-      <text variable="title" font-style="italic"/>
-      <choose>
-        <if variable="volume chapter-number" match="none">
-          <text variable="number"/>
-        </if>
-      </choose>
-      <choose>
-        <if variable="chapter-number">
-          <text variable="chapter-number" strip-periods="true"/>
-          <text variable="authority" strip-periods="true"/>
-        </if>
-        <else>
-          <text variable="volume"/>
-          <text variable="container-title" strip-periods="true"/>
-        </else>
-      </choose>
-      <text variable="section" strip-periods="true"/>
-      <text macro="issued"/>
+  <macro name="render-article-newspaper">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=","/>
+      <text macro="container-title" font-style="italic"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+      <text variable="page-first"/>
     </group>
-    <text macro="URL"/>
+    <text macro="internet-location"/>
   </macro>
-  <macro name="legislation-note">
-    <group delimiter=", ">
-      <text macro="contributors-note" strip-periods="true"/>
-      <text variable="title" font-style="italic"/>
-      <choose>
-        <if variable="page">
-          <group delimiter=" ">
-            <text macro="issued-year" prefix=" (" suffix=")"/>
-            <text variable="section" strip-periods="true"/>
-            <text variable="container-title" strip-periods="true"/>
-            <text variable="page" strip-periods="true"/>
-          </group>
-          <text variable="number" strip-periods="true"/>
-        </if>
-        <else>
-          <text variable="container-title" strip-periods="true"/>
-          <text variable="section" strip-periods="true"/>
-          <text variable="number" strip-periods="true"/>
-          <text macro="issued"/>
-        </else>
-      </choose>
+  <macro name="render-article-magazine">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=""/>
+      <text macro="container-title" font-style="italic"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+      <text variable="page-first"/>
     </group>
-    <text macro="point-locators"/>
-    <text variable="references" prefix=" (" suffix=")"/>
-    <text variable="title-short" prefix=" [" suffix="]"/>
-    <text macro="URL"/>
+    <text macro="internet-location"/>
   </macro>
-  <macro name="legislation-bib">
+  <macro name="render-webpage">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=","/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+    </group>
+    <group delimiter=" ">
+      <text term="online" prefix=", " suffix=":"/>
+      <text macro="container-title" font-style="italic"/>
+      <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+    </group>
+  </macro>
+  <!-- cases and bill legislations render the same for biblio and (first) cite -->
+  <macro name="render-bill">
     <group delimiter=", ">
-      <text macro="contributors" strip-periods="true"/>
-      <text variable="title" font-style="italic"/>
       <choose>
-        <if variable="page">
+        <if variable="container-title" match="none">
+          <!-- if no volume, assume bill -->
+          <text variable="publisher-place"/>
+          <text variable="authority"/>
+          <text variable="section"/>
+          <text variable="chapter-number"/>
           <group delimiter=" ">
-            <text macro="issued-year" prefix=" (" suffix=")"/>
-            <text variable="section" strip-periods="true"/>
-            <text variable="container-title" strip-periods="true"/>
-            <text variable="page" strip-periods="true"/>
+            <text variable="title" font-style="italic"/>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
+          <text variable="number-of-volumes"/>
+          <group delimiter=" ">
+            <text variable="number"/>
+            <text macro="issued-long" prefix="(" suffix=")"/>
           </group>
-          <text variable="number" strip-periods="true"/>
         </if>
         <else>
-          <text variable="container-title" strip-periods="true"/>
-          <text variable="section" strip-periods="true"/>
-          <text variable="number" strip-periods="true"/>
-          <text macro="issued"/>
+          <text variable="number" prefix="Bill "/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
+          <text variable="chapter-number"/>
+          <text variable="authority"/>
+          <group delimiter=" ">
+            <date form="text" variable="issued" date-parts="year"/>
+          </group>
+          <text variable="section"/>
         </else>
       </choose>
     </group>
-    <text macro="URL"/>
   </macro>
-  <macro name="note-book">
-    <group delimiter=", ">
-      <text macro="contributors-note" strip-periods="true"/>
-      <text variable="title" font-style="italic"/>
-      <text macro="edition"/>
-      <text macro="translator-note" strip-periods="true"/>
-      <text variable="genre" strip-periods="true"/>
-      <text variable="number" strip-periods="true"/>
-      <text variable="volume" strip-periods="true"/>
-      <text macro="collection-title" strip-periods="true"/>
-      <text macro="collection-number"/>
-      <text variable="publisher-place" strip-periods="true"/>
-      <text variable="publisher" strip-periods="true"/>
-      <text macro="issued-year"/>
-    </group>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
+  <macro name="render-legislation">
+    <choose>
+      <if variable="references" match="any">
+        <text variable="title"/>
+        <date form="text" variable="issued" date-parts="year" prefix=" (" suffix=")"/>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="title" font-style="italic"/>
+          <group delimiter=" ">
+            <text macro="container-title"/>
+            <date form="text" variable="issued" date-parts="year"/>
+          </group>
+          <text variable="section"/>
+        </group>
+      </else>
+    </choose>
   </macro>
-  <macro name="book">
-    <group delimiter=". ">
-      <text macro="contributors"/>
-      <group delimiter=", ">
-        <text variable="title" font-style="italic"/>
-        <text macro="edition" strip-periods="true"/>
-        <text macro="translator" strip-periods="true"/>
-        <text variable="genre" strip-periods="true"/>
-        <text variable="number" strip-periods="true"/>
-        <text variable="volume" strip-periods="true"/>
-        <text macro="collection-title" strip-periods="true"/>
-        <text macro="collection-number" strip-periods="true"/>
-        <text variable="publisher-place" strip-periods="true"/>
-        <text variable="publisher" strip-periods="true"/>
-        <text macro="issued-year"/>
-      </group>
+  <macro name="render-patent">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <text variable="number" prefix="Patent No "/>
+      <text variable="references" prefix=", PCT Patent No "/>
+      <text macro="submitted-long" prefix="(" suffix=")"/>
     </group>
-    <text macro="URL"/>
   </macro>
-  <macro name="note-article-newspaper">
-    <group delimiter=", ">
-      <text macro="contributors-note" strip-periods="true"/>
+  <macro name="render-song">
+    <group delimiter=" ">
       <text variable="title" quotes="true"/>
-      <choose>
-        <if type="webpage post post-weblog" match="none">
-          <text variable="container-title" font-style="italic"/>
-        </if>
-      </choose>
-      <group>
-        <text term="edition" form="short" suffix=" " strip-periods="true"/>
-        <text variable="edition" strip-periods="true"/>
-      </group>
-      <group>
-        <text term="section" form="short" suffix=" " strip-periods="true"/>
-        <text variable="section" strip-periods="true"/>
-      </group>
+      <text variable="medium" prefix="(" suffix=")"/>
+      <text macro="author-note" strip-periods="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <text variable="call-number"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
     </group>
-    <text macro="issued" prefix=" (" suffix=")"/>
-    <text variable="page" prefix=" "/>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
   </macro>
-  <macro name="article-newspaper">
-    <group delimiter=". ">
-      <text macro="contributors"/>
-      <group delimiter=", ">
-        <text variable="title" quotes="true"/>
-        <choose>
-          <if type="webpage post post-weblog" match="none">
-            <text variable="container-title" font-style="italic"/>
-          </if>
-        </choose>
-        <group>
-          <text term="edition" form="short" suffix=" " strip-periods="true"/>
-          <text variable="edition" strip-periods="true"/>
-        </group>
-        <group>
-          <text term="section" form="short" suffix=" " strip-periods="true"/>
-          <text variable="section" strip-periods="true"/>
-        </group>
-      </group>
-    </group>
-    <text macro="issued" prefix=" (" suffix=")"/>
-    <text variable="page" prefix=" "/>
-    <text macro="URL"/>
-  </macro>
-  <macro name="note-article-magazine">
+  <macro name="render-manuscript">
     <group delimiter=" ">
-      <text macro="contributors-note" suffix="," strip-periods="true"/>
-      <text variable="title" quotes="true" suffix=","/>
-      <text variable="container-title" font-style="italic"/>
-      <choose>
-        <if variable="volume" match="any">
-          <group delimiter=":">
-            <text variable="volume"/>
-            <number variable="issue"/>
-          </group>
-        </if>
-        <else>
-          <group>
-            <text term="issue" form="short" strip-periods="true"/>
-            <number variable="issue"/>
-          </group>
-        </else>
-      </choose>
-      <text macro="issued" prefix="(" suffix=")"/>
-      <text variable="page"/>
+      <text variable="title" quotes="true"/>
+      <text variable="medium" prefix="(" suffix=")"/>
+      <text macro="author-note" strip-periods="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <text variable="call-number"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
     </group>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
   </macro>
-  <macro name="article-magazine">
-    <group delimiter=". ">
-      <text macro="contributors"/>
-      <group delimiter=" ">
-        <text variable="title" quotes="true" suffix=","/>
-        <text variable="container-title" font-style="italic"/>
-        <choose>
-          <if variable="volume" match="any">
-            <group delimiter=":">
-              <text variable="volume"/>
-              <number variable="issue"/>
-            </group>
-          </if>
-          <else>
-            <group>
-              <text term="issue" form="short" strip-periods="true"/>
-              <number variable="issue"/>
-            </group>
-          </else>
-        </choose>
-        <text macro="issued" prefix="(" suffix=")"/>
+  <macro name="render-case">
+    <text variable="title" font-style="italic" suffix=", " strip-periods="true"/>
+    <choose>
+      <if variable="container-title" match="none">
+        <group delimiter=" ">
+          <date form="text" variable="issued" date-parts="year"/>
+          <text variable="authority" strip-periods="true"/>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else>
+        <date form="text" variable="issued" date-parts="year" prefix="[" suffix="] "/>
+        <text variable="volume" suffix=" "/>
+        <text variable="container-title" suffix=" " strip-periods="true"/>
         <text variable="page"/>
-      </group>
-    </group>
-    <text macro="URL"/>
+        <!-- COMMENTED OUT FOR 9TH ED  <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/> -->
+      </else>
+    </choose>
+    <!-- COMMENTED OUT FOR 9TH ED  <text variable="URL" prefix=" (available on " suffix=")"/> -->
   </macro>
-  <macro name="note-article-journal">
+  <macro name="pinpoint">
     <group delimiter=" ">
-      <text macro="contributors-note" suffix="," strip-periods="true"/>
-      <text variable="title" quotes="true"/>
       <choose>
-        <if variable="volume" match="none">
-          <text macro="issued-year" prefix="[" suffix="]"/>
-          <number variable="issue"/>
+        <if locator="page">
+          <choose>
+            <if variable="locator">
+              <label variable="locator" plural="contextual" form="short" strip-periods="true" prefix=" "/>
+              <text variable="locator"/>
+            </if>
+          </choose>
         </if>
+        <else-if locator="section">
+          <label variable="locator" plural="contextual" form="short" strip-periods="true" prefix=", "/>
+          <text variable="locator"/>
+        </else-if>
+        <else-if locator="sub-verbo">
+          <label variable="locator" plural="contextual" form="short" strip-periods="true" font-style="italic" prefix=" "/>
+          <text variable="locator" quotes="true"/>
+        </else-if>
         <else>
-          <text macro="issued-year" prefix="(" suffix=")"/>
-          <group delimiter=":">
-            <text variable="volume"/>
-            <number variable="issue"/>
-          </group>
+          <label variable="locator" plural="contextual" form="short" strip-periods="true" prefix=" "/>
+          <text variable="locator"/>
         </else>
       </choose>
-      <text variable="container-title" form="short" strip-periods="true"/>
-      <text variable="page"/>
     </group>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
   </macro>
-  <macro name="article-journal">
-    <group delimiter=". ">
-      <text macro="contributors"/>
-      <group delimiter=" ">
-        <text variable="title" quotes="true"/>
-        <choose>
-          <if variable="volume" match="none">
-            <text macro="issued-year" prefix="[" suffix="]"/>
-            <number variable="issue"/>
-          </if>
-          <else>
-            <text macro="issued-year" prefix="(" suffix=")"/>
-            <group delimiter=":">
-              <text variable="volume"/>
-              <number variable="issue"/>
-            </group>
-          </else>
-        </choose>
-        <text variable="container-title" form="short" strip-periods="true"/>
-        <text variable="page"/>
-      </group>
-    </group>
-    <text macro="URL"/>
-  </macro>
-  <macro name="note-case">
+  <macro name="short-form">
     <choose>
-      <if variable="author">
-        <group delimiter=", ">
-          <text variable="authority" strip-periods="true"/>
-          <text macro="issued"/>
-          <text variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <text variable="volume"/>
-          <text variable="page"/>
-          <text macro="point-locators"/>
-        </group>
-      </if>
-      <else-if variable="title" match="none">
-        <group delimiter=", ">
-          <text variable="authority" strip-periods="true"/>
-          <text macro="issued"/>
-          <text variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" form="short" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <text variable="volume"/>
-          <text variable="page"/>
-          <text macro="point-locators"/>
-        </group>
-      </else-if>
-      <else>
-        <text variable="title" font-style="italic" suffix=", " strip-periods="true"/>
+      <if type="bill legal_case legislation" match="none">
+        <names variable="author">
+          <name and="symbol" form="short" delimiter-precedes-last="never"/>
+          <substitute>
+            <names variable="editor">
+              <name and="symbol" form="short"/>
+            </names>
+          </substitute>
+        </names>
         <choose>
-          <if variable="container-title" match="none">
-            <group delimiter=" ">
-              <text macro="issued-year"/>
-              <text variable="authority" strip-periods="true"/>
-              <text variable="page"/>
-            </group>
+          <if type="article-journal">
+            <text variable="title-short" quotes="true" prefix=", "/>
           </if>
-          <else>
-            <text macro="issued-year" prefix=" [" suffix="] "/>
-            <text variable="volume" suffix=" "/>
-            <text variable="container-title" suffix=" " strip-periods="true"/>
-            <text variable="page"/>
-            <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/>
-          </else>
         </choose>
-        <text variable="references" prefix=" (" suffix=")"/>
-        <text macro="point-locators"/>
-        <text variable="title-short" prefix=" [" suffix="]" font-style="italic"/>
-      </else>
-    </choose>
-    <text macro="URL"/>
-  </macro>
-  <macro name="case">
-    <choose>
-      <if variable="author">
-        <group delimiter=", ">
-          <text variable="authority" strip-periods="true"/>
-          <text macro="issued"/>
-          <text variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <text variable="volume"/>
-          <text variable="page"/>
-        </group>
       </if>
-      <else-if variable="title" match="none">
-        <group delimiter=", ">
-          <text variable="authority" strip-periods="true"/>
-          <text macro="issued"/>
-          <text variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" form="short" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <text variable="volume"/>
-          <text variable="page"/>
-        </group>
-      </else-if>
       <else>
-        <text variable="title" font-style="italic" suffix=", " strip-periods="true"/>
         <choose>
-          <if variable="container-title" match="none">
-            <text macro="issued-year" suffix=" "/>
-            <text variable="authority" suffix=" " strip-periods="true"/>
-            <text variable="page"/>
+          <if type="legal_case">
+            <choose>
+              <if variable="author">
+                <text variable="authority" suffix=", "/>
+                <date form="numeric" variable="issued" suffix=" "/>
+              </if>
+              <else-if variable="title" match="none">
+                <text variable="authority" suffix=", "/>
+                <date form="numeric" variable="issued" suffix=" "/>
+              </else-if>
+            </choose>
           </if>
-          <else>
-            <text macro="issued-year" prefix=" [" suffix="] "/>
-            <text variable="volume" suffix=" "/>
-            <text variable="container-title" suffix=" " strip-periods="true"/>
-            <text variable="page"/>
-            <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/>
-          </else>
         </choose>
-        <text variable="references" prefix=" (" suffix=")"/>
+        <text variable="title" font-style="italic" form="short"/>
       </else>
     </choose>
-    <text macro="URL"/>
   </macro>
-  <macro name="entrydic-note">
-    <group delimiter=", ">
-      <text macro="contributors-note" strip-periods="true"/>
-      <text variable="container-title" font-style="italic"/>
-      <text macro="edition" strip-periods="true"/>
-      <text macro="translator-note" strip-periods="true"/>
-      <text variable="volume" strip-periods="true"/>
-      <text macro="collection-title" strip-periods="true"/>
-      <text macro="collection-number" strip-periods="true"/>
-      <text variable="publisher-place" strip-periods="true"/>
-      <text variable="publisher" strip-periods="true"/>
-      <text macro="issued-year"/>
-      <group delimiter=" ">
-        <text value="sub verbo" font-style="italic"/>
-        <text variable="title" quotes="true"/>
-      </group>
-    </group>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
-  </macro>
-  <macro name="entrydic-bib">
-    <group delimiter=". ">
-      <text macro="contributors"/>
+  <macro name="publisher-place-year">
+    <group delimiter=", " prefix=", " suffix="">
       <group delimiter=", ">
-        <text variable="container-title" font-style="italic"/>
-        <text macro="edition" strip-periods="true"/>
-        <text macro="translator" strip-periods="true"/>
-        <text variable="volume" strip-periods="true"/>
-        <text macro="collection-title" strip-periods="true"/>
-        <text macro="collection-number" strip-periods="true"/>
-        <text variable="publisher-place" strip-periods="true"/>
-        <text variable="publisher" strip-periods="true"/>
-        <text macro="issued-year"/>
-      </group>
-    </group>
-    <text macro="URL"/>
-  </macro>
-  <macro name="entryencyclo-note">
-    <group delimiter=", ">
-      <text variable="container-title" font-style="italic" strip-periods="true"/>
-      <text variable="volume" font-style="italic" strip-periods="true"/>
-      <text macro="collection-title" strip-periods="true"/>
-      <text variable="collection-number" strip-periods="true"/>
-      <text macro="edition" strip-periods="true"/>
-      <text macro="translator-note" strip-periods="true"/>
-      <text variable="publisher-place" strip-periods="true"/>
-      <text variable="publisher" strip-periods="true"/>
-      <group delimiter=" ">
-        <text variable="page" strip-periods="true"/>
-        <text variable="title" quotes="true"/>
-        <text macro="contributors-note" prefix="par "/>
-      </group>
-    </group>
-    <text macro="point-locators"/>
-    <text macro="URL"/>
-  </macro>
-  <macro name="entryencyclo-bib">
-    <group delimiter=". ">
-      <text macro="contributors"/>
-      <group delimiter=", ">
-        <group delimiter=" ">
-          <text variable="page" strip-periods="true"/>
-          <text variable="title" quotes="true"/>
-        </group>
-        <text variable="container-title" font-style="italic" strip-periods="true"/>
-        <text variable="volume" font-style="italic" strip-periods="true"/>
-        <text macro="collection-title" strip-periods="true"/>
-        <text variable="collection-number" strip-periods="true"/>
-        <text macro="edition" strip-periods="true"/>
-        <text macro="translator-note" strip-periods="true"/>
-        <text variable="publisher-place" strip-periods="true"/>
-        <text variable="publisher" strip-periods="true"/>
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
       </group>
+      <date form="text" variable="issued" date-parts="year"/>
     </group>
-    <text macro="URL"/>
-  </macro>
-  <macro name="point-locators">
-    <choose>
-      <if variable="locator" match="any">
-        <choose>
-          <if locator="page paragraph" match="any">
-            <label variable="locator" prefix=" " suffix="&#160;" form="short" strip-periods="true"/>
-            <text variable="locator"/>
-          </if>
-          <else-if locator="sub-verbo" match="any">
-            <label variable="locator" prefix=", " suffix="&#160;" form="long" font-style="italic"/>
-            <text variable="locator" quotes="true"/>
-          </else-if>
-          <else-if type="legislation bill" locator="section" match="all">
-            <text variable="locator" prefix=", art&#160;"/>
-          </else-if>
-          <else>
-            <label variable="locator" prefix=", " suffix="&#160;" form="short" strip-periods="true"/>
-            <text variable="locator"/>
-          </else>
-        </choose>
-      </if>
-    </choose>
   </macro>
-  <macro name="sort-by-type">
-    <choose>
-      <if type="bill legislation" match="any">
-        <text value="1"/>
-      </if>
-      <else-if type="legal_case">
-        <text value="2"/>
-      </else-if>
-      <else-if type="book thesis entry-dictionary" match="any">
-        <text value="3" font-weight="normal"/>
-      </else-if>
-      <else-if type="chapter article-journal entry-encyclopedia" match="any">
-        <text value="4"/>
-      </else-if>
-      <else>
-        <text value="5"/>
-      </else>
-    </choose>
-  </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" delimiter-precedes-et-al="never">
-    <layout suffix="." delimiter="; ">
+  <citation et-al-min="4" et-al-use-first="1">
+    <!-- translator needs to be added for chapter book film etc. chapter? -->
+    <layout delimiter="; " suffix=".">
       <choose>
+        <!-- Not implemented: ibid only needs capitalize-first if it's the first word in a footnote -->
         <if position="ibid-with-locator">
-          <text term="ibid" font-style="italic" strip-periods="true" text-case="capitalize-first"/>
-          <text macro="point-locators"/>
+          <group>
+            <text term="ibid" font-style="italic" strip-periods="true"/>
+            <text macro="pinpoint"/>
+          </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid" font-style="italic" strip-periods="true" text-case="capitalize-first"/>
+          <text term="ibid" font-style="italic" strip-periods="true"/>
         </else-if>
+        <!-- For future versions? Cannot test for whether short form exists (Supra should be capitalized if no short form) -->
         <else-if position="subsequent">
-          <group delimiter=", ">
-            <choose>
-              <if type="bill legal_case legislation entry-dictionary" match="any">
-                <choose>
-                  <if type="legal_case">
-                    <choose>
-                      <if variable="author">
-                        <text variable="authority"/>
-                        <text macro="issued"/>
-                      </if>
-                      <else-if variable="title" match="none">
-                        <text variable="authority"/>
-                        <text macro="issued"/>
-                      </else-if>
-                    </choose>
-                  </if>
-                </choose>
-                <choose>
-                  <if variable="title-short" type="legislation bill entry-dictionary" match="all">
-                    <text variable="title-short"/>
-                  </if>
-                  <else-if variable="title" type="legal_case" match="any">
-                    <text variable="title" form="short" font-style="italic" strip-periods="true"/>
-                  </else-if>
-                  <else-if variable="title-short" match="any">
-                    <text variable="title-short" font-style="italic"/>
-                  </else-if>
-                  <else>
-                    <text variable="title" form="short" font-style="italic"/>
-                  </else>
-                </choose>
-              </if>
-              <else>
-                <text macro="contributors-short" strip-periods="true"/>
-              </else>
-            </choose>
-            <text value="supra" font-style="italic" suffix=" "/>
-          </group>
           <group delimiter=" ">
+            <group delimiter=", ">
+              <text macro="short-form"/>
+              <text value="supra" font-style="italic"/>
+            </group>
             <text value="note"/>
             <text variable="first-reference-note-number"/>
           </group>
-          <text macro="point-locators"/>
-        </else-if>
-        <else-if type="legislation">
-          <text macro="legislation-note"/>
-        </else-if>
-        <else-if type="bill">
-          <text macro="note-bill"/>
-        </else-if>
-        <else-if type="legal_case">
-          <text macro="note-case"/>
-        </else-if>
-        <else-if type="thesis">
-          <text macro="note-thesis"/>
-        </else-if>
-        <else-if type="chapter">
-          <text macro="note-chapter"/>
-        </else-if>
-        <else-if type="book report" match="any">
-          <text macro="note-book"/>
-        </else-if>
-        <else-if type="article-newspaper webpage post post-weblog" match="any">
-          <text macro="note-article-newspaper"/>
-        </else-if>
-        <else-if type="article-magazine">
-          <text macro="note-article-magazine"/>
-        </else-if>
-        <else-if type="article-journal">
-          <text macro="note-article-journal"/>
-        </else-if>
-        <else-if type="entry-dictionary">
-          <text macro="entrydic-note"/>
-        </else-if>
-        <else-if type="entry-encyclopedia">
-          <text macro="entryencyclo-note"/>
+          <text macro="pinpoint"/>
         </else-if>
         <else>
-          <group delimiter=", ">
-            <text macro="contributors-note" strip-periods="true"/>
-            <text variable="title" font-style="italic"/>
-            <text macro="description-note"/>
-            <text macro="secondary-contributors-note" strip-periods="true"/>
-            <group delimiter="">
-              <text macro="container-contributors-note" strip-periods="true"/>
-              <text macro="container-title-note"/>
+          <group>
+            <group delimiter=" ">
+              <choose>
+                <if type="legislation" match="any">
+                  <choose>
+                    <if variable="references" match="any">
+                      <group delimiter=" ">
+                        <text macro="pinpoint"/>
+                        <text macro="render-legislation"/>
+                        <text variable="note" prefix=", "/>
+                      </group>
+                    </if>
+                    <else>
+                      <group delimiter="">
+                        <text macro="render-legislation"/>
+                        <text macro="pinpoint"/>
+                        <text variable="note" prefix=", "/>
+                      </group>
+                    </else>
+                  </choose>
+                </if>
+                <else-if type="bill" match="any">
+                  <text macro="render-bill"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note" prefix=", "/>
+                </else-if>
+                <else-if type="song" match="any">
+                  <text macro="render-song"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note" prefix=", "/>
+                </else-if>
+                <else-if type="patent" match="any">
+                  <text macro="render-patent"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note" prefix=", "/>
+                </else-if>
+                <else-if type="manuscript" match="any">
+                  <text macro="render-manuscript"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note" prefix=", "/>
+                </else-if>
+                <else-if type="legal_case">
+                  <group delimiter="">
+                    <text macro="render-case"/>
+                    <text macro="pinpoint"/>
+                    <text variable="note" prefix=", "/>
+                  </group>
+                </else-if>
+                <else-if type="report">
+                  <text macro="render-report"/>
+                  <text macro="pinpoint"/>
+                  <text variable="note" prefix=", "/>
+                </else-if>
+                <else>
+                  <text macro="author-note" strip-periods="true" suffix=", "/>
+                  <choose>
+                    <if type="article-journal">
+                      <text macro="render-article-journal"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </if>
+                    <else-if type="chapter">
+                      <text macro="render-chapter"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else-if>
+                    <else-if type="entry-dictionary">
+                      <text macro="render-dictionary"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else-if>
+                    <else-if type="entry-encyclopedia">
+                      <text macro="render-encyclopedia"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else-if>
+                    <else-if type="thesis">
+                      <text macro="render-thesis"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else-if>
+                    <else-if type="article-newspaper" match="any">
+                      <text macro="render-article-newspaper"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else-if>
+                    <else-if type="article-magazine">
+                      <text macro="render-article-magazine"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else-if>
+                    <else-if type="webpage post-weblog" match="any">
+                      <text macro="render-webpage"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else-if>
+                    <else-if type="book">
+                      <text macro="render-book"/>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else-if>
+                    <else>
+                      <group delimiter=" ">
+                        <group delimiter=", ">
+                          <text variable="title" font-style="italic"/>
+                          <text macro="translator"/>
+                          <text macro="edition"/>
+                        </group>
+                        <text macro="publisher-place-year"/>
+                      </group>
+                      <text macro="pinpoint"/>
+                      <text variable="note" prefix=", "/>
+                    </else>
+                  </choose>
+                </else>
+              </choose>
             </group>
-            <text variable="genre" strip-periods="true"/>
-            <text macro="collection-title" strip-periods="true"/>
-            <text variable="collection-number" strip-periods="true"/>
-            <text variable="publisher-place" strip-periods="true"/>
-            <text variable="publisher" strip-periods="true"/>
-            <text variable="event" strip-periods="true"/>
-            <text variable="issue" prefix="n°"/>
-            <text variable="volume" strip-periods="true"/>
-            <text macro="issued"/>
-            <text variable="page"/>
+            <choose>
+              <if type="legal_case" match="any">
+                <text variable="references" prefix=", "/>
+                <text variable="title-short" prefix=" [" suffix="]" font-style="italic"/>
+              </if>
+            </choose>
           </group>
-          <text macro="point-locators"/>
-          <text macro="URL"/>
         </else>
       </choose>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+  <bibliography et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;">
     <sort>
       <key macro="sort-by-type"/>
-      <key macro="contributors-sort"/>
-      <key variable="issued"/>
+      <key macro="author-bib"/>
       <key variable="title"/>
+      <key variable="issued"/>
     </sort>
     <layout suffix=".">
       <choose>
-        <if type="legislation">
-          <text macro="legislation-bib"/>
+        <if type="bill legal_case legislation" match="any">
+          <choose>
+            <if type="legislation" match="any">
+              <text macro="render-legislation"/>
+            </if>
+            <else-if type="bill">
+              <text macro="render-bill"/>
+            </else-if>
+            <else-if type="legal_case">
+              <text macro="render-case"/>
+              <text variable="note" prefix=", "/>
+            </else-if>
+          </choose>
         </if>
-        <else-if type="bill">
-          <text macro="bill"/>
-        </else-if>
-        <else-if type="legal_case">
-          <text macro="case"/>
-        </else-if>
-        <else-if type="thesis">
-          <text macro="thesis"/>
-        </else-if>
-        <else-if type="chapter paper-conference" match="any">
-          <text macro="chapter"/>
-        </else-if>
-        <else-if type="book report" match="any">
-          <text macro="book"/>
-        </else-if>
-        <else-if type="article-newspaper webpage post post-weblog" match="any">
-          <text macro="article-newspaper"/>
-        </else-if>
-        <else-if type="article-magazine">
-          <text macro="article-magazine"/>
-        </else-if>
-        <else-if type="article-journal">
-          <text macro="article-journal"/>
-        </else-if>
-        <else-if type="entry-dictionary">
-          <text macro="entrydic-bib"/>
-        </else-if>
-        <else-if type="entry-encyclopedia">
-          <text macro="entryencyclo-bib"/>
-        </else-if>
         <else>
-          <group delimiter=". ">
-            <text macro="contributors"/>
-            <group delimiter=", ">
-              <text variable="title" font-style="italic"/>
-              <text macro="description"/>
-              <text macro="secondary-contributors" strip-periods="true"/>
-              <group>
-                <text macro="container-contributors" strip-periods="true"/>
-                <text macro="container-title"/>
-              </group>
-              <text variable="genre" strip-periods="true"/>
-              <text macro="collection-title" strip-periods="true"/>
-              <text variable="collection-number" strip-periods="true"/>
-              <text variable="publisher-place" strip-periods="true"/>
-              <text variable="publisher" strip-periods="true"/>
-              <text variable="event" strip-periods="true"/>
-              <text variable="issue" prefix="n°"/>
-              <text variable="volume" strip-periods="true"/>
-              <text macro="issued"/>
-              <text variable="page" strip-periods="true"/>
-            </group>
+          <group delimiter=", ">
+            <choose>
+              <if type="article-journal">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-article-journal"/>
+              </if>
+              <else-if type="chapter">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-chapter"/>
+              </else-if>
+              <else-if type="thesis">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-thesis"/>
+              </else-if>
+              <else-if type="article-newspaper">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-article-newspaper"/>
+              </else-if>
+              <else-if type="article-magazine">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-article-magazine"/>
+              </else-if>
+              <else-if type="book">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-book"/>
+              </else-if>
+              <else-if type="webpage post-weblog" match="any">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-webpage"/>
+              </else-if>
+              <else-if type="entry-dictionary">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-dictionary"/>
+              </else-if>
+              <else-if type="entry-encyclopedia">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-encyclopedia"/>
+              </else-if>
+              <else-if type="report">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-report"/>
+              </else-if>
+              <else-if type="patent">
+                <text macro="render-patent"/>
+              </else-if>
+              <else-if type="song">
+                <text macro="render-song"/>
+              </else-if>
+              <else-if type="manuscript">
+                <text macro="author-bib" strip-periods="true"/>
+                <text macro="render-manuscript"/>
+              </else-if>
+              <else>
+                <text macro="author-bib" strip-periods="true"/>
+                <group>
+                  <group delimiter=", ">
+                    <text variable="title" font-style="italic"/>
+                    <text macro="edition"/>
+                    <text macro="translator"/>
+                    <text macro="editor"/>
+                  </group>
+                  <text macro="publisher-place-year"/>
+                </group>
+              </else>
+            </choose>
           </group>
         </else>
       </choose>
diff --git a/medicina-delle-dipendenze-italian-journal-of-the-addictions.csl b/medicina-delle-dipendenze-italian-journal-of-the-addictions.csl
new file mode 100644
index 00000000000..4dc5a5fe632
--- /dev/null
+++ b/medicina-delle-dipendenze-italian-journal-of-the-addictions.csl
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="it-IT">
+  <info>
+    <title>Medicina delle Dipendenze - Italian Journal of the Addictions (Italian)</title>
+    <title-short>MDD</title-short>
+    <id>http://www.zotero.org/styles/medicina-delle-dipendenze-italian-journal-of-the-addictions</id>
+    <link href="http://www.zotero.org/styles/medicina-delle-dipendenze-italian-journal-of-the-addictions" rel="self"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="template"/>
+    <link href="https://www.medicinadelledipendenze.it/rivista/istruzioni-per-gli-autori/criteri-generali-per-la-pubblicazione.html" rel="documentation"/>
+    <author>
+      <name>Ernesto de Bernardis</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>2039-7925</issn>
+    <summary>A style for  Medicina delle Dipendenze - Italian Journal of the Addictions, official journal of SITD</summary>
+    <updated>2020-10-25T08:28:07+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="author">
+    <names variable="author">
+      <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title" form="short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <label form="long" prefix=", " suffix="."/>
+    </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>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher" suffix=", "/>
+    <text variable="publisher-place" suffix=", "/>
+    <text macro="year-date"/>
+  </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="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <choose>
+          <if variable="URL">
+            <text variable="URL"/>
+            <group prefix=" (" suffix=")" delimiter=" ">
+              <text term="accessed"/>
+              <date variable="accessed" form="text"/>
+            </group>
+          </if>
+        </choose>
+      </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="year-date" sort="descending"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" et-al-min="7" et-al-use-first="6">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date" sort="descending"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author" suffix=". "/>
+      <choose>
+        <if type="book legal_case legislation motion_picture report song graphic" match="any">
+          <group delimiter=". ">
+            <text variable="title" font-style="italic"/>
+            <text variable="volume" prefix="vol. "/>
+            <text macro="edition"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group>
+            <group delimiter=". ">
+              <text variable="title"/>
+              <group>
+                <text term="in" text-case="capitalize-first" suffix=": "/>
+                <text macro="editor"/>
+              </group>
+              <group suffix=". ">
+                <text variable="container-title" form="short" font-style="italic"/>
+                <text variable="volume" prefix="vol. "/>
+              </group>
+              <text macro="edition"/>
+            </group>
+            <text macro="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <text variable="number"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=". ">
+            <text variable="title"/>
+            <text variable="genre"/>
+            <group delimiter=", ">
+              <text variable="publisher"/>
+              <text macro="year-date"/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group>
+            <group delimiter=" ">
+              <group delimiter=". ">
+                <text variable="title"/>
+                <text variable="container-title" form="short" text-case="title" strip-periods="true" font-style="italic" suffix=". "/>
+              </group>
+              <group suffix=": ">
+                <text variable="volume"/>
+                <number prefix="(" suffix=")" variable="issue"/>
+              </group>
+            </group>
+            <text variable="page" suffix=", "/>
+            <text macro="year-date"/>
+          </group>
+        </else>
+      </choose>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/molecular-therapy.csl b/molecular-therapy.csl
deleted file mode 100644
index 0350368d31a..00000000000
--- a/molecular-therapy.csl
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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>Molecular Therapy</title>
-    <id>http://www.zotero.org/styles/molecular-therapy</id>
-    <link href="http://www.zotero.org/styles/molecular-therapy" rel="self"/>
-    <link href="http://www.nature.com/mt/author_instructions.html" rel="documentation"/>
-    <author>
-      <name>Sebastian Karcher</name>
-    </author>
-    <contributor>
-      <name>Michael Berkowitz</name>
-      <email>mberkowi@gmu.edu</email>
-    </contributor>
-    <contributor>
-      <name>Ulrik Stervbo</name>
-      <email>ulrik.stervbo@gmail.com</email>
-    </contributor>
-    <category citation-format="numeric"/>
-    <category field="science"/>
-    <category field="biology"/>
-    <issn>1525-0016</issn>
-    <eissn>1525-0024</eissn>
-    <updated>2020-09-07T16:20:53+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="title">
-    <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" font-style="italic"/>
-      </if>
-      <else>
-        <text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name sort-separator=", " delimiter=", " and="text" initialize-with="" delimiter-precedes-last="never" name-as-sort-order="all"/>
-      <et-al font-style="italic"/>
-    </names>
-  </macro>
-  <macro name="editor">
-    <names variable="editor" prefix="In: ">
-      <name sort-separator=", " delimiter=", " and="text" initialize-with="" delimiter-precedes-last="never" name-as-sort-order="all"/>
-      <label form="short" prefix=" (" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="volume"/>
-      <else-if variable="DOI">
-        <text variable="DOI" prefix=" doi:"/>
-      </else-if>
-      <else-if variable="URL">
-        <text term="at"/>
-        <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="issuance">
-    <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=" " delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-          <text variable="number-of-pages" suffix="pp"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="year-date">
-    <date prefix=" (" suffix=")" variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="pages">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <group delimiter=" ">
-          <label variable="page" strip-periods="true" form="short"/>
-          <text variable="page"/>
-        </group>
-      </if>
-      <else>
-        <text variable="page"/>
-      </else>
-    </choose>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout delimiter="," vertical-align="sup">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush" entry-spacing="0">
-    <layout suffix=".">
-      <text variable="citation-number" suffix="."/>
-      <group delimiter=" " suffix=". ">
-        <text macro="author"/>
-        <text macro="year-date"/>
-      </group>
-      <group delimiter=". ">
-        <text macro="title"/>
-        <text macro="editor"/>
-        <text variable="container-title" font-style="italic" form="short"/>
-      </group>
-      <text variable="volume" font-weight="bold" prefix=" "/>
-      <text macro="issuance" prefix=", "/>
-      <text macro="pages" prefix=": "/>
-      <text macro="access"/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/norsk-apa-manual-note.csl b/norsk-apa-manual-note.csl
new file mode 100644
index 00000000000..79f976483f8
--- /dev/null
+++ b/norsk-apa-manual-note.csl
@@ -0,0 +1,1623 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
+  <info>
+    <title>Norsk APA-manual - APA 7th edition (note)</title>
+    <id>http://www.zotero.org/styles/norsk-apa-manual-note</id>
+    <link href="http://www.zotero.org/styles/norsk-apa-manual-note" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://kildekompasset.no/referansestiler/apa-7th-tilpasset-fotnoter" rel="documentation"/>
+    <author>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="generic-base"/>
+    <updated>2020-01-14T02:24:58+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="nb">
+    <terms>
+      <term name="et-al">et al.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nn">
+    <terms>
+      <term name="et-al">et al.</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="never"/>
+      <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="never"/>
+          <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="never"/>
+          <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="never"/>
+          <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="never"/>
+          <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">
+        <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">
+                  <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">
+            <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 and title case -->
+        <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"/>
+          </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"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic"/>
+      </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"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic"/>
+      </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">
+          <!-- 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"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic"/>
+      </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=", " delimiter-precedes-last="never"/>
+              <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">
+          <!-- 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="page" match="none">
+          <label variable="locator" form="short"/>
+        </if>
+      </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">
+    <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 delimiter="; ">
+      <group delimiter=": ">
+        <group delimiter=" ">
+          <text macro="author-intext"/>
+          <text macro="date-intext"/>
+        </group>
+        <text macro="citation-locator"/>
+      </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/norsk-apa-manual.csl b/norsk-apa-manual.csl
new file mode 100644
index 00000000000..40af2ffa334
--- /dev/null
+++ b/norsk-apa-manual.csl
@@ -0,0 +1,1652 @@
+<?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">
+  <info>
+    <title>Norsk APA-manual - APA 7th edition (author-date)</title>
+    <title-short>Norsk APA</title-short>
+    <id>http://www.zotero.org/styles/norsk-apa-manual</id>
+    <link href="http://www.zotero.org/styles/norsk-apa-manual" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://www.unit.no/tjenester/norsk-apa-referansestil" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <updated>2020-10-28T12: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 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>
+  <locale xml:lang="nb">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikasjon</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nn">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikasjon</term>
+      <term name="letter" form="short">brev</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="never"/>
+      <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="never"/>
+          <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="never"/>
+          <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="never"/>
+          <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="never"/>
+          <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=", " delimiter-precedes-last="never"/>
+              <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">
+    <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"/>
+        <text macro="date-intext"/>
+        <text macro="citation-locator"/>
+      </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/offa.csl b/offa.csl
new file mode 100644
index 00000000000..e197526d792
--- /dev/null
+++ b/offa.csl
@@ -0,0 +1,425 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" delimiter-precedes-et-al="never" demote-non-dropping-particle="sort-only">
+  <!-- Polyglot; journal publishes in English, German, and occasionally in other languages -->
+  <info>
+    <title>Offa - Berichte und Mitteilungen zur Urgeschichte, Frühgeschichte und Mittelalterarchäologie</title>
+    <title-short>Offa</title-short>
+    <id>http://www.zotero.org/styles/offa</id>
+    <link href="http://www.zotero.org/styles/offa" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-neolithic-archaeology" rel="template"/>
+    <link href="https://www.ufg.uni-kiel.de/de/schriften/verlinkte-dateien/offa-richtlinien-2018" rel="documentation"/>
+    <author>
+      <name>Nils Müller-Scheeßel</name>
+      <email>nils.mueller-scheessel@ufg.uni-kiel.de</email>
+    </author>
+    <contributor>
+      <name>Offa</name>
+      <email>offa@ufg.uni-kiel.de</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="anthropology"/>
+    <issn>0078-3714</issn>
+    <summary>Author-date style meeting citation specifications provided by Offa. Based on the JNA style.</summary>
+    <updated>2020-10-12T00:09:05+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="reviewed-author" form="verb">rev. of</term>
+      <term name="presented at">talk</term>
+      <term name="accessed">accessed: </term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="reviewed-author" form="verb">Rez. zu</term>
+      <term name="presented at">Vortrag</term>
+      <term name="accessed">Zugriff: </term>
+    </terms>
+  </locale>
+  <macro name="short-container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group>
+          <choose>
+            <if variable="editor container-title" match="any">
+              <text term="in" text-case="sentence" prefix=". " suffix=": "/>
+              <names variable="editor">
+                <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+                <label form="short" strip-periods="false" prefix=" (" suffix="),"/>
+              </names>
+              <names variable="container-author">
+                <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+              </names>
+              <text macro="collection-title"/>
+            </if>
+          </choose>
+        </group>
+      </if>
+      <else-if type="article article-journal article-magazine article-newspaper" match="any">
+        <text macro="translator"/>
+        <choose>
+          <if match="any" variable="container-title-short">
+            <text variable="container-title-short" prefix=". "/>
+          </if>
+          <else>
+            <text variable="container-title" prefix=". "/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". "/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <choose>
+      <if match="any" variable="translator">
+        <choose>
+          <if match="none" variable="editor">
+            <names variable="translator" prefix=", ">
+              <label form="verb-short" suffix=" "/>
+              <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+            </names>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="contributors">
+    <group suffix=", ">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". "/>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <text macro="editor"/>
+      </else-if>
+    </choose>
+    </group>
+  </macro>
+  <macro name="contributors-short-citation">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name form="short" delimiter="/" et-al-min="3" et-al-use-first="1" font-variant="small-caps" initialize-with=". " name-as-sort-order="all"/>
+          <et-al font-variant="normal"/>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name form="short" delimiter="/" et-al-min="3" et-al-use-first="1" font-variant="small-caps" initialize-with=". " name-as-sort-order="all"/>
+          <et-al font-variant="normal"/>
+        </names>
+      </else-if>
+      <else>
+        <text variable="title-short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="contributors-short-biblio">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name form="short" delimiter="/" et-al-min="3" et-al-use-first="1" initialize-with=". " name-as-sort-order="all"/>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name form="short" delimiter="/" delimiter-precedes-last="always" et-al-min="3" et-al-use-first="1" initialize-with=". " name-as-sort-order="all"/>
+        </names>
+      </else-if>
+      <else>
+        <text variable="title-short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song thesis" match="any">
+        <text variable="title"/>
+        <text variable="volume" prefix=" "/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <text variable="edition" vertical-align="sup"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <number prefix=" " variable="volume"/>
+        <text variable="issue" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text variable="page" prefix=" "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-article">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="edition" prefix=", "/>
+            <text term="edition" prefix=", "/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=" "/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal">
+        <text variable="page" prefix=", "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="place-date">
+    <choose>
+      <if type="book thesis chapter paper-conference" match="any">
+        <choose>
+          <if match="none" variable="edition">
+            <text value=""/>
+          </if>
+        </choose>
+        <group delimiter="" prefix=" (" suffix=")">
+          <group delimiter=" ">
+            <choose>
+              <if type="thesis" match="any">
+                <text variable="genre" suffix=" "/>
+                <text variable="publisher"/>
+              </if>
+              <else>
+                <text variable="publisher-place"/>
+              </else>
+            </choose>
+            <text macro="date"/>
+          </group>
+          <text macro="edition"/>
+          <choose>
+            <if match="any" variable="original-date original-publisher-place">
+              <group prefix=" [Originalausgabe: " suffix="]">
+                <text variable="original-publisher-place"/>
+                <date date-parts="year" form="text" variable="original-date" prefix=" "/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="journal-date">
+    <choose>
+      <if type="article-journal">
+        <text macro="date" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="collection-title">
+    <text variable="container-title" prefix=" "/>
+    <text variable="volume" prefix=" "/>
+  </macro>
+  <macro name="event">
+    <text term="presented at" suffix=" "/>
+    <date form="text" variable="issued" suffix=", "/>
+    <text variable="event-place" suffix=". "/>
+    <text variable="event"/>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="speech" match="any">
+        <text macro="event" prefix=" "/>
+      </if>
+      <else-if type="paper-conference" match="any">
+        <text variable="event" prefix=" "/>
+        <date form="text" variable="event-date" prefix=" "/>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text macro="day-month" prefix=", "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="series">
+    <choose>
+      <if match="any" variable="collection-title">
+        <text variable="collection-title" prefix=". "/>
+        <text variable="collection-number" prefix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="paper-conference" match="any">
+        <text variable="volume" prefix=" "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="url">
+    <choose>
+      <if match="any" variable="URL">
+        <group>
+          <text variable="URL" text-case="lowercase" prefix=". "/>
+          <choose>
+            <if match="none" is-uncertain-date="accessed">
+              <group>
+                <text term="accessed" prefix=" ("/>
+                <date form="numeric" variable="accessed" suffix=")"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="doi">
+  <text variable="DOI" prefix=". DOI: https://doi.org/"/>
+  </macro>
+  <macro name="review">
+    <choose>
+      <if match="any" variable="reviewed-author">
+        <text term="reviewed-author" form="verb" prefix=", " suffix=" "/>
+        <names variable="reviewed-author">
+          <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+        </names>
+        <text variable="reviewed-title" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="encyclopedia-article">
+    <text variable="container-title"/>
+    <number prefix=" " variable="volume"/>
+    <choose>
+      <if match="none" is-uncertain-date="issued">
+        <date date-parts="year" form="text" variable="issued" prefix=" (" suffix=")"/>
+      </if>
+    </choose>
+    <text variable="page" prefix=" "/>
+    <group>
+      <choose>
+        <if match="any" variable="title">
+          <text term="sub verbo" form="short" prefix=" " suffix=" "/>
+          <text variable="title"/>
+        </if>
+      </choose>
+    </group>
+    <text variable="edition" prefix=" [" suffix="]"/>
+    <choose>
+      <if match="any" variable="author">
+        <group prefix=" (" suffix=")">
+          <names variable="author"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="webpage-date">
+    <choose>
+      <if type="webpage" match="any">
+        <choose>
+          <if match="none" is-uncertain-date="issued">
+            <date date-parts="year" form="text" variable="issued" prefix=", "/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" givenname-disambiguation-rule="all-names-with-initials" disambiguate-add-year-suffix="true">
+    <sort>
+      <key variable="issued"/>
+      <key macro="contributors-short-citation"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="contributors-short-citation"/>
+          <text macro="date"/>
+        </group>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="false" line-spacing="1" entry-spacing="1">
+    <sort>
+      <key macro="contributors-short-biblio"/>
+      <key variable="issued"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group suffix=": ">
+          <text macro="contributors-short-biblio" suffix=" "/>
+          <text macro="date"/>
+        </group>
+        <group>
+          <choose>
+            <if type="entry-encyclopedia entry-dictionary" match="any">
+              <text macro="encyclopedia-article"/>
+            </if>
+            <else>
+              <text macro="contributors"/>
+              <text macro="title" strip-periods="false"/>
+              <text macro="review"/>
+              <text macro="short-container-contributors"/>
+              <text macro="locators"/>
+              <text macro="issue"/>
+              <text macro="series"/>
+              <choose>
+                <if type="article article-journal article-magazine article-newspaper" match="none">
+                  <text macro="translator" suffix=" "/>
+                </if>
+              </choose>
+              <text macro="webpage-date"/>
+              <text macro="place-date"/>
+              <text macro="journal-date"/>
+              <text macro="locators-chapter"/>
+              <text macro="locators-article"/>
+            </else>
+          </choose>
+          <choose>
+          <if variable="DOI" match="any">
+              <text macro="doi"/>
+            </if>
+            <else>
+              <text macro="url"/>
+            </else>
+          </choose>
+        </group>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/research-institute-for-nature-and-forest.csl b/research-institute-for-nature-and-forest.csl
index d3da0597aeb..3281b7d8aab 100644
--- a/research-institute-for-nature-and-forest.csl
+++ b/research-institute-for-nature-and-forest.csl
@@ -5,65 +5,94 @@
     <title-short>INBO</title-short>
     <id>http://www.zotero.org/styles/research-institute-for-nature-and-forest</id>
     <link href="http://www.zotero.org/styles/research-institute-for-nature-and-forest" rel="self"/>
+    <link href="https://inbomd-examples.netlify.app/citation_style/nl/index.html" rel="documentation"/>
     <author>
       <name>Maarten Stevens</name>
-      <uri>http://www.mendeley.com/profiles/maarten-stevens/</uri>
+      <uri>https://www.mendeley.com/profiles/maarten-stevens/</uri>
     </author>
-    <contributor>
-      <name>Thierry Onkelinx</name>
-      <uri>http://www.mendeley.com/profiles/thierry-onkelinx/</uri>
-    </contributor>
-    <contributor>
+    <author>
       <name>Floris Vanderhaeghe</name>
       <email>floris.vanderhaeghe@inbo.be</email>
+    </author>
+    <contributor>
+      <name>Thierry Onkelinx</name>
+      <uri>https://www.mendeley.com/profiles/thierry-onkelinx/</uri>
     </contributor>
     <category citation-format="author-date"/>
     <category field="biology"/>
-    <updated>2019-08-01T00:00:00</updated>
+    <category field="botany"/>
+    <category field="zoology"/>
+    <updated>2020-10-12T12:01:18+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="en">
     <terms>
-      <term name="in">In</term>
+      <term name="edition" form="short">edn.</term>
+      <term name="no date" form="short">s.d.</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
-      <term name="in">In</term>
       <term name="et-al">et al.</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="edition" form="short">ed.</term>
+      <term name="no date" form="short">s.d.</term>
     </terms>
   </locale>
   <macro name="container">
     <choose>
-      <if type="chapter paper-conference" match="any">
-        <text term="in" prefix=". " suffix=": "/>
-        <names variable="editor translator" delimiter=", " suffix=". ">
-          <name delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
-          <label text-case="lowercase" prefix=" (" suffix=")"/>
-        </names>
-        <group delimiter=", ">
-          <text variable="container-title"/>
-          <text variable="collection-title"/>
-        </group>
+      <if type="article-journal article-magazine article-newspaper" match="none">
+        <choose>
+          <if type="paper-conference" variable="container-title" match="any">
+            <text term="in" text-case="capitalize-first" suffix=": "/>
+            <names variable="editor translator" delimiter=", " suffix=". ">
+              <name and="symbol" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+              <label text-case="lowercase" form="short" prefix=" (" suffix=")"/>
+            </names>
+          </if>
+        </choose>
       </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"/>
-          <text variable="collection-title"/>
-        </group>
-      </else>
     </choose>
+    <group delimiter=", ">
+      <text variable="container-title"/>
+      <text variable="collection-title"/>
+      <choose>
+        <if type="article-journal article-magazine article-newspaper" match="any">
+          <!-- show nothing -->
+        </if>
+        <else-if variable="volume">
+          <group delimiter=" ">
+            <text term="volume" form="short" text-case="capitalize-first"/>
+            <number variable="volume"/>
+          </group>
+        </else-if>
+        <else-if variable="collection-number">
+          <group delimiter=" ">
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <number variable="collection-number"/>
+          </group>
+        </else-if>
+        <else-if variable="number">
+          <group delimiter=" ">
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
+      </choose>
+      <choose>
+        <if type="paper-conference" variable="container-title" match="any">
+          <text macro="edition"/>
+        </if>
+      </choose>
+    </group>
   </macro>
   <macro name="author">
     <names variable="author">
       <name and="symbol" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -93,15 +122,10 @@
     <choose>
       <if type="webpage">
         <group delimiter=" ">
-          <text value="URL"/>
           <text variable="URL"/>
           <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>
+            <date variable="accessed" form="text"/>
           </group>
         </group>
       </if>
@@ -109,20 +133,13 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="report thesis" match="any">
+      <if type="webpage">
         <text variable="title"/>
-        <group prefix=" (" suffix=")">
-          <text variable="genre"/>
-          <text variable="number" prefix=" No. "/>
-        </group>
+        <text value="WWW document" prefix=" [" suffix="]"/>
       </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">
+      <else-if variable="container-title" match="none">
         <text variable="title"/>
-        <text value="WWW Document" prefix=" [" suffix="]"/>
+        <text macro="edition" prefix=". "/>
       </else-if>
       <else>
         <text variable="title"/>
@@ -162,16 +179,16 @@
           <number variable="edition" form="ordinal"/>
         </if>
         <else>
-          <text variable="edition" suffix="."/>
+          <text variable="edition"/>
         </else>
       </choose>
-      <text value="ed"/>
+      <text term="edition" form="short"/>
     </group>
   </macro>
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter=": " prefix=" ">
+        <group delimiter=": ">
           <group>
             <text variable="volume"/>
             <choose>
@@ -184,36 +201,32 @@
         </group>
       </if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
-        <group delimiter=", " prefix=". ">
+        <group delimiter=", ">
           <text macro="event"/>
           <text macro="publisher"/>
-          <text variable="number-of-pages" prefix=" " suffix=" p"/>
+          <text variable="number-of-pages" suffix=" p"/>
         </group>
       </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <group delimiter=", " prefix=". ">
+      <else-if type="chapter paper-conference" variable="page" match="any">
+        <group delimiter=", ">
           <text macro="event"/>
           <text macro="publisher"/>
           <text variable="page" prefix="p. "/>
         </group>
       </else-if>
-      <else-if type="report" match="any">
-        <group>
-          <text macro="publisher"/>
-          <text variable="page" suffix=" p "/>
-        </group>
-      </else-if>
       <else-if type="patent">
-        <text variable="number" prefix=". "/>
+        <text variable="number"/>
       </else-if>
+      <else>
+        <text macro="publisher"/>
+      </else>
     </choose>
   </macro>
   <macro name="url">
     <choose>
-      <if type="webpage" match="none">
+      <if type="webpage" variable="DOI" match="none">
         <choose>
           <if match="any" variable="URL">
-            <text value="URL" suffix=": "/>
             <text variable="URL"/>
           </if>
         </choose>
@@ -223,7 +236,6 @@
   <macro name="doi">
     <choose>
       <if match="any" variable="DOI">
-        <text value="DOI:" suffix=" "/>
         <text variable="DOI" prefix="https://doi.org/"/>
       </if>
     </choose>
@@ -253,11 +265,22 @@
       <group suffix=".">
         <text macro="author"/>
         <text macro="issued" prefix=" (" suffix="). "/>
-        <group>
-          <text macro="title"/>
-          <text macro="container"/>
-          <text macro="locators"/>
-        </group>
+        <choose>
+          <if type="article-journal article-magazine article-newspaper" match="any">
+            <group delimiter=" ">
+              <text macro="title" suffix="."/>
+              <text macro="container"/>
+              <text macro="locators"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text macro="container"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
       </group>
       <text macro="access" prefix=" " suffix="."/>
       <text macro="url" prefix=" " suffix="."/>
@@ -265,3 +288,4 @@
     </layout>
   </bibliography>
 </style>
+
diff --git a/revista-espanola-de-nutricion-humana-y-dietetica.csl b/revista-espanola-de-nutricion-humana-y-dietetica.csl
new file mode 100644
index 00000000000..f030b24079f
--- /dev/null
+++ b/revista-espanola-de-nutricion-humana-y-dietetica.csl
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" page-range-format="minimal" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="es-ES">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Revista Espanola de Nutricion Humana y Dietetica (Spanish)</title>
+    <title-short>RENHYD</title-short>
+    <id>http://www.zotero.org/styles/revista-espanola-de-nutricion-humana-y-dietetica</id>
+    <link rel="self" href="http://www.zotero.org/styles/revista-espanola-de-nutricion-humana-y-dietetica"/>
+    <link rel="template" href="http://www.zotero.org/styles/angiologia"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2173-1292</issn>
+    <eissn>2174-5145</eissn>
+    <summary>Vancouver style (only year, with doi)</summary>
+    <updated>2020-09-25T15:52:44+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="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi: "/>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <choose>
+          <if variable="URL">
+            <group delimiter=" ">
+              <text term="available at" suffix=": " text-case="capitalize-first"/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access-date">
+    <group delimiter=" ">
+      <text term="accessed"/>
+      <date variable="accessed" delimiter=" ">
+        <date-part name="day"/>
+        <date-part name="month"/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-et-al="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name form="long" initialize="true" initialize-with="" delimiter=", " delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <label form="long" prefix=", " plural="contextual" suffix="."/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year" form="long" range-delimiter="–"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <text variable="volume" form="long"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="publisher_thesis">
+    <group delimiter=", ">
+      <text variable="publisher" form="long"/>
+      <text variable="publisher-place" form="long"/>
+    </group>
+  </macro>
+  <macro name="edition_book">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="long"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition_chapter">
+    <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>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number" sort="ascending"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" second-field-align="flush" et-al-min="7" et-al-use-first="6">
+    <layout suffix=".">
+      <text variable="citation-number" prefix="(" suffix=")"/>
+      <text macro="author" suffix=" "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=". ">
+            <text variable="title" form="long"/>
+            <group delimiter=" ">
+              <text term="volume" form="short"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="volume" prefix="vol. " form="long"/>
+            <text macro="edition_book"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=". ">
+            <group delimiter=". ">
+              <text variable="title" form="long"/>
+              <group delimiter=" ">
+                <text term="in" text-case="capitalize-first" suffix=":"/>
+                <text macro="editor"/>
+              </group>
+              <group delimiter=", ">
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </group>
+              <text macro="edition_chapter"/>
+            </group>
+            <text macro="publisher"/>
+            <group delimiter=" ">
+              <label variable="page" form="short" plural="never"/>
+              <text variable="page" form="short"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <group delimiter=". ">
+              <text variable="title" form="long"/>
+              <text variable="number" form="long"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=" ">
+            <text variable="title" form="long" suffix="."/>
+            <text variable="genre" form="long" suffix=","/>
+            <text macro="publisher_thesis" suffix="," text-case="title"/>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="webpage">
+          <group delimiter=". ">
+            <text variable="title" form="long"/>
+            <text variable="container-title" form="long" suffix="." text-case="title"/>
+            <text macro="access-date" prefix="[" suffix="]"/>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=":">
+            <group delimiter=". ">
+              <group delimiter=". ">
+                <text variable="title" form="long"/>
+                <text variable="container-title" form="short" text-case="title" strip-periods="true"/>
+              </group>
+              <group delimiter=";">
+                <text macro="year-date"/>
+                <text macro="journal-location"/>
+              </group>
+            </group>
+            <text variable="page" form="short"/>
+          </group>
+          <text macro="access" prefix=", "/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 96d9e89fbba..1be62a88899 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -29,6 +29,11 @@
 
 # These styles are ignored when checking for unused macros
 UNUSED_MACROS_FILTER = %w{
+  apa-annotated-bibliography
+  apa-cv
+  apa-numeric-superscript
+  apa-numeric-superscript-brackets
+  apa-with-abstract
   chicago-annotated-bibliography chicago-author-date chicago-author-date-16th-edition
   chicago-library-list chicago-note-bibliography-16th-edition
   chicago-note-bibliography-with-ibid
diff --git a/steinbeis-hochschule-school-of-management-and-innovation.csl b/steinbeis-hochschule-school-of-management-and-innovation.csl
new file mode 100644
index 00000000000..fd1fcdb4fee
--- /dev/null
+++ b/steinbeis-hochschule-school-of-management-and-innovation.csl
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="expanded" default-locale="de-DE">
+  <info>
+    <title>Steinbeis-Hochschule - School of Management &amp; Innovation (German)</title>
+    <id>http://www.zotero.org/styles/steinbeis-hochschule-school-of-management-and-innovation</id>
+    <link href="http://www.zotero.org/styles/steinbeis-hochschule-school-of-management-and-innovation" rel="self"/>
+    <author>
+      <name>Sebastian Karcher</name>
+    </author>
+    <category citation-format="note"/>
+    <category field="social_science"/>
+    <summary>Format for the Steinbeis Hochschule (SMI). Zitierformat nach der Präsentation "Wissenschaftliches Arbeiten"</summary>
+    <updated>2020-04-26T18:22:50+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="de">
+    <terms>
+      <term name="volume" form="short">Jg.</term>
+      <term name="issue">Heft</term>
+      <term name="et-al">et al.</term>
+      <term name="ibid">ebenda</term>
+      <term name="accessed">Stand</term>
+      <term name="anonymous" form="short">o.V.</term>
+    </terms>
+  </locale>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" delimiter="/ " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="editor"/>
+        <choose>
+          <if type="post-weblog webpage" match="none">
+            <text macro="anon"/>
+          </if>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-long">
+    <names variable="author">
+      <name initialize-with=". " delimiter="/ " delimiter-precedes-last="always" name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued" form="numeric" date-parts="year"/>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short"/>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text macro="edition"/>
+    </group>
+  </macro>
+  <macro name="container-journal">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter=", ">
+          <group delimiter=": ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title"/>
+          </group>
+          <group delimiter=" ">
+            <number variable="volume" form="ordinal"/>
+            <text term="volume" form="short"/>
+          </group>
+          <group delimiter=" ">
+            <text term="issue"/>
+            <text variable="issue"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <group delimiter=": ">
+          <choose>
+            <if type="post-weblog webpage" match="none">
+              <text term="online"/>
+            </if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+        <group delimiter=" " prefix=" (" suffix=")">
+          <text term="accessed" text-case="capitalize-first"/>
+          <date variable="accessed" form="numeric"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-chapter">
+    <choose>
+      <if type="paper-conference chapter" match="any">
+        <group delimiter=": ">
+          <text term="in"/>
+          <names variable="editor">
+            <name initialize-with=". " delimiter="/ " delimiter-precedes-last="always" name-as-sort-order="all"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+          <text variable="container-title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <group delimiter=" ">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="type-sort">
+    <choose>
+      <if type="post-weblog webpage" match="any">
+        <text value="2"/>
+      </if>
+      <else>
+        <text value="1"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <group delimiter=" ">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-names="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator" match="any">
+          <group delimiter=", ">
+            <text term="ibid"/>
+            <text macro="locators"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid"/>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <choose>
+              <if type="post-weblog webpage" match="none">
+                <group delimiter=" ">
+                  <text macro="author-short"/>
+                  <text macro="year-date" prefix="(" suffix=")"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=": ">
+                  <choose>
+                    <if variable="author editor" match="any">
+                      <text macro="author-short"/>
+                      <text macro="year-date" prefix="(" suffix=")"/>
+                    </if>
+                    <else>
+                      <text macro="access"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <text macro="locators"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" entry-spacing="0">
+    <sort>
+      <key macro="type-sort"/>
+      <key macro="author-long"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <choose>
+        <if type="post-weblog webpage" match="none">
+          <group delimiter=": ">
+            <group delimiter=" ">
+              <text macro="author-long"/>
+              <text macro="year-date" prefix="(" suffix=")"/>
+            </group>
+            <group>
+              <group delimiter=", ">
+                <text variable="title"/>
+                <text macro="container-chapter"/>
+              </group>
+              <text macro="container-journal" prefix=". "/>
+            </group>
+          </group>
+          <text macro="publisher" prefix=". "/>
+          <text macro="pages" prefix=", "/>
+          <text macro="access" prefix=", "/>
+        </if>
+        <else>
+          <!--Internetquellen-->
+          <group delimiter=": ">
+            <choose>
+              <if variable="author editor" match="any">
+                <group delimiter=" ">
+                  <text macro="author-long"/>
+                  <text macro="year-date" prefix="(" suffix=")"/>
+                </group>
+              </if>
+              <else>
+                <text macro="anon"/>
+              </else>
+            </choose>
+            <text macro="access"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl b/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
new file mode 100644
index 00000000000..fef53deed07
--- /dev/null
+++ b/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
@@ -0,0 +1,1657 @@
+<?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="de-DE">
+  <info>
+    <title>Technische Universität Dresden - Betriebswirtschaftslehre/Rechnungswesen/Controlling (German)</title>
+    <title-short>TUD BWL/BRW (APA)</title-short>
+    <id>http://www.zotero.org/styles/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling</id>
+    <link href="http://www.zotero.org/styles/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://tu-dresden.de/bu/wirtschaft/bwl/brw/ressourcen/dateien/studium/Richtlinien-wiss-Arbeiten-Stand-Januar-2020.pdf?lang=de" rel="documentation"/>
+    <author>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <summary>Zitierstil entsprechend den Zitierrichtlinien des Lehrstuhls Betriebswirtschaftslehre, insbesondere betriebliches Rechnungwesen und Controlling, der Fakultät Wirtschaftswissenschaften, Technische Universität Dresden.</summary>
+    <updated>2020-10-15T12: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 xml:lang="de">
+    <terms>
+      <term name="accessed">zuletzt abgerufen am</term>
+      <term name="et-al">et al.</term>
+      <term name="letter">persönliche Kommunikation</term>
+      <term name="letter" form="short">Brief</term>
+      <term name="editor" form="short">Hrsg.</term>
+      <term name="presented at">gehalten auf</term>
+      <term name="volume" form="symbol">
+        <single>Jg.</single>
+        <multiple>Jgs.</multiple>
+      </term>
+      <term name="issue" form="long">
+        <single>Heft</single>
+        <multiple>Hefts</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">
+        <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">
+                  <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">
+            <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">
+          <!-- 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"/>
+        <group delimiter=". ">
+          <text variable="volume"/>
+          <label variable="volume" form="symbol"/>
+        </group>
+        <group delimiter=" ">
+          <label variable="issue" form="long"/>
+          <text variable="issue"/>
+        </group>
+        <choose>
+          <if variable="page">
+            <group delimiter=" ">
+              <label variable="page" form="short"/>
+              <text variable="page"/>
+            </group>
+          </if>
+          <else>
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <text variable="number" prefix="Beitrag "/>
+          </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">
+          <!-- 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">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </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="show-access">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper paper-conference review review-book" match="any">
+        <choose>
+          <if variable="issue page number" match="none">
+            <text macro="access"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure interview manuscript personal_communication post post-weblog webpage">
+        <choose>
+          <if variable="issue page" match="none">
+            <text macro="access"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="post-weblog post webpage" match="any">
+        <choose>
+          <if variable="DOI" match="any">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+          <else-if variable="URL">
+            <group delimiter=", ">
+              <text variable="URL" prefix="URL: "/>
+              <group delimiter=": ">
+                <text term="accessed"/>
+                <date variable="accessed" form="numeric"/>
+              </group>
+            </group>
+          </else-if>
+        </choose>
+      </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">
+    <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"/>
+        <text macro="date-intext"/>
+        <text macro="citation-locator"/>
+      </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="show-access"/>
+            <text macro="publication-history"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/thieme-german.csl b/thieme-german.csl
index c2b3dbdd07e..acf1792a614 100644
--- a/thieme-german.csl
+++ b/thieme-german.csl
@@ -41,11 +41,11 @@
   <macro name="editor">
     <names suffix=". " variable="editor">
       <name sort-separator=" " name-as-sort-order="all" initialize-with="" delimiter-precedes-last="always" delimiter=", "/>
-      <label prefix=" (" form="short" suffix=")"/>
+      <label prefix=", " form="short"/>
     </names>
   </macro>
   <macro name="publisher">
-    <group delimiter=", ">
+    <group delimiter="; ">
       <group delimiter=": ">
         <text variable="publisher-place"/>
         <text variable="publisher"/>
@@ -58,10 +58,20 @@
     </group>
   </macro>
   <macro name="access">
-    <group>
-      <text value=" Im Internet: "/>
-      <text variable="URL"/>
-    </group>
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </if>
+      <else>
+        <group delimiter="; ">
+          <group>
+            <text value="Im Internet: "/>
+            <text variable="URL"/>
+          </group>
+          <date variable="accessed" form="numeric" prefix="Stand: "/>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="journal-title">
     <text form="short" variable="container-title" strip-periods="true"/>
@@ -114,15 +124,15 @@
         <else>
           <group delimiter=" ">
             <text macro="journal-title"/>
-            <date suffix=";" variable="issued">
-              <date-part name="year"/>
-            </date>
-            <text variable="volume"/>
+            <group delimiter="; ">
+              <date variable="issued" form="numeric" date-parts="year"/>
+              <text variable="volume"/>
+            </group>
           </group>
           <text prefix=": " variable="page"/>
         </else>
       </choose>
-      <text macro="access"/>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/ucl-institute-of-education-harvard.csl b/ucl-institute-of-education-harvard.csl
new file mode 100644
index 00000000000..8e19c052ee8
--- /dev/null
+++ b/ucl-institute-of-education-harvard.csl
@@ -0,0 +1,305 @@
+<?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">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>UCL Institute of Education - Harvard</title>
+    <id>http://www.zotero.org/styles/ucl-institute-of-education-harvard</id>
+    <link href="http://www.zotero.org/styles/ucl-institute-of-education-harvard" rel="self"/>
+    <link href="http://www.zotero.org/styles/harvard-cite-them-right-no-et-al" rel="template"/>
+    <link href="https://libguides.ioe.ac.uk/harvard" rel="documentation"/>
+    <author>
+      <name>Zhang, Dekun</name>
+      <email>dekun.zhang.20@ucl.ac.uk</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>UCL Institute of Education - Harvard for bibliographic entries.</summary>
+    <updated>2020-10-29T08:50:05+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-GB">
+    <terms>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
+      <term name="edition" form="short">edn.</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="container-author" delimiter=", " suffix=", ">
+          <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
+        </names>
+        <choose>
+          <if variable="container-author" match="none">
+            <names variable="editor translator" delimiter=", ">
+              <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
+              <label form="short" prefix=" (" suffix=")"/>
+            </names>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </if>
+      <else-if variable="container-author" match="any">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi: "/>
+      </if>
+      <else-if variable="URL">
+        <text term="available at" suffix=": " text-case="capitalize-first"/>
+        <text variable="URL"/>
+        <group prefix=" (" delimiter=": " suffix=")">
+          <text term="accessed" text-case="capitalize-first"/>
+          <date form="text" variable="accessed">
+            <date-part name="day"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="number-volumes">
+    <choose>
+      <if variable="volume" match="none">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="number-of-volumes"/>
+          <label variable="volume" form="short" strip-periods="true"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage" match="any">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <text macro="number-volumes"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="title" form="long" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=". ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="report">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="none">
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if type="speech" variable="event" match="any">
+                <text variable="event" font-style="italic"/>
+              </if>
+            </choose>
+            <group delimiter=": ">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </group>
+          <group prefix="(" suffix=")" delimiter=", ">
+            <text variable="collection-title"/>
+            <text variable="collection-number"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="year-suffix"/>
+      </if>
+      <else>
+        <text term="no date"/>
+        <text variable="year-suffix" prefix=" "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume"/>
+        <text variable="issue" prefix=" (" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="published-date">
+    <choose>
+      <if type="article-newspaper article-magazine post-weblog speech" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" form="long"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="chapter paper-conference article-journal article article-magazine article-newspaper book review review-book report" match="any">
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if variable="container-title">
+        <group delimiter=". ">
+          <text variable="container-title" font-style="italic"/>
+          <text macro="edition"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in"/>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+    <sort>
+      <key macro="year-date"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" form="short" suffix=" "/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography and="text">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <text macro="year-date" prefix="(" suffix=")"/>
+          <group delimiter=". ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text macro="container-prefix"/>
+              <text macro="editor"/>
+              <text macro="container-title"/>
+            </group>
+          </group>
+        </group>
+        <text macro="secondary-contributors"/>
+        <text macro="publisher"/>
+      </group>
+      <group delimiter=", " prefix=", ">
+        <text macro="locator"/>
+        <text macro="published-date"/>
+        <text macro="pages"/>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/universidade-estadual-de-alagoas-abnt.csl b/universidade-estadual-de-alagoas-abnt.csl
index 1789d030c17..e5308e61b38 100644
--- a/universidade-estadual-de-alagoas-abnt.csl
+++ b/universidade-estadual-de-alagoas-abnt.csl
@@ -9,13 +9,13 @@
     <link href="http://www.uneal.edu.br/pro-reitorias/prograd/regulamento-do-tcc-uneal.pdf" rel="documentation"/>
     <author>
       <name>Wellyngton Chaves Monteiro da Silva</name>
-      <email>wellyngton.silva@uneal.edu.br</email>
+      <email>wellyngton@uneal.edu.br</email>
       <uri>http://www.uneal.edu.br</uri>
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>De acordo com ABNT-NBR 10520.2002 e ABNT-NBR 6023.2018</summary>
-    <updated>2020-06-30T16:31:59+00:00</updated>
+    <updated>2020-10-29T19:02: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 xml:lang="pt-BR">
@@ -139,8 +139,10 @@ do autor. Na regra da ABNT o sobrenome deve aparecer com todas as letras em caix
   </macro>
   <!--A macro 'access' é utilizada em arquivos de páginas da web. Ela é responsável por exibir a URL do site pesquisado e a data do acesso, além do DOI -->
   <macro name="access">
+    <text variable="ISSN" prefix=" ISSN: " suffix="."/>
+    <text variable="ISBN" prefix=" ISBN: " suffix="."/>
     <text variable="DOI" prefix=" DOI: " suffix="."/>
-    <text variable="URL" prefix=" Disponível em: &lt;" suffix="&gt;."/>
+    <text variable="URL" prefix=" Disponível em: " suffix="."/>
     <date variable="accessed" prefix=". Acesso em: " suffix=".">
       <date-part name="day" suffix=" "/>
       <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
@@ -334,6 +336,8 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
             <text variable="page" prefix="p. "/>
             <!--Inseri este campo 'extra' caso queira colocar alguma observacao, como 'nome da coleção', 'nome da série' etc. -->
             <!-- <text variable="note" prefix=". " suffix=""/> -->
+            <text macro="collection-title" prefix=". (" suffix=")."/>
+            <!-- AQUI INSERE A COLEÇÃO OU SÉRIE DA OBRA -->
           </group>
         </group>
       </else-if>
@@ -449,6 +453,8 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
             <text macro="publisher" suffix=". "/>
             <!--Inseri este campo 'extra' caso queira colocar alguma observacao-->
             <text variable="note" suffix=". "/>
+            <text macro="collection-title" prefix="(" suffix=")."/>
+            <!-- AQUI INSERE A COLEÇÃO OU SÉRIE DA OBRA -->
             <!--Dados complementares "pagina, volume"-->
             <text macro="locators"/>
             <text macro="access"/>
@@ -471,7 +477,7 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
             <text macro="container-title" suffix=". "/>
             <!--Traducao INSERI DA ABNT (ver como funciona) -->
             <text macro="translator" suffix=". "/>
-            <text variable="collection-title" suffix=" "/>
+            <!--            <text variable="collection-title" suffix=" "/>  AQUI INSERIA A SÉRIE OU COLEÇÃO DENTRO DO TEXTO -->
             <!--Edicao-->
             <text macro="edition" suffix=". "/>
             <!--Local, data, etc-->