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

Stadt-Geschichte-Basel · Feb 26, 2024 · ba1f5ae · ba1f5ae
2 parents f8e0ee5 + ff2b910
commit ba1f5ae
Show file tree

Hide file tree

Showing 110 changed files with 10,380 additions and 5,955 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-github: rmzelle
+github: adam3smith
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -42,7 +42,7 @@ jobs:
 
     - name: Check for relevant changes
       if: github.event_name == 'push'
-      uses: dorny/paths-filter@v2
+      uses: dorny/paths-filter@v3
       id: update
       with:
         list-files: shell
@@ -72,7 +72,7 @@ jobs:
         ruby-version: 3.0.2
     - name: but use cache to speed that up
       if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -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
@@ -39,7 +39,7 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Check for relevant changes
-      uses: dorny/paths-filter@v2
+      uses: dorny/paths-filter@v3
       id: changed
       with:
         list-files: shell
@@ -59,7 +59,7 @@ jobs:
       with:
         ruby-version: 3.0.2
     - name: but use cache to speed that up
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -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.1)
+    mini_portile2 (2.8.5)
     multipart-post (2.1.1)
     namae (1.1.1)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.16.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.14.3-x64-mingw32)
+    nokogiri (1.16.2-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.2)
+    racc (1.7.3)
     rake (13.0.6)
     reverse_markdown (2.1.1)
       nokogiri

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/american-political-science-association.csl b/american-political-science-association.csl
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="chicago" demote-non-dropping-particle="sort-only">
-  <!-- This style was edited with the Visual CSL Editor (http://steveridout.com/csl/visualEditor/) -->
   <info>
     <title>American Political Science Association</title>
     <title-short>APSA</title-short>
     <id>http://www.zotero.org/styles/american-political-science-association</id>
     <link href="http://www.zotero.org/styles/american-political-science-association" rel="self"/>
-    <link href="http://www.apsanet.org/media/PDFs/Publications/APSAStyleManual2006.pdf" rel="documentation"/>
+    <link href="https://connect.apsanet.org/stylemanual/wp-content/uploads/sites/43/2023/12/Style-Manual-for-Political-Science-December-2023-Revision.pdf" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>[email protected]</email>
     </author>
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="political_science"/>
     <summary>The American Political Science Association style. Et al rules based on published APSR articles</summary>
-    <updated>2012-09-14T22:11:27+00:00</updated>
+    <updated>2024-02-06T15:37:50+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en-US">
@@ -71,14 +73,17 @@
     <choose>
       <if type="legal_case" match="none">
         <choose>
-          <if variable="URL">
+          <if variable="DOI">
+            <text variable="DOI" prefix="doi:"/>
+          </if>
+          <else-if match="any" variable="URL">
             <group delimiter=" ">
               <text variable="URL"/>
               <group prefix="(" suffix=")">
                 <date variable="accessed" form="text"/>
               </group>
             </group>
-          </if>
+          </else-if>
         </choose>
       </if>
     </choose>

diff --git a/american-society-for-horticultural-science.csl b/american-society-for-horticultural-science.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="sort-only" default-locale="en-US">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>American Society for Horticultural Science</title>
     <title-short>ASHS</title-short>
@@ -13,7 +13,7 @@
     <category citation-format="author-date"/>
     <category field="biology"/>
     <category field="botany"/>
-    <updated>2023-05-12T09:18:16+00:00</updated>
+    <updated>2023-10-07T12:02:26+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>
@@ -147,7 +147,7 @@
               </group>
             </group>
           </if>
-          <else-if type="article-journal">
+          <else-if type="article-journal" match="any">
             <group delimiter=". ">
               <text macro="title"/>
               <group delimiter=". ">
@@ -168,7 +168,7 @@
               <text macro="publisher"/>
             </group>
           </else-if>
-          <else-if type="webpage post-weblog" match="any">
+          <else-if type="webpage post-weblog post" match="any">
             <group delimiter=". ">
               <text macro="title"/>
               <text variable="container-title" form="short"/>
@@ -183,8 +183,21 @@
               <text macro="publisher"/>
             </group>
           </else-if>
+          <else-if type="patent" match="any">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <group delimiter=" ">
+                <text variable="authority"/>
+                <text variable="number"/>
+              </group>
+              <group delimiter=", " prefix="(" suffix=")">
+                <date form="text" variable="submitted" prefix="Filed "/>
+                <date form="text" variable="issued" prefix="granted "/>
+              </group>
+            </group>
+          </else-if>
           <else>
-            <group delimiter=" ">
+            <group delimiter=". ">
               <text macro="title"/>
               <text variable="container-title" form="short"/>
               <group delimiter=":">

diff --git a/american-sociological-association.csl b/american-sociological-association.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago">
   <info>
-    <title>American Sociological Association 6th edition</title>
+    <title>American Sociological Association 6th/7th edition</title>
     <title-short>ASA</title-short>
     <id>http://www.zotero.org/styles/american-sociological-association</id>
     <link href="http://www.zotero.org/styles/american-sociological-association" rel="self"/>
@@ -15,7 +15,7 @@
     </contributor>
     <category citation-format="author-date"/>
     <category field="sociology"/>
-    <summary>The ASA style following the 6th edition of the Style Guide</summary>
+    <summary>The ASA style following the 6th/7th edition of the Style Guide (reference formatting is the same for both editions).</summary>
     <updated>2023-07-16T21:48:56+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>