From 84dba23af36ef3974202cd0a39d54ded74c3c376 Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Sat, 17 Dec 2022 19:51:26 +0100
Subject: [PATCH] Update international-union-of-crystallography.csl (#6279)

* Update international-union-of-crystallography.csl

* Re-indent CSL styles

Co-authored-by: POBrien333 <POBrien333@users.noreply.github.com>
Co-authored-by: Sebastian Karcher <karcher@u.northwestern.edu>
Co-authored-by: adam3smith <adam3smith@users.noreply.github.com>
---
 international-union-of-crystallography.csl | 68 +++++++++++++++++-----
 1 file changed, 53 insertions(+), 15 deletions(-)

diff --git a/international-union-of-crystallography.csl b/international-union-of-crystallography.csl
index dcaa4332ce8c..564787bf09d5 100644
--- a/international-union-of-crystallography.csl
+++ b/international-union-of-crystallography.csl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="en-US" demote-non-dropping-particle="sort-only" page-range-format="expanded">
-  <!-- INFO -->
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" demote-non-dropping-particle="sort-only" page-range-format="expanded" default-locale="en-US">
   <info>
     <title>International Union of Crystallography journals</title>
     <title-short>IUCr</title-short>
@@ -15,21 +14,31 @@
       <name>Wouter Touw</name>
       <email>Wouter.Touw@radboudumc.nl</email>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="chemistry"/>
-    <updated>2016-02-09T09:43:09+00:00</updated>
+    <updated>2022-10-21T16:24:39+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>
-  <!-- MACROS -->
   <macro name="author-short">
     <names variable="author">
       <name form="short" and="symbol" delimiter-precedes-et-al="never"/>
       <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title" form="short"/>
+      </substitute>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" initialize-with=". " and="symbol" delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
     </names>
   </macro>
   <macro name="issued">
@@ -47,10 +56,23 @@
   <macro name="editor">
     <names variable="editor">
       <label form="verb" suffix=" "/>
-      <name initialize-with="." and="symbol" delimiter-precedes-last="never"/>
+      <name and="symbol" delimiter-precedes-last="never" initialize-with=". "/>
     </names>
   </macro>
-  <!-- CITATION -->
+  <macro name="access">
+    <choose>
+      <if type="article-journal article" match="any">
+        <choose>
+          <if match="none" variable="page">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="webpage post-weblog post" match="any">
+        <text variable="URL"/>
+      </else-if>
+    </choose>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-year-suffix="true" collapse="year-suffix" year-suffix-delimiter=",">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
@@ -59,7 +81,6 @@
       </group>
     </layout>
   </citation>
-  <!-- BIBLIOGRAPHY -->
   <bibliography hanging-indent="true">
     <sort>
       <key macro="author"/>
@@ -72,24 +93,41 @@
         <text macro="issued" prefix="(" suffix=")."/>
         <choose>
           <if type="article article-magazine article-newspaper article-journal review" match="any">
-            <text variable="container-title" form="short" font-style="italic" text-case="title" suffix="."/>
-            <text variable="volume" font-weight="bold" suffix=","/>
-            <text variable="page" suffix="."/>
+            <group delimiter=" ">
+              <text variable="container-title" form="short" text-case="title" font-style="italic"/>
+              <group delimiter=", ">
+                <text variable="volume" font-weight="bold"/>
+                <text variable="page"/>
+                <text macro="access"/>
+              </group>
+            </group>
           </if>
           <else-if type="chapter paper-conference" match="any">
-            <text variable="container-title" text-case="title" font-style="italic" suffix=", "/>
             <label variable="volume" form="short" text-case="capitalize-first"/>
             <text variable="volume" font-style="italic" suffix=", "/>
-            <text macro="editor" suffix=", "/>
-            <label variable="page" form="short"/>
-            <text variable="page" suffix="."/>
-            <text macro="publisher" suffix="."/>
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text variable="container-title" text-case="title" font-style="italic"/>
+                <text macro="editor"/>
+              </group>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+              <text macro="publisher" suffix="."/>
+            </group>
           </else-if>
           <else-if type="thesis">
             <text variable="title" suffix="."/>
             <text variable="genre" suffix="."/>
             <text variable="publisher" suffix="."/>
           </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=", ">
+              <text variable="container-title"/>
+              <text macro="access"/>
+            </group>
+          </else-if>
           <else>
             <text variable="title"/>
             <text macro="publisher" suffix="."/>