From 51e4d91a1e9e32fe9e34019ab509053f9ac9deac Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sat, 7 Jul 2018 23:07:23 +0200
Subject: [PATCH 01/52] APA bug fix

Fixes regression in https://github.com/citation-style-language/styles/pull/3590
---
 apa-annotated-bibliography.csl | 4 ++--
 apa-cv.csl                     | 8 ++++----
 apa-no-ampersand.csl           | 4 ++--
 apa-no-doi-no-issue.csl        | 4 ++--
 apa-old-doi-prefix.csl         | 4 ++--
 apa.csl                        | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index acb68706c3..b58178ecb8 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -764,12 +764,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
       <text variable="abstract" display="block"/>
     </layout>
diff --git a/apa-cv.csl b/apa-cv.csl
index 341886f1d7..b9cca6aabc 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -646,12 +646,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </citation>
@@ -695,12 +695,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 8d481857ac..25d2cc837e 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -759,12 +759,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 3d6b71e5b9..222e77d6ad 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -764,12 +764,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index 35abd51341..9eed529af8 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -763,12 +763,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/apa.csl b/apa.csl
index 1237709ecb..0af86aa16e 100644
--- a/apa.csl
+++ b/apa.csl
@@ -763,12 +763,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>

From 1dd5d159e68f05d8b61c94f0d0985483e4d633b7 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 8 Jul 2018 11:38:21 +0200
Subject: [PATCH 02/52] Don't show publisher if other access information is
 available

- Also some other minor changes in preparation of a unified format macro
---
 apa.csl | 144 +++++++++++++++++++++++---------------------------------
 1 file changed, 59 insertions(+), 85 deletions(-)

diff --git a/apa.csl b/apa.csl
index 0af86aa16e..a068d29b8c 100644
--- a/apa.csl
+++ b/apa.csl
@@ -10,6 +10,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -24,10 +28,6 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
@@ -50,7 +50,7 @@
   </locale>
   <macro name="container-contributors">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+      <if type="chapter paper-conference entry entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=", ">
           <names variable="container-author" delimiter=", ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
@@ -66,7 +66,7 @@
   </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
+      <if type="article-journal chapter paper-conference entry entry-dictionary entry-encyclopedia" match="none">
         <group delimiter=", " prefix=" (" suffix=")">
           <names variable="container-author" delimiter=", ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
@@ -155,55 +155,41 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="none">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website"/>
+                </if>
+              </choose>
+            </if>
+          </choose>
+          <text variable="URL" prefix=": "/>
+        </group>
+      </else-if>
+      <else-if variable="archive" type="report thesis pamphlet" match="all">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <text term="from"/>
+          <text variable="archive" suffix="."/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </else-if>
       <else>
-        <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
-            <choose>
-              <if type="post post-weblog webpage" match="any">
-                <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
-                  <text term="from"/>
-                  <text variable="URL"/>
-                </group>
-              </if>
-              <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
-              </else>
-            </choose>
-          </else>
-        </choose>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
@@ -226,6 +212,7 @@
             <group delimiter=" ">
               <text variable="title"/>
               <group delimiter=", " prefix="[" suffix="]">
+                <!-- This should be localized -->
                 <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
                 <names variable="reviewed-author" delimiter=", ">
                   <label form="verb-short" suffix=" "/>
@@ -237,6 +224,7 @@
           <else>
             <!-- assume `title` is title of reviewed work -->
             <group delimiter=", " prefix="[" suffix="]">
+              <!-- This should be localized -->
               <text variable="title" font-style="italic" prefix="Review of "/>
               <names variable="reviewed-author" delimiter=", ">
                 <label form="verb-short" suffix=" "/>
@@ -300,7 +288,7 @@
             <text variable="genre" text-case="capitalize-first"/>
           </if>
           <else>
-            <!-- This should be localized -->
+            
             <text value="Data set"/>
           </else>
         </choose>
@@ -309,10 +297,11 @@
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
+      <if type="manuscript dataset" match="any">
+        <group delimiter=", ">
+          <text variable="genre">
           <text variable="publisher"/>
+          <text variable="publisher-place"/>
         </group>
       </if>
       <else-if type="thesis" match="any">
@@ -334,35 +323,24 @@
           </choose>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper post post-weblog webpage" match="none">
+        <group delimiter=": ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
-            </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
-              <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
-                <text variable="publisher"/>
-              </group>
+            <if variable="publisher-place">
+              <text variable="publisher-place"/>
             </if>
+            <else>
+              <text variable="event-place"/>
+            </else>
           </choose>
+          <text variable="publisher"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
+      <!-- Don't print event info if published in a proceedings -->
       <if variable="container-title" match="none">
         <choose>
           <if variable="event">
@@ -552,7 +530,7 @@
           <text variable="page"/>
         </group>
         <choose>
-          <!--for advanced online publication-->
+          <!--for advance online publication-->
           <if variable="issued">
             <choose>
               <if variable="page issue" match="none">
@@ -568,7 +546,7 @@
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
+      <else-if type="book chapter entry entry-dictionary entry-encyclopedia graphic motion_picture paper-conference report song" match="any">
         <group prefix=" (" suffix=")" delimiter=", ">
           <choose>
             <if type="report" match="none">
@@ -635,7 +613,7 @@
       <if type="post-weblog webpage" match="none">
         <group>
           <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
+            <if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" match="any">
               <text term="in" text-case="capitalize-first" suffix=" "/>
             </if>
           </choose>
@@ -745,14 +723,10 @@
             </else>
           </choose>
           <text macro="title-plus-extra"/>
-          <text macro="container"/>
         </group>
         <text macro="legal-cites"/>
         <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>

From acd844b7ca53240bd2953a9afebc465598e86cde Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 8 Jul 2018 12:19:03 +0200
Subject: [PATCH 03/52] Allow report to potentially refer to a chapter in a
 report

- And show translators, etc. for webpages and blogposts
---
 apa.csl | 97 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 53 insertions(+), 44 deletions(-)

diff --git a/apa.csl b/apa.csl
index a068d29b8c..14629a334a 100644
--- a/apa.csl
+++ b/apa.csl
@@ -48,37 +48,48 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="additional-contributors">
     <choose>
-      <if type="chapter paper-conference entry entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if type="report">
+        <choose>
+          <if variable="container-title">
+            <text macro="container-contributors"/>
+          </if>
+          <else>
+            <text macro="secondary-contributors"/>
+          </else>
+        </choose>
       </if>
-    </choose>
+      <else-if type="chapter entry entry-dictionary entry-encyclopedia paper-conference">
+        <text macro="container-contributors"/>
+      </else-if>
+      <else-if type="article-journal" match="none">
+        <text macro="secondary-contributors"/>
+      </else-if>
+  </macro>
+  <macro name="container-contributors">
+    <group delimiter=", ">
+      <names variable="container-author" delimiter=", ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=" (" text-case="title" suffix=")"/>
+      </names>
+      <names variable="editor translator" delimiter=", ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=" (" text-case="title" suffix=")"/>
+      </names>
+    </group>
   </macro>
   <macro name="secondary-contributors">
-    <choose>
-      <if type="article-journal chapter paper-conference entry entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </if>
-    </choose>
+    <group delimiter=", " prefix=" (" suffix=")">
+      <names variable="container-author" delimiter=", ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+      <names variable="editor translator" delimiter=", ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
   </macro>
   <macro name="author">
     <names variable="author">
@@ -609,29 +620,27 @@
     </group>
   </macro>
   <macro name="container">
-    <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-          </group>
-        </group>
-      </if>
-    </choose>
+    <group>
+      <choose>
+        <if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" match="any">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+        </if>
+        <else-if type="report" variable="container-title" match="all">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <text macro="additional-contributors"/>
+        <text macro="container-title"/>
+      </group>
+    </group>
   </macro>
   <macro name="container-title">
     <choose>
       <if type="article article-journal article-magazine article-newspaper" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="bill legal_case legislation" match="none">
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>

From 9e9d3be9c7a75b8e72cc03480e0aaa46e85a2d37 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 9 Jul 2018 17:37:26 +0200
Subject: [PATCH 04/52] Update APA (description) [format] container

To meet all of the various requirements

Needs testing
Need to check the rules for:
- patent
- treaty
- song
- interview
---
 apa.csl | 466 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 319 insertions(+), 147 deletions(-)

diff --git a/apa.csl b/apa.csl
index 14629a334a..13751b24ee 100644
--- a/apa.csl
+++ b/apa.csl
@@ -48,73 +48,158 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="additional-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="report">
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia paper-conference personal_communication report">
         <choose>
-          <if variable="container-title">
-            <text macro="container-contributors"/>
-          </if>
+          <!-- If broadcast, personal_communication, or report don't have container titles, use secondary-contributors -->
+          <if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" variable="container-title" match="none"/>
+          <else-if variable="container-author">
+            <group delimiter="; ">
+              <names variable="container-author" delimiter=", ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=" (" text-case="title" suffix=")"/>
+              </names>
+              <names variable="translator" delimiter=", ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=" (" text-case="title" suffix=")"/>
+              </names>
+            </group>
+          </else-if>
           <else>
-            <text macro="secondary-contributors"/>
+            <group>
+              <names variable="editor translator" delimiter=", ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=" (" text-case="title" suffix=")"/>
+              </names>
+            </group>
           </else>
         </choose>
       </if>
-      <else-if type="chapter entry entry-dictionary entry-encyclopedia paper-conference">
-        <text macro="container-contributors"/>
-      </else-if>
-      <else-if type="article-journal" match="none">
-        <text macro="secondary-contributors"/>
-      </else-if>
-  </macro>
-  <macro name="container-contributors">
-    <group delimiter=", ">
-      <names variable="container-author" delimiter=", ">
-        <name and="symbol" initialize-with=". " delimiter=", "/>
-        <label form="short" prefix=" (" text-case="title" suffix=")"/>
-      </names>
-      <names variable="editor translator" delimiter=", ">
-        <name and="symbol" initialize-with=". " delimiter=", "/>
-        <label form="short" prefix=" (" text-case="title" suffix=")"/>
-      </names>
-    </group>
+    </choose>
   </macro>
   <macro name="secondary-contributors">
-    <group delimiter=", " prefix=" (" suffix=")">
-      <names variable="container-author" delimiter=", ">
-        <name and="symbol" initialize-with=". " delimiter=", "/>
-        <label form="short" prefix=", " text-case="title"/>
-      </names>
-      <names variable="editor translator" delimiter=", ">
-        <name and="symbol" initialize-with=". " delimiter=", "/>
-        <label form="short" prefix=", " text-case="title"/>
-      </names>
-    </group>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" 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"/>
+    <choose>
+      <if type="broadcast report" variable="container-title" match="all">
+          <names variable="interviewer" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter=", ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="original-author composer" match="any">
+            <group delimter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" delimiter=", " prefix="Recorded by ">
+                <label form="verb" prefix=", " text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator" delimiter=", ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </if>
-          <else>
-            <text macro="title"/>
-          </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper">
+        <group>
+          <names variable="interviewer translator" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      <else>
+        <group delimiter=", ">
+          <names variable="interviewer" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer original-author">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+          <substitute>
+            <names variable="author"/>
+            <names variable="translator"/>
+            <text macro="title"/>
+          </substitute>
+        </names>
+      </if>
+      <else>
+        <names variable="author">
+          <name name-as-sort-order="all" and="symbol" 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"/>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+                <text macro="title"/>
+              </if>
+              <else>
+                <text macro="title"/>
+              </else>
+            </choose>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="song">
+        <names variable="composer original-author">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="author"/>
+            <names variable="translator"/>
+            <text variable="title" form="short" font-style="italic"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
         <names variable="author">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
@@ -204,7 +289,7 @@
       </else>
     </choose>
   </macro>
-  <macro name="title">
+  <macro name="title">text-case="capitalize-first"
     <choose>
       <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
         <choose>
@@ -226,8 +311,8 @@
                 <!-- This should be localized -->
                 <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
                 <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
                   <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="verb-short" suffix=" "/>
                 </names>
               </group>
             </group>
@@ -253,62 +338,125 @@
       </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
-    <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <if type="report">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; " prefix="(" suffix=")">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book dataset interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
           </group>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication song" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if type="speech thesis">
+          <text variable="medium" text-case="capitalize-first"/>
+        </if>
+        <else-if type="report">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="description-report"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="manuscript">
+          <choose>
+            <if variable="archive">
+              <!-- Assume manuscript with archive is historical/archival manuscript -->
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+            <else>
+              <text variable="medium" text-case="capitalize-first"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication song">
+          <text macro="secondary-contributors" prefix="[" suffix="]"/>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty" match="none">
+          <group delimiter=", ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+          <choose>
+            <if variable="genre medium" match="none">
+              <!-- This should be localized -->
+              <choose>
+                <if type="dataset">
+                  <text value="Data set"/>
+                </if>
+              </choose>
+            </if>
+          </choose>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="description-report">
+    <choose>
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- This should be localized -->
+            <number variable="number" prefix="No. "/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
-        <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
-          </if>
-          <else>
-            
-            <text value="Data set"/>
-          </else>
-        </choose>
-      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
     </choose>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="manuscript dataset" match="any">
+      <if type="manuscript" match="any">
         <group delimiter=", ">
           <text variable="genre">
           <text variable="publisher"/>
@@ -336,14 +484,7 @@
       </else-if>
       <else-if type="article-journal article-magazine article-newspaper post post-weblog webpage" match="none">
         <group delimiter=": ">
-          <choose>
-            <if variable="publisher-place">
-              <text variable="publisher-place"/>
-            </if>
-            <else>
-              <text variable="event-place"/>
-            </else>
-          </choose>
+          <text variable="publisher-place"/>
           <text variable="publisher"/>
         </group>
       </else-if>
@@ -532,8 +673,8 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
@@ -557,34 +698,6 @@
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book chapter entry entry-dictionary entry-encyclopedia graphic motion_picture paper-conference report song" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
-              <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </if>
-            <else>
-              <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-              </group>
-            </else>
-          </choose>
-          <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
-          </group>
-        </group>
-      </else-if>
       <else-if type="legal_case">
         <group prefix=" (" suffix=")" delimiter=" ">
           <text variable="authority"/>
@@ -605,6 +718,30 @@
         </date>
       </else-if>
     </choose>
+    <else-if type="broadcast interview patent post post-weblog speech treaty webpage" match="none">
+      <group delimiter=", ">
+        <text macro="edition"/>
+        <text macro="version"/>
+        <choose>
+          <if variable="volume" match="any">
+            <group>
+              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+              <number variable="volume" form="numeric"/>
+            </group>
+          </if>
+          <else>
+            <group>
+              <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+              <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+            </group>
+          </else>
+        </choose>
+        <group>
+          <label variable="page" form="short" suffix=" "/>
+          <text variable="page"/>
+        </group>
+      </group>
+    </else-if>
   </macro>
   <macro name="citation-locator">
     <group>
@@ -620,20 +757,52 @@
     </group>
   </macro>
   <macro name="container">
-    <group>
-      <choose>
-        <if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" match="any">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper figure post review review-book">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+      </if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
           <text term="in" text-case="capitalize-first" suffix=" "/>
-        </if>
-        <else-if type="report" variable="container-title" match="all">
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+      </else-if>
+      <else-if type="chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference song">
+        <group delimiter=" ">
           <text term="in" text-case="capitalize-first" suffix=" "/>
-        </else-if>
-      </choose>
-      <group delimiter=", ">
-        <text macro="additional-contributors"/>
-        <text macro="container-title"/>
-      </group>
-    </group>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <choose>
+                <if type="song">
+                  <group delimiter=", ">
+                    <text variable="genre" text-case="capitalize-first"/>
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="bill legal_case legislation">
+        <group delimiter=" ">
+          <text macro="legal-cites"/>
+          <text macro="locators"/>
+        </group>
+      </else-if>     
+    </choose>
   </macro>
   <macro name="container-title">
     <choose>
@@ -731,10 +900,13 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <text macro="description"/>
+            <text macro="format"/>
+          </group>
+          <text macro="container">
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
         <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>

From c03c8a462bc0c23ac5cef24ee588959f797a2d21 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 9 Jul 2018 19:13:06 +0200
Subject: [PATCH 05/52] Fix typos

---
 apa.csl | 58 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/apa.csl b/apa.csl
index 13751b24ee..6566fc4b37 100644
--- a/apa.csl
+++ b/apa.csl
@@ -116,7 +116,7 @@
       <else-if type="song">
         <choose>
           <if variable="original-author composer" match="any">
-            <group delimter="; ">
+            <group delimiter="; ">
               <!-- Replace prefix with performer label as that becomes available -->
               <names variable="author" delimiter=", " prefix="Recorded by ">
                 <label form="verb" prefix=", " text-case="title"/>
@@ -137,6 +137,7 @@
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
+      </else-if>
       <else>
         <group delimiter=", ">
           <names variable="interviewer" delimiter=", ">
@@ -289,7 +290,7 @@
       </else>
     </choose>
   </macro>
-  <macro name="title">text-case="capitalize-first"
+  <macro name="title">
     <choose>
       <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
         <choose>
@@ -458,7 +459,7 @@
     <choose>
       <if type="manuscript" match="any">
         <group delimiter=", ">
-          <text variable="genre">
+          <text variable="genre"/>
           <text variable="publisher"/>
           <text variable="publisher-place"/>
         </group>
@@ -717,31 +718,31 @@
           <date-part name="year"/>
         </date>
       </else-if>
-    </choose>
-    <else-if type="broadcast interview patent post post-weblog speech treaty webpage" match="none">
-      <group delimiter=", ">
-        <text macro="edition"/>
-        <text macro="version"/>
-        <choose>
-          <if variable="volume" match="any">
-            <group>
-              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-              <number variable="volume" form="numeric"/>
-            </group>
-          </if>
-          <else>
-            <group>
-              <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-              <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-            </group>
-          </else>
-        </choose>
-        <group>
-          <label variable="page" form="short" suffix=" "/>
-          <text variable="page"/>
+      <else-if type="broadcast interview patent post post-weblog speech treaty webpage" match="none">
+        <group delimiter=", ">
+          <text macro="edition"/>
+          <text variable="version"/>
+          <choose>
+            <if variable="volume" match="any">
+              <group>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </if>
+            <else>
+              <group>
+                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+              </group>
+            </else>
+          </choose>
+          <group>
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
         </group>
-      </group>
-    </else-if>
+      </else-if>
+    </choose>
   </macro>
   <macro name="citation-locator">
     <group>
@@ -775,6 +776,7 @@
               <text macro="format-report" prefix="[" suffix="]"/>
             </group>
           </group>
+        </group>
       </else-if>
       <else-if type="chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference song">
         <group delimiter=" ">
@@ -905,7 +907,7 @@
             <text macro="description"/>
             <text macro="format"/>
           </group>
-          <text macro="container">
+          <text macro="container"/>
         </group>
         <text macro="event" prefix=". "/>
       </group>

From 957085b10e13ede4eb57f3090702be52e513c2f0 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Tue, 10 Jul 2018 12:06:11 +0200
Subject: [PATCH 06/52] Update legal_cites, patents, and creators

- Update legal_cites (bill, legal_case, legislation, treaty)
- Update patents
- Add additional creators alongside "author"
---
 apa.csl | 149 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 81 insertions(+), 68 deletions(-)

diff --git a/apa.csl b/apa.csl
index 6566fc4b37..755c484c00 100644
--- a/apa.csl
+++ b/apa.csl
@@ -165,8 +165,9 @@
           </substitute>
         </names>
       </if>
+      <else-if type="treaty"/>
       <else>
-        <names variable="author">
+        <names variable="author illustrator 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="capitalize-first"/>
           <substitute>
@@ -191,6 +192,9 @@
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
       <else-if type="song">
         <names variable="composer original-author">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
@@ -202,7 +206,7 @@
         </names>
       </else-if>
       <else>
-        <names variable="author">
+        <names variable="author illustrator director">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
             <names variable="editor"/>
@@ -303,6 +307,12 @@
           </else>
         </choose>
       </if>
+      <else-if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author" delimiter="-" initialize-with="." form="short"/>
+        </group>
+      </else-if>
       <else-if variable="reviewed-author">
         <choose>
           <if variable="reviewed-title">
@@ -699,26 +709,7 @@
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else-if type="broadcast interview patent post post-weblog speech treaty webpage" match="none">
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
         <group delimiter=", ">
           <text macro="edition"/>
           <text variable="version"/>
@@ -798,11 +789,8 @@
           </group>
         </group>
       </else-if>
-      <else-if type="bill legal_case legislation">
-        <group delimiter=" ">
-          <text macro="legal-cites"/>
-          <text macro="locators"/>
-        </group>
+      <else-if type="bill legal_case legislation treaty">
+        <text macro="legal-cites"/>
       </else-if>     
     </choose>
   </macro>
@@ -820,52 +808,77 @@
     <choose>
       <if type="legal_case" match="any">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <text variable="number" prefix="No. "/>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
         </group>
       </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title" form="short"/>
+          <number variable="page"/>
+      </else-if>
     </choose>
   </macro>
   <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">

From 35641e48e0834b4f577dde1c1eb32ba1be4ca397 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Tue, 10 Jul 2018 16:27:26 +0200
Subject: [PATCH 07/52] Bug fixes and robustification

---
 apa.csl | 252 ++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 182 insertions(+), 70 deletions(-)

diff --git a/apa.csl b/apa.csl
index 755c484c00..c67faceae8 100644
--- a/apa.csl
+++ b/apa.csl
@@ -41,6 +41,7 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -50,7 +51,7 @@
   </locale>
   <macro name="container-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia paper-conference personal_communication report">
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia paper-conference personal_communication report" variable="container-title" match="all">
         <choose>
           <!-- If broadcast, personal_communication, or report don't have container titles, use secondary-contributors -->
           <if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" variable="container-title" match="none"/>
@@ -81,11 +82,17 @@
   <macro name="secondary-contributors">
     <choose>
       <if type="broadcast report" variable="container-title" match="all">
-          <names variable="interviewer" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
+        <names variable="interviewer" delimiter=", ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=", " text-case="title"/>
+        </names>
       </if>
+      <else-if type="chapter entry entry-dictionary entry-encyclopedia paper-conference">
+        <names variable="interviewer" delimiter=", ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=", " text-case="title"/>
+        </names>
+      </else-if>
       <else-if type="personal_communication">
         <group delimiter="; ">
           <group delimiter=" ">
@@ -195,6 +202,32 @@
       <else-if type="treaty">
         <text variable="title" form="short"/>
       </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author illustrator director">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <text variable="title" form="short" quotes="true"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="song">
         <names variable="composer original-author">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
@@ -261,27 +294,29 @@
       </if>
       <else-if variable="URL">
         <group delimiter=" ">
-          <text term="retrieved" text-case="capitalize-first"/>
-          <choose>
-            <if type="post post-weblog webpage" match="any">
-              <date variable="accessed" form="text" suffix=","/>
-            </if>
-          </choose>
-          <text term="from"/>
-          <choose>
-            <if type="report">
-              <choose>
-                <if variable="author editor translator" match="none">
-                  <!-- This should be localized -->
-                  <text variable="publisher" suffix=" website"/>
-                </if>
-              </choose>
-            </if>
-          </choose>
-          <text variable="URL" prefix=": "/>
+          <group delimiter=" " suffix=":">
+            <text term="retrieved" text-case="capitalize-first"/>
+            <choose>
+              <if type="post post-weblog webpage" match="any">
+                <date variable="accessed" form="text" suffix=","/>
+              </if>
+            </choose>
+            <text term="from"/>
+            <choose>
+              <if type="report">
+                <choose>
+                  <if variable="author editor translator" match="any">
+                    <!-- This should be localized -->
+                    <text variable="publisher" suffix=" website"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+          <text variable="URL"/>
         </group>
       </else-if>
-      <else-if variable="archive" type="report thesis pamphlet" match="all">
+      <else-if variable="archive" type="report thesis" match="all">
         <group delimiter=" ">
           <text term="retrieved" text-case="capitalize-first"/>
           <text term="from"/>
@@ -296,21 +331,16 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
-        <choose>
-          <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
-            <text variable="title"/>
-          </if>
-          <else>
-            <text variable="title" font-style="italic"/>
-          </else>
-        </choose>
+      <if variable="version" type="book" match="all">
+        <!---This is a hack until we have a software type -->
+        <text variable="title"/>
       </if>
       <else-if type="treaty">
         <group delimiter=", ">
           <text variable="title" text-case="title"/>
-          <names variable="author" delimiter="-" initialize-with="." form="short"/>
+          <names variable="author" delimiter="-" >
+            <name initialize-with="." form="short"/>
+          </names>
         </group>
       </else-if>
       <else-if variable="reviewed-author">
@@ -344,8 +374,11 @@
       <else-if type="patent" variable="number" match="all">
         <text macro="patent-number" font-style="italic"/>
       </else-if>
-      <else>
+      <else-if variable="container-title">
         <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" font-style="italic"/>
       </else>
     </choose>
   </macro>
@@ -368,7 +401,7 @@
           </choose>
         </if>
         <else-if type="thesis">
-          <group delimiter="; " prefix="(" suffix=")">
+          <group delimiter="; ">
             <text variable="genre" text-case="capitalize-first"/>
             <text macro="locators"/>
             <text macro="secondary-contributors"/>
@@ -395,7 +428,7 @@
         <else-if type="report">
           <choose>
             <if variable="container-title" match="none">
-              <text macro="description-report"/>
+              <text macro="format-report"/>
             </if>
           </choose>
         </else-if>
@@ -414,7 +447,17 @@
           </choose>
         </else-if>
         <else-if type="personal_communication song">
-          <text macro="secondary-contributors" prefix="[" suffix="]"/>
+          <text macro="secondary-contributors"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <group delimiter=", ">
+            <choose>
+              <if variable="container-title">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
         </else-if>
         <else-if type="bill legislation legal_case patent treaty" match="none">
           <group delimiter=", ">
@@ -469,11 +512,29 @@
     <choose>
       <if type="manuscript" match="any">
         <group delimiter=", ">
-          <text variable="genre"/>
+          <choose>
+            <if variable="archive" match="none">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <group delimiter=" ">
+            <text variable="archive"/>
+            <text variable="archive_location" prefix="(" suffix=")"/>
+          </group>
           <text variable="publisher"/>
           <text variable="publisher-place"/>
         </group>
       </if>
+      <else-if type="pamphlet personal_communication" match="any">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="archive"/>
+            <text variable="archive_location" prefix="(" suffix=")"/>
+          </group> 
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </else-if>
       <else-if type="thesis" match="any">
         <group delimiter=", ">
           <text variable="publisher"/>
@@ -494,36 +555,51 @@
         </group>
       </else-if>
       <else-if type="article-journal article-magazine article-newspaper post post-weblog webpage" match="none">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+        <choose>
+          <if variable="event">
+            <choose>
+              <if variable="container-title">
+                <group delimiter=": ">
+                  <text variable="publisher-place"/>
+                  <text variable="publisher"/>
+                </group>
+              </if>
+            </choose>
+          </if>
+          <else> 
+            <group delimiter=": ">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <!-- Don't print event info if published in a proceedings -->
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="container-title" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -607,18 +683,50 @@
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
                 <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
+                  <choose>
+                    <if type="personal_communication">
+                      <choose>
+                        <if variable="archive DOI publisher URL" match="none">
+                          <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>
             </if>
             <else>
               <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
+                <choose>
+                  <if type="personal_communication">
+                    <choose>
+                      <if variable="archive DOI publisher URL" match="none">
+                        <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>
             </else>
@@ -712,7 +820,10 @@
       <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
         <group delimiter=", ">
           <text macro="edition"/>
-          <text variable="version"/>
+          <group delimiter=" ">
+            <text term="version" text-case="capitalize-first"/>
+            <text variable="version"/>
+          </group>
           <choose>
             <if variable="volume" match="any">
               <group>
@@ -808,7 +919,7 @@
     <choose>
       <if type="legal_case" match="any">
         <group prefix=", " delimiter=" ">
-          <group delimter=" ">
+          <group delimiter=" ">
             <choose>
               <if variable="container-title">
                 <text variable="volume"/>
@@ -877,7 +988,8 @@
         <group delimiter=" ">
           <number variable="volume"/>
           <text variable="container-title" form="short"/>
-          <number variable="page"/>
+          <text variable="page"/>
+        </group>
       </else-if>
     </choose>
   </macro>

From 2182a37e614cd4bd98078ade022d75e0f826d393 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sat, 14 Jul 2018 01:16:24 +0200
Subject: [PATCH 08/52] Adjust contributor inclusion and formatting

Including multiple creator types in one names string with consistent delimiter/and/et-al results isn't currently possible in CSL.
---
 apa.csl | 62 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/apa.csl b/apa.csl
index c67faceae8..6c88acf18d 100644
--- a/apa.csl
+++ b/apa.csl
@@ -56,12 +56,8 @@
           <!-- If broadcast, personal_communication, or report don't have container titles, use secondary-contributors -->
           <if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" variable="container-title" match="none"/>
           <else-if variable="container-author">
-            <group delimiter="; ">
-              <names variable="container-author" delimiter=", ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=" (" text-case="title" suffix=")"/>
-              </names>
-              <names variable="translator" delimiter=", ">
+            <group>
+              <names variable="container-author translator" delimiter=", &amp; ">
                 <name and="symbol" initialize-with=". " delimiter=", "/>
                 <label form="short" prefix=" (" text-case="title" suffix=")"/>
               </names>
@@ -69,7 +65,7 @@
           </else-if>
           <else>
             <group>
-              <names variable="editor translator" delimiter=", ">
+              <names variable="editor translator" delimiter=", &amp; ">
                 <name and="symbol" initialize-with=". " delimiter=", "/>
                 <label form="short" prefix=" (" text-case="title" suffix=")"/>
               </names>
@@ -82,13 +78,13 @@
   <macro name="secondary-contributors">
     <choose>
       <if type="broadcast report" variable="container-title" match="all">
-        <names variable="interviewer" delimiter=", ">
+        <names variable="interviewer" delimiter="; ">
           <name and="symbol" initialize-with=". " delimiter=", "/>
           <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
       <else-if type="chapter entry entry-dictionary entry-encyclopedia paper-conference">
-        <names variable="interviewer" delimiter=", ">
+        <names variable="interviewer" delimiter="; ">
           <name and="symbol" initialize-with=". " delimiter=", "/>
           <label form="short" prefix=", " text-case="title"/>
         </names>
@@ -112,7 +108,7 @@
           <text variable="medium" text-case="capitalize-first"/>
           <choose>
             <if variable="container-title" match="none">
-              <names variable="editor translator" delimiter=", ">
+              <names variable="editor translator" delimiter="; ">
                 <name and="symbol" initialize-with=". " delimiter=", "/>
                 <label form="short" prefix=", " text-case="title"/>
               </names>
@@ -125,11 +121,11 @@
           <if variable="original-author composer" match="any">
             <group delimiter="; ">
               <!-- Replace prefix with performer label as that becomes available -->
-              <names variable="author" delimiter=", " prefix="Recorded by ">
-                <label form="verb" prefix=", " text-case="title"/>
+              <names variable="author" delimiter="; " prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
                 <name and="symbol" initialize-with=". " delimiter=", "/>
               </names>
-              <names variable="translator" delimiter=", ">
+              <names variable="translator" delimiter="; ">
                 <name and="symbol" initialize-with=". " delimiter=", "/>
                 <label form="short" prefix=", " text-case="title"/>
               </names>
@@ -139,19 +135,19 @@
       </else-if>
       <else-if type="article-journal article-magazine article-newspaper">
         <group>
-          <names variable="interviewer translator" delimiter=", ">
+          <names variable="interviewer translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
       </else-if>
       <else>
-        <group delimiter=", ">
-          <names variable="interviewer" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
+        <group delimiter="; ">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter="; "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+          <names variable="editor translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
@@ -162,22 +158,29 @@
   <macro name="author">
     <choose>
       <if type="song">
-        <names variable="composer original-author">
+        <names variable="composer" 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="capitalize-first"/>
           <substitute>
+            <names variable="original-author"/>
             <names variable="author"/>
-            <names variable="translator"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+            </names>
             <text macro="title"/>
           </substitute>
         </names>
       </if>
       <else-if type="treaty"/>
       <else>
-        <names variable="author illustrator director">
+        <names variable="author" 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="capitalize-first"/>
           <substitute>
+            <names variable="illustrator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+            </names>
+            <names variable="director"/>
             <names variable="editor"/>
             <names variable="translator"/>
             <choose>
@@ -217,7 +220,7 @@
             </group>
           </if>
           <else>
-            <names variable="author illustrator director">
+            <names variable="author" delimiter=", ">
               <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
               <substitute>
                 <names variable="editor"/>
@@ -229,9 +232,10 @@
         </choose>
       </else-if>
       <else-if type="song">
-        <names variable="composer original-author">
+        <names variable="composer" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="original-author"/>
             <names variable="author"/>
             <names variable="translator"/>
             <text variable="title" form="short" font-style="italic"/>
@@ -239,9 +243,11 @@
         </names>
       </else-if>
       <else>
-        <names variable="author illustrator director">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="director"/>
             <names variable="editor"/>
             <names variable="translator"/>
             <choose>
@@ -338,8 +344,8 @@
       <else-if type="treaty">
         <group delimiter=", ">
           <text variable="title" text-case="title"/>
-          <names variable="author" delimiter="-" >
-            <name initialize-with="." form="short"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
           </names>
         </group>
       </else-if>
@@ -890,7 +896,7 @@
               <text macro="locators" prefix="(" suffix=")"/>
               <choose>
                 <if type="song">
-                  <group delimiter=", ">
+                  <group delimiter=", " prefix="[" suffix="]">
                     <text variable="genre" text-case="capitalize-first"/>
                     <text variable="medium" text-case="capitalize-first"/>
                   </group>

From 02ffda9dadb6b9a71ba2fd68e46a51513bd166fa Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sat, 14 Jul 2018 01:41:07 +0200
Subject: [PATCH 09/52] Bug fix in newspaper

---
 apa.csl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index 6c88acf18d..c006ebe2b2 100644
--- a/apa.csl
+++ b/apa.csl
@@ -267,6 +267,7 @@
               <else-if variable="reviewed-author">
                 <choose>
                   <if variable="reviewed-title" match="none">
+                    <!-- This should be localized -->
                     <text variable="title" form="short" font-style="italic" prefix="Review of "/>
                   </if>
                   <else>
@@ -818,7 +819,7 @@
         </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>

From 04033ed720cffbb0911e99509e9109f4a52a50ca Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sat, 14 Jul 2018 01:53:49 +0200
Subject: [PATCH 10/52] Fix broadcast container bug

---
 apa.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index c006ebe2b2..cf904d9576 100644
--- a/apa.csl
+++ b/apa.csl
@@ -887,7 +887,7 @@
           </group>
         </group>
       </else-if>
-      <else-if type="chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference song">
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference song">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">

From a99710a0631243265cf619dc20acfcb2e8e7cd0f Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sat, 14 Jul 2018 14:16:58 +0200
Subject: [PATCH 11/52] Adjust names subsitution

`illustrator` currently isn't be rendered at all, probably due to a citeproc-js bug
---
 apa.csl | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/apa.csl b/apa.csl
index cf904d9576..01600b4c8e 100644
--- a/apa.csl
+++ b/apa.csl
@@ -175,14 +175,26 @@
       <else>
         <names variable="author" 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="capitalize-first"/>
           <substitute>
-            <names variable="illustrator">
+            <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="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+              <substitute>
+                <choose>
+                  <if variable="container-title">
+                    <names variable="translator"/>
+                    <names variable="editor"/>
+                    <names variable="editorial-director"/>
+                  </if>
+                  <else>
+                    <names variable="editor"/>
+                    <names variable="editorial-director"/>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </substitute>
             </names>
-            <names variable="director"/>
-            <names variable="editor"/>
-            <names variable="translator"/>
             <choose>
               <if type="report">
                 <text variable="publisher"/>
@@ -248,8 +260,18 @@
           <substitute>
             <names variable="illustrator"/>
             <names variable="director"/>
-            <names variable="editor"/>
-            <names variable="translator"/>
+            <choose>
+              <if variable="container-title">
+                <names variable="translator"/>
+                <names variable="editor"/>
+                <names variable="editorial-director"/>
+              </if>
+              <else>
+                <names variable="editor"/>
+                <names variable="editorial-director"/>
+                <names variable="translator"/>
+              </else>
+            </choose>
             <choose>
               <if type="report">
                 <text variable="publisher"/>

From 8bf6cdcf1b2b5ac984bb155288355c30e3164a30 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sat, 14 Jul 2018 14:42:13 +0200
Subject: [PATCH 12/52] Update song recording

---
 apa.csl | 50 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/apa.csl b/apa.csl
index 01600b4c8e..f562240010 100644
--- a/apa.csl
+++ b/apa.csl
@@ -442,7 +442,14 @@
             <text macro="secondary-contributors"/>
           </group>
         </else-if>
-        <else-if type="bill legislation legal_case patent treaty personal_communication song" match="none">
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
           <text macro="secondary-contributors"/>
         </else-if>
       </choose>
@@ -475,9 +482,22 @@
             </else>
           </choose>
         </else-if>
-        <else-if type="personal_communication song">
+        <else-if type="personal_communication">
           <text macro="secondary-contributors"/>
         </else-if>
+        <else-if type="song">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if variable="container-title" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="medium" text-case="capitalize-first"/>
+                </group>
+              </if>
+            </choose>
+          </group>
+        </else-if>
         <else-if type="paper-conference">
           <group delimiter=", ">
             <choose>
@@ -909,7 +929,23 @@
           </group>
         </group>
       </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference song">
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
@@ -917,14 +953,6 @@
             <group delimiter=" ">
               <text macro="container-title"/>
               <text macro="locators" prefix="(" suffix=")"/>
-              <choose>
-                <if type="song">
-                  <group delimiter=", " prefix="[" suffix="]">
-                    <text variable="genre" text-case="capitalize-first"/>
-                    <text variable="medium" text-case="capitalize-first"/>
-                  </group>
-                </if>
-              </choose>
             </group>
           </group>
         </group>

From cb4b022c7978e239381d5889cd17f16f079c7bcd Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sat, 14 Jul 2018 22:24:57 +0200
Subject: [PATCH 13/52] Update container formatting for items without
 container-title

---
 apa.csl | 62 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/apa.csl b/apa.csl
index f562240010..24b8425162 100644
--- a/apa.csl
+++ b/apa.csl
@@ -53,16 +53,14 @@
     <choose>
       <if type="broadcast chapter entry entry-dictionary entry-encyclopedia paper-conference personal_communication report" variable="container-title" match="all">
         <choose>
-          <!-- If broadcast, personal_communication, or report don't have container titles, use secondary-contributors -->
-          <if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" variable="container-title" match="none"/>
-          <else-if variable="container-author">
+          <if variable="container-author">
             <group>
-              <names variable="container-author translator" delimiter=", &amp; ">
+              <names variable="container-author" delimiter=", &amp; ">
                 <name and="symbol" initialize-with=". " delimiter=", "/>
                 <label form="short" prefix=" (" text-case="title" suffix=")"/>
               </names>
             </group>
-          </else-if>
+          </if>
           <else>
             <group>
               <names variable="editor translator" delimiter=", &amp; ">
@@ -77,18 +75,28 @@
   </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="broadcast report" variable="container-title" match="all">
-        <names variable="interviewer" delimiter="; ">
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title"/>
-        </names>
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia paper-conference report">
+        <group delimiter="; ">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter="; ">
+                <names variable="container-author" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
+              </group>
+            </if>
+          </choose>
+        </group>
       </if>
-      <else-if type="chapter entry entry-dictionary entry-encyclopedia paper-conference">
-        <names variable="interviewer" delimiter="; ">
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title"/>
-        </names>
-      </else-if>
       <else-if type="personal_communication">
         <group delimiter="; ">
           <group delimiter=" ">
@@ -345,7 +353,7 @@
           <text variable="URL"/>
         </group>
       </else-if>
-      <else-if variable="archive" type="report thesis" match="all">
+      <else-if variable="archive" type="article report thesis" match="all">
         <group delimiter=" ">
           <text term="retrieved" text-case="capitalize-first"/>
           <text term="from"/>
@@ -815,7 +823,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -945,15 +953,25 @@
           </group>
         </group>
       </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference">
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference" variable="container-title" match="all">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
             <group delimiter=" ">
               <text macro="container-title"/>
-              <text macro="locators" prefix="(" suffix=")"/>
-            </group>
+              <group delimiter="; " prefix="(" suffix=")">
+                <text macro="locators"/>
+                <choose>
+                  <if variable="container-author">
+                    <names variable="editor translator" delimiter="; ">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                      <label form="short" prefix=", " text-case="title"/>
+                    </names>
+                  </if>
+                </choose>
+              </group>
+            </group>  
           </group>
         </group>
       </else-if>

From 5e9d023786608cb1da589a26022b01b1b727479d Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 15 Jul 2018 01:33:07 +0200
Subject: [PATCH 14/52] Tweaks to container formatting

And other minor fixes
---
 apa.csl | 172 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 119 insertions(+), 53 deletions(-)

diff --git a/apa.csl b/apa.csl
index 24b8425162..35abcb2a24 100644
--- a/apa.csl
+++ b/apa.csl
@@ -51,7 +51,7 @@
   </locale>
   <macro name="container-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia paper-conference personal_communication report" variable="container-title" match="all">
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference personal_communication report" variable="container-title" match="all">
         <choose>
           <if variable="container-author">
             <group>
@@ -75,7 +75,7 @@
   </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia paper-conference report">
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference report">
         <group delimiter="; ">
           <names variable="interviewer" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
@@ -175,7 +175,15 @@
               <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
               <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
             </names>
-            <text macro="title"/>
+            <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format"/>
           </substitute>
         </names>
       </if>
@@ -185,33 +193,40 @@
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
           <substitute>
             <names variable="illustrator"/>
+            <names variable="composer"/>
             <names variable="director">
               <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-              <substitute>
-                <choose>
-                  <if variable="container-title">
-                    <names variable="translator"/>
-                    <names variable="editor"/>
-                    <names variable="editorial-director"/>
-                  </if>
-                  <else>
-                    <names variable="editor"/>
-                    <names variable="editorial-director"/>
-                    <names variable="translator"/>
-                  </else>
-                </choose>
-              </substitute>
+              <label form="long" prefix=" (" suffix=")" text-case="capitalize-first"/>
             </names>
             <choose>
-              <if type="report">
-                <text variable="publisher"/>
-                <text macro="title"/>
+              <if variable="container-title">
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+                    <substitute>
+                      <names variable="editor"/>
+                      <names variable="editorial-director"/>
+                    </substitute>
+                </names>
               </if>
               <else>
-                <text macro="title"/>
+                <names variable="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="capitalize-first"/>
+                    <substitute>
+                      <names variable="editorial-director"/>
+                      <names variable="translator"/>
+                    </substitute>
+                </names>
               </else>
             </choose>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <text macro="title"/>
+            <text macro="format"/>
           </substitute>
         </names>
       </else>
@@ -245,7 +260,15 @@
               <substitute>
                 <names variable="editor"/>
                 <names variable="translator"/>
-                <text variable="title" form="short" quotes="true"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format"/>
               </substitute>
             </names>
           </else>
@@ -258,7 +281,15 @@
             <names variable="original-author"/>
             <names variable="author"/>
             <names variable="translator"/>
-            <text variable="title" form="short" font-style="italic"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format"/>
           </substitute>
         </names>
       </else-if>
@@ -267,6 +298,7 @@
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
             <names variable="illustrator"/>
+            <names variable="composer"/>
             <names variable="director"/>
             <choose>
               <if variable="container-title">
@@ -281,16 +313,12 @@
               </else>
             </choose>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
@@ -305,10 +333,14 @@
                   </else>
                 </choose>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format"/>
           </substitute>
         </names>
       </else>
@@ -348,12 +380,16 @@
                   </if>
                 </choose>
               </if>
+              <else-if type="post post-weblog webpage">
+                <!-- This should be localized -->
+                <text variable="container-title" suffix=" website"/>
+              </else-if>
             </choose>
           </group>
           <text variable="URL"/>
         </group>
       </else-if>
-      <else-if variable="archive" type="article report thesis" match="all">
+      <else-if variable="archive" type="article dataset report thesis" match="all">
         <group delimiter=" ">
           <text term="retrieved" text-case="capitalize-first"/>
           <text term="from"/>
@@ -411,7 +447,7 @@
       <else-if type="patent" variable="number" match="all">
         <text macro="patent-number" font-style="italic"/>
       </else-if>
-      <else-if variable="container-title">
+      <else-if type="post post-weblog webpage" variable="container-title" match="any">
         <text variable="title"/>
       </else-if>
       <else>
@@ -444,7 +480,7 @@
             <text macro="secondary-contributors"/>
           </group>
         </else-if>
-        <else-if type="book dataset interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage">
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage">
           <group delimiter="; ">
             <text macro="locators"/>
             <text macro="secondary-contributors"/>
@@ -457,6 +493,19 @@
             </if>
           </choose>
         </else-if>
+        <else-if type="article dataset figure">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
         <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
           <text macro="secondary-contributors"/>
         </else-if>
@@ -517,19 +566,16 @@
           </group>
         </else-if>
         <else-if type="bill legislation legal_case patent treaty" match="none">
-          <group delimiter=", ">
-            <text variable="genre" text-case="capitalize-first"/>
-            <text variable="medium" text-case="capitalize-first"/>
-          </group>
           <choose>
-            <if variable="genre medium" match="none">
-              <!-- This should be localized -->
-              <choose>
-                <if type="dataset">
-                  <text value="Data set"/>
-                </if>
-              </choose>
+            <if variable="genre medium" match="any">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
             </if>
+            <else-if type="dataset">
+              <text value="Data set"/>
+            </else-if>
           </choose>
         </else-if>
       </choose>
@@ -573,16 +619,18 @@
             <if variable="archive" match="none">
               <text variable="genre"/>
             </if>
+            <else>
+              <group delimiter=" ">
+                <text variable="archive"/>
+                <text variable="archive_location" prefix="(" suffix=")"/>
+              </group>
+            </else>
           </choose>
-          <group delimiter=" ">
-            <text variable="archive"/>
-            <text variable="archive_location" prefix="(" suffix=")"/>
-          </group>
           <text variable="publisher"/>
           <text variable="publisher-place"/>
         </group>
       </if>
-      <else-if type="pamphlet personal_communication" match="any">
+      <else-if type="graphic pamphlet personal_communication" match="any">
         <group delimiter=", ">
           <group delimiter=" ">
             <text variable="archive"/>
@@ -918,12 +966,18 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper figure post review review-book">
+      <if type="article article-journal article-magazine article-newspaper review review-book">
         <group delimiter=", ">
           <text macro="container-title"/>
           <text macro="locators"/>
         </group>
       </if>
+      <else-if type="article dataset figure" variable="container-title" match="all">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+      </else-if>
       <else-if type="report" variable="container-title" match="all">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first" suffix=" "/>
@@ -982,7 +1036,7 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <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="bill legal_case legislation post-weblog webpage" match="none">
@@ -1104,8 +1158,20 @@
           </choose>
           <group delimiter=" ">
             <text macro="title"/>
-            <text macro="description"/>
-            <text macro="format"/>
+            <choose>
+              <if variable="title">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
           </group>
           <text macro="container"/>
         </group>

From 162c47ef496dcc8330254370601eeaba5f60728d Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 6 Aug 2018 11:42:03 +0200
Subject: [PATCH 15/52] Move duplicated lines to macro

---
 apa.csl | 72 ++++++++++++++++++++++-----------------------------------
 1 file changed, 27 insertions(+), 45 deletions(-)

diff --git a/apa.csl b/apa.csl
index 35abcb2a24..cb39022ad6 100644
--- a/apa.csl
+++ b/apa.csl
@@ -765,6 +765,30 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -787,53 +811,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <choose>
-                    <if type="personal_communication">
-                      <choose>
-                        <if variable="archive DOI publisher URL" match="none">
-                          <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>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <choose>
-                  <if type="personal_communication">
-                    <choose>
-                      <if variable="archive DOI publisher URL" match="none">
-                        <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>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -1130,7 +1112,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>

From 0c4d306d34d071a48e6113bf2c0423a2df223c89 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 6 Aug 2018 12:23:48 +0200
Subject: [PATCH 16/52] Fix multiple type conditionals

---
 apa.csl | 142 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 81 insertions(+), 61 deletions(-)

diff --git a/apa.csl b/apa.csl
index cb39022ad6..52a8bc1fdc 100644
--- a/apa.csl
+++ b/apa.csl
@@ -51,31 +51,35 @@
   </locale>
   <macro name="container-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference personal_communication report" variable="container-title" match="all">
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference personal_communication report" match="any">
         <choose>
-          <if variable="container-author">
-            <group>
-              <names variable="container-author" delimiter=", &amp; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=" (" text-case="title" suffix=")"/>
-              </names>
-            </group>
+          <if variable="container-title">
+            <choose>
+              <if variable="container-author">
+                <group>
+                  <names variable="container-author" delimiter=", &amp; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=" (" text-case="title" suffix=")"/>
+                  </names>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <names variable="editor translator" delimiter=", &amp; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=" (" text-case="title" suffix=")"/>
+                  </names>
+                </group>
+              </else>
+            </choose>
           </if>
-          <else>
-            <group>
-              <names variable="editor translator" delimiter=", &amp; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=" (" text-case="title" suffix=")"/>
-              </names>
-            </group>
-          </else>
         </choose>
       </if>
     </choose>
   </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference report">
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference report" match="any">
         <group delimiter="; ">
           <names variable="interviewer" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
@@ -141,7 +145,7 @@
           </if>
         </choose>
       </else-if>
-      <else-if type="article-journal article-magazine article-newspaper">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
         <group>
           <names variable="interviewer translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
@@ -333,8 +337,12 @@
                   </else>
                 </choose>
               </else-if>
-              <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
+              <else-if type="post post-weblog webpage" match="any">
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                </choose>
               </else-if>
               <else>
                 <text variable="title" form="short" font-style="italic"/>
@@ -380,7 +388,7 @@
                   </if>
                 </choose>
               </if>
-              <else-if type="post post-weblog webpage">
+              <else-if type="post post-weblog webpage" match="any">
                 <!-- This should be localized -->
                 <text variable="container-title" suffix=" website"/>
               </else-if>
@@ -389,13 +397,17 @@
           <text variable="URL"/>
         </group>
       </else-if>
-      <else-if variable="archive" type="article dataset report thesis" match="all">
-        <group delimiter=" ">
-          <text term="retrieved" text-case="capitalize-first"/>
-          <text term="from"/>
-          <text variable="archive" suffix="."/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
-        </group>
+      <else-if variable="archive">
+        <choose>
+          <if type="article dataset report thesis" match="any">
+            <group delimiter=" ">
+              <text term="retrieved" text-case="capitalize-first"/>
+              <text term="from"/>
+              <text variable="archive" suffix="."/>
+              <text variable="archive_location" prefix="(" suffix=")"/>
+            </group>
+          </if>
+        </choose>
       </else-if>
       <else>
         <text macro="publisher" suffix="."/>
@@ -480,7 +492,7 @@
             <text macro="secondary-contributors"/>
           </group>
         </else-if>
-        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage">
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
           <group delimiter="; ">
             <text macro="locators"/>
             <text macro="secondary-contributors"/>
@@ -493,7 +505,7 @@
             </if>
           </choose>
         </else-if>
-        <else-if type="article dataset figure">
+        <else-if type="article dataset figure" match="any">
           <choose>
             <if variable="container-title">
               <text macro="secondary-contributors"/>
@@ -515,7 +527,7 @@
   <macro name="format">
     <group prefix="[" suffix="]">
       <choose>
-        <if type="speech thesis">
+        <if type="speech thesis" match="any">
           <text variable="medium" text-case="capitalize-first"/>
         </if>
         <else-if type="report">
@@ -719,7 +731,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -833,7 +845,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -853,7 +865,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -948,17 +960,21 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper review review-book">
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
         <group delimiter=", ">
           <text macro="container-title"/>
           <text macro="locators"/>
         </group>
       </if>
-      <else-if type="article dataset figure" variable="container-title" match="all">
-        <group delimiter=", ">
-          <text macro="container-title"/>
-          <text macro="locators"/>
-        </group>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </if>
+        </choose>
       </else-if>
       <else-if type="report" variable="container-title" match="all">
         <group delimiter=" ">
@@ -989,29 +1005,33 @@
           </group>
         </group>
       </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference" variable="container-title" match="all">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first"/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference" match="any">
+        <choose>
+          <if variable="container-title">
             <group delimiter=" ">
-              <text macro="container-title"/>
-              <group delimiter="; " prefix="(" suffix=")">
-                <text macro="locators"/>
-                <choose>
-                  <if variable="container-author">
-                    <names variable="editor translator" delimiter="; ">
-                      <name and="symbol" initialize-with=". " delimiter=", "/>
-                      <label form="short" prefix=", " text-case="title"/>
-                    </names>
-                  </if>
-                </choose>
+              <text term="in" text-case="capitalize-first"/>
+              <group delimiter=", ">
+                <text macro="container-contributors"/>
+                <group delimiter=" ">
+                  <text macro="container-title"/>
+                  <group delimiter="; " prefix="(" suffix=")">
+                    <text macro="locators"/>
+                    <choose>
+                      <if variable="container-author">
+                        <names variable="editor translator" delimiter="; ">
+                          <name and="symbol" initialize-with=". " delimiter=", "/>
+                          <label form="short" prefix=", " text-case="title"/>
+                        </names>
+                      </if>
+                    </choose>
+                  </group>
+                </group>  
               </group>
-            </group>  
-          </group>
-        </group>
+            </group>
+          </if>
+        </choose>
       </else-if>
-      <else-if type="bill legal_case legislation treaty">
+      <else-if type="bill legal_case legislation treaty" match="any">
         <text macro="legal-cites"/>
       </else-if>     
     </choose>
@@ -1028,7 +1048,7 @@
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
           <group delimiter=" ">
             <choose>

From ca7dcb33eeb849935afad8cf087bf2644facaf03 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 6 Aug 2018 12:31:51 +0200
Subject: [PATCH 17/52] Replace hard-coded "No. " with term

---
 apa.csl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apa.csl b/apa.csl
index 52a8bc1fdc..89fe0bd4f1 100644
--- a/apa.csl
+++ b/apa.csl
@@ -599,8 +599,9 @@
         <group delimiter="; ">
           <group delimiter=" ">
             <text variable="genre" text-case="title"/>
-            <!-- This should be localized -->
-            <number variable="number" prefix="No. "/>
+            <!-- Replace with term="number" if that becomes available. -->
+            <text term="issue" form="short"/>
+            <number variable="number"/>
           </group>
           <text macro="locators"/>
         </group>

From b2fc3a792802cfbfe60a535be0ec4a64eed1930a Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 6 Aug 2018 12:36:35 +0200
Subject: [PATCH 18/52] Replace hardcoded "No. " with term

---
 apa.csl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/apa.csl b/apa.csl
index 89fe0bd4f1..7a042fade1 100644
--- a/apa.csl
+++ b/apa.csl
@@ -357,10 +357,8 @@
   <macro name="patent-number">
     <!-- genre: U.S. Patent number: 123,445-->
     <group delimiter=" ">
-      <group delimiter=" ">
-        <text variable="genre"/>
-        <text term="issue" form="short" text-case="capitalize-first"/>
-      </group>
+      <text variable="genre"/>
+      <text term="issue" form="short" text-case="capitalize-first"/>
       <text variable="number"/>
     </group>
   </macro>
@@ -599,8 +597,8 @@
         <group delimiter="; ">
           <group delimiter=" ">
             <text variable="genre" text-case="title"/>
-            <!-- Replace with term="number" if that becomes available. -->
-            <text term="issue" form="short"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
             <number variable="number"/>
           </group>
           <text macro="locators"/>
@@ -1064,7 +1062,11 @@
                 <text variable="page"/>
               </if>
               <else>
-                <text variable="number" prefix="No. "/>
+                <group delimiter=" ">
+                  <!-- Replace with term="number" if that becomes available -->
+                  <text term="issue" form="short" text-case="capitalize-first"/>
+                  <text variable="number"/>
+                </group>
               </else>
             </choose>
           </group>

From 2d751895a91a73a1e14204e4d71e34f8af1302e1 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 6 Aug 2018 12:43:43 +0200
Subject: [PATCH 19/52] Fix reviewed-author label

---
 apa.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index 7a042fade1..340231775e 100644
--- a/apa.csl
+++ b/apa.csl
@@ -435,8 +435,8 @@
                 <!-- This should be localized -->
                 <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
                 <names variable="reviewed-author" delimiter=", ">
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
                   <label form="verb-short" suffix=" "/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
                 </names>
               </group>
             </group>

From 241414e30eaccc0213e8dd114cb5591bfb82675d Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 6 Aug 2018 13:44:04 +0200
Subject: [PATCH 20/52] Remove unnecessary delimiter

---
 apa.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index 340231775e..ce898def2a 100644
--- a/apa.csl
+++ b/apa.csl
@@ -57,7 +57,7 @@
             <choose>
               <if variable="container-author">
                 <group>
-                  <names variable="container-author" delimiter=", &amp; ">
+                  <names variable="container-author">
                     <name and="symbol" initialize-with=". " delimiter=", "/>
                     <label form="short" prefix=" (" text-case="title" suffix=")"/>
                   </names>

From 4904a691bdb854ffbf768cc5f9faaa8bab07d9c2 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 6 Aug 2018 15:59:41 +0200
Subject: [PATCH 21/52] Simplify nested subsitute

---
 apa.csl | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/apa.csl b/apa.csl
index ce898def2a..30415c6824 100644
--- a/apa.csl
+++ b/apa.csl
@@ -207,23 +207,21 @@
                 <names variable="translator">
                   <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
                     <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-                    <substitute>
-                      <names variable="editor"/>
-                      <names variable="editorial-director"/>
-                    </substitute>
                 </names>
               </if>
-              <else>
-                <names variable="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="capitalize-first"/>
-                    <substitute>
-                      <names variable="editorial-director"/>
-                      <names variable="translator"/>
-                    </substitute>
-                </names>
-              </else>
             </choose>
+            <names variable="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="capitalize-first"/>
+            </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="capitalize-first"/>
+            </names>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+            </names>
             <choose>
               <if type="report">
                 <text variable="publisher"/>
@@ -307,15 +305,11 @@
             <choose>
               <if variable="container-title">
                 <names variable="translator"/>
-                <names variable="editor"/>
-                <names variable="editorial-director"/>
               </if>
-              <else>
-                <names variable="editor"/>
-                <names variable="editorial-director"/>
-                <names variable="translator"/>
-              </else>
             </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <names variable="translator"/>
             <choose>
               <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>

From 8b171f1f68181d2466f295447b6cd5fce197976d Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 2 Dec 2018 14:02:19 -0500
Subject: [PATCH 22/52] Fix "retrieved from" for reports

---
 apa.csl | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/apa.csl b/apa.csl
index 30415c6824..107064b05e 100644
--- a/apa.csl
+++ b/apa.csl
@@ -363,29 +363,27 @@
       </if>
       <else-if variable="URL">
         <group delimiter=" ">
-          <group delimiter=" " suffix=":">
-            <text term="retrieved" text-case="capitalize-first"/>
-            <choose>
-              <if type="post post-weblog webpage" match="any">
-                <date variable="accessed" form="text" suffix=","/>
-              </if>
-            </choose>
-            <text term="from"/>
-            <choose>
-              <if type="report">
-                <choose>
-                  <if variable="author editor translator" match="any">
-                    <!-- This should be localized -->
-                    <text variable="publisher" suffix=" website"/>
-                  </if>
-                </choose>
-              </if>
-              <else-if type="post post-weblog webpage" match="any">
-                <!-- This should be localized -->
-                <text variable="container-title" suffix=" website"/>
-              </else-if>
-            </choose>
-          </group>
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
           <text variable="URL"/>
         </group>
       </else-if>

From fda57143b1479f03a9d66338cac9279d981374ee Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 2 Dec 2018 14:02:38 -0500
Subject: [PATCH 23/52] Add circa abbreviation

---
 apa.csl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apa.csl b/apa.csl
index 107064b05e..0183c6aff0 100644
--- a/apa.csl
+++ b/apa.csl
@@ -42,6 +42,7 @@
       </term>
       <term name="translator" form="short">trans.</term>
       <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
     </terms>
   </locale>
   <locale xml:lang="es">

From e44104b436599e73a7c484cce40068bddfd8e66c Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 2 Dec 2018 14:52:02 -0500
Subject: [PATCH 24/52] Fix status bug

---
 apa.csl | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/apa.csl b/apa.csl
index 0183c6aff0..729ca999c1 100644
--- a/apa.csl
+++ b/apa.csl
@@ -891,16 +891,6 @@
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advance online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
         <group delimiter=" ">
@@ -957,6 +947,16 @@
           <text macro="container-title"/>
           <text macro="locators"/>
         </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
       </if>
       <else-if type="article dataset figure" match="any">
         <choose>
@@ -965,6 +965,16 @@
               <text macro="container-title"/>
               <text macro="locators"/>
             </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
           </if>
         </choose>
       </else-if>

From 93649a5b3d31f547603c5cff22a7a83f960bb471 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 2 Dec 2018 14:56:43 -0500
Subject: [PATCH 25/52] Add archive for article-journal, etc.

---
 apa.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index 729ca999c1..42510b4137 100644
--- a/apa.csl
+++ b/apa.csl
@@ -390,7 +390,7 @@
       </else-if>
       <else-if variable="archive">
         <choose>
-          <if type="article dataset report thesis" match="any">
+          <if type="article article-journal article-magazine article-newspaper dataset report thesis" match="any">
             <group delimiter=" ">
               <text term="retrieved" text-case="capitalize-first"/>
               <text term="from"/>

From ae081bc82940ad08395995fd92d9d081fc7466f2 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 2 Dec 2018 16:08:05 -0500
Subject: [PATCH 26/52] Support chapters in book series volumes

---
 apa.csl | 73 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 60 insertions(+), 13 deletions(-)

diff --git a/apa.csl b/apa.csl
index 42510b4137..31603d1a72 100644
--- a/apa.csl
+++ b/apa.csl
@@ -43,6 +43,7 @@
       <term name="translator" form="short">trans.</term>
       <term name="interviewer" form="short">interviewer</term>
       <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -69,6 +70,9 @@
                   <names variable="editor translator" delimiter=", &amp; ">
                     <name and="symbol" initialize-with=". " delimiter=", "/>
                     <label form="short" prefix=" (" text-case="title" suffix=")"/>
+                    <substitute>
+                      <names variable="collection-editor"/>
+                    </substitute>
                   </names>
                 </group>
               </else>
@@ -82,14 +86,14 @@
     <choose>
       <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference report" match="any">
         <group delimiter="; ">
-          <names variable="interviewer" delimiter="; ">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
           <choose>
             <if variable="container-title" match="none">
               <group delimiter="; ">
-                <names variable="container-author" delimiter="; ">
+                <names variable="container-author">
                   <name and="symbol" initialize-with=". " delimiter=", "/>
                   <label form="short" prefix=", " text-case="title"/>
                 </names>
@@ -134,11 +138,11 @@
           <if variable="original-author composer" match="any">
             <group delimiter="; ">
               <!-- Replace prefix with performer label as that becomes available -->
-              <names variable="author" delimiter="; " prefix="Recorded by ">
+              <names variable="author" prefix="Recorded by ">
                 <label form="verb" text-case="title"/>
                 <name and="symbol" initialize-with=". " delimiter=", "/>
               </names>
-              <names variable="translator" delimiter="; ">
+              <names variable="translator">
                 <name and="symbol" initialize-with=". " delimiter=", "/>
                 <label form="short" prefix=", " text-case="title"/>
               </names>
@@ -156,7 +160,7 @@
       </else-if>
       <else>
         <group delimiter="; ">
-          <names variable="interviewer" delimiter="; ">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter="; "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
@@ -223,6 +227,10 @@
               <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
                 <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
             </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="capitalize-first"/>
+            </names>
             <choose>
               <if type="report">
                 <text variable="publisher"/>
@@ -907,10 +915,24 @@
           </group>
           <choose>
             <if variable="volume" match="any">
-              <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
-              </group>
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+                <else>
+                  <group>
+                    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                    <number variable="volume" form="numeric"/>
+                  </group>
+                </else>
+              </choose>
             </if>
             <else>
               <group>
@@ -1009,13 +1031,34 @@
       </else-if>
       <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference" match="any">
         <choose>
-          <if variable="container-title">
+          <if variable="container-title collection-title" match="any">
             <group delimiter=" ">
               <text term="in" text-case="capitalize-first"/>
               <group delimiter=", ">
                 <text macro="container-contributors"/>
                 <group delimiter=" ">
-                  <text macro="container-title"/>
+                  <choose>
+                    <if variable="editor translator" match="none">
+                      <group delimiter=". ">
+                        <group delimiter=": ">
+                          <text variable="collection-title" font-style="italic" text-case="title"/>
+                          <group>
+                            <text term="volume" form="short" font-style="italic" text-case="capitalize-first" suffix=" "/>
+                            <number variable="collection-number" font-style="italic" form="numeric"/>
+                            <choose>
+                              <if variable="collection-number" match="none">
+                                <number variable="volume" font-style="italic" form="numeric"/>
+                              </if>
+                            </choose>
+                          </group>
+                        </group>
+                        <text macro="container-title"/>
+                      </group>
+                    </if>
+                    <else>
+                      <text macro="container-title"/>
+                    </else>
+                  </choose>
                   <group delimiter="; " prefix="(" suffix=")">
                     <text macro="locators"/>
                     <choose>
@@ -1066,8 +1109,12 @@
               </if>
               <else>
                 <group delimiter=" ">
-                  <!-- Replace with term="number" if that becomes available -->
-                  <text term="issue" form="short" text-case="capitalize-first"/>
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
                   <text variable="number"/>
                 </group>
               </else>

From 3fdfc534aeeb31e853ef2daaa2b8e71410523d85 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 2 Dec 2018 16:20:26 -0500
Subject: [PATCH 27/52] Tweak collection-number

---
 apa.csl | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/apa.csl b/apa.csl
index 31603d1a72..c66dd7ff76 100644
--- a/apa.csl
+++ b/apa.csl
@@ -916,9 +916,9 @@
           <choose>
             <if variable="volume" match="any">
               <choose>
-                <if variable="editor translator" match="none">
+                <if variable="collection-title">
                   <choose>
-                    <if variable="collection-number">
+                    <if variable="editor translator collection-number" match="none">
                       <group>
                         <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
                         <number variable="volume" form="numeric"/>
@@ -1042,15 +1042,19 @@
                       <group delimiter=". ">
                         <group delimiter=": ">
                           <text variable="collection-title" font-style="italic" text-case="title"/>
-                          <group>
-                            <text term="volume" form="short" font-style="italic" text-case="capitalize-first" suffix=" "/>
-                            <number variable="collection-number" font-style="italic" form="numeric"/>
-                            <choose>
-                              <if variable="collection-number" match="none">
-                                <number variable="volume" font-style="italic" form="numeric"/>
-                              </if>
-                            </choose>
-                          </group>
+                          <choose>
+                            <if variable="collection-title">
+                              <group>
+                                <text term="volume" form="short" font-style="italic" text-case="capitalize-first" suffix=" "/>
+                                <number variable="collection-number" font-style="italic" form="numeric"/>
+                                <choose>
+                                  <if variable="collection-number" match="none">
+                                    <number variable="volume" font-style="italic" form="numeric"/>
+                                  </if>
+                                </choose>
+                              </group>
+                            </if>
+                          </choose>
                         </group>
                         <text macro="container-title"/>
                       </group>

From 6201bb3ac714cd9306218ff64af237204855f7a3 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 2 Dec 2018 17:23:45 -0500
Subject: [PATCH 28/52] Support book-like and journal-like paper-conference

---
 apa.csl | 321 +++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 202 insertions(+), 119 deletions(-)

diff --git a/apa.csl b/apa.csl
index c66dd7ff76..73ff06c849 100644
--- a/apa.csl
+++ b/apa.csl
@@ -51,60 +51,73 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference personal_communication report" match="any">
+      <if variable="container-title">
         <choose>
-          <if variable="container-title">
-            <choose>
-              <if variable="container-author">
-                <group>
-                  <names variable="container-author">
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                    <label form="short" prefix=" (" text-case="title" suffix=")"/>
-                  </names>
-                </group>
-              </if>
-              <else>
-                <group>
-                  <names variable="editor translator" delimiter=", &amp; ">
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                    <label form="short" prefix=" (" text-case="title" suffix=")"/>
-                    <substitute>
-                      <names variable="collection-editor"/>
-                    </substitute>
-                  </names>
-                </group>
-              </else>
-            </choose>
+          <if variable="container-author">
+            <group>
+              <names variable="container-author">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=" (" text-case="title" suffix=")"/>
+              </names>
+            </group>
           </if>
+          <else>
+            <group>
+              <names variable="editor translator" delimiter=", &amp; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=" (" text-case="title" suffix=")"/>
+                <substitute>
+                  <names variable="collection-editor"/>
+                </substitute>
+              </names>
+            </group>
+          </else>
         </choose>
       </if>
     </choose>
   </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <names variable="interviewer">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference report" match="any">
-        <group delimiter="; ">
-          <names variable="interviewer">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-          <choose>
-            <if variable="container-title" match="none">
-              <group delimiter="; ">
-                <names variable="container-author">
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                  <label form="short" prefix=", " text-case="title"/>
-                </names>
-                <names variable="editor translator" delimiter="; ">
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                  <label form="short" prefix=", " text-case="title"/>
-                </names>
-              </group>
-            </if>
-          </choose>
-        </group>
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
       </if>
       <else-if type="personal_communication">
         <group delimiter="; ">
@@ -158,6 +171,21 @@
           </names>
         </group>
       </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <group>
+              <names variable="interviewer translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
       <else>
         <group delimiter="; ">
           <names variable="interviewer">
@@ -742,7 +770,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -906,48 +944,67 @@
           <text variable="page"/>
         </group>
       </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <group>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
-        <group delimiter=", ">
-          <text macro="edition"/>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
-          </group>
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
           <choose>
-            <if variable="volume" match="any">
+            <if variable="collection-title">
               <choose>
-                <if variable="collection-title">
-                  <choose>
-                    <if variable="editor translator collection-number" match="none">
-                      <group>
-                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                        <number variable="volume" form="numeric"/>
-                      </group>
-                    </if>
-                  </choose>
-                </if>
-                <else>
+                <if variable="editor translator collection-number" match="none">
                   <group>
                     <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
                     <number variable="volume" form="numeric"/>
                   </group>
-                </else>
+                </if>
               </choose>
             </if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
@@ -1029,67 +1086,93 @@
           </group>
         </group>
       </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map paper-conference" match="any">
+      <else-if type="paper-conference">
         <choose>
-          <if variable="container-title collection-title" match="any">
-            <group delimiter=" ">
-              <text term="in" text-case="capitalize-first"/>
-              <group delimiter=", ">
-                <text macro="container-contributors"/>
-                <group delimiter=" ">
-                  <choose>
-                    <if variable="editor translator" match="none">
-                      <group delimiter=". ">
-                        <group delimiter=": ">
-                          <text variable="collection-title" font-style="italic" text-case="title"/>
-                          <choose>
-                            <if variable="collection-title">
-                              <group>
-                                <text term="volume" form="short" font-style="italic" text-case="capitalize-first" suffix=" "/>
-                                <number variable="collection-number" font-style="italic" form="numeric"/>
-                                <choose>
-                                  <if variable="collection-number" match="none">
-                                    <number variable="volume" font-style="italic" form="numeric"/>
-                                  </if>
-                                </choose>
-                              </group>
-                            </if>
-                          </choose>
-                        </group>
-                        <text macro="container-title"/>
-                      </group>
-                    </if>
-                    <else>
-                      <text macro="container-title"/>
-                    </else>
-                  </choose>
-                  <group delimiter="; " prefix="(" suffix=")">
-                    <text macro="locators"/>
-                    <choose>
-                      <if variable="container-author">
-                        <names variable="editor translator" delimiter="; ">
-                          <name and="symbol" initialize-with=". " delimiter=", "/>
-                          <label form="short" prefix=", " text-case="title"/>
-                        </names>
-                      </if>
-                    </choose>
-                  </group>
-                </group>  
-              </group>
-            </group>
+          <if variable="editor collection-editor" match="any">
+            <text macro="container-booklike"/>
           </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
         </choose>
       </else-if>
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
       <else-if type="bill legal_case legislation treaty" match="any">
         <text macro="legal-cites"/>
       </else-if>     
     </choose>
   </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <group delimiter=". ">
+                    <group delimiter=": ">
+                      <text variable="collection-title" font-style="italic" text-case="title"/>
+                      <choose>
+                        <if variable="collection-title">
+                          <group>
+                            <text term="volume" form="short" font-style="italic" text-case="capitalize-first" suffix=" "/>
+                            <number variable="collection-number" font-style="italic" form="numeric"/>
+                            <choose>
+                              <if variable="collection-number" match="none">
+                                <number variable="volume" font-style="italic" form="numeric"/>
+                              </if>
+                            </choose>
+                          </group>
+                        </if>
+                      </choose>
+                    </group>
+                    <text macro="container-title"/>
+                  </group>
+                </if>
+                <else>
+                  <text macro="container-title"/>
+                </else>
+              </choose>
+              <group delimiter="; " prefix="(" suffix=")">
+                <text macro="locators"/>
+                <choose>
+                  <if variable="container-author">
+                    <names variable="editor translator" delimiter="; ">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                      <label form="short" prefix=", " text-case="title"/>
+                    </names>
+                  </if>
+                </choose>
+              </group>
+            </group>  
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
   <macro name="container-title">
     <choose>
       <if type="article article-journal article-magazine article-newspaper dataset" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>

From 5a04ea9bbd7612d24b2df484237aa226675e48e2 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Sun, 2 Dec 2018 18:31:15 -0500
Subject: [PATCH 29/52] Correctly format volume titles

---
 apa.csl | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/apa.csl b/apa.csl
index 73ff06c849..86368f6f81 100644
--- a/apa.csl
+++ b/apa.csl
@@ -264,7 +264,11 @@
                 <text variable="publisher"/>
               </if>
             </choose>
-            <text macro="title"/>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
             <text macro="format"/>
           </substitute>
         </names>
@@ -975,16 +979,21 @@
       <choose>
         <if variable="volume" match="any">
           <choose>
-            <if variable="collection-title">
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
               <choose>
-                <if variable="editor translator collection-number" match="none">
-                  <group>
-                    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                    <number variable="volume" form="numeric"/>
-                  </group>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
                 </if>
               </choose>
-            </if>
+            </else-if>
             <else>
               <group>
                 <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
@@ -1122,8 +1131,8 @@
                       <text variable="collection-title" font-style="italic" text-case="title"/>
                       <choose>
                         <if variable="collection-title">
-                          <group>
-                            <text term="volume" form="short" font-style="italic" text-case="capitalize-first" suffix=" "/>
+                          <group delimiter=" ">
+                            <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
                             <number variable="collection-number" font-style="italic" form="numeric"/>
                             <choose>
                               <if variable="collection-number" match="none">
@@ -1138,7 +1147,18 @@
                   </group>
                 </if>
                 <else>
-                  <text macro="container-title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
                 </else>
               </choose>
               <group delimiter="; " prefix="(" suffix=")">

From f472820b24826399ff586fe19032919e61ee314a Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 17 Dec 2018 14:08:00 +0100
Subject: [PATCH 30/52] Allow genre to be specified in reviews

And unify format/title formatting for reviews and other items
---
 apa.csl | 251 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 146 insertions(+), 105 deletions(-)

diff --git a/apa.csl b/apa.csl
index 86368f6f81..fd4d7a0026 100644
--- a/apa.csl
+++ b/apa.csl
@@ -210,7 +210,7 @@
             <names variable="author"/>
             <names variable="translator">
               <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-              <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
             </names>
             <choose>
               <if variable="container-title">
@@ -233,31 +233,27 @@
             <names variable="composer"/>
             <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="capitalize-first"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
             </names>
             <choose>
               <if variable="container-title">
                 <names variable="translator">
                   <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                    <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
                 </names>
               </if>
             </choose>
-            <names variable="editor">
+            <names variable="editor translator" 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="capitalize-first"/>
+                <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="capitalize-first"/>
-            </names>
-            <names variable="translator">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+                <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="capitalize-first"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
             </names>
             <choose>
               <if type="report">
@@ -269,7 +265,6 @@
               <text macro="description"/>
               <text macro="format"/>
             </group>
-            <text macro="format"/>
           </substitute>
         </names>
       </else>
@@ -311,7 +306,7 @@
                     <text variable="title" form="short" font-style="italic"/>
                   </else>
                 </choose>
-                <text macro="format"/>
+                <text macro="format-short" prefix="[" suffix="]"/>
               </substitute>
             </names>
           </else>
@@ -332,7 +327,7 @@
                 <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
-            <text macro="format"/>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else-if>
@@ -361,29 +356,17 @@
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <!-- This should be localized -->
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else-if type="post post-weblog webpage" match="any">
-                <choose>
-                  <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
-                  </if>
-                </choose>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
+                <text variable="title" form="short" quotes="true"/>
               </else-if>
               <else>
                 <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
-            <text macro="format"/>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
@@ -459,37 +442,23 @@
           </names>
         </group>
       </else-if>
-      <else-if variable="reviewed-author">
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="reviewed-author" type="review review-book" match="any">
         <choose>
           <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <!-- This should be localized -->
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
-              </group>
-            </group>
+            <choose>
+              <if type="post post-weblog webpage" variable="container-title" match="any">
+                <text variable="title"/>
+              </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
+            </choose>
           </if>
-          <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <!-- This should be localized -->
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
-          </else>
         </choose>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
-      </else-if>
       <else-if type="post post-weblog webpage" variable="container-title" match="any">
         <text variable="title"/>
       </else-if>
@@ -558,71 +527,143 @@
   <macro name="format">
     <group prefix="[" suffix="]">
       <choose>
-        <if type="speech thesis" match="any">
-          <text variable="medium" text-case="capitalize-first"/>
-        </if>
-        <else-if type="report">
-          <choose>
-            <if variable="container-title" match="none">
-              <text macro="format-report"/>
-            </if>
-          </choose>
-        </else-if>
-        <else-if type="manuscript">
-          <choose>
-            <if variable="archive">
-              <!-- Assume manuscript with archive is historical/archival manuscript -->
-              <group delimiter=", ">
-                <text variable="genre" text-case="capitalize-first"/>
-                <text variable="medium" text-case="capitalize-first"/>
-              </group>
-            </if>
-            <else>
-              <text variable="medium" text-case="capitalize-first"/>
-            </else>
-          </choose>
-        </else-if>
-        <else-if type="personal_communication">
-          <text macro="secondary-contributors"/>
-        </else-if>
-        <else-if type="song">
-          <group delimiter="; ">
-            <text macro="secondary-contributors"/>
+        <if variable="reviewed-author" type="review review-book" match="any">
+          <group delimiter=", ">
             <choose>
-              <if variable="container-title" match="none">
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
                 <group delimiter=", ">
                   <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="medium" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
                 </group>
               </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
             </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
-        </else-if>
-        <else-if type="paper-conference">
-          <group delimiter=", ">
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
             <choose>
-              <if variable="container-title">
-                <text variable="genre" text-case="capitalize-first"/>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
               </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
             </choose>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="report">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript">
+        <choose>
+          <if variable="archive">
+            <!-- Assume manuscript with archive is historical/archival manuscript -->
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else>
             <text variable="medium" text-case="capitalize-first"/>
-          </group>
-        </else-if>
-        <else-if type="bill legislation legal_case patent treaty" match="none">
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
           <choose>
-            <if variable="genre medium" match="any">
+            <if variable="container-title" match="none">
               <group delimiter=", ">
                 <text variable="genre" text-case="capitalize-first"/>
                 <text variable="medium" text-case="capitalize-first"/>
               </group>
             </if>
-            <else-if type="dataset">
-              <text value="Data set"/>
-            </else-if>
           </choose>
-        </else-if>
-      </choose>
-    </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="container-title">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <text value="Data set"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
   </macro>
   <macro name="description-report">
     <choose>
@@ -632,7 +673,7 @@
             <text variable="genre" text-case="title"/>
             <!-- Replace with term="number" if that becomes available -->
             <text term="issue" form="short" text-case="capitalize-first"/>
-            <number variable="number"/>
+            <text variable="number"/>
           </group>
           <text macro="locators"/>
         </group>

From 58d4a6c25512bda50890ad35eca56e3541d915f6 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Mon, 17 Dec 2018 15:20:03 +0100
Subject: [PATCH 31/52] Fix manuscript formatting

---
 apa.csl | 60 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/apa.csl b/apa.csl
index fd4d7a0026..01300f0fb7 100644
--- a/apa.csl
+++ b/apa.csl
@@ -421,6 +421,9 @@
               <text variable="archive_location" prefix="(" suffix=")"/>
             </group>
           </if>
+          <else>
+            <text macro="publisher" suffix="."/>
+          </else>
         </choose>
       </else-if>
       <else>
@@ -487,7 +490,15 @@
         </if>
         <else-if type="thesis">
           <group delimiter="; ">
-            <text variable="genre" text-case="capitalize-first"/>
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
+            </group>
             <text macro="locators"/>
             <text macro="secondary-contributors"/>
           </group>
@@ -610,19 +621,8 @@
           </if>
         </choose>
       </else-if>
-      <else-if type="manuscript">
-        <choose>
-          <if variable="archive">
-            <!-- Assume manuscript with archive is historical/archival manuscript -->
-            <group delimiter=", ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <text variable="medium" text-case="capitalize-first"/>
-            </group>
-          </if>
-          <else>
-            <text variable="medium" text-case="capitalize-first"/>
-          </else>
-        </choose>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <else-if type="personal_communication">
         <text macro="secondary-contributors"/>
@@ -698,24 +698,24 @@
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="manuscript" match="any">
-        <group delimiter=", ">
-          <choose>
-            <if variable="archive" match="none">
-              <text variable="genre"/>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="archive"/>
-                <text variable="archive_location" prefix="(" suffix=")"/>
-              </group>
-            </else>
-          </choose>
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+      <if type="manuscript pamphlet" match="any">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <!-- Replace "archive" with "archive_collection" as that becomes available -->
+              <text variable="archive"/>
+              <text variable="archive_location" prefix="(" suffix=")"/>
+            </group>         
+          </group>
+          <group delimiter=", ">
+            <!-- Move "archive" here when "archive_collection" becomes available -->
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
         </group>
       </if>
-      <else-if type="graphic pamphlet personal_communication" match="any">
+      <else-if type="graphic personal_communication" match="any">
         <group delimiter=", ">
           <group delimiter=" ">
             <text variable="archive"/>

From e6e400d1f9759117f52f604a9ccbfe3c41b14cf7 Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Tue, 18 Dec 2018 10:25:57 +0100
Subject: [PATCH 32/52] Song author substitute

---
 apa.csl | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/apa.csl b/apa.csl
index 01300f0fb7..7093f2375e 100644
--- a/apa.csl
+++ b/apa.csl
@@ -212,15 +212,11 @@
               <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="container-title">
-                <text variable="title" form="short" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format"/>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
           </substitute>
         </names>
       </if>

From bf039b0f9668bcd9d36b4b2e3e5cfaf7c3e3114b Mon Sep 17 00:00:00 2001
From: bwiernik <github@wiernik.org>
Date: Tue, 18 Dec 2018 10:56:04 +0100
Subject: [PATCH 33/52] Remove short container title from treaty

To avoid triggering the Zotero MEDLINE checkbox
---
 apa.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index 7093f2375e..4286174d7e 100644
--- a/apa.csl
+++ b/apa.csl
@@ -1315,7 +1315,7 @@
       <else-if type="treaty">
         <group delimiter=" ">
           <number variable="volume"/>
-          <text variable="container-title" form="short"/>
+          <text variable="container-title"/>
           <text variable="page"/>
         </group>
       </else-if>

From 22d1cf652ed4a1ca93b05327756855b28bdbaba5 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Mon, 4 Feb 2019 14:59:32 -0500
Subject: [PATCH 34/52] Update handling of archival material

---
 apa.csl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apa.csl b/apa.csl
index 4286174d7e..d77c044a00 100644
--- a/apa.csl
+++ b/apa.csl
@@ -705,17 +705,19 @@
             </group>         
           </group>
           <group delimiter=", ">
-            <!-- Move "archive" here when "archive_collection" becomes available -->
+            <!-- Move "archive" and "archive-place" here when "archive_collection" becomes available -->
+            <!-- Move "publisher" and "publisher-place" between "genre" and "archive_collection"/"archive_location" when "archive_collection" becomes available -->
             <text variable="publisher"/>
             <text variable="publisher-place"/>
           </group>
         </group>
       </if>
-      <else-if type="graphic personal_communication" match="any">
+      <else-if type="thesis patent article-journal article-magazine article-newspaper post post-weblog webpage" match="none">
         <group delimiter=", ">
           <group delimiter=" ">
             <text variable="archive"/>
             <text variable="archive_location" prefix="(" suffix=")"/>
+            <!-- Same details as above regarding archive_collection -->
           </group> 
           <text variable="publisher"/>
           <text variable="publisher-place"/>

From a3c9067f97011d602d11830f58b62a0637a11ede Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Mon, 4 Feb 2019 15:02:59 -0500
Subject: [PATCH 35/52] Use full name for recipient

---
 apa.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index d77c044a00..8af77f00e8 100644
--- a/apa.csl
+++ b/apa.csl
@@ -132,7 +132,7 @@
             </choose>
             <names variable="recipient" delimiter=", ">
               <label form="verb" suffix=" "/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <name and="symbol" delimiter=", "/>
             </names>
           </group>
           <text variable="medium" text-case="capitalize-first"/>

From e912b15f3d6aebb083e5378740fcd753b725fa3d Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Mon, 4 Feb 2019 19:47:26 -0500
Subject: [PATCH 36/52] Fix handling of archives

---
 apa.csl | 130 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 74 insertions(+), 56 deletions(-)

diff --git a/apa.csl b/apa.csl
index 8af77f00e8..a1507f29a3 100644
--- a/apa.csl
+++ b/apa.csl
@@ -80,12 +80,12 @@
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report" match="any">
+      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
         <text macro="container-contributors-booklike"/>
       </if>
       <else-if type="paper-conference">
         <choose>
-          <if variable="editor collection-editor" match="any">
+          <if variable="collection-editor container-author editor" match="any">
             <text macro="container-contributors-booklike"/>
           </if>
         </choose>
@@ -173,7 +173,7 @@
       </else-if>
       <else-if type="paper-conference">
         <choose>
-          <if variable="editor collection-editor" match="any">
+          <if variable="collection-editor editor" match="any">
             <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
@@ -409,13 +409,20 @@
       </else-if>
       <else-if variable="archive">
         <choose>
-          <if type="article article-journal article-magazine article-newspaper dataset report thesis" match="any">
-            <group delimiter=" ">
-              <text term="retrieved" text-case="capitalize-first"/>
-              <text term="from"/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix="(" suffix=")"/>
-            </group>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <choose>
+              <if variable="archive-place" match="none">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <text term="from"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
+                </group>
+              </if>
+              <else>
+                <text macro="publisher" suffix="."/>
+              </else>
+            </choose>
           </if>
           <else>
             <text macro="publisher" suffix="."/>
@@ -639,7 +646,7 @@
       <else-if type="paper-conference">
         <group delimiter=", ">
           <choose>
-            <if variable="container-title">
+            <if variable="collection-editor editor issue page volume" match="any">
               <text variable="genre" text-case="capitalize-first"/>
             </if>
           </choose>
@@ -692,61 +699,71 @@
       </else>
     </choose>
   </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <choose>
+          <if type="manuscript">
+            <text variable="genre"/>
+          </if>
+        </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
   <macro name="publisher">
     <choose>
       <if type="manuscript pamphlet" match="any">
         <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="genre"/>
-            <group delimiter=" ">
-              <!-- Replace "archive" with "archive_collection" as that becomes available -->
-              <text variable="archive"/>
-              <text variable="archive_location" prefix="(" suffix=")"/>
-            </group>         
-          </group>
-          <group delimiter=", ">
-            <!-- Move "archive" and "archive-place" here when "archive_collection" becomes available -->
-            <!-- Move "publisher" and "publisher-place" between "genre" and "archive_collection"/"archive_location" when "archive_collection" becomes available -->
-            <text variable="publisher"/>
+          <group delimiter=": ">
             <text variable="publisher-place"/>
+            <text variable="publisher"/>
           </group>
+          <text macro="archive"/>
         </group>
       </if>
-      <else-if type="thesis patent article-journal article-magazine article-newspaper post post-weblog webpage" match="none">
-        <group delimiter=", ">
-          <group delimiter=" ">
-            <text variable="archive"/>
-            <text variable="archive_location" prefix="(" suffix=")"/>
-            <!-- Same details as above regarding archive_collection -->
-          </group> 
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-        </group>
-      </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <choose>
+              <if variable="publisher">
+                <text variable="publisher"/>
+              </if>
+              <else>
+                <text variable="authority"/>
+              </else>
+            </choose>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="article-journal article-magazine article-newspaper post post-weblog webpage" match="none">
+      <else-if type="article article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
         <choose>
           <if variable="event">
             <choose>
-              <if variable="container-title">
+              <!-- Only print publisher info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="any">
                 <group delimiter=": ">
                   <text variable="publisher-place"/>
                   <text variable="publisher"/>
@@ -761,6 +778,7 @@
             </group>
           </else>
         </choose>
+        <text macro="archive"/>
       </else-if>
     </choose>
   </macro>
@@ -769,7 +787,7 @@
       <if variable="event" type="speech paper-conference" match="any">
         <choose>
           <!-- Don't print event info if published in a proceedings -->
-          <if variable="container-title" match="none">
+          <if variable="collection-editor editor issue page volume" match="none">
             <group delimiter=" ">
               <text variable="genre" text-case="capitalize-first"/>
               <group delimiter=" ">
@@ -989,7 +1007,7 @@
       </else-if>
       <else-if type="paper-conference">
         <choose>
-          <if variable="editor collection-editor" match="any">
+          <if variable="collection-editor editor" match="any">
             <text macro="locators-booklike"/>
           </if>
           <else>
@@ -1136,7 +1154,7 @@
       </else-if>
       <else-if type="paper-conference">
         <choose>
-          <if variable="editor collection-editor" match="any">
+          <if variable="editor collection-editor container-author" match="any">
             <text macro="container-booklike"/>
           </if>
           <else>
@@ -1147,7 +1165,7 @@
           </else>
         </choose>
       </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map" match="any">
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
         <text macro="container-booklike"/>
       </else-if>
       <else-if type="bill legal_case legislation treaty" match="any">
@@ -1164,7 +1182,7 @@
             <text macro="container-contributors"/>
             <group delimiter=" ">
               <choose>
-                <if variable="editor translator" match="none">
+                <if variable="container-author editor translator" match="none">
                   <group delimiter=". ">
                     <group delimiter=": ">
                       <text variable="collection-title" font-style="italic" text-case="title"/>
@@ -1222,9 +1240,9 @@
       <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">
+      <else-if type="paper-conference speech">
         <choose>
-          <if variable="editor collection-editor" match="any">
+          <if variable="collection-editor container-author editor" match="any">
             <text variable="container-title" font-style="italic"/>
           </if>
           <else>

From 2ccc18c6050c8960d76ac0c73931fc96e66e647e Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Sun, 17 Feb 2019 19:12:38 -0500
Subject: [PATCH 37/52] Fix title-less interviews

---
 apa.csl | 102 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 68 insertions(+), 34 deletions(-)

diff --git a/apa.csl b/apa.csl
index a1507f29a3..ac209e3c06 100644
--- a/apa.csl
+++ b/apa.csl
@@ -94,10 +94,14 @@
   </macro>
   <macro name="secondary-contributors-booklike">
     <group delimiter="; ">
-      <names variable="interviewer">
-        <name and="symbol" initialize-with=". " delimiter=", "/>
-        <label form="short" prefix=", " text-case="title"/>
-      </names>
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
       <choose>
         <if variable="container-title" match="none">
           <group delimiter="; ">
@@ -164,8 +168,16 @@
         </choose>
       </else-if>
       <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <group>
-          <names variable="interviewer translator" delimiter="; ">
+        <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>
@@ -177,8 +189,16 @@
             <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <group>
-              <names variable="interviewer translator" delimiter="; ">
+            <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>
@@ -188,10 +208,14 @@
       </else-if>
       <else>
         <group delimiter="; ">
-          <names variable="interviewer">
-            <name and="symbol" initialize-with=". " delimiter="; "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
           <names variable="editor translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
@@ -436,41 +460,51 @@
   </macro>
   <macro name="title">
     <choose>
-      <if variable="version" type="book" match="all">
-        <!---This is a hack until we have a software type -->
-        <text variable="title"/>
-      </if>
-      <else-if type="treaty">
+      <if type="treaty">
         <group delimiter=", ">
           <text variable="title" text-case="title"/>
           <names variable="author">
             <name initialize-with="." form="short" delimiter="-"/>
           </names>
         </group>
-      </else-if>
+      </if>
       <else-if type="patent" variable="number" match="all">
         <text macro="patent-number" font-style="italic"/>
       </else-if>
-      <else-if variable="reviewed-author" type="review review-book" match="any">
+      <else-if variable="title">
         <choose>
-          <if variable="reviewed-title">
+          <if variable="version" type="book" match="all">
+            <!---This is a hack until we have a software type -->
+            <text variable="title"/>
+          </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
             <choose>
-              <if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title"/>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
               </if>
-              <else>
-                <text variable="title" font-style="italic"/>
-              </else>
             </choose>
-          </if>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
         </choose>
       </else-if>
-      <else-if type="post post-weblog webpage" variable="container-title" match="any">
-        <text variable="title"/>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
       </else-if>
-      <else>
-        <text variable="title" font-style="italic"/>
-      </else>
     </choose>
   </macro>
   <!-- APA has four descriptive sections following the title: -->
@@ -541,7 +575,7 @@
   <macro name="format">
     <group prefix="[" suffix="]">
       <choose>
-        <if variable="reviewed-author" type="review review-book" match="any">
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
           <group delimiter=", ">
             <choose>
               <if variable="genre">
@@ -589,7 +623,7 @@
   </macro>
   <macro name="format-short">
     <choose>
-      <if variable="reviewed-author" type="review review-book" match="any">
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
         <choose>
           <if variable="reviewed-title" match="none">
             <choose>
@@ -1378,7 +1412,7 @@
           <group delimiter=" ">
             <text macro="title"/>
             <choose>
-              <if variable="title">
+              <if variable="title interviewer" type="interview" match="any">
                 <group delimiter=" ">
                   <text macro="description"/>
                   <text macro="format"/>

From f05ea4c2ee4feac484177bf30a0c789b18be2f6f Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 12:00:30 -0500
Subject: [PATCH 38/52] Remove form="long" from Chapter locator

long is the default, and this yields correct formatting when multiple locators are specified with citeproc-js and pandoc-citeproc
---
 apa.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index ac209e3c06..d30ec61218 100644
--- a/apa.csl
+++ b/apa.csl
@@ -1110,7 +1110,7 @@
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>

From 41c9b339ab6d64e70f0fb85b43fe55c90ea08f29 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 13:56:59 -0500
Subject: [PATCH 39/52] Fix container information for whole reference books
 entered as entry

---
 apa.csl | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/apa.csl b/apa.csl
index d30ec61218..308c5c710f 100644
--- a/apa.csl
+++ b/apa.csl
@@ -1208,13 +1208,13 @@
     </choose>
   </macro>
   <macro name="container-booklike">
-    <choose>
-      <if variable="container-title collection-title" match="any">
-        <group delimiter=" ">
-          <text term="in" text-case="capitalize-first"/>
-          <group delimiter=", ">
-            <text macro="container-contributors"/>
-            <group delimiter=" ">
+    <group delimiter=" ">
+      <choose>
+        <if variable="container-title collection-title" match="any">
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <group delimiter=", ">
+              <text macro="container-contributors"/>
               <choose>
                 <if variable="container-author editor translator" match="none">
                   <group delimiter=". ">
@@ -1252,22 +1252,22 @@
                   </group>
                 </else>
               </choose>
-              <group delimiter="; " prefix="(" suffix=")">
-                <text macro="locators"/>
-                <choose>
-                  <if variable="container-author">
-                    <names variable="editor translator" delimiter="; ">
-                      <name and="symbol" initialize-with=". " delimiter=", "/>
-                      <label form="short" prefix=", " text-case="title"/>
-                    </names>
-                  </if>
-                </choose>
-              </group>
-            </group>  
+            </group>
           </group>
-        </group>
-      </if>
-    </choose>
+        </if>
+      </choose>
+      <group delimiter="; " prefix="(" suffix=")">
+        <text macro="locators"/>
+        <choose>
+          <if variable="container-author">
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </if>
+        </choose>
+      </group>
+    </group>
   </macro>
   <macro name="container-title">
     <choose>

From 887cbe048bbffe0b51d91d827531c47f155f09e0 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 14:33:44 -0500
Subject: [PATCH 40/52] Accomodate entry without byline and software with
 container-title

---
 apa.csl | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/apa.csl b/apa.csl
index 308c5c710f..04e80d7ef5 100644
--- a/apa.csl
+++ b/apa.csl
@@ -80,7 +80,8 @@
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
         <text macro="container-contributors-booklike"/>
       </if>
       <else-if type="paper-conference">
@@ -120,7 +121,8 @@
   </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
         <text macro="secondary-contributors-booklike"/>
       </if>
       <else-if type="personal_communication">
@@ -257,6 +259,14 @@
             </names>
             <choose>
               <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
                 <names variable="translator">
                   <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"/>
@@ -360,7 +370,14 @@
             <names variable="director"/>
             <choose>
               <if variable="container-title">
-                <names variable="translator"/>
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
               </if>
             </choose>
             <names variable="editor"/>
@@ -512,7 +529,8 @@
   <macro name="description">
     <group prefix="(" suffix=")">
       <choose>
-        <if type="report">
+        <!-- book is here to catch software with container titles -->
+        <if type="book report">
           <choose>
             <if variable="container-title">
               <text macro="secondary-contributors"/>
@@ -651,7 +669,8 @@
       <else-if type="speech thesis" match="any">
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="report">
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report">
         <choose>
           <if variable="container-title" match="none">
             <text macro="format-report"/>
@@ -1157,7 +1176,8 @@
           </if>
         </choose>
       </else-if>
-      <else-if type="report" variable="container-title" match="all">
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" variable="container-title" match="all">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
@@ -1199,7 +1219,7 @@
           </else>
         </choose>
       </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
         <text macro="container-booklike"/>
       </else-if>
       <else-if type="bill legal_case legislation treaty" match="any">

From 47242c7c3d3e10e475cb5333e3c920b551637194 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 14:54:56 -0500
Subject: [PATCH 41/52] Change placement of container-author

Prioritize editor/translator and place container-author in (description) if they are present. APA says that authored books should be cited as a whole, rather than individually as sections, so this priority seems more in line with that.
---
 apa.csl | 44 ++++++++++++++------------------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/apa.csl b/apa.csl
index 04e80d7ef5..9a4f4bc952 100644
--- a/apa.csl
+++ b/apa.csl
@@ -54,27 +54,15 @@
   <macro name="container-contributors-booklike">
     <choose>
       <if variable="container-title">
-        <choose>
-          <if variable="container-author">
-            <group>
-              <names variable="container-author">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=" (" text-case="title" suffix=")"/>
-              </names>
-            </group>
-          </if>
-          <else>
-            <group>
-              <names variable="editor translator" delimiter=", &amp; ">
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-                <label form="short" prefix=" (" text-case="title" suffix=")"/>
-                <substitute>
-                  <names variable="collection-editor"/>
-                </substitute>
-              </names>
-            </group>
-          </else>
-        </choose>
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
@@ -107,8 +95,8 @@
         <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=", "/>
-              <label form="short" prefix=", " text-case="title"/>
             </names>
             <names variable="editor translator" delimiter="; ">
               <name and="symbol" initialize-with=". " delimiter=", "/>
@@ -1278,14 +1266,10 @@
       </choose>
       <group delimiter="; " prefix="(" suffix=")">
         <text macro="locators"/>
-        <choose>
-          <if variable="container-author">
-            <names variable="editor translator" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-          </if>
-        </choose>
+        <names variable="container-author">
+          <label form="verb-short" suffix=" " text-case="title"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
       </group>
     </group>
   </macro>

From 9af1996f42e7a922542bb867504cec7945ddbb89 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 16:03:25 -0500
Subject: [PATCH 42/52] Put the conditional back into container-booklike

---
 apa.csl | 92 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/apa.csl b/apa.csl
index 9a4f4bc952..ee492d5304 100644
--- a/apa.csl
+++ b/apa.csl
@@ -1216,62 +1216,60 @@
     </choose>
   </macro>
   <macro name="container-booklike">
-    <group delimiter=" ">
-      <choose>
-        <if variable="container-title collection-title" match="any">
-          <group delimiter=" ">
-            <text term="in" text-case="capitalize-first"/>
-            <group delimiter=", ">
-              <text macro="container-contributors"/>
-              <choose>
-                <if variable="container-author editor translator" match="none">
-                  <group delimiter=". ">
-                    <group delimiter=": ">
-                      <text variable="collection-title" font-style="italic" text-case="title"/>
-                      <choose>
-                        <if variable="collection-title">
-                          <group delimiter=" ">
-                            <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                            <number variable="collection-number" font-style="italic" form="numeric"/>
-                            <choose>
-                              <if variable="collection-number" match="none">
-                                <number variable="volume" font-style="italic" form="numeric"/>
-                              </if>
-                            </choose>
-                          </group>
-                        </if>
-                      </choose>
-                    </group>
-                    <text macro="container-title"/>
-                  </group>
-                </if>
-                <else>
-                  <!-- Replace with volume-title as that becomes available -->
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
                   <group delimiter=": ">
-                    <text macro="container-title"/>
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
                     <choose>
-                      <if is-numeric="volume" match="none">
+                      <if variable="collection-title">
                         <group delimiter=" ">
                           <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                          <text variable="volume" font-style="italic"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
                         </group>
                       </if>
                     </choose>
                   </group>
-                </else>
-              </choose>
-            </group>
+                  <text macro="container-title"/>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
           </group>
-        </if>
-      </choose>
-      <group delimiter="; " prefix="(" suffix=")">
-        <text macro="locators"/>
-        <names variable="container-author">
-          <label form="verb-short" suffix=" " text-case="title"/>
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-        </names>
-      </group>
-    </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </group>
+      </if>
+    </choose>
   </macro>
   <macro name="container-title">
     <choose>

From 5d22378e54d027c7b067127ebab0b91b5e517870 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 16:41:48 -0500
Subject: [PATCH 43/52] Fix container title non-numeric volume display for
 editor-less containers

---
 apa.csl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/apa.csl b/apa.csl
index ee492d5304..7567dd96fd 100644
--- a/apa.csl
+++ b/apa.csl
@@ -1241,7 +1241,18 @@
                       </if>
                     </choose>
                   </group>
-                  <text macro="container-title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
                 </group>
               </if>
               <else>

From db5aac737731f9bf27903ed3b9143d86fa18ef78 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 17:16:08 -0500
Subject: [PATCH 44/52] Fix non-archival manuscripts

---
 apa.csl | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/apa.csl b/apa.csl
index 7567dd96fd..61e1b0ad62 100644
--- a/apa.csl
+++ b/apa.csl
@@ -763,13 +763,24 @@
   <macro name="publisher">
     <choose>
       <if type="manuscript pamphlet" match="any">
-        <group delimiter=". ">
-          <group delimiter=": ">
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
-          </group>
-          <text macro="archive"/>
-        </group>
+        <choose>
+          <if variable="archive archive_location" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
         <group delimiter=". ">

From cae0ae413311783262376171ecae7031e3a89a54 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 17:47:41 -0500
Subject: [PATCH 45/52] Fix delimiter

---
 apa.csl | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/apa.csl b/apa.csl
index 61e1b0ad62..44d52e045e 100644
--- a/apa.csl
+++ b/apa.csl
@@ -811,26 +811,28 @@
         <text macro="archive"/>
       </else-if>
       <else-if type="post post-weblog webpage" match="none">
-        <choose>
-          <if variable="event">
-            <choose>
-              <!-- Only print publisher info if published in a proceedings -->
-              <if variable="collection-editor editor issue page volume" match="any">
-                <group delimiter=": ">
-                  <text variable="publisher-place"/>
-                  <text variable="publisher"/>
-                </group>
-              </if>
-            </choose>
-          </if>
-          <else> 
-            <group delimiter=": ">
-              <text variable="publisher-place"/>
-              <text variable="publisher"/>
-            </group>
-          </else>
-        </choose>
-        <text macro="archive"/>
+        <group delimiter=". ">
+          <choose>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
+            </if>
+            <else> 
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+            </else>
+          </choose>
+          <text macro="archive"/>
+        </group>
       </else-if>
     </choose>
   </macro>

From d4eae2c1c408f79b25e9b363510617f15173ff6b Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Feb 2019 18:24:18 -0500
Subject: [PATCH 46/52] Fix preprint publisher

---
 apa.csl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apa.csl b/apa.csl
index 44d52e045e..2b9a4f32d8 100644
--- a/apa.csl
+++ b/apa.csl
@@ -764,7 +764,7 @@
     <choose>
       <if type="manuscript pamphlet" match="any">
         <choose>
-          <if variable="archive archive_location" match="any">
+          <if variable="archive archive_location archive-place" match="any">
             <group delimiter=". ">
               <group delimiter=": ">
                 <text variable="publisher-place"/>
@@ -807,7 +807,7 @@
           <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="article article-journal article-magazine article-newspaper" match="any">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
         <text macro="archive"/>
       </else-if>
       <else-if type="post post-weblog webpage" match="none">

From ef0ffe01ac81d8dc569f4f1843a0516ca2cc0a51 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Tue, 19 Mar 2019 16:16:58 -0400
Subject: [PATCH 47/52] Address comments from adamsmith

- "book report" match="any"
- Commenting about logic
- Localization notes
---
 apa.csl | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/apa.csl b/apa.csl
index 2b9a4f32d8..6f9bfe50b1 100644
--- a/apa.csl
+++ b/apa.csl
@@ -439,6 +439,7 @@
       <else-if variable="archive">
         <choose>
           <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
               <if variable="archive-place" match="none">
                 <group delimiter=" ">
@@ -518,7 +519,7 @@
     <group prefix="(" suffix=")">
       <choose>
         <!-- book is here to catch software with container titles -->
-        <if type="book report">
+        <if type="book report" match="any">
           <choose>
             <if variable="container-title">
               <text macro="secondary-contributors"/>
@@ -658,7 +659,7 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- book is here to catch software with container titles -->
-      <else-if type="book report">
+      <else-if type="book report" match="any">
         <choose>
           <if variable="container-title" match="none">
             <text macro="format-report"/>
@@ -703,6 +704,7 @@
             </group>
           </if>
           <else-if type="dataset">
+            <!-- This should be localized -->
             <text value="Data set"/>
           </else-if>
         </choose>
@@ -935,6 +937,7 @@
         <if type="personal_communication">
           <choose>
             <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
               <date variable="issued" form="text"/>
             </if>
             <else>
@@ -1178,7 +1181,20 @@
         </choose>
       </else-if>
       <!-- book is here to catch software with container titles -->
-      <else-if type="book report" variable="container-title" match="all">
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">

From d300778cf059d7e70c1c85360924b022003d357c Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 20 Mar 2019 15:29:48 -0400
Subject: [PATCH 48/52] Fix patent rendering

---
 apa.csl | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/apa.csl b/apa.csl
index 6f9bfe50b1..7a6f1eccc2 100644
--- a/apa.csl
+++ b/apa.csl
@@ -398,18 +398,33 @@
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
-      <text variable="genre"/>
-      <text term="issue" form="short" text-case="capitalize-first"/>
-      <text variable="number"/>
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
+      </group>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if variable="DOI" match="any">
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="patent">
+        <text macro="publisher" suffix="."/>
+      </else-if>
+      <else-if variable="DOI" match="any">
         <text variable="DOI" prefix="https://doi.org/"/>
-      </if>
+      </else-if>
       <else-if variable="URL">
         <group delimiter=" ">
           <text term="retrieved" text-case="capitalize-first"/>
@@ -797,14 +812,7 @@
         <group delimiter=". ">
           <group delimiter=": ">
             <text variable="publisher-place"/>
-            <choose>
-              <if variable="publisher">
-                <text variable="publisher"/>
-              </if>
-              <else>
-                <text variable="authority"/>
-              </else>
-            </choose>
+            <text variable="publisher"/>
           </group>
           <text macro="archive"/>
         </group>

From 214d6d7799fc8dcd5506e2a55971649aa2d288e1 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Fri, 22 Mar 2019 10:56:57 -0400
Subject: [PATCH 49/52] Let URL/DOI replace publisher for patents

I emailed APA Style and they indicated that this was acceptable.
---
 apa.csl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apa.csl b/apa.csl
index 7a6f1eccc2..57ecdb3c37 100644
--- a/apa.csl
+++ b/apa.csl
@@ -419,9 +419,6 @@
   <macro name="access">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="patent">
-        <text macro="publisher" suffix="."/>
-      </else-if>
       <else-if variable="DOI" match="any">
         <text variable="DOI" prefix="https://doi.org/"/>
       </else-if>

From af852eaa58d5918f45b74c2795681e8439ef8867 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Sat, 23 Mar 2019 22:35:34 -0400
Subject: [PATCH 50/52] Update other APA styles

---
 apa-annotated-bibliography.csl | 1411 +++++++++++++++++++++--------
 apa-cv.csl                     | 1523 +++++++++++++++++++++++++-------
 apa-no-ampersand.csl           | 1416 +++++++++++++++++++++--------
 apa-no-doi-no-issue.csl        | 1427 +++++++++++++++++++++++-------
 apa-old-doi-prefix.csl         | 1409 ++++++++++++++++++++++-------
 apa-single-spaced.csl          | 1413 +++++++++++++++++++++--------
 6 files changed, 6539 insertions(+), 2060 deletions(-)

diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index b58178ecb8..db0d54dd78 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -1,15 +1,20 @@
 <?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">
+<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 6th edition (annotated bibliography with abstract)</title>
     <title-short>APA</title-short>
     <id>http://www.zotero.org/styles/apa-annotated-bibliography</id>
     <link href="http://www.zotero.org/styles/apa-annotated-bibliography" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
     <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
     <author>
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -24,15 +29,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <summary>APA style with abstract added as annotation in bibliography</summary>
-    <updated>2013-02-26T04:33:40+00:00</updated>
+    <updated>2016-09-28T13: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">
@@ -42,6 +42,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -49,341 +52,822 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="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>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="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>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" 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"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <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>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <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>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="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">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <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>
+              </if>
+            </choose>
+            <names variable="editor translator" 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 type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -398,7 +882,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -409,7 +893,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -444,6 +938,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -466,21 +985,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -498,7 +1007,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -518,7 +1027,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -544,85 +1053,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -633,17 +1150,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -651,62 +1319,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <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="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -719,7 +1431,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -745,15 +1457,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
diff --git a/apa-cv.csl b/apa-cv.csl
index b9cca6aabc..d3720280ff 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -1,19 +1,20 @@
 <?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">
+<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 6th edition (curriculum vitae, sorted by descending date)</title>
     <title-short>APA</title-short>
     <id>http://www.zotero.org/styles/apa-cv</id>
     <link href="http://www.zotero.org/styles/apa-cv" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
     <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
     <author>
-      <name>Joseph Reagle</name>
-      <email>joseph.2011@reagle.org</email>
-    </author>
-    <contributor>
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
-    </contributor>
+    </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -28,15 +29,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <summary>APA style for CVs, in-line citations becomes references; redundant bibliography is sorted by date (descending), then title, then author</summary>
-    <updated>2018-05-14T04:33:40+00:00</updated>
+    <updated>2016-09-28T13: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">
@@ -46,6 +42,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -53,297 +52,822 @@
       <term name="from">de</term>
     </terms>
   </locale>
+  <macro name="container-contributors-booklike">
+    <choose>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
+      </if>
+    </choose>
+  </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
       </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
     </choose>
   </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="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>
+    </group>
+  </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="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>
-          <names variable="editor translator" delimiter=", ">
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="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>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <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>
+          <names variable="editor translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
+      </else>
     </choose>
   </macro>
   <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" 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"/>
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="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">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <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>
+              </if>
+            </choose>
+            <names variable="editor translator" 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 type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="patent" variable="number" match="all">
+        <text macro="patent-number"/>
+      </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
           </if>
           <else>
-            <text macro="title"/>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <names variable="translator"/>
+            <choose>
+              <if type="report" variable="publisher" match="all">
+                <text variable="publisher"/>
+              </if>
+              <else-if type="legal_case">
+                <text variable="title" font-style="italic"/>
+              </else-if>
+              <else-if type="bill legislation" match="any">
+                <text variable="title" form="short"/>
+              </else-if>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </else-if>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
+                <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -358,7 +882,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -369,44 +893,121 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
+          </choose>
+        </group>
+      </else-if>
+      <else-if variable="status">
+        <group>
+          <text variable="status" text-case="lowercase"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else-if>
+      <else>
+        <group>
+          <text term="no date" form="short"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <choose>
+            <if is-uncertain-date="original-date">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </if>
+            <else>
+              <date variable="original-date">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+          <choose>
+            <if is-uncertain-date="issued">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <text macro="issued-year"/>
+              </group>
+            </if>
+            <else>
+              <text macro="issued-year"/>
+            </else>
           </choose>
         </group>
-      </else-if>
+      </if>
       <else-if variable="status">
-        <group>
-          <text variable="status" text-case="lowercase"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="issued-sort">
-    <choose>
-      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-          <date-part name="month"/>
-          <date-part name="day"/>
-        </date>
-      </if>
-      <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
       </else>
     </choose>
   </macro>
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -426,7 +1027,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -452,93 +1053,265 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+          </group>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
           </group>
         </group>
       </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
         </group>
       </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
       </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
     </choose>
   </macro>
-  <macro name="container">
+  <macro name="container-booklike">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -546,67 +1319,111 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <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="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
   </macro>
-  <citation et-al-min="8" et-al-use-first="6" et-al-use-last="true">
+  <citation et-al-min="8" et-al-use-first="6" et-al-use-last="true" disambiguate-add-year-suffix="true">
     <sort>
       <key macro="issued-sort" sort="descending"/>
       <key macro="author"/>
@@ -627,15 +1444,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -676,15 +1504,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 25d2cc837e..2a2db6f144 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.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" demote-non-dropping-particle="never">
+<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 6th edition (no ampersand)</title>
     <title-short>APA</title-short>
@@ -11,6 +11,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -25,14 +29,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2015-05-14T11:18:00+00:00</updated>
+    <updated>2016-09-28T13: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">
@@ -42,343 +42,832 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <locale xml:lang="es">
+    <terms>
+      <term name="from">de</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="text" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="text" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="text" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="text" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="text" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="text" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="text" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
             <name and="text" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" 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"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="text" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="text" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="text" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="text" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="text" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="text" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="text" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="text" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -393,7 +882,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -404,7 +893,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -439,6 +938,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -461,21 +985,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -493,7 +1007,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -513,7 +1027,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -539,85 +1053,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -628,17 +1150,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -646,75 +1319,119 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <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="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
-      <key macro="author"/>
+      <key macro="author" names-min="8" names-use-first="6"/>
       <key macro="issued-sort"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -740,15 +1457,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 222e77d6ad..c6675ce6a6 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.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" demote-non-dropping-particle="never">
+<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 6th edition (no DOIs, no issue numbers)</title>
     <title-short>APA</title-short>
@@ -10,6 +10,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -24,15 +28,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <summary>APA 6th edition, but without DOIs and issue numbers, as used in a number of journals like Organization Studies</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2016-09-28T13: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">
@@ -42,6 +41,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -49,342 +51,836 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="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>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="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>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" 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"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <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>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <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>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="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">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <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>
+              </if>
+            </choose>
+            <names variable="editor translator" 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 type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
         <choose>
-          <if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
+          <if variable="page"/>
+          <else>
+            <text macro="online-access"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <choose>
+          <if variable="publisher page" match="any">
+            <text macro="publisher" suffix="."/>
           </if>
           <else>
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
+            <text macro="online-access"/>
           </else>
         </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="online-access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
-      <else>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="page" match="none">
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if variable="DOI">
-                <text variable="DOI" prefix="doi:"/>
+              <if variable="archive-place" match="none">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <text term="from"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
+                </group>
               </if>
               <else>
-                <choose>
-                  <if type="webpage">
-                    <group delimiter=" ">
-                      <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                      <group>
-                        <date variable="accessed" form="text" suffix=", "/>
-                      </group>
-                      <text term="from"/>
-                      <text variable="URL"/>
-                    </group>
-                  </if>
-                  <else>
-                    <group>
-                      <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                      <text term="from" suffix=" "/>
-                      <text variable="URL"/>
-                    </group>
-                  </else>
-                </choose>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
           </if>
+          <else>
+            <text macro="publisher" suffix="."/>
+          </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
-          </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -399,7 +895,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -410,7 +906,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -445,6 +951,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -467,21 +998,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -499,7 +1020,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -519,7 +1040,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -545,84 +1066,100 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
+      <else-if type="article-magazine">
+        <group delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </else-if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -633,17 +1170,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -651,62 +1339,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <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="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -719,7 +1451,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -745,15 +1477,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index 9eed529af8..28d3191202 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.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" demote-non-dropping-particle="never">
+<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 6th edition ("doi:" DOI prefix)</title>
     <title-short>APA</title-short>
@@ -10,6 +10,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -24,14 +28,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2015-10-25T09:01:49+00:00</updated>
+    <updated>2016-09-28T13: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">
@@ -41,6 +41,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -48,341 +51,822 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="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>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="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>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" 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"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <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>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <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>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="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">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <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>
+              </if>
+            </choose>
+            <names variable="editor translator" 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 type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="doi:/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="doi: "/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="doi:"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -397,7 +881,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -408,7 +892,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -443,6 +937,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -465,21 +984,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -497,7 +1006,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -517,7 +1026,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -543,85 +1052,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -632,17 +1149,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -650,62 +1318,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <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="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -718,7 +1430,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -744,15 +1456,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index cd8eb8dfcd..e6da6f581e 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.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" demote-non-dropping-particle="never">
+<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 6th edition (single-spaced bibliography)</title>
     <title-short>APA</title-short>
@@ -11,6 +11,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -25,14 +29,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2014-07-06T15:22:58+00:00</updated>
+    <updated>2016-09-28T13: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">
@@ -42,6 +42,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -49,341 +52,822 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="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>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="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>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" 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"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <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>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <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>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="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">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <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>
+              </if>
+            </choose>
+            <names variable="editor translator" 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 type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -398,7 +882,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -409,7 +893,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -444,6 +938,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -466,21 +985,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -498,7 +1007,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -518,7 +1027,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -544,85 +1053,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -633,17 +1150,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -651,62 +1319,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <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="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -719,7 +1431,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -745,15 +1457,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -764,12 +1487,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>

From ddb9be46e708b6f40097db647624025388f5099b Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Sat, 23 Mar 2019 22:43:24 -0400
Subject: [PATCH 51/52] Update apa-cv.csl

Remove unused macros to pass Travis. Also add `annote` as block variable to permit display of common CV annotations (e.g., awards, authorship notes).
---
 apa-cv.csl | 166 +----------------------------------------------------
 1 file changed, 2 insertions(+), 164 deletions(-)

diff --git a/apa-cv.csl b/apa-cv.csl
index d3720280ff..5941a96d28 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -289,115 +289,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="author-short">
-    <choose>
-      <if type="patent" variable="number" match="all">
-        <text macro="patent-number"/>
-      </if>
-      <else-if type="treaty">
-        <text variable="title" form="short"/>
-      </else-if>
-      <else-if type="personal_communication">
-        <choose>
-          <if variable="archive DOI publisher URL" match="none">
-            <group delimiter=", ">
-              <names variable="author">
-                <name and="symbol" delimiter=", " initialize-with=". "/>
-                <substitute>
-                  <text variable="title" form="short" quotes="true"/>
-                </substitute>
-              </names>
-              <!-- This should be localized -->
-              <text value="personal communication"/>
-            </group>
-          </if>
-          <else>
-            <names variable="author" delimiter=", ">
-              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-              <substitute>
-                <names variable="editor"/>
-                <names variable="translator"/>
-                <choose>
-                  <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" font-style="italic"/>
-                  </else>
-                </choose>
-                <text macro="format-short" prefix="[" suffix="]"/>
-              </substitute>
-            </names>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="song">
-        <names variable="composer" delimiter=", ">
-          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-          <substitute>
-            <names variable="original-author"/>
-            <names variable="author"/>
-            <names variable="translator"/>
-             <choose>
-              <if variable="container-title">
-                <text variable="title" form="short" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
-          </substitute>
-        </names>
-      </else-if>
-      <else>
-        <names variable="author" delimiter=", ">
-          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-          <substitute>
-            <names variable="illustrator"/>
-            <names variable="composer"/>
-            <names variable="director"/>
-            <choose>
-              <if variable="container-title">
-                <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text variable="title" form="short" quotes="true"/>
-                  </if>
-                  <else>
-                    <names variable="translator"/>
-                  </else>
-                </choose>
-              </if>
-            </choose>
-            <names variable="editor"/>
-            <names variable="editorial-director"/>
-            <names variable="translator"/>
-            <choose>
-              <if type="report" variable="publisher" match="all">
-                <text variable="publisher"/>
-              </if>
-              <else-if type="legal_case">
-                <text variable="title" font-style="italic"/>
-              </else-if>
-              <else-if type="bill legislation" match="any">
-                <text variable="title" form="short"/>
-              </else-if>
-              <else-if variable="reviewed-author" type="review review-book" match="any">
-                <text macro="format-short" prefix="[" suffix="]"/>
-              </else-if>
-              <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
-              </else-if>
-              <else>
-                <text variable="title" form="short" font-style="italic"/>
-              </else>
-            </choose>
-            <text macro="format-short" prefix="[" suffix="]"/>
-          </substitute>
-        </names>
-      </else>
-    </choose>
-  </macro>
   <macro name="patent-number">
     <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
@@ -962,48 +853,6 @@
       <text variable="year-suffix"/>
     </group>
   </macro>
-  <macro name="issued-citation">
-    <choose>
-      <if variable="issued">
-        <group delimiter="/">
-          <choose>
-            <if is-uncertain-date="original-date">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <date variable="original-date">
-                  <date-part name="year"/>
-                </date>
-              </group>
-            </if>
-            <else>
-              <date variable="original-date">
-                <date-part name="year"/>
-              </date>
-            </else>
-          </choose>
-          <choose>
-            <if is-uncertain-date="issued">
-              <group prefix="[" suffix="]" delimiter=" ">
-                <text term="circa" form="short"/>
-                <text macro="issued-year"/>
-              </group>
-            </if>
-            <else>
-              <text macro="issued-year"/>
-            </else>
-          </choose>
-        </group>
-      </if>
-      <else-if variable="status">
-        <text variable="status" text-case="lowercase"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else-if>
-      <else>
-        <text term="no date" form="short"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else>
-    </choose>
-  </macro>
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
@@ -1135,19 +984,6 @@
       </group>
     </group>
   </macro>
-  <macro name="citation-locator">
-    <group>
-      <choose>
-        <if locator="chapter">
-          <label variable="locator" text-case="capitalize-first"/>
-        </if>
-        <else>
-          <label variable="locator" form="short"/>
-        </else>
-      </choose>
-      <text variable="locator" prefix=" "/>
-    </group>
-  </macro>
   <macro name="container">
     <choose>
       <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
@@ -1481,6 +1317,7 @@
           </group>
         </else-if>
       </choose>
+      <text variable="annote" display="block"/>
     </layout>
   </citation>
   <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
@@ -1541,6 +1378,7 @@
           </group>
         </else-if>
       </choose>
+      <text variable="annote" display="block"/>
     </layout>
   </bibliography>
 </style>

From e7241874578f25ee4aadc1861ef26f35f89e9a51 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Sat, 23 Mar 2019 22:49:21 -0400
Subject: [PATCH 52/52] Update apa-cv.csl

Remove one more unused macro from apa-cv
---
 apa-cv.csl | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/apa-cv.csl b/apa-cv.csl
index 5941a96d28..e08e3db6ea 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -828,31 +828,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="issued-year">
-    <group>
-      <choose>
-        <if type="personal_communication">
-          <choose>
-            <if variable="archive DOI publisher URL" match="none">
-              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
-              <date variable="issued" form="text"/>
-            </if>
-            <else>
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
-            </else>
-          </choose>
-        </if>
-        <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-        </else>
-      </choose>
-      <text variable="year-suffix"/>
-    </group>
-  </macro>
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>