[Bot] Update CSL styles (#7680)

* Squashed 'buildres/csl/csl-styles/' changes from e1acabe..10b2222 10b2222 small fixes for jopr.csl (#5422) bf59a9f Create jci-insight.csl (#5423) 9aebd58 Update mammalia.csl (#5404) 77dcd74 Update gost-r-7-0-5-2008 styles (#5412) 5d348dd Update journal-of-oil-palm-research.csl (#5403) 55f6eda Adds missing space after title and moves space from title prefix to author suffix. (#5407) b5df1a8 Fixed Mendeley bug (#5411) 49530b4 Create the-journal-of-laryngology-and-otology.csl (#5410) 6d95f75 Create college-research-libraries.csl (#5406) 9876e81 Create biostatistics.csl (#5372) 673db49 Update revue-forestiere-francaise.csl (#5387) 474cc2e Create oil-shale.csl (#5389) 249ad6a Updating infoclio.ch styles (#5391) 6dc6742 Update ocean-and-coastal-research.csl (#5392) 1e75c74 Update and rename dependent/experimental-biology-and-medicine.csl to … (#5398) 0a072f8 Update universite-du-quebec-a-montreal.csl (#5399) 373d684 Create the-bovine-practitioner.csl (#5400) cdbb6ed Create journal-of-oil-palm-research.csl (#5388) a75cb35 Update south-african-medical-journal.csl (#5393) a35360f Update journal-of-nutrition.csl (#5397) ef215ac Update and rename journal-of-neurosurgery.csl to dependent/journal-of… (make AMA dependent) (#5359) c435731 Create ocean-and-coastal-research.csl (#5364) 561024e Create istanbul-medical-journal.csl (#5374) 21ba5d8 Update aquatic-conservation.csl (#5379) c83c4a9 Create endocrine-connections.csl (#5380) 7da88e9 Update society-of-biblical-literature-fullnote-bibliography.csl (#5381) ca27bc1 Update university-of-york-harvard-environment.csl (#5384) df54422 Update university-of-york-harvard-archaeology.csl (#5385) 4439cdd Create revue-forestiere-francaise.csl (#5386) c363e8f Update catholic-biblical-association.csl (#5360) 7e383b8 Fix locators in PU Paris-Nanterre (#5376) 83cb249 Update methods-of-information-in-medicine.csl (#5370) 5b19db4 Update taylor-and-francis-council-of-science-editors-author-date.csl (#5371) 27d116b Update harvard-cite-them-right-no-et-al.csl (#5373) e2ef408 Update ageing-and-society.csl (#5375) 16098e4 Update triangle.csl (#5369) 133d633 Create university-of-tasmania-simplified-author-date.csl (#5357) b9ecf07 Update revue-archeologique.csl (#5366) 6152cce Update journal-of-consumer-research.csl (#5358) 93f6600 Create refugee-survey-quarterly.csl (#5354) bfa3b6d Update canadian-biosystems-engineering.csl (#5362) 53e75ee update doi prefix (#5361) 5b3de98 Create archives-of-hand-and-microsurgery.csl (#5363) git-subtree-dir: buildres/csl/csl-styles git-subtree-split: 10b2222 * Squashed 'buildres/csl/csl-locales/' changes from 79c4dba80a..bd8d2dbc85 bd8d2dbc85 Update spec_helper for pull-request testing (#220) ed3fc7c9be Update to Ruby 3.0.0 (#218) git-subtree-dir: buildres/csl/csl-locales git-subtree-split: bd8d2dbc85713b192d426fb02749475df30f0d2c Co-authored-by: github actions <jabrefmail+webfeedback@gmail.com>
JabRef · May 1, 2021 · 7e12b23 · 7e12b23
1 parent f504ff0
commit 7e12b23
Show file tree

Hide file tree

Showing 40 changed files with 3,287 additions and 333 deletions.
diff --git a/buildres/csl/csl-locales/Gemfile b/buildres/csl/csl-locales/Gemfile
@@ -1,4 +1,4 @@
-ruby '2.7.1'
+ruby '3.0.0'
 source 'https://rubygems.org'
 
 gem 'rake'

diff --git a/buildres/csl/csl-locales/Gemfile.lock b/buildres/csl/csl-locales/Gemfile.lock
@@ -1,56 +1,85 @@
 GIT
   remote: https://github.com/citation-style-language/Sheldon.git
-  revision: 1962fad73610a3e0b1610e0c24c16669d584196b
+  revision: 38b6de75ac4dd86d6b3b47c172431e6e44f53ca0
   specs:
-    sheldon (1.0.2)
+    sheldon (1.0.30)
       citeproc-ruby
       csl-styles
       diffy
       dotenv
+      erubis (~> 2.7)
+      faraday
+      faraday_middleware
+      git_diff
+      hashdiff (= 0.3.7)
       nokogiri
+      octokit (~> 4.0)
       ostruct
       reverse_markdown
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.12)
+    citeproc-ruby (1.1.13)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.5)
-    csl (1.5.1)
+    csl (1.5.2)
       namae (~> 1.0)
     csl-styles (1.0.1.10)
       csl (~> 1.0)
     diff-lcs (1.4.4)
     diffy (3.4.0)
     dotenv (2.7.6)
-    fuubar (2.5.0)
+    erubis (2.7.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    mini_portile2 (2.4.0)
-    namae (1.0.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    ostruct (0.2.0)
-    rake (13.0.1)
+    git_diff (0.4.3)
+    hashdiff (0.3.7)
+    mini_portile2 (2.5.0)
+    multipart-post (2.1.1)
+    namae (1.0.2)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    octokit (4.20.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    ostruct (0.3.3)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rake (13.0.3)
     reverse_markdown (2.0.0)
       nokogiri
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    ruby-progressbar (1.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
 
 PLATFORMS
   ruby
@@ -64,7 +93,7 @@ DEPENDENCIES
   sheldon!
 
 RUBY VERSION
-   ruby 2.7.1
+   ruby 3.0.0p0
 
 BUNDLED WITH
-   2.1.4
+   2.2.3
diff --git a/buildres/csl/csl-locales/spec/spec_helper.rb b/buildres/csl/csl-locales/spec/spec_helper.rb
@@ -2,6 +2,8 @@
 require 'json'
 
 LOCALE_ROOT = File.expand_path('../..', __FILE__)
+PULL_REQUEST = File.join(LOCALE_ROOT, 'pull-request')
+LOCALE_ROOT = PULL_REQUEST if File.directory?(PULL_REQUEST)
 
 NO_REGIONS = %w{
   eu ar la

diff --git a/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl b/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl
@@ -155,9 +155,11 @@
   </citation>
   <bibliography second-field-align="flush">
     <layout>
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author" suffix="."/>
-      <text macro="title" suffix="." prefix=" "/>
+      <group delimiter=". " suffix=". ">
+        <text variable="citation-number"/>
+        <text macro="author"/>
+        <text macro="title"/>
+      </group>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=" " delimiter=" ">

diff --git a/buildres/csl/csl-styles/aquatic-conservation.csl b/buildres/csl/csl-styles/aquatic-conservation.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-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="symbol" delimiter-precedes-last="never" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Aquatic Conservation: Marine and Freshwater Ecosystems</title>
     <id>http://www.zotero.org/styles/aquatic-conservation</id>
@@ -19,18 +19,31 @@
     <issn>1052-7613</issn>
     <eissn>1099-0755</eissn>
     <summary>style for Aquatic Conservation: Marine and Freshwater Ecosystems, derived primarily from Cell and AMA styles</summary>
-    <updated>2020-12-03T16:59:23+00:00</updated>
+    <updated>2021-04-14T07:21:19+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="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="editor-translator">
-    <names variable="editor translator" prefix="(" suffix=")." delimiter=", ">
+    <names variable="editor translator" delimiter=", ">
       <name and="text" initialize-with="" delimiter=", "/>
       <label form="short" prefix=", " text-case="capitalize-first" strip-periods="true"/>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
-      <name et-al-min="11" et-al-use-first="10" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <name initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
@@ -41,8 +54,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" delimiter=", " initialize-with="" et-al-min="3" et-al-use-first="1"/>
-      <et-al font-style="italic"/>
+      <name form="short" initialize-with=""/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -79,7 +91,7 @@
       <if variable="version" match="any">
         <text variable="title"/>
       </if>
-      <else-if type="bill book graphic legal_case motion_picture song" match="any">
+      <else-if type="bill book graphic legal_case motion_picture song report" match="any">
         <text variable="title" font-style="italic"/>
       </else-if>
       <else>
@@ -94,8 +106,8 @@
   </macro>
   <macro name="publisher">
     <group delimiter=": ">
-      <text variable="publisher-place"/>
       <text variable="publisher"/>
+      <text variable="publisher-place"/>
     </group>
   </macro>
   <macro name="access">
@@ -111,19 +123,13 @@
           </group>
           <group delimiter=" " prefix="[" suffix="]">
             <text term="accessed" text-case="capitalize-first"/>
-            <date form="text" date-parts="year-month-day" variable="issued"/>
+            <date form="text" variable="accessed"/>
           </group>
         </group>
       </else-if>
     </choose>
   </macro>
-  <macro name="pages">
-    <group delimiter=" ">
-      <label variable="page" form="short"/>
-      <text variable="page"/>
-    </group>
-  </macro>
-  <citation disambiguate-add-year-suffix="true" collapse="year">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
     <sort>
       <key macro="issued"/>
       <key macro="author"/>
@@ -135,7 +141,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography and="symbol" et-al-min="7" et-al-use-first="6" entry-spacing="0" line-spacing="2" hanging-indent="true">
+  <bibliography et-al-min="7" et-al-use-first="6" entry-spacing="0" line-spacing="2" hanging-indent="true">
     <sort>
       <key macro="author" names-min="1" names-use-first="1"/>
       <key macro="author-count" names-min="3" names-use-first="3"/>
@@ -144,69 +150,80 @@
       <key macro="author"/>
     </sort>
     <layout>
-      <group delimiter=". ">
+      <group delimiter=". " suffix=".">
         <text macro="author"/>
         <date variable="issued" prefix="(" suffix=")">
           <date-part name="year"/>
         </date>
-        <text macro="title" prefix=" "/>
         <choose>
           <if type="bill book graphic legal_case motion_picture song" match="any">
             <group delimiter=". ">
-              <text macro="editor-translator"/>
+              <group delimiter=", ">
+                <text macro="title" prefix=" "/>
+                <text macro="editor-translator" prefix=" "/>
+                <text macro="edition"/>
+              </group>
               <text prefix=" " suffix="." macro="publisher"/>
             </group>
           </if>
           <else-if type="report" match="any">
-            <group>
-              <group suffix=".">
-                <text variable="genre" prefix=" "/>
-                <text variable="number" prefix=" No. "/>
-              </group>
-              <text macro="publisher" prefix=" "/>
+            <group delimiter=". ">
+              <text macro="title" prefix=" "/>
+              <text variable="publisher" prefix=" "/>
+              <text variable="number" prefix="Report number: "/>
             </group>
           </else-if>
           <else-if type="thesis" match="any">
-            <group suffix="." delimiter=", ">
-              <text variable="genre"/>
-              <text macro="publisher"/>
+            <text macro="title" prefix=" "/>
+            <group prefix=".">
+              <group prefix=" ">
+                <group suffix="." delimiter=", ">
+                  <text variable="genre"/>
+                  <text variable="publisher"/>
+                  <text variable="publisher-place"/>
+                </group>
+              </group>
             </group>
           </else-if>
           <else-if type="chapter paper-conference" match="any">
             <group delimiter=". ">
+              <text macro="title" prefix=" "/>
               <group delimiter=" ">
                 <group delimiter=": ">
                   <text term="in" text-case="capitalize-first"/>
                   <names variable="editor">
-                    <name et-al-min="8" et-al-use-first="3" initialize-with="" name-as-sort-order="first" sort-separator=" "/>
-                    <label form="short" text-case="capitalize-first" strip-periods="false" prefix=" (" suffix=")"/>
+                    <name et-al-min="8" et-al-use-first="3" name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=", "/>
+                    <label form="short" strip-periods="true" prefix=" (" suffix=")."/>
                   </names>
                 </group>
                 <text variable="container-title" font-style="italic"/>
               </group>
               <group delimiter=", ">
-                <text macro="publisher" prefix=" "/>
-                <text macro="pages"/>
+                <text macro="publisher"/>
+                <group delimiter=" ">
+                  <label variable="page" form="short"/>
+                  <text variable="page"/>
+                </group>
               </group>
             </group>
           </else-if>
           <else>
-            <group suffix=".">
+            <group delimiter=". ">
               <text macro="title" prefix=" "/>
               <text macro="editor-translator" prefix=" "/>
-            </group>
-            <group delimiter=", " prefix=" " suffix=".">
-              <text variable="container-title" font-style="italic"/>
-              <group prefix=" ">
-                <text variable="volume" font-weight="normal"/>
-                <text variable="issue" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix=" " suffix=".">
+                <text variable="container-title" font-style="italic"/>
+                <group prefix=" ">
+                  <text variable="volume" font-weight="normal"/>
+                  <text variable="issue" prefix="(" suffix=")"/>
+                </group>
+                <text variable="page"/>
               </group>
-              <text variable="page"/>
             </group>
           </else>
         </choose>
-        <text macro="access"/>
       </group>
+      <text macro="access" prefix=" "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas-note.csl b/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas-note.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" default-locale="pt-BR" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="never" default-locale="pt-BR">
   <info>
     <title>Associação Brasileira de Normas Técnicas (note, Português - Brasil)</title>
     <title-short>ABNT</title-short>
@@ -183,8 +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=", "></name>
       <et-al term="et-al" font-style="italic"/>
     </names>
   </macro>
@@ -353,9 +352,7 @@
   <macro name="access-info">
     <choose>
       <if variable="URL">
-        <text value="Disponível em: &lt;"/>
-        <text variable="URL"/>
-        <text value="&gt;."/>
+        <text variable="URL" prefix="Disponível em: &lt;" suffix="&gt;."/>
         <group>
           <text value=" Acesso em: "/>
           <date variable="accessed">
@@ -370,9 +367,7 @@
   <macro name="access-info-lowercase">
     <choose>
       <if variable="URL">
-        <text value="disponível em: &lt;"/>
-        <text variable="URL"/>
-        <text value="&gt;,"/>
+        <text variable="URL" prefix="disponível em: &lt;" suffix="&gt;."/>
         <group>
           <text value=" acesso em: "/>
           <date variable="accessed">