Squashed 'buildres/csl/csl-styles/' changes from f78c707..5563ccc

5563ccc Update american-society-for-microbiology.csl (#5842) 19ab80f Merge pull request #5843 from POBrien333/patch-1002 d4a6c6d double trouble 424f7fe in-text >> superscript for T&F ACS style 605253c Merge pull request #5837 from POBrien333/patch-998 eb5417d Merge pull request #5838 from alessandro-gentilini/patch-1 7d2d3f5 Fix typo 9f557b5 Re-indent CSL styles f587e60 polyglot style 3a3fe2c Create journal-fur-kulturpflanzen-journal-of-cultivated-plants.csl cb24633 Merge pull request #5826 from dstark/patch-7 2590a6c Merge pull request #5833 from POBrien333/patch-997 5b2481e Create nist-techpubs-jres.csl (#5756) d2a1a49 Re-indent CSL styles 42c51d1 Update tyndale-bulletin.csl 8dae693 rework style 070586b Localize IEEE dates (#5835) 588fbfe Hopefully fix sorting in CSE author-date (#5834) 1291d72 Update physiotherapy-theory-and-practice.csl 1a64076 New Style for "Neue Kriminalpolitik (Deutsch)" (#5586) eac93a0 Create physiotherapy-theory-and-practice.csl 2e7a9f6 Merge pull request #5832 from POBrien333/patch-996 4dfad5f Update administrative-science-quarterly.csl f56db0f Merge pull request #5829 from benthamite/patch-1 526b0b3 Update effective-altruism-wiki.csl e5b11eb Update effective-altruism-wiki.csl f2a7301 Update effective-altruism-wiki.csl 5b166c2 Update university-of-roehampton-harvard.csl (#5831) b231514 Update european-society-of-cardiology.csl (#5519) dbd902c Re-indent CSL styles fe8892b Update effective-altruism-wiki.csl 734fa7d Update effective-altruism-wiki.csl 2430a32 Create effective-altruism-wiki.csl a5101b6 update modern-pathology.csl (#5828) 16f77c8 Update tyndale-bulletin.csl ea8804e Create the-korean-journal-of-mycology.csl (#5822) 22d8be0 Patch 3 (#5825) 0220ba2 Create jcom.csl (#5819) cd7b72b Create taylor-and-francis-council-of-science-editors-numeric.csl (#5824) 0033383 Create gomis-senegalese-medicine-thesis.csl (#5774) b221bcc Create mycobiology.csl (#5821) d7056f9 Re-indent CSL styles 04ae08b Update tyndale-bulletin.csl 24bd577 Re-indent CSL styles e08d431 clean up logging f6ac2a6 Update tyndale-bulletin.csl e4c07f8 this should be the PR repo name 7f9936c fetch pull request from originating repo f232f51 Update tyndale-bulletin.csl e2ae4fc Update tyndale-bulletin.csl f09f8db Update Sheldon to csl-styles 2.0 a4d7dec re-indent style a903664 sheldon 7db75fc sheldon f08dc96 sheldon 35b8bfa sheldon 04e28ca pull req checkout 9c9d061 pull req checkout 9249490 sheldon reindent 9792be6 sheldon reindent 3bced06 reindent & commit 7cc9735 Update styles README and GitHub Actions with 1.0.2 information (#5803) 205c4ea remaining dependents 9458056 fix broken styles 07ba7af fix dependents e2e7842 Fix term hacks for transition to CSL 1.0.2 (#5801) 5c8c5e9 Replace "sub verbo" with "sub-verbo" (#5799) 7ec637c Fix CSL styles bcd3054 update to csl/citeproc-ruby 2.0 ec13830 bundle update git-subtree-dir: buildres/csl/csl-styles git-subtree-split: 5563ccc
JabRef · Jan 15, 2022 · aaab4e8 · aaab4e8
1 parent 1d32876
commit aaab4e8
Show file tree

Hide file tree

Showing 65 changed files with 5,088 additions and 407 deletions.
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -28,7 +28,7 @@ jobs:
 
     - name: Release branch version
       id: release
-      run: echo ::set-output name=branch::v1.0.1
+      run: echo ::set-output name=branch::v1.0.2
     - name: Checkout release branch
       uses: actions/checkout@v2
       with:

diff --git a/.github/workflows/sheldon.yaml b/.github/workflows/sheldon.yaml
@@ -18,18 +18,20 @@ jobs:
       uses: actions/checkout@v2
       if: contains(github.event.pull_request.labels.*.name, 'safe to test')
       with:
-        ref: ${{ github.event.pull_request.head.sha }}
+        ref: ${{ github.event.pull_request.head.ref }}
 
-    # otherwise, checkout the current master, and the pr to the subdirectory 'pr'
+    # otherwise, checkout the current master, and the pr to the subdirectory 'pull-request'
     - name: Checkout base repo for pull-request test
       uses: actions/checkout@v2
       if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
     - name: Checkout pull-request
       uses: actions/checkout@v2
       if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
       with:
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
         path: pull-request
-        ref: ${{ github.event.pull_request.head.sha }}
+        ref: ${{ github.event.pull_request.head.ref }}
+        token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Check for relevant changes
       uses: dorny/paths-filter@v2
@@ -73,3 +75,13 @@ jobs:
     - name: report
       if: (failure() || success()) && steps.changed.outputs.style == 'true'
       run: bundle exec sheldon --token=$GITHUB_TOKEN --${{ job.status }} --verbose
+
+    - 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
+      with:
+        commit_message: Re-indent CSL styles
+        file_pattern: ${{ steps.changed.outputs.style_files }}
+        repository: pull-request
+        skip_dirty_check: false
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,9 @@
-ruby '3.0.2'
+ruby '~>3.0.2'
 source 'https://rubygems.org'
 
 gem 'rake'
 gem 'rspec'
 gem 'nokogiri'
-gem 'csl', '~>1.0'
+gem 'csl', '~>2.0'
 gem 'fuubar'
 gem 'sheldon', git: 'https://github.com/citation-style-language/Sheldon.git'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,10 @@
 GIT
   remote: https://github.com/citation-style-language/Sheldon.git
-  revision: 38b1c813448737261a43060ccd3669d67dbfcad7
+  revision: 2f22073efcbfe1d0a2599f8a8a68791a81da2022
   specs:
-    sheldon (1.0.30)
-      citeproc-ruby
-      csl-styles
+    sheldon (1.0.31)
+      citeproc-ruby (~> 2.0)
+      csl-styles (~> 2.0)
       diffy
       dotenv
       erubis (~> 2.7)
@@ -24,15 +24,15 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.14)
+    citeproc-ruby (2.0.0)
       citeproc (~> 1.0, >= 1.0.9)
-      csl (~> 1.6)
-    csl (1.6.0)
+      csl (~> 2.0)
+    csl (2.0.0)
       namae (~> 1.0)
       rexml
-    csl-styles (1.0.1.11)
-      csl (~> 1.0)
-    diff-lcs (1.4.4)
+    csl-styles (2.0.0)
+      csl (~> 2.0)
+    diff-lcs (1.5.0)
     diffy (3.4.0)
     dotenv (2.7.6)
     erubis (2.7.0)
@@ -55,7 +55,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
@@ -68,14 +68,16 @@ GEM
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
+    nokogiri (1.12.5-x64-mingw32)
+      racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ostruct (0.4.0)
+    ostruct (0.5.2)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rake (13.0.6)
-    reverse_markdown (2.0.0)
+    reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
     rspec (3.10.0)
@@ -90,7 +92,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     sawyer (0.8.2)
@@ -99,9 +101,10 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
-  csl (~> 1.0)
+  csl (~> 2.0)
   fuubar
   nokogiri
   rake
@@ -112,4 +115,4 @@ RUBY VERSION
    ruby 3.0.2p107
 
 BUNDLED WITH
-   2.2.22
+   2.2.32
diff --git a/README.md b/README.md
@@ -54,8 +54,8 @@ Versioning and style distribution
 
 We currently only actively maintain CSL styles in the "master" branch for the latest released version of CSL.
 
-In addition, in order to provide a stable location for styles of a given CSL version, styles in "master" are automatically copied to a branch named after the latest version of CSL (e.g. "v1.0.1" when CSL 1.0.1 is the latest version).
-Once a new version of CSL is released (e.g. CSL 1.0.2), "master" will upgrade to that version, after which styles will be copied from "master" to a new version branch ("v1.0.2").
+In addition, in order to provide a stable location for styles of a given CSL version, styles in "master" are automatically copied to a branch named after the latest version of CSL (e.g. "v1.0.2" when CSL 1.0.2 is the latest version).
+Once a new version of CSL is released (e.g. CSL 1.1.0), "master" will upgrade to that version, after which styles will be copied from "master" to a new version branch ("v1.1.0").
 Version branches for old versions of CSL are kept but typically become dormant, as for these branches we generally stop maintenance, won't accept third-party contributions via pull requests, nor backport changes made to styles in "master".
 
 Starting with branch "v1.0.1", the version branches differ from "master" in the following ways:
@@ -64,10 +64,11 @@ Starting with branch "v1.0.1", the version branches differ from "master" in the
 * `<updated/>` timestamps of styles in the version branch are changed to match the git modification date of each individual style in "master"
 * superfluous files present in "master", e.g. for style testing, are removed.
 
-As such, especially for downstream integrators, you are encouraged to obtain your CSL styles from the appropriate version branch (e.g. "v1.0.1" for CSL 1.0.1 styles).
+As such, especially for downstream integrators, you are encouraged to obtain your CSL styles from the appropriate version branch (e.g. "v1.0.2" for CSL 1.0.2 styles).
 Currently, the styles repository includes the following (protected) branches:
 
 * "master"
+* "v1.0.2" (for CSL 1.0.2 styles)
 * "v1.0.1" (for CSL 1.0.1 styles)
 * "v1.0" (for CSL 1.0 styles)
 

diff --git a/STYLE_DEVELOPMENT.md b/STYLE_DEVELOPMENT.md
@@ -34,7 +34,7 @@ If you want to improve an existing CSL style, make sure that you start from the
 The most recent version of each CSL style can be found in the [`master` branch of this repository](https://github.com/citation-style-language/styles).
 
 If you want to create a new style, find an existing style that closely matches what you need using the previews in the style repository. 
-Typically the best way to find a most similar style is the ["seach by example"](http://editor.citationstyles.org/searchByExample/) function of the CSL Visual Editor. 
+Typically the best way to find a most similar style is the ["search by example"](http://editor.citationstyles.org/searchByExample/) function of the CSL Visual Editor. 
 
 
 ### 2 - Edit the Style

diff --git a/administrative-science-quarterly.csl b/administrative-science-quarterly.csl
@@ -14,7 +14,7 @@
     <category field="social_science"/>
     <issn>0001-8392</issn>
     <eissn>1930-3815</eissn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2022-01-07T15:49:10+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">
@@ -179,6 +179,7 @@
           <text variable="publisher-place"/>
         </group>
       </else-if>
+      <else-if type="article-journal" match="any"/>
       <else>
         <choose>
           <if variable="event" match="none">

diff --git a/american-society-for-microbiology.csl b/american-society-for-microbiology.csl
@@ -24,10 +24,13 @@
       <uri>http://twitter.com/cparnot</uri>
       <email>charles.parnot@gmail.com</email>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="biology"/>
     <summary>Style for all American Society for Microbiology journals.</summary>
-    <updated>2020-07-27T18:54:54+00:00</updated>
+    <updated>2022-01-13T16:47:12+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
@@ -92,15 +95,21 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=", " prefix=". ">
-      <choose>
-        <if type="article-journal article-magazine" match="none">
-          <text variable="genre"/>
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-        </if>
-      </choose>
-    </group>
+    <choose>
+      <if type="article-journal article-magazine" match="none">
+        <group delimiter=". " prefix=". ">
+          <choose>
+            <if type="book" match="none">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+        </group>
+      </if>
+    </choose>
   </macro>
   <macro name="locators">
     <choose>
@@ -117,8 +126,27 @@
           </else>
         </choose>
       </if>
+      <else-if type="book webpage post post-weblog" match="any">
+        <group delimiter=". " prefix=". ">
+          <text variable="URL"/>
+          <group delimiter=" ">
+            <text term="retrieved" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="day"/>
+              <date-part name="month" prefix=" "/>
+              <date-part name="year" prefix=" "/>
+            </date>
+          </group>
+        </group>
+      </else-if>
     </choose>
   </macro>
+  <macro name="title">
+    <group delimiter=" ">
+      <text variable="title"/>
+      <text variable="version" prefix="(" suffix=")"/>
+    </group>
+  </macro>
   <citation collapse="citation-number">
     <sort>
       <key variable="citation-number"/>
@@ -132,7 +160,7 @@
       <text variable="citation-number" suffix=". "/>
       <text macro="author"/>
       <text macro="issued"/>
-      <text variable="title" prefix=" "/>
+      <text macro="title" prefix=" "/>
       <text macro="chapter-specifics"/>
       <text macro="patent-specifics"/>
       <text macro="container-title"/>

diff --git a/anabases.csl b/anabases.csl
@@ -38,7 +38,7 @@
       <term name="paragraph" form="short">§</term>
       <term name="no date">sans date</term>
       <term name="no date" form="short">s. d.</term>
-      <term name="sub verbo" form="short">s. v.</term>
+      <term name="sub-verbo" form="short">s. v.</term>
       <term name="et-al">et alii</term>
       <term name="online">en ligne</term>
     </terms>
@@ -88,7 +88,7 @@
       <term name="paragraph" form="short">§</term>
       <term name="no date">ohne Datum</term>
       <term name="no date" form="short">o.&#160;J.</term>
-      <term name="sub verbo" form="short">s. v.</term>
+      <term name="sub-verbo" form="short">s. v.</term>
       <term name="and">und</term>
       <term name="et-al">et alii</term>
       <term name="open-quote">«</term>
@@ -106,7 +106,7 @@
       <term name="paragraph" form="short">§</term>
       <term name="no date">sin fecha</term>
       <term name="no date" form="short">s. f.</term>
-      <term name="sub verbo" form="short">s. v.</term>
+      <term name="sub-verbo" form="short">s. v.</term>
       <term name="and">y</term>
       <term name="et-al">et alii</term>
       <term name="open-quote">«</term>
@@ -371,7 +371,7 @@
             <group delimiter=", ">
               <text macro="author"/>
               <group delimiter=" ">
-                <text term="sub verbo" form="short" font-style="italic"/>
+                <text term="sub-verbo" form="short" font-style="italic"/>
                 <text macro="title"/>
               </group>
               <group>

diff --git a/aquitania.csl b/aquitania.csl
@@ -26,7 +26,7 @@
       <term name="anonymous" form="short">anon.</term>
       <term name="no date">sans date</term>
       <term name="no date" form="short">s.&#160;d.</term>
-      <term name="sub verbo">s.u.</term>
+      <term name="sub-verbo">s.u.</term>
       <term name="open-quote">“</term>
       <term name="close-quote">”</term>
       <term name="open-inner-quote">‘</term>

diff --git a/ausonius-editions.csl b/ausonius-editions.csl
@@ -28,7 +28,7 @@
       <term name="accessed">consulté le</term>
       <term name="no date">sans date</term>
       <term name="no date" form="short">à paraître</term>
-      <term name="sub verbo">s.u.</term>
+      <term name="sub-verbo">s.u.</term>
       <term name="open-quote">“</term>
       <term name="close-quote">”</term>
       <term name="open-inner-quote">‘</term>
@@ -272,7 +272,7 @@
               <text variable="container-title" font-style="italic"/>
               <text variable="volume"/>
               <group delimiter=" ">
-                <text term="sub verbo" font-style="italic"/>
+                <text term="sub-verbo" font-style="italic"/>
                 <text macro="title"/>
               </group>
               <text macro="pages"/>

diff --git a/bulletin-de-correspondance-hellenique.csl b/bulletin-de-correspondance-hellenique.csl
@@ -253,7 +253,7 @@
                 <text variable="page"/>
               </group>
               <group delimiter=" ">
-                <text term="sub verbo" form="short" font-style="italic"/>
+                <text term="sub-verbo" form="short" font-style="italic"/>
                 <text macro="title" quotes="true"/>
               </group>
             </group>

diff --git a/catholic-biblical-association.csl b/catholic-biblical-association.csl
@@ -393,7 +393,7 @@
         <!-- Adds sub verbo to an initial citation where it had previously been left out. -->
         <choose>
           <if locator="sub-verbo" match="any">
-            <text term="sub verbo" form="short" prefix=" "/>
+            <text term="sub-verbo" form="short" prefix=" "/>
           </if>
         </choose>
         <text variable="locator" prefix=" "/>
@@ -447,7 +447,7 @@
       <text variable="annote"/>
       <choose>
         <if locator="sub-verbo" match="any">
-          <text term="sub verbo" form="short" prefix=" "/>
+          <text term="sub-verbo" form="short" prefix=" "/>
           <text variable="locator" prefix=" "/>
         </if>
         <else>