From 6b18cc82e1e571c50866869c87bd0768d82c8510 Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Thu, 7 Nov 2019 05:51:24 +0100
Subject: [PATCH] Update developing-world-bioethics.csl and bioethics.csl
 (#4372)

---
 bioethics.csl                  | 226 ---------------------------------
 dependent/bioethics.csl        |  19 +++
 developing-world-bioethics.csl | 149 ++++++++++++++++------
 3 files changed, 131 insertions(+), 263 deletions(-)
 delete mode 100644 bioethics.csl
 create mode 100644 dependent/bioethics.csl

diff --git a/bioethics.csl b/bioethics.csl
deleted file mode 100644
index d5cc0774d0..0000000000
--- a/bioethics.csl
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="minimal-two" demote-non-dropping-particle="never" default-locale="en-GB">
-  <info>
-    <title>Bioethics</title>
-    <id>http://www.zotero.org/styles/bioethics</id>
-    <link href="http://www.zotero.org/styles/bioethics" rel="self"/>
-    <link href="http://www.zotero.org/styles/journal-of-roman-archaeology-b" rel="template"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1111/(ISSN)1467-8519/homepage/ForAuthors.html" rel="documentation"/>
-    <author>
-      <name>Patrick O'Brien</name>
-    </author>
-    <category citation-format="note"/>
-    <category field="anthropology"/>
-    <issn>0269-9702</issn>
-    <eissn>1467-8519</eissn>
-    <updated>2017-07-12T11:26:44+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">
-      <name sort-separator=", " initialize-with="." delimiter=", "/>
-      <label form="short" prefix=", "/>
-      <substitute>
-        <text macro="container-author"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="container-author">
-    <names variable="container-author" delimiter=", ">
-      <name sort-separator=", " initialize-with="." delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name initialize-with="."/>
-      <substitute>
-        <text macro="editor"/>
-        <text variable="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor-short">
-    <names variable="editor">
-      <name form="short" sort-separator=", " delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="container-author-short">
-    <names variable="container-author" delimiter=", ">
-      <name form="short" sort-separator=", " delimiter=", "/>
-      <et-al font-style="italic"/>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" sort-separator=", " delimiter=", "/>
-      <et-al font-style="italic"/>
-      <substitute>
-        <text macro="editor-short"/>
-        <text macro="container-author-short"/>
-        <text variable="title-short" font-style="italic"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="collection">
-    <group delimiter=" " suffix=", ">
-      <text variable="collection-title"/>
-      <text variable="collection-number"/>
-    </group>
-  </macro>
-  <macro name="encyclopedia">
-    <group delimiter=" ">
-      <choose>
-        <if variable="title-short" match="any">
-          <text variable="title" form="short" font-style="italic"/>
-        </if>
-        <else>
-          <text variable="container-title" font-style="italic"/>
-        </else>
-      </choose>
-      <text variable="volume"/>
-      <date variable="issued" prefix="(" suffix=")">
-        <date-part name="year"/>
-      </date>
-      <text variable="page" suffix=","/>
-      <text variable="title" prefix="s.v. " quotes="true"/>
-      <text macro="author" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book thesis" match="any">
-        <text variable="title" font-style="italic"/>
-      </if>
-      <else-if type="webpage post-weblog" match="any">
-        <date form="text" variable="issued" suffix=". "/>
-        <text variable="title" font-style="italic" suffix=". "/>
-        <text variable="container-title" font-style="italic"/>
-      </else-if>
-      <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter=". ">
-          <text variable="title" quotes="false"/>
-          <group delimiter=" ">
-            <text variable="container-title" form="short" strip-periods="true" font-style="italic"/>
-            <group delimiter="; ">
-              <text macro="year-date"/>
-              <group delimiter=": ">
-                <group>
-                  <text variable="volume"/>
-                  <text variable="issue" prefix="(" suffix=")"/>
-                </group>
-                <text variable="page"/>
-              </group>
-            </group>
-          </group>
-        </group>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <group delimiter=". " suffix=". ">
-          <text macro="year-date"/>
-          <text variable="title" quotes="false"/>
-        </group>
-        <group delimiter=". ">
-          <group delimiter=" ">
-            <text term="in" text-case="capitalize-first"/>
-            <text macro="editor"/>
-          </group>
-          <text variable="container-title"/>
-        </group>
-      </else-if>
-      <else>
-        <text variable="title" font-style="italic" font-weight="bold"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if variable="collection-title" match="any">
-        <text macro="collection"/>
-      </if>
-      <else-if type="thesis">
-        <text variable="genre" suffix=","/>
-        <text variable="publisher"/>
-      </else-if>
-      <else>
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="locator">
-    <choose>
-      <if locator="page">
-        <text variable="locator" prefix=": "/>
-      </if>
-      <else-if locator="paragraph">
-        <text variable="locator" prefix="§"/>
-      </else-if>
-      <else-if type="webpage post-weblog" match="any">
-        <group delimiter=" " prefix=". ">
-          <group delimiter=": ">
-            <text term="available at" text-case="capitalize-first"/>
-            <text variable="URL"/>
-          </group>
-          <group delimiter=" " prefix="[" suffix="]">
-            <text term="accessed" text-case="capitalize-first"/>
-            <date form="text" variable="accessed"/>
-          </group>
-        </group>
-      </else-if>
-      <else>
-        <text variable="page" prefix=": "/>
-      </else>
-    </choose>
-  </macro>
-  <citation and="symbol" delimiter-precedes-et-al="always" delimiter-precedes-last="always" et-al-min="3" et-al-use-first="1">
-    <layout delimiter="; " suffix=".">
-      <choose>
-        <if type="entry-dictionary entry-encyclopedia" match="any">
-          <text macro="encyclopedia"/>
-        </if>
-        <else-if position="ibid-with-locator">
-          <group delimiter=" ">
-            <text term="ibid" suffix="."/>
-            <text macro="locator"/>
-          </group>
-        </else-if>
-        <else-if position="ibid">
-          <text term="ibid" suffix="."/>
-        </else-if>
-        <else-if position="subsequent">
-          <group delimiter=" ">
-            <text macro="author-short"/>
-            <group prefix="(" suffix=")" delimiter=" ">
-              <text term="cited"/>
-              <group delimiter="&#160;">
-                <text term="note" form="short"/>
-                <text variable="first-reference-note-number"/>
-              </group>
-            </group>
-            <text macro="locator"/>
-          </group>
-        </else-if>
-        <else>
-          <text macro="author" suffix=". "/>
-          <text macro="title"/>
-          <text macro="publisher" prefix=". "/>
-          <text macro="locator"/>
-        </else>
-      </choose>
-    </layout>
-  </citation>
-</style>
diff --git a/dependent/bioethics.csl b/dependent/bioethics.csl
new file mode 100644
index 0000000000..f9a6a3d9a1
--- /dev/null
+++ b/dependent/bioethics.csl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" default-locale="en-GB">
+  <info>
+    <title>Bioethics</title>
+    <id>http://www.zotero.org/styles/bioethics</id>
+    <link href="http://www.zotero.org/styles/bioethics" rel="self"/>
+    <link href="http://www.zotero.org/styles/developing-world-bioethics" rel="independent-parent"/>
+    <link href="http://onlinelibrary.wiley.com/journal/10.1111/(ISSN)1467-8519/homepage/ForAuthors.html" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="note"/>
+    <category field="anthropology"/>
+    <issn>0269-9702</issn>
+    <eissn>1467-8519</eissn>
+    <updated>2019-10-21T11:26:44+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/developing-world-bioethics.csl b/developing-world-bioethics.csl
index 214f641b4b..388da01991 100644
--- a/developing-world-bioethics.csl
+++ b/developing-world-bioethics.csl
@@ -2,6 +2,7 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="never" default-locale="en-GB">
   <info>
     <title>Developing World Bioethics</title>
+    <title-short>DWB</title-short>
     <id>http://www.zotero.org/styles/developing-world-bioethics</id>
     <link href="http://www.zotero.org/styles/developing-world-bioethics" rel="self"/>
     <link href="http://www.zotero.org/styles/apa-cv" rel="template"/>
@@ -14,7 +15,7 @@
     <category field="humanities"/>
     <issn>1471-8731</issn>
     <eissn>1471-8847</eissn>
-    <updated>2019-02-06T19:29:38+00:00</updated>
+    <updated>2019-10-21T08:40:21+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">
@@ -23,6 +24,7 @@
         <single>ed. &amp; trans.</single>
         <multiple>eds. &amp; trans.</multiple>
       </term>
+      <term name="cited">op. cit.</term>
       <term name="translator" form="short">trans.</term>
     </terms>
   </locale>
@@ -40,7 +42,7 @@
             <label form="short" prefix=" (" text-case="title" suffix=")"/>
           </names>
           <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <name and="symbol" initialize-with="."/>
             <label form="short" prefix=" (" text-case="title" suffix=")"/>
           </names>
         </group>
@@ -65,7 +67,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <name and="symbol" delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
@@ -82,6 +84,28 @@
       </substitute>
     </names>
   </macro>
+  <macro name="editor-short">
+    <names variable="editor">
+      <name form="short" sort-separator=", " delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="container-author-short">
+    <names variable="container-author" delimiter=", ">
+      <name form="short" sort-separator=", " delimiter=", "/>
+      <et-al font-style="italic"/>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" sort-separator=", " delimiter=", "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <text macro="editor-short"/>
+        <text macro="container-author-short"/>
+        <text variable="title-short" font-style="italic"/>
+      </substitute>
+    </names>
+  </macro>
   <macro name="patent-number">
     <group delimiter=" ">
       <group delimiter=" ">
@@ -269,7 +293,7 @@
           </choose>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
+      <else-if type="post-weblog webpage post" match="none">
         <group delimiter=", ">
           <choose>
             <if variable="event version" type="speech dataset motion_picture" match="none">
@@ -570,6 +594,31 @@
       </else-if>
     </choose>
   </macro>
+  <macro name="locator">
+    <choose>
+      <if locator="page">
+        <text variable="locator" prefix=": "/>
+      </if>
+      <else-if locator="paragraph">
+        <text variable="locator" prefix="§"/>
+      </else-if>
+      <else-if type="webpage post-weblog post" match="any">
+        <group delimiter=" " prefix=". ">
+          <group delimiter=": ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+          <group delimiter=" " prefix="[" suffix="]">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date form="text" variable="accessed"/>
+          </group>
+        </group>
+      </else-if>
+      <else>
+        <text variable="page" prefix=": "/>
+      </else>
+    </choose>
+  </macro>
   <citation et-al-min="8" et-al-use-first="6" et-al-use-last="true">
     <sort>
       <key macro="issued-sort" sort="descending"/>
@@ -577,45 +626,71 @@
       <key macro="title"/>
     </sort>
     <layout>
-      <group suffix=".">
-        <group delimiter=". ">
-          <text macro="author"/>
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=" ">
+            <text term="ibid" suffix="."/>
+            <text macro="locator"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" suffix="."/>
+        </else-if>
+        <else-if position="subsequent">
+          <group delimiter=" ">
+            <text macro="author-short"/>
+            <group prefix="(" suffix=")" delimiter=" ">
+              <text term="cited"/>
+              <group delimiter=" ">
+                <text term="note" form="short"/>
+                <text variable="first-reference-note-number"/>
+              </group>
+            </group>
+            <text macro="locator"/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix=".">
+            <group delimiter=". ">
+              <text macro="author"/>
+              <choose>
+                <if is-uncertain-date="issued">
+                  <group prefix=" [" suffix="]" delimiter=" ">
+                    <text term="circa" form="short"/>
+                    <text macro="issued"/>
+                  </group>
+                </if>
+                <else>
+                  <text macro="issued" prefix=" (" suffix=")"/>
+                </else>
+              </choose>
+              <text macro="title-plus-extra"/>
+              <text macro="container"/>
+            </group>
+            <text macro="legal-cites"/>
+            <text macro="locators"/>
+            <group delimiter=", " prefix=". ">
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
+          <text macro="access" prefix=" "/>
           <choose>
-            <if is-uncertain-date="issued">
+            <if is-uncertain-date="original-date">
               <group prefix=" [" suffix="]" delimiter=" ">
+                <text macro="original-published"/>
                 <text term="circa" form="short"/>
-                <text macro="issued"/>
+                <text macro="original-date"/>
               </group>
             </if>
-            <else>
-              <text macro="issued" prefix=" (" suffix=")"/>
-            </else>
+            <else-if variable="original-date">
+              <group prefix=" (" suffix=")" delimiter=" ">
+                <text macro="original-published"/>
+                <text macro="original-date"/>
+              </group>
+            </else-if>
           </choose>
-          <text macro="title-plus-extra"/>
-          <text macro="container"/>
-        </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
-      </group>
-      <text macro="access" prefix=" "/>
-      <choose>
-        <if is-uncertain-date="original-date">
-          <group prefix=" [" suffix="]" delimiter=" ">
-            <text macro="original-published"/>
-            <text term="circa" form="short"/>
-            <text macro="original-date"/>
-          </group>
-        </if>
-        <else-if variable="original-date">
-          <group prefix=" (" suffix=")" delimiter=" ">
-            <text macro="original-published"/>
-            <text macro="original-date"/>
-          </group>
-        </else-if>
+        </else>
       </choose>
     </layout>
   </citation>