Merge branch 'citation-style-language:master' into patch-1

citation-style-language · Nov 20, 2023 · 909f4d5 · 909f4d5
2 parents 7db30a3 + 5bea241
commit 909f4d5
Show file tree

Hide file tree

Showing 238 changed files with 24,786 additions and 10,201 deletions.
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -109,13 +109,13 @@ jobs:
         cd release
         git rm composer.json
     
-    - uses: stefanzweifel/git-auto-commit-action@v4
+    - uses: stefanzweifel/git-auto-commit-action@v5
       with:
         repository: 'release'
         commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
       if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true' || steps.update.outputs.updated_composer == 'true' || steps.update.outputs.deleted_composer == 'true')
 
-    - uses: stefanzweifel/git-auto-commit-action@v4
+    - uses: stefanzweifel/git-auto-commit-action@v5
       with:
         repository: 'release'
         commit_message: ${{ github.event.inputs.commit_message }}
@@ -125,7 +125,7 @@ jobs:
     - name: ping Zotero servers
       if: github.repository == 'citation-style-language/styles'
       run: |
-        curl -H 'Content-Length:' -H "Authorization: $ZOTERO_UPDATE_TOKEN" -F 'payload={"type":"push","branch":"${{ steps.release.outputs.branch }}","status":0,"commit":"'$GITHUB_SHA'"}' https://styles-update.zotero.org:8826/
+        curl -H 'Content-Length:' -H "Authorization: $ZOTERO_UPDATE_TOKEN" -d 'payload={"type":"push","branch":"${{ steps.release.outputs.branch }}","status":0,"commit":"'$GITHUB_SHA'"}' https://styles-update.zotero.org:8826/
 
     - name: Copy workflows to locales repository
       if: github.repository == 'citation-style-language/styles' && steps.update.outputs.workflows == 'true'

diff --git a/.github/workflows/sheldon.yaml b/.github/workflows/sheldon.yaml
@@ -84,7 +84,7 @@ jobs:
     - name: commit reindented styles
       if: github.repository == 'citation-style-language/styles' && steps.changed.outputs.style == 'true'
       continue-on-error: true
-      uses: stefanzweifel/git-auto-commit-action@v4
+      uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: Re-indent CSL styles
         file_pattern: ${{ steps.changed.outputs.style_files }}

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -62,20 +62,20 @@ GEM
       ruby-progressbar (~> 1.4)
     git_diff (0.4.3)
     hashdiff (0.3.7)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     multipart-post (2.1.1)
     namae (1.1.1)
-    nokogiri (1.13.10)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.10-x64-mingw32)
+    nokogiri (1.14.3-x64-mingw32)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     ostruct (0.5.2)
     public_suffix (4.0.6)
-    racc (1.6.1)
+    racc (1.6.2)
     rake (13.0.6)
     reverse_markdown (2.1.1)
       nokogiri

diff --git a/acm-sig-proceedings-long-author-list.csl b/acm-sig-proceedings-long-author-list.csl
@@ -4,7 +4,7 @@
     <title>ACM SIG Proceedings ("et al." for 15+ authors)</title>
     <id>http://www.zotero.org/styles/acm-sig-proceedings-long-author-list</id>
     <link href="http://www.zotero.org/styles/acm-sig-proceedings-long-author-list" rel="self"/>
-    <link href="http://www.acm.org/sigs/publications/proceedings-templates" rel="documentation"/>
+    <link href="https://www.acm.org/publications/authors/reference-formatting" rel="documentation"/>
     <author>
       <name>Naeem Esfahani</name>
       <email>[email protected]</email>

diff --git a/acm-sig-proceedings.csl b/acm-sig-proceedings.csl
@@ -4,7 +4,7 @@
     <title>ACM SIG Proceedings ("et al." for 3+ authors)</title>
     <id>http://www.zotero.org/styles/acm-sig-proceedings</id>
     <link href="http://www.zotero.org/styles/acm-sig-proceedings" rel="self"/>
-    <link href="http://www.acm.org/sigs/publications/proceedings-templates" rel="documentation"/>
+    <link href="https://www.acm.org/publications/authors/reference-formatting" rel="documentation"/>
     <author>
       <name>Naeem Esfahani</name>
       <email>[email protected]</email>

diff --git a/acta-palaeontologica-polonica.csl b/acta-palaeontologica-polonica.csl
@@ -8,7 +8,8 @@
     <link href="http://www.app.pan.pl/instruction.html" rel="documentation"/>
     <author>
       <name>Martin R. Smith</name>
-      <email>[email protected]</email>
+      <email>[email protected]</email>
+      <uri>https://smithlabdurham.github.io/</uri>
     </author>
     <contributor>
       <name>Benjamin C. Moon</name>
@@ -84,7 +85,8 @@
         <text macro="year-date"/>
       </group>
       <text variable="year-suffix" font-style="italic"/>
-      <group prefix=": ">
+      <group prefix=": " delimiter=" ">
+        <label variable="locator" form="short"/>
         <text variable="locator"/>
       </group>
     </layout>

diff --git a/acta-universitatis-agriculturae-sueciae.csl b/acta-universitatis-agriculturae-sueciae.csl
@@ -15,7 +15,7 @@
     </contributor>
     <category citation-format="author-date"/>
     <summary>Style as per the May 2019 guidelines.</summary>
-    <updated>2022-07-13T09:26:37+00:00</updated>
+    <updated>2023-10-02T14:12: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">
@@ -108,19 +108,12 @@
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="all">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </if>
-      <else-if type="thesis" match="any">
+      <if type="report thesis" match="any">
         <text variable="publisher"/>
-      </else-if>
+      </if>
       <else>
-        <text variable="genre" suffix=", "/>
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
+        <group delimiter=", ">
+          <text variable="genre"/>
           <text variable="publisher"/>
         </group>
       </else>

diff --git a/al-jamiah-journal-of-islamic-studies.csl b/al-jamiah-journal-of-islamic-studies.csl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="text" et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" initialize="false" initialize-with="." page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="text" et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" initialize="false" initialize-with="." page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
     <title>Al-Jami'ah - Journal of Islamic Studies</title>
     <title-short>AJIS</title-short>
     <id>http://www.zotero.org/styles/al-jamiah-journal-of-islamic-studies</id>
     <link href="http://www.zotero.org/styles/al-jamiah-journal-of-islamic-studies" rel="self"/>
-    <link href="http://www.zotero.org/styles/turabian-fullnote-bibliography" rel="template"/>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
     <link href="http://aljamiah.or.id/index.php/AJIS/about/submissions#authorGuidelines" rel="documentation"/>
     <author>
       <name>Al-Jamiah</name>