Merge commit 'd9d4e6275255bfbf5c182e557e9771e08fc412d1'

JabRef · Feb 26, 2020 · 46cdfa0 · 46cdfa0
2 parents 0839875 + d9d4e62
commit 46cdfa0
Show file tree

Hide file tree

Showing 71 changed files with 4,425 additions and 202 deletions.
diff --git a/src/main/resources/csl-styles/.travis.yml b/src/main/resources/csl-styles/.travis.yml
@@ -2,22 +2,22 @@ dist: bionic
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.5
+- 2.6.5
 install:
-  - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-  - bundle update sheldon
+- bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+- bundle update sheldon
 notifications:
   email:
-    recipients:
-      - rintze.zelle@gmail.com
-      - karcher@u.northwestern.edu
     on_success: change
     on_failure: always
+    recipients:
+    - secure: Ko9SzcdByE/HOMP7s9ddTpRdqahnO5LJ1MGJWX/cmymQc8fDRMgP9jgI6D/G5Ntgo6uGUO+xkcV5mBbOAoI5v8U2GQ5nICDXHdQrX8kJzve9JDiQJOy0c17TYi3d7bBeS1bOhy7E0TxHRax2wWWxDhqz80GwSo9JAhQbcusR/1U=
+    - secure: Ov0xcwOVBSbc7uuCk0Qu+ILmh3HuFNa9PnfI363at9V3aG05oJHiTRseFXvfiHgK5663Wcytcl3DU+A2vYZSz7Y3ZGzcUzhlRBLMUfebncB2nAsX3NJsieJ6FoYlkRBZdzA2lzt3FVv99hebuZnU4OiANdnHFiLmFzeWRaPZfIQ=
   webhooks:
     urls:
-      - https://shelbot.herokuapp.com/build
-      - https://styles-update.zotero.org:8826/
-      - https://styles-update.zotero.org:8827/
+    - https://shelbot.herokuapp.com/build
+    - https://styles-update.zotero.org:8826/
+    - https://styles-update.zotero.org:8827/
     on_success: always
     on_failure: always
     on_start: never
diff --git a/src/main/resources/csl-styles/Gemfile.lock b/src/main/resources/csl-styles/Gemfile.lock
@@ -31,7 +31,7 @@ GEM
       ruby-progressbar (~> 1.4)
     mini_portile2 (2.4.0)
     namae (1.0.1)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     ostruct (0.1.0)
     rake (13.0.1)

diff --git a/src/main/resources/csl-styles/american-sociological-association.csl b/src/main/resources/csl-styles/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</title>
+    <title>American Sociological Association 6th 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.</summary>
+    <summary>The ASA style following the 6th edition of the Style Guide</summary>
     <updated>2018-04-20T10:42:41+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>
@@ -30,7 +30,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="contextual" initialize="false" initialize-with=". "/>
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize="false" initialize-with=". "/>
       <label form="short" prefix=", "/>
       <substitute>
         <names variable="editor"/>

diff --git a/src/main/resources/csl-styles/anatomical-sciences-education.csl b/src/main/resources/csl-styles/anatomical-sciences-education.csl
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-GB">
+  <info>
+    <title>Anatomical Sciences Education</title>
+    <title-short>ASE</title-short>
+    <id>http://www.zotero.org/styles/anatomical-sciences-education</id>
+    <link href="http://www.zotero.org/styles/anatomical-sciences-education" rel="self"/>
+    <link href="http://www.zotero.org/styles/clinical-anatomy" rel="template"/>
+    <link href="https://anatomypubs.onlinelibrary.wiley.com/hub/journal/19359780/homepage/forauthors.html#5" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>1935-9772</issn>
+    <eissn>1935-9780</eissn>
+    <updated>2020-02-20T14:47:42+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-short">
+    <names variable="author">
+      <name form="short" and="text"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " delimiter=", " initialize-with=""/>
+      <label text-case="capitalize-first" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with=""/>
+      <label text-case="capitalize-first" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="issued">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <number variable="edition" form="ordinal"/>
+      <label text-case="capitalize-first" variable="edition" form="short"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal" match="any">
+        <choose>
+          <if match="none" variable="page volume">
+            <text variable="DOI" prefix="(in press; doi: " suffix=")"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation disambiguate-add-year-suffix="true" et-al-min="3" et-al-use-first="1" collapse="year">
+    <sort>
+      <key macro="issued"/>
+      <key macro="author-short"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="13" et-al-use-first="12">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+        <text macro="author" suffix="."/>
+        <text macro="issued" suffix="."/>
+        <choose>
+          <if type="book thesis" match="any">
+            <group delimiter=". ">
+              <text variable="title" text-case="title"/>
+              <text macro="edition"/>
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <text variable="number-of-pages"/>
+                <label plural="never" strip-periods="true" variable="number-of-pages" form="short"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor"/>
+              </group>
+              <text variable="container-title" text-case="title"/>
+              <text macro="edition"/>
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <group delimiter=" ">
+                <label plural="never" strip-periods="true" variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article article-journal" match="any">
+            <text variable="title" suffix="."/>
+            <text variable="container-title" form="short" strip-periods="true"/>
+            <group delimiter=":">
+              <text variable="volume"/>
+              <text variable="page"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post-weblog post" match="any">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <text variable="URL" prefix="URL: "/>
+                <group delimiter=" " prefix="[" suffix="]">
+                  <text term="accessed"/>
+                  <date form="text" variable="accessed"/>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <text variable="container-title"/>
+          </else>
+        </choose>
+      </group>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/src/main/resources/csl-styles/apa-no-ampersand.csl b/src/main/resources/csl-styles/apa-no-ampersand.csl
@@ -1711,4 +1711,4 @@
       </choose>
     </layout>
   </bibliography>
-</style>
+</style>
diff --git a/src/main/resources/csl-styles/apa-single-spaced.csl b/src/main/resources/csl-styles/apa-single-spaced.csl
@@ -1711,4 +1711,4 @@
       </choose>
     </layout>
   </bibliography>
-</style>
+</style>
diff --git a/src/main/resources/csl-styles/apa.csl b/src/main/resources/csl-styles/apa.csl
@@ -1711,4 +1711,4 @@
       </choose>
     </layout>
   </bibliography>
-</style>
+</style>
diff --git a/src/main/resources/csl-styles/associacao-brasileira-de-normas-tecnicas-ufrgs.csl b/src/main/resources/csl-styles/associacao-brasileira-de-normas-tecnicas-ufrgs.csl
@@ -102,29 +102,29 @@
   <macro name="translator">
     <text value="Tradução "/>
     <names variable="translator" delimiter="; ">
-      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"></name>
+      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="composer">
     <text value="Compositor: "/>
     <names variable="composer" delimiter="; ">
-      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"></name>
+      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="recipient">
     <text value="Destinatário: "/>
     <names variable="recipient" delimiter="; ">
-      <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"></name>
+      <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="author">
     <choose>
       <if type="motion_picture broadcast song" match="any">
         <names variable="author">
-          <name></name>
+          <name/>
         </names>
       </if>
       <else>