From 06ab36eb021efffb60e1fd81f90f1e431c217f67 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 2 Oct 2021 11:29:29 -0400
Subject: [PATCH] etc/csl: Update files to latest versions

* etc/csl/chicago-author-date.csl:
* etc/csl/locales-en-US.xml: Catch up to latest upstream version.

chicago-author-date.csl is from commit
e22b8a566bad9b4c7f52720f60dd875057a5d210
(https://github.com/citation-style-language/styles), and
locales-en-US.xml is from commit
495f88863723df52ca10506eb4c2ed246aa37f2f
(https://github.com/citation-style-language/locales).

Link: https://list.orgmode.org/CAF-FPGO1kDOR2Nr8QOuP_jV-pxkxE=HA1Vx0TvhBjBe7M+fu4w@mail.gmail.com
---
 etc/csl/chicago-author-date.csl | 62 ++++++++++++++++++++-------------
 etc/csl/locales-en-US.xml       |  9 +++++
 2 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/etc/csl/chicago-author-date.csl b/etc/csl/chicago-author-date.csl
index d066efa20..8c133354b 100644
--- a/etc/csl/chicago-author-date.csl
+++ b/etc/csl/chicago-author-date.csl
@@ -20,11 +20,20 @@
     <contributor>
       <name>Andrew Dunning</name>
       <email>andrew.dunning@utoronto.ca</email>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
+    </contributor>
+    <contributor>
+      <name>Matthew Roth</name>
+      <email>matthew.g.roth@yale.edu</email>
+      <uri> https://orcid.org/0000-0001-7902-6331</uri>
+    </contributor>
+    <contributor>
+      <name>Brenton M. Wiernik</name>
     </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>The author-date variant of the Chicago style</summary>
-    <updated>2017-10-12T12:00:00+00:00</updated>
+    <updated>2018-01-24T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -32,16 +41,13 @@
       <term name="editor" form="verb-short">ed.</term>
       <term name="container-author" form="verb">by</term>
       <term name="translator" form="verb-short">trans.</term>
-      <term name="editortranslator" form="verb">
-        <single>edited and translated by</single>
-        <multiple>edited and translated by</multiple>
-      </term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
       <term name="translator" form="short">trans.</term>
     </terms>
   </locale>
   <macro name="secondary-contributors">
     <choose>
-      <if type="chapter paper-conference" match="none">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
         <group delimiter=". ">
           <names variable="editor translator" delimiter=". ">
             <label form="verb" text-case="capitalize-first" suffix=" "/>
@@ -57,7 +63,7 @@
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <group prefix=", " delimiter=", ">
           <names variable="container-author" delimiter=", ">
             <label form="verb" suffix=" "/>
@@ -250,7 +256,7 @@
           </else>
         </choose>
       </if>
-      <else-if type="chapter paper-conference" match="any">
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" " prefix=", ">
@@ -317,7 +323,7 @@
           </group>
         </group>
       </else-if>
-      <else-if type="chapter paper-conference" match="any">
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <choose>
           <if variable="page" match="none">
             <group prefix=". ">
@@ -331,7 +337,7 @@
   </macro>
   <macro name="locators-chapter">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <choose>
           <if variable="page">
             <group prefix=", ">
@@ -360,7 +366,7 @@
       <else-if type="article-journal">
         <choose>
           <if variable="volume issue" match="any">
-            <text variable="page" prefix=":"/>
+            <text variable="page" prefix=": "/>
           </if>
           <else>
             <text variable="page" prefix=", "/>
@@ -407,7 +413,7 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <text macro="container-prefix" suffix=" "/>
       </if>
     </choose>
@@ -416,14 +422,14 @@
         <text variable="container-title" text-case="title"/>
       </if>
       <else-if type="legal_case" match="none">
-	<group delimiter=" ">
-        <text variable="container-title" text-case="title" font-style="italic"/>
-	<choose>
-	  <if type="post-weblog">
-	    <text value="(blog)"/>
-	  </if>
-	</choose>
-	  </group>
+        <group delimiter=" ">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+          <choose>
+            <if type="post-weblog">
+              <text value="(blog)"/>
+            </if>
+          </choose>
+        </group>
       </else-if>
     </choose>
   </macro>
@@ -506,14 +512,21 @@
     </choose>
   </macro>
   <macro name="event">
-    <group>
-      <text term="presented at" suffix=" "/>
+    <group delimiter=" ">
+      <choose>
+        <if variable="genre">
+          <text term="presented at"/>
+        </if>
+        <else>
+          <text term="presented at" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <text variable="event"/>
     </group>
   </macro>
   <macro name="description">
     <choose>
-      <if type="interview">
+      <if variable="interviewer" type="interview" match="any">
         <group delimiter=". ">
           <text macro="interviewer"/>
           <text variable="medium" text-case="capitalize-first"/>
@@ -581,6 +594,7 @@
           </group>
         </group>
       </else-if>
+      <else-if type="article-journal" match="any"/>
       <else>
         <group prefix=". " delimiter=", ">
           <choose>
@@ -593,7 +607,7 @@
       </else>
     </choose>
   </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <choose>
diff --git a/etc/csl/locales-en-US.xml b/etc/csl/locales-en-US.xml
index a5e95dfb2..be78c5e81 100644
--- a/etc/csl/locales-en-US.xml
+++ b/etc/csl/locales-en-US.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="en-US">
   <info>
+    <translator>
+      <name>Andrew Dunning</name>
+    </translator>
+    <translator>
+      <name>Sebastian Karcher</name>
+    </translator>
+    <translator>
+      <name>Rintze M. Zelle</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
     <updated>2015-10-10T23:31:02+00:00</updated>
   </info>