From 6d8efb6e8915b1fe16a9fa9c36b7953370395b44 Mon Sep 17 00:00:00 2001
From: github actions <jabrefmail+webfeedback@gmail.com>
Date: Sun, 1 Mar 2020 02:09:42 +0000
Subject: [PATCH] Squashed 'src/main/resources/csl-styles/' changes from
 f03decef0e..566df871e2

566df871e2 Create archeologicke-rozhledy.csl (#4586)
420558620b Update mcgill-en.csl - include render-legislation macro (#4579)
7d857f1df5 Create journal-of-plankton-research.csl (#4581)
05c8aca5bd Update mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl (#4582)
564dc5f633 Update vodohospodarske-technicko-ekonomicke-informace.csl (#4584)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 566df871e2daa3c8903f8a31c92ccff338c21d14
---
 archeologicke-rozhledy.csl                    | 303 ++++++++++++++++++
 journal-of-plankton-research.csl              | 144 +++++++++
 mcgill-en.csl                                 |  28 +-
 ...forderung-und-deutsch-als-zweitsprache.csl |   4 +-
 ...odarske-technicko-ekonomicke-informace.csl |   2 +-
 5 files changed, 475 insertions(+), 6 deletions(-)
 create mode 100644 archeologicke-rozhledy.csl
 create mode 100644 journal-of-plankton-research.csl

diff --git a/archeologicke-rozhledy.csl b/archeologicke-rozhledy.csl
new file mode 100644
index 00000000000..9a018c99af0
--- /dev/null
+++ b/archeologicke-rozhledy.csl
@@ -0,0 +1,303 @@
+<?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">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Archeologické rozhledy</title>
+    <title-short>AR</title-short>
+    <id>http://www.zotero.org/styles/archeologicke-rozhledy</id>
+    <link href="http://www.zotero.org/styles/archeologicke-rozhledy" rel="self"/>
+    <link href="http://www.zotero.org/styles/natures-sciences-societes" rel="template"/>
+    <link href="http://www.arup.cas.cz/?cat=227" rel="documentation"/>
+    <author>
+      <name>David Spacil</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="anthropology"/>
+    <category field="history"/>
+    <issn>0323-1267</issn>
+    <eissn>2570-9151</eissn>
+    <updated>2020-02-28T06:25:16+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-GB">
+    <terms>
+      <term name="editortranslator" form="verb">edited and translated by</term>
+      <term name="edition" form="short">edn.</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="container-author" delimiter=", " suffix=", ">
+          <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
+        </names>
+        <choose>
+          <if variable="container-author" match="none">
+            <names variable="editor translator" delimiter=", ">
+              <name and="symbol" initialize-with=". "/>
+              <label form="short" text-case="lowercase" strip-periods="false" prefix=" "/>
+            </names>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </if>
+      <else-if variable="container-author" match="any">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter=" &#8211; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi: "/>
+      </if>
+      <else>
+        <group delimiter=": " prefix="(" suffix=")">
+          <text term="online"/>
+          <text variable="URL"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="number-volumes">
+    <choose>
+      <if variable="volume" match="none">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="number-of-volumes"/>
+          <label variable="volume" form="short" strip-periods="true"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage" match="any">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="title" font-style="normal"/>
+            <text macro="number-volumes"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="title" quotes="false" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=". ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="report">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="none">
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if type="speech" variable="event" match="any">
+                <text variable="event" font-style="italic"/>
+              </if>
+            </choose>
+            <group delimiter=": ">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </group>
+          <group prefix="(" suffix=")" delimiter=", ">
+            <text variable="collection-title"/>
+            <text variable="collection-number"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="year-suffix"/>
+      </if>
+      <else>
+        <text term="no date"/>
+        <text variable="year-suffix" prefix=" "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", " prefix=" ">
+          <text variable="volume"/>
+          <text variable="issue"/>
+          <text variable="page"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="published-date">
+    <choose>
+      <if type="article-newspaper article-magazine post-weblog speech" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" form="long"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="chapter paper-conference article article-magazine article-newspaper book review review-book report" match="any">
+        <group delimiter=" ">
+          <text variable="page" prefix=", "/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if variable="container-title">
+        <group delimiter=". ">
+          <text variable="container-title" font-style="normal"/>
+          <text macro="edition"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" text-case="capitalize-first" suffix=":"/>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+    <sort>
+      <key macro="year-date"/>
+    </sort>
+    <layout delimiter=", " prefix="(" suffix=")">
+      <group delimiter=", ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" form="short" suffix=" "/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=", ">
+        <group delimiter=": ">
+          <group font-style="italic" delimiter=" ">
+            <text macro="author"/>
+            <text macro="year-date"/>
+          </group>
+          <group delimiter=". ">
+            <text macro="title"/>
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text macro="container-prefix"/>
+                <text macro="editor"/>
+              </group>
+              <text macro="container-title"/>
+            </group>
+          </group>
+        </group>
+        <text macro="secondary-contributors"/>
+        <text macro="publisher"/>
+      </group>
+      <group delimiter=", ">
+        <text macro="locator"/>
+        <text macro="published-date"/>
+        <text macro="pages"/>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/journal-of-plankton-research.csl b/journal-of-plankton-research.csl
new file mode 100644
index 00000000000..66ccbba36e9
--- /dev/null
+++ b/journal-of-plankton-research.csl
@@ -0,0 +1,144 @@
+<?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">
+  <info>
+    <title>Journal of Plankton Research</title>
+    <title-short>JPR</title-short>
+    <id>http://www.zotero.org/styles/journal-of-plankton-research</id>
+    <link href="http://www.zotero.org/styles/journal-of-plankton-research" rel="self"/>
+    <link href="http://www.zotero.org/styles/toxicological-sciences" rel="template"/>
+    <link href="https://academic.oup.com/plankt/pages/ms_prep_submission#references" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>0142-7873</issn>
+    <eissn>1464-3774</eissn>
+    <updated>2020-02-25T14:41:53+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="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="text" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+      <et-al font-style="italic"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="3" et-al-use-first="1" entry-spacing="0">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author"/>
+      <date variable="issued" prefix=" (" suffix=")">
+        <date-part name="year"/>
+      </date>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=". " prefix=" ">
+            <text macro="title"/>
+            <text macro="edition"/>
+            <text macro="editor"/>
+            <text macro="publisher"/>
+          </group>
+        </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"/>
+                <text macro="editor"/>
+              </group>
+              <text variable="container-title" font-style="italic"/>
+              <text variable="collection-title" prefix=" " suffix="."/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=". " prefix=" ">
+            <text macro="title"/>
+            <group delimiter=", ">
+              <text variable="container-title" form="short" font-style="italic"/>
+              <text variable="volume" font-weight="bold"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/mcgill-en.csl b/mcgill-en.csl
index 5b051d22006..ba9caaf08b9 100644
--- a/mcgill-en.csl
+++ b/mcgill-en.csl
@@ -274,6 +274,20 @@ all the other tests should have been done... -->
       </choose>
     </group>
   </macro>
+  <macro name="render-legislation">
+    <group delimiter=", ">
+      <!-- if no volume, assume bill -->
+      <group delimiter=" ">
+        <text variable="title" font-style="italic"/>
+        <text variable="references" prefix="(" suffix=")"/>
+      </group>
+      <group delimiter=" ">
+        <text variable="container-title"/>
+        <date form="text" variable="issued" date-parts="year"/>
+      </group>
+      <text variable="section"/>
+    </group>
+  </macro>
   <macro name="render-patent">
     <group delimiter=" ">
       <text variable="title" quotes="true" suffix=","/>
@@ -386,6 +400,11 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar
             </names>
           </substitute>
         </names>
+        <choose>
+          <if type="article-journal">
+            <text variable="title-short" quotes="true" prefix=", "/>
+          </if>
+        </choose>
       </if>
       <else>
         <choose>
@@ -445,9 +464,12 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar
           <group>
             <group delimiter=", ">
               <choose>
-                <if type="bill legislation" match="any">
-                  <text macro="render-bill"/>
+                <if type="legislation" match="any">
+                  <text macro="render-legislation"/>
                 </if>
+                <else-if type="bill" match="any">
+                  <text macro="render-bill"/>
+                </else-if>
                 <else-if type="song" match="any">
                   <text macro="render-song"/>
                 </else-if>
@@ -507,9 +529,9 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar
             <choose>
               <if type="legal_case" match="any">
                 <text variable="references" prefix=", "/>
+                <text variable="title-short" prefix=" [" suffix="]" font-style="italic"/>
               </if>
             </choose>
-            <text variable="title-short" prefix=" [" suffix="]" font-style="italic"/>
           </group>
         </else>
       </choose>
diff --git a/mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl b/mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl
index 36732a6fb42..d5a271b2291 100644
--- a/mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl
+++ b/mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl
@@ -14,7 +14,7 @@
     <category field="linguistics"/>
     <category field="psychology"/>
     <summary>Style for the Mercator-Institute for Literacy and Language Education in Cologne. Based on Waxmann Style which is based on the style for the German society for psychology, 4th style manual (Feb-2016).</summary>
-    <updated>2018-10-30T15:11:15+00:00</updated>
+    <updated>2020-02-26T09:32:15+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="de">
@@ -269,7 +269,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography entry-spacing="1" line-spacing="2" hanging-indent="true">
+  <bibliography entry-spacing="0" line-spacing="1" hanging-indent="true">
     <sort>
       <key macro="author"/>
       <key macro="issued-year" sort="ascending"/>
diff --git a/vodohospodarske-technicko-ekonomicke-informace.csl b/vodohospodarske-technicko-ekonomicke-informace.csl
index 1f63dfb38d6..b28a6ab4547 100644
--- a/vodohospodarske-technicko-ekonomicke-informace.csl
+++ b/vodohospodarske-technicko-ekonomicke-informace.csl
@@ -438,7 +438,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="3" and="text">
+  <bibliography>
     <sort>
       <key variable="citation-number"/>
     </sort>