From de5d453bc036108187073c7827c58f05bfc1a8ef Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Sun, 10 Mar 2024 20:12:02 +0100
Subject: [PATCH] Update who-europe-numeric+harvard.csl (#6898)

https://forums.zotero.org/discussion/111701/who-regional-office-for-europe-styles-harvard-numeric#latest
---
 who-europe-harvard.csl | 55 ++++++++++++++++++-----------------
 who-europe-numeric.csl | 65 ++++++++++++++++++++++--------------------
 2 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/who-europe-harvard.csl b/who-europe-harvard.csl
index 43af01814a..88536f3f87 100644
--- a/who-europe-harvard.csl
+++ b/who-europe-harvard.csl
@@ -9,16 +9,19 @@
       <name>Ivo Rakovac</name>
       <email>irk@euro.who.int</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="medicine"/>
     <summary>The WHO Regional Office for Europe author year style</summary>
-    <updated>2013-02-28T13:30:00+00:00</updated>
+    <updated>2024-02-12T11:22:25+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 name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", "/>
+      <label prefix=", "/>
     </names>
   </macro>
   <macro name="anon">
@@ -28,7 +31,7 @@
     <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" strip-periods="true"/>
+        <label strip-periods="false" prefix=", "/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -48,8 +51,11 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL">
-        <group delimiter=", ">
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </if>
+      <else-if match="any" variable="URL">
+        <group delimiter=", " prefix="(" suffix=")">
           <text variable="URL"/>
           <group delimiter=" ">
             <text term="accessed"/>
@@ -60,18 +66,16 @@
             </date>
           </group>
         </group>
-      </if>
+      </else-if>
     </choose>
   </macro>
   <macro name="accessSeries">
     <choose>
       <if variable="URL collection-title collection-number" match="any">
-        <text value="("/>
         <group delimiter="; ">
           <text macro="series"/>
           <text macro="access"/>
         </group>
-        <text value=")"/>
       </if>
     </choose>
   </macro>
@@ -105,7 +109,7 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=", ">
+    <group delimiter=": ">
       <text variable="publisher-place"/>
       <text variable="publisher"/>
     </group>
@@ -145,7 +149,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="false" et-al-min="4" et-al-use-first="1">
+  <bibliography delimiter-precedes-et-al="never" et-al-min="7" et-al-use-first="6">
     <sort>
       <key macro="author"/>
       <key variable="issued"/>
@@ -173,17 +177,22 @@
             </group>
           </if>
           <else-if type="chapter" match="any">
-            <text macro="title" suffix="."/>
-            <group prefix=" ">
-              <text term="in" text-case="capitalize-first" suffix=": "/>
-              <text macro="editor"/>
-              <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-              <text variable="volume" prefix="Vol" suffix="."/>
+            <group delimiter=". ">
+              <text macro="title" suffix="."/>
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor"/>
+              </group>
+              <text variable="container-title" font-style="italic"/>
+              <group delimiter=" ">
+                <label text-case="capitalize-first" variable="volume" form="short"/>
+                <text variable="volume"/>
+              </group>
               <text macro="edition" prefix=","/>
-              <text variable="collection-title" suffix="."/>
-              <group suffix=".">
+              <text variable="collection-title"/>
+              <group delimiter="; ">
                 <text macro="publisher" prefix=" "/>
-                <group suffix="." prefix=",">
+                <group delimiter=":">
                   <date variable="issued">
                     <date-part name="year"/>
                   </date>
@@ -209,15 +218,9 @@
                   </group>
                 </if>
                 <else>
-                  <!-- no editor given -->
                   <text variable="event" font-style="italic" suffix="."/>
                   <group>
                     <text macro="publisher" prefix=" "/>
-                    <!--group suffix="." prefix=",">
-                      <date variable="issued">
-                        <date-part name="year"/>
-                      </date>
-                    </group-->
                   </group>
                 </else>
               </choose>
@@ -251,7 +254,7 @@
               <text macro="editor"/>
             </group>
             <group prefix=" " suffix=".">
-              <text variable="container-title" font-style="italic"/>
+              <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
               <group prefix=", ">
                 <text variable="volume"/>
                 <text variable="issue" prefix="(" suffix=")"/>
diff --git a/who-europe-numeric.csl b/who-europe-numeric.csl
index fd7a8e251c..e8e83137c3 100644
--- a/who-europe-numeric.csl
+++ b/who-europe-numeric.csl
@@ -9,31 +9,30 @@
       <name>Ivo Rakovac</name>
       <email>irk@euro.who.int</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="medicine"/>
-    <summary>The WHO Regional Office for Europe numeric style</summary>
-    <updated>2013-02-28T13:00:00+00:00</updated>
+    <summary>The WHO Regional Office for Europe numeric style, based on the second edition from 2017.</summary>
+    <updated>2024-02-12T11:17:06+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 name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", "/>
+      <label prefix=", "/>
     </names>
   </macro>
-  <!--macro name="anon">
-<text term="" form="short" text-case="capitalize-first" strip-periods="true"/>
-</macro-->
   <macro name="author">
     <choose>
       <if variable="call-number" match="none">
         <group suffix=".">
           <names variable="author">
             <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-            <label form="short" strip-periods="true"/>
+            <label strip-periods="true" prefix=", "/>
             <substitute>
               <names variable="editor"/>
-              <!--text macro="anon"/-->
             </substitute>
           </names>
         </group>
@@ -42,11 +41,14 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL">
-        <group delimiter=", ">
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </if>
+      <else-if match="any" variable="URL">
+        <group delimiter=", " prefix="(" suffix=")">
           <text variable="URL"/>
-          <group>
-            <text value="accessed "/>
+          <group delimiter=" ">
+            <text term="accessed"/>
             <date variable="accessed">
               <date-part name="day" suffix=" "/>
               <date-part name="month" suffix=" "/>
@@ -54,18 +56,16 @@
             </date>
           </group>
         </group>
-      </if>
+      </else-if>
     </choose>
   </macro>
   <macro name="accessSeries">
     <choose>
       <if variable="URL collection-title collection-number" match="any">
-        <text value="("/>
         <group delimiter="; ">
           <text macro="series"/>
           <text macro="access"/>
         </group>
-        <text value=")"/>
       </if>
     </choose>
   </macro>
@@ -135,7 +135,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography hanging-indent="false" et-al-min="4" et-al-use-first="1">
+  <bibliography delimiter-precedes-et-al="never" et-al-min="7" et-al-use-first="6">
     <layout>
       <text variable="citation-number" suffix=". "/>
       <group suffix=".">
@@ -157,16 +157,21 @@
           </if>
           <else-if type="chapter" match="any">
             <text macro="title" suffix="."/>
-            <group prefix=" ">
-              <text term="in" text-case="capitalize-first" suffix=": "/>
-              <text macro="editor"/>
+            <group delimiter=". " prefix=" ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor"/>
+              </group>
               <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-              <text variable="volume" prefix="Vol" suffix="."/>
-              <text macro="edition" prefix=","/>
-              <text variable="collection-title" suffix="."/>
-              <group suffix="." prefix=" ">
+              <group delimiter=" ">
+                <label text-case="capitalize-first" variable="volume" form="short"/>
+                <text variable="volume"/>
+              </group>
+              <text macro="edition"/>
+              <text variable="collection-title"/>
+              <group delimiter="; ">
                 <text macro="publisher"/>
-                <group suffix="." prefix=", ">
+                <group>
                   <date variable="issued">
                     <date-part name="year"/>
                   </date>
@@ -197,7 +202,6 @@
                   </group>
                 </if>
                 <else>
-                  <!-- no editor given -->
                   <text variable="event" font-style="italic" suffix="."/>
                   <group>
                     <text macro="publisher" prefix=" "/>
@@ -241,18 +245,17 @@
               <text macro="title"/>
               <text macro="editor"/>
             </group>
-            <group prefix=" " suffix=".">
-              <text variable="container-title" font-style="italic"/>
-              <group prefix=", ">
+            <group delimiter=" " prefix=" " suffix=".">
+              <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+              <group delimiter=";">
                 <date variable="issued">
                   <date-part name="year"/>
                 </date>
-                <group prefix=", ">
+                <group delimiter=":">
                   <text variable="volume"/>
-                  <text variable="issue" prefix="(" suffix=")"/>
+                  <text variable="page"/>
                 </group>
               </group>
-              <text variable="page" prefix=":"/>
             </group>
           </else>
         </choose>