Squashed 'buildres/csl/csl-styles/' changes from 3b00357..3a6a0a7

3a6a0a7 Update masarykova-univerzita-pravnicka-fakulta.csl (#5655) 136653a Corrections for Conservation Biology style (#5661) af148f8 Update biophysics-and-physicobiology.csl (#5646) 8842ed1 Create production-and-operations-management.csl (#5654) 6b4965f update style file (#5656) e5f6066 Update to Ruby 3.0.2 (#5657) 61c530c Reindent/reorder (#5653) 118c217 Update gems (#5652) 46cd9ab harvard-university-of-bath.csl: correct et-al-min (#5651) 37ba705 Create focaal-journal-of-global-and-historical-anthropology.csl (#5649) e22b8a5 Create developmental-medicine-and-child-neurology.csl (#5644) f7bc32c Bump nokogiri from 1.11.4 to 1.12.5 (#5640) git-subtree-dir: buildres/csl/csl-styles git-subtree-split: 3a6a0a7
JabRef · Oct 15, 2021 · 5cf89fe · 5cf89fe
1 parent 7085d4b
commit 5cf89fe
Show file tree

Hide file tree

Showing 33 changed files with 2,130 additions and 766 deletions.
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -58,7 +58,7 @@ jobs:
       if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.0
+        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@v2

diff --git a/.github/workflows/sheldon.yaml b/.github/workflows/sheldon.yaml
@@ -50,7 +50,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.0
+        ruby-version: 3.0.2
     - name: but use cache to speed that up
       uses: actions/cache@v2
       with:

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-ruby '3.0.0'
+ruby '3.0.2'
 source 'https://rubygems.org'
 
 gem 'rake'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citation-style-language/Sheldon.git
-  revision: 38b6de75ac4dd86d6b3b47c172431e6e44f53ca0
+  revision: 38b1c813448737261a43060ccd3669d67dbfcad7
   specs:
     sheldon (1.0.30)
       citeproc-ruby
@@ -24,44 +24,60 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.13)
+    citeproc-ruby (1.1.14)
       citeproc (~> 1.0, >= 1.0.9)
-      csl (~> 1.5)
-    csl (1.5.2)
+      csl (~> 1.6)
+    csl (1.6.0)
       namae (~> 1.0)
-    csl-styles (1.0.1.10)
+      rexml
+    csl-styles (1.0.1.11)
       csl (~> 1.0)
     diff-lcs (1.4.4)
     diffy (3.4.0)
     dotenv (2.7.6)
     erubis (2.7.0)
-    faraday (1.3.0)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday_middleware (1.1.0)
       faraday (~> 1.0)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     git_diff (0.4.3)
     hashdiff (0.3.7)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.6.1)
     multipart-post (2.1.1)
-    namae (1.0.2)
-    nokogiri (1.11.4)
-      mini_portile2 (~> 2.5.0)
+    namae (1.1.1)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    octokit (4.20.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ostruct (0.3.3)
+    ostruct (0.4.0)
     public_suffix (4.0.6)
     racc (1.5.2)
-    rake (13.0.3)
+    rake (13.0.6)
     reverse_markdown (2.0.0)
       nokogiri
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -76,7 +92,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -93,7 +109,7 @@ DEPENDENCIES
   sheldon!
 
 RUBY VERSION
-   ruby 3.0.0p0
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.2.3
+   2.2.22
diff --git a/acta-hydrotechnica.csl b/acta-hydrotechnica.csl
@@ -75,7 +75,7 @@
   <macro name="access">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="https://doi.org/" text-decoration="underline" />
+        <text variable="DOI" prefix="https://doi.org/" text-decoration="underline"/>
       </if>
       <else-if type="webpage post-weblog" match="any">
         <group delimiter=" ">

diff --git a/american-sociological-association.csl b/american-sociological-association.csl
@@ -236,7 +236,7 @@
           <group prefix=" " delimiter=". ">
             <group>
               <!-- To Do: localize once we have a proper term -->
-              <text macro="title" suffix=" [computer program]" />
+              <text macro="title" suffix=" [computer program]"/>
             </group>
             <group delimiter=" ">
               <text term="version" text-case="capitalize-first"/>

diff --git a/archeosciences.csl b/archeosciences.csl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" delimiter-precedes-et-al="never" delimiter-precedes-last="never" page-range-format="expanded" demote-non-dropping-particle="never" default-locale="fr-FR">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>

diff --git a/associacao-brasileira-de-normas-tecnicas-note.csl b/associacao-brasileira-de-normas-tecnicas-note.csl
@@ -183,7 +183,7 @@
   <macro name="secondary-producers">
     <names variable="translator">
       <label form="verb-short" suffix=" " text-case="capitalize-first"/>
-      <name form="long" delimiter=", "></name>
+      <name form="long" delimiter=", "/>
       <et-al term="et-al" font-style="italic"/>
     </names>
   </macro>

diff --git a/biophysics-and-physicobiology.csl b/biophysics-and-physicobiology.csl
@@ -33,16 +33,15 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name delimiter-precedes-last="never" and="symbol" initialize-with=". " name-as-sort-order="all"/>
+      <name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
       <label form="short" prefix=", "/>
-      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
       </substitute>
     </names>
   </macro>
   <macro name="access">
-    <text variable="DOI" prefix="DOI: "/>
+    <text variable="DOI" prefix="https://doi.org/"/>
   </macro>
   <macro name="issuance">
     <choose>
@@ -72,10 +71,10 @@
   <macro name="container-title">
     <choose>
       <if type="article-journal">
-        <text variable="container-title" form="short" font-style="italic"/>
+        <text variable="container-title" form="short"/>
       </if>
       <else>
-        <text variable="container-title" font-style="italic"/>
+        <text variable="container-title"/>
       </else>
     </choose>
   </macro>
@@ -84,8 +83,7 @@
       <if type="chapter paper-conference" match="any">
         <names variable="editor" prefix="(" suffix=")">
           <label form="short" suffix=" "/>
-          <name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all" and="symbol"/>
-          <et-al font-style="italic"/>
+          <name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
         </names>
       </if>
     </choose>

diff --git a/brazilian-journal-of-experimental-design-data-analysis-and-inferential-statistics.csl b/brazilian-journal-of-experimental-design-data-analysis-and-inferential-statistics.csl
@@ -71,7 +71,7 @@
     <names variable="container-author">
       <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
         <name-part name="family" text-case="uppercase"/>
-       </name>
+      </name>
     </names>
   </macro>
   <macro name="container-responsability">

diff --git a/conservation-biology.csl b/conservation-biology.csl
@@ -16,7 +16,7 @@
     <category field="biology"/>
     <issn>0888-8892</issn>
     <eissn>1523-1739</eissn>
-    <updated>2016-02-11T07:27:17+00:00</updated>
+    <updated>2021-10-06T23:33: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-US">
@@ -29,7 +29,7 @@
       <if type="chapter paper-conference" match="any">
         <text term="in" suffix=" "/>
         <names variable="editor translator" delimiter=", ">
-          <name and="text" initialize-with=". " delimiter=", "/>
+          <name initialize-with="" name-as-sort-order="all" sort-separator=" "/>
           <label form="long" prefix=", " suffix="."/>
         </names>
       </if>
@@ -170,6 +170,11 @@
         <text variable="container-title" prefix=". "/>
         <text variable="volume" prefix=" " font-weight="bold"/>
         <text variable="page" prefix=":"/>
+        <choose>
+          <if match="none" variable="volume page">
+            <text variable="DOI" prefix="DOI: "/>
+          </if>
+        </choose>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group prefix=". " delimiter=" ">

diff --git a/dependent/european-accounting-review.csl b/dependent/european-accounting-review.csl
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <info>
-    <title>European Accounting Review</title>
-    <title-short>EAR</title-short>
-    <id>http://www.zotero.org/styles/european-accounting-review</id>
-    <link href="http://www.zotero.org/styles/european-accounting-review" rel="self"/>
-    <link href="http://www.zotero.org/styles/apa" rel="independent-parent"/>
-    <link href="https://www.tandfonline.com/action/authorSubmission?show=instructions&amp;journalCode=rear20#refs" rel="documentation"/>
-    <author>
-      <name>Nicola Maria Fiore</name>
-      <email>[email protected]</email>
-    </author>
-    <contributor>
-      <name>Xuanheng Huang</name>
-      <email>[email protected]</email>
-    </contributor>
-    <contributor>
-      <name>Vito Ferrulli</name>
-      <email>[email protected]</email>
-    </contributor>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <issn>0963-8180</issn>
-    <eissn>1468-4497</eissn>
-    <summary>European Accounting Review (variant of the APA style)</summary>
-    <updated>2021-03-11T20:18:08+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>
-</style>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>European Accounting Review</title>
+    <title-short>EAR</title-short>
+    <id>http://www.zotero.org/styles/european-accounting-review</id>
+    <link href="http://www.zotero.org/styles/european-accounting-review" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="independent-parent"/>
+    <link href="https://www.tandfonline.com/action/authorSubmission?show=instructions&amp;journalCode=rear20#refs" rel="documentation"/>
+    <author>
+      <name>Nicola Maria Fiore</name>
+      <email>[email protected]</email>
+    </author>
+    <contributor>
+      <name>Xuanheng Huang</name>
+      <email>[email protected]</email>
+    </contributor>
+    <contributor>
+      <name>Vito Ferrulli</name>
+      <email>[email protected]</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <issn>0963-8180</issn>
+    <eissn>1468-4497</eissn>
+    <summary>European Accounting Review (variant of the APA style)</summary>
+    <updated>2021-03-11T20:18:08+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>
+</style>
diff --git a/dependent/journal-of-business-finance-and-accounting.csl b/dependent/journal-of-business-finance-and-accounting.csl
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <info>
-    <title>Journal of Business Finance &amp; Accounting</title>
-    <title-short>JBFA</title-short>
-    <id>http://www.zotero.org/styles/journal-of-business-finance-and-accounting</id>
-    <link href="http://www.zotero.org/styles/journal-of-business-finance-and-accounting" rel="self"/>
-    <link href="http://www.zotero.org/styles/apa" rel="independent-parent"/>
-    <link href="https://onlinelibrary.wiley.com/page/journal/14685957/homepage/forauthors.html" rel="documentation"/>
-    <author>
-      <name>Nicola Maria Fiore</name>
-      <email>[email protected]</email>
-    </author>
-    <contributor>
-      <name>Xuanheng Huang</name>
-      <email>[email protected]</email>
-    </contributor>
-    <contributor>
-      <name>Vito Ferrulli</name>
-      <email>[email protected]</email>
-    </contributor>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <issn>0306-686X</issn>
-    <eissn>1468-5957</eissn>
-    <summary>Journal of Business Finance &amp; Accounting (variant of the APA style)</summary>
-    <updated>2021-03-11T20:18:08+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>
-</style>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>Journal of Business Finance &amp; Accounting</title>
+    <title-short>JBFA</title-short>
+    <id>http://www.zotero.org/styles/journal-of-business-finance-and-accounting</id>
+    <link href="http://www.zotero.org/styles/journal-of-business-finance-and-accounting" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="independent-parent"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/14685957/homepage/forauthors.html" rel="documentation"/>
+    <author>
+      <name>Nicola Maria Fiore</name>
+      <email>[email protected]</email>
+    </author>
+    <contributor>
+      <name>Xuanheng Huang</name>
+      <email>[email protected]</email>
+    </contributor>
+    <contributor>
+      <name>Vito Ferrulli</name>
+      <email>[email protected]</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <issn>0306-686X</issn>
+    <eissn>1468-5957</eissn>
+    <summary>Journal of Business Finance &amp; Accounting (variant of the APA style)</summary>
+    <updated>2021-03-11T20:18:08+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>
+</style>