From dfd1308e6561632fb8d60a4b7684d5d042218b4a Mon Sep 17 00:00:00 2001
From: Peter Wills <peter@peterwills.ca>
Date: Fri, 14 Apr 2023 14:26:17 -0700
Subject: [PATCH 01/12] Fix English online/blog posts

---
 jm-mcgill-v9.csl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index 55805a3..fd082aa 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -122,7 +122,8 @@
       <term name="in" form="short">in</term>
       <term name="in" form="verb">reprinted in</term>
       <term name="in" form="symbol">:</term>
-      <term name="online" form="short">en ligne (blog)</term>
+      <term name="online">online</term>
+      <term name="online" form="short">online (blog)</term>
       <term name="and" form="symbol">&#38;</term>
       <term name="et-al">et al</term>
       <term name="from" form="verb">to the</term>

From f6e4adea4f6a3fafc7759b59e966352c8c185b08 Mon Sep 17 00:00:00 2001
From: Peter Wills <peter@peterwills.ca>
Date: Fri, 14 Apr 2023 14:42:23 -0700
Subject: [PATCH 02/12] Ensure open paren (open-quote) added if no place

---
 jm-mcgill-v9.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index fd082aa..85cdc83 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1479,8 +1479,8 @@
   </macro>
   <macro name="publisher-place-year">
     <group delimiter=" ">
+      <text term="open-quote" form="short"/>
       <group>
-        <text term="open-quote" form="short"/>
         <text variable="publisher-place"/>
         <text term="open-inner-quote" form="short"/>
       </group>

From b1d9285b293ba68d7f1101ce700cfa835bf578b4 Mon Sep 17 00:00:00 2001
From: Peter Wills <peter@peterwills.ca>
Date: Fri, 14 Apr 2023 14:47:03 -0700
Subject: [PATCH 03/12] Revert "Ensure open paren (open-quote) added if no
 place"

This reverts commit f6e4adea4f6a3fafc7759b59e966352c8c185b08.
---
 jm-mcgill-v9.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index 85cdc83..fd082aa 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1479,8 +1479,8 @@
   </macro>
   <macro name="publisher-place-year">
     <group delimiter=" ">
-      <text term="open-quote" form="short"/>
       <group>
+        <text term="open-quote" form="short"/>
         <text variable="publisher-place"/>
         <text term="open-inner-quote" form="short"/>
       </group>

From a542d61a87760f392028091b2e571661d7e02d6b Mon Sep 17 00:00:00 2001
From: Peter Wills <peter@peterwills.ca>
Date: Fri, 14 Apr 2023 15:03:37 -0700
Subject: [PATCH 04/12] Ensure paren opened even when no place

---
 jm-mcgill-v9.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index fd082aa..2951baa 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1478,9 +1478,9 @@
     </choose>
   </macro>
   <macro name="publisher-place-year">
+    <text term="open-quote" form="short"/>
     <group delimiter=" ">
       <group>
-        <text term="open-quote" form="short"/>
         <text variable="publisher-place"/>
         <text term="open-inner-quote" form="short"/>
       </group>

From 1e82392d4166f358898d98f61b6f5ddf7a19734a Mon Sep 17 00:00:00 2001
From: Admin <peter@peterwills.ca>
Date: Wed, 6 Dec 2023 15:17:34 -0500
Subject: [PATCH 05/12] to be edited

---
 jm-mcgill-v9-pw-edit.csl | 1673 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 1673 insertions(+)
 create mode 100644 jm-mcgill-v9-pw-edit.csl

diff --git a/jm-mcgill-v9-pw-edit.csl b/jm-mcgill-v9-pw-edit.csl
new file mode 100644
index 0000000..e29d57a
--- /dev/null
+++ b/jm-mcgill-v9-pw-edit.csl
@@ -0,0 +1,1673 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.1mlz1" year-range-format="expanded" require-comma-on-symbol="after-number">
+  <info>
+    <title>JM - McGill9e</title>
+    <id>http://juris-m.github.io/styles/jm-mcgill-v9-pw-edit</id>
+    <link href="http://juris-m.github.io/styles/jm-mgcill-v9" rel="self"/>
+    <link href="https://lawjournal.mcgill.ca/fr/manuel-de-reference/" rel="documentation"/>
+    <author>
+      <name>Samuel Gagnon</name>
+      <email>gagnon-samuel@outlook.com</email>
+      <uri>https://github.com/Droitslinguistiques</uri>
+    </author>
+    <contributor>
+      <name>Liam McHugh-Russell</name>
+      <email>liam.mchugh.russell@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Frank Bennet</name>
+      <uri>https://juris-m.github.io/</uri>
+    </contributor>
+    <contributor>
+      <name>Florian Martin-Bariteau</name>
+      <email>f.martin-bariteau@umontreal.ca</email>
+      <uri>http://f-mb.github.io/cslegal/</uri>
+    </contributor>
+    <contributor>
+      <name>Gareth Spanglett</name>
+      <email>gspanglett@gmail.com</email>
+      <uri>https://gspanglett.github.io</uri>
+    </contributor>
+    <contributor>
+      <name>Peter Wills</name>
+      <email>peter.wills@law.ox.ac.uk</email>
+    </contributor>
+    <category citation-format="note"/>
+    <category field="law"/>
+    <updated>2022-04-04 18:37:58</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="fr">
+    <style-options jurisdiction-preference="fr"/>
+     <terms>
+      <term name="page" form="short">
+        <single>à la p</single>
+        <multiple>aux pp</multiple>
+      </term>
+      <term name="paragraph" form="short">
+        <single>au para</single>
+        <multiple>aux paras</multiple>
+      </term>
+      <term name="note" form="short">
+        <single>n</single>
+        <multiple>nn</multiple>
+      </term>
+      <term name="issue" form="short">
+        <single>nᵒ</single>
+        <multiple>nᵒ</multiple>
+      </term>
+      <term name="article" form="short">
+        <single>art</single>
+        <multiple>arts</multiple>
+      </term>
+      <term name="accessed">dernière consultation le</term>
+      <term name="issue" form="long">nᵒ</term>
+      <term name="issue" form="verb">nᵒ de catalogue</term>
+      <term name="number" form="long">nᵒ</term>
+      <term name="chapter" form="short">c</term>
+      <term name="schedule" form="long">constitutant l'annexe</term>
+      <term name="schedule" form="short">annexe</term>
+      <term name="collection-editor" form="short">dir</term>
+      <term name="collection-editor" form="long">président :</term>
+      <term name="editor" form="short">dir</term>
+      <term name="editor" form="verb">dir</term>
+      <term name="translator" form="verb">traduit par</term>
+      <term name="in">dans</term>
+      <term name="in" form="verb">reproduit dans</term>
+      <term name="in" form="symbol"> :</term>
+      <term name="online">en ligne</term>
+      <term name="online" form="short">en ligne (blogue)</term>
+      <term name="and" form="symbol">et</term>
+      <term name="supplement" form="short">supp</term>
+      <term name="open-quote" form="short">, </term>
+      <term name="close-quote" form="short">,</term>
+      <term name="open-inner-quote" form="short">,</term>
+      <term name="close-inner-quote" form="short"></term>
+      <term name="letter" form="verb">lettre</term>
+      <term name="from" form="short">de</term>
+      <term name="from" form="verb">du</term>
+      <term name="section" form="short">
+        <single>art</single>
+      <multiple>arts</multiple>
+      </term>
+      <term name="part" form="long">partie</term>
+    </terms>
+  </locale>
+  <locale xml:lang="en">
+    <date form="text">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" suffix=" "/>
+      <date-part name="year"/>
+    </date>
+     <terms>
+      <term name="page" form="short">at</term>
+      <term name="paragraph" form="short">
+        <single>at para</single>
+        <multiple>at paras</multiple>
+      </term>
+      <term name="note" form="short">
+        <single>n</single>
+        <multiple>nn</multiple>
+      </term>
+      <term name="issue" form="short">
+        <single>at no</single>
+        <multiple>at nos</multiple>
+      </term>
+      <term name="accessed">last visited</term>
+      <term name="issue" form="long">No</term>
+      <term name="issue" form="verb">Catalogue No</term>
+      <term name="number" form="long">No</term>
+      <term name="chapter" form="short">c</term>
+      <term name="editor" form="verb-short">ed</term>
+      <term name="editor" form="short">ed</term>
+      <term name="collection-editor" form="short">ed</term>
+      <term name="collection-editor" form="long">Chair:</term>
+      <term name="translator" form="verb">translated by</term>
+      <term name="in" form="short">in</term>
+      <term name="in" form="verb">reprinted in</term>
+      <term name="in" form="symbol">:</term>
+									   
+      <term name="online" form="short">online (blog)</term>
+      <term name="and" form="symbol">&#38;</term>
+      <term name="et-al">et al</term>
+      <term name="from" form="verb">to the</term>
+      <term name="from" form="verb-short">of the</term>
+      <term name="supplement" form="short">Supp</term>
+      <term name="schedule" form="long">being Schedule</term>
+      <term name="schedule" form="short">Appendix</term>
+      <term name="open-quote" form="short"> (</term>
+      <term name="close-quote" form="short">)</term>
+      <term name="open-inner-quote" form="short">:</term>
+      <term name="close-inner-quote" form="short">)</term>
+      <term name="ordinal-02">d</term>
+      <term name="ordinal-03">d</term>
+      <term name="section" form="short">
+        <single>s</single>
+        <multiple>ss</multiple>
+      </term>
+      <term name="section" form="long">
+        <single>art</single>
+        <multiple>arts</multiple>
+      </term>
+      <term name="article" form="short">
+        <single>art</single>
+        <multiple>arts</multiple>
+      </term>
+      <term name="part" form="long">Part</term>
+    </terms>
+  </locale>
+  <!-- Juris-M Macros-->
+  <macro name="juris-pretitle">
+    <text value=""/>
+  </macro>
+  <macro name="juris-title">
+    <text value="[HINT: Install the Myles plugin, available at https://juris-m.github.io/downloads]"/>
+  </macro>
+  <macro name="juris-main">
+    <text value=""/>
+  </macro>
+  <macro name="juris-tail">
+    <text value=""/>
+  </macro>
+  <macro name="juris-pretitle-short">
+    <text value=""/>
+  </macro>
+  <macro name="juris-title-short">
+    <text value=""/>
+  </macro>
+  <macro name="juris-main-short">
+    <text value=""/>
+  </macro>
+  <macro name="juris-tail-short">
+    <text value=""/>
+  </macro>
+  <macro name="juris-locator">
+	<text value=""/>
+  </macro>
+  <macro name="jurism">
+    <choose>
+      <if>
+        <conditions match="all">
+          <condition type="legislation"/>
+          <condition match="none" variable="volume section container-title number"/>
+          <condition match="all" variable="title-short"/>
+        </conditions>
+        <group delimiter=" ">
+          <text macro="juris-locator"/>
+          <text macro="juris-title-short" strip-periods="true"/>
+        </group>
+      </if>
+      <else-if position="ibid-with-locator">
+        <choose>
+          <if type="legislation regulation" match="any">
+            <group delimiter=", ">
+              <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
+              <text macro="juris-locator" label-form="short"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
+              <text macro="pinpoint"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if position="ibid">
+        <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
+      </else-if>
+      <else-if position="subsequent">
+        <!-- short form -->
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <text macro="local-title-short" font-style="italic" strip-periods="true" suffix=","/>
+            <text value="supra" font-style="italic"/>
+          </group>
+          <choose>
+            <if match="any" type="legislation regulation">
+              <group delimiter=", ">
+                <text variable="first-reference-note-number" prefix="note "/>
+                <text macro="juris-locator" label-form="short" strip-periods="true"/>
+              </group>
+            </if>
+            <else>
+              <text variable="first-reference-note-number" prefix="note "/>            
+              <text macro="pinpoint"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else>
+        <choose>
+          <if country="ca">
+            <!-- full form -->
+            <choose>
+              <if type="bill">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle" strip-periods="true"/>
+                  <text macro="juris-title" font-style="italic" strip-periods="true"/>
+                  <text macro="juris-main" strip-periods="true"/>
+                  <group delimiter=" ">
+                    <text macro="juris-locator" label-form="short" strip-periods="true"/>
+                    <text macro="juris-tail" strip-periods="true" prefix="(" suffix=")"/>
+                  </group>
+                </group>
+              </if>
+              <else-if type="legislation">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group parallel-first="title" parallel-delimiter-override=", ">
+                      <text macro="juris-title" font-style="italic" strip-periods="true"/>
+                    </group>
+                    <choose>
+                      <if variable="volume page container-title" match="all">
+                        <text macro="juris-locator"/>
+                        <group delimiter=" ">
+                          <text term="part" form="long"/>
+                          <number variable="volume" form="roman" text-case="uppercase"/>
+                          <text term="from" form="verb-short"/>
+                          <text variable="container-title" font-style="italic"/>
+                        </group>
+                        <group delimiter=" ">
+                          <text term="schedule" form="long"/>
+                          <number variable="page"/>
+                          <text term="from" form="verb"/>
+                        </group>
+                      </if>
+                      <else-if variable="page">
+                        <group parallel-first="title" delimiter=", ">
+                          <text macro="juris-locator"/>
+                          <group delimiter=" ">
+                            <text term="schedule" form="verb"/>
+                            <number variable="page"/>
+                            <text term="from" form="verb"/>
+                          </group>
+                        </group>
+                      </else-if>
+                      <else>
+                        <text macro="juris-main" strip-periods="false"/>
+                        <text macro="juris-locator" label-form="short"/>
+                      </else>
+                    </choose>
+                  </group>
+                  <choose>
+                    <if>
+                      <conditions match="all">
+                        <condition match="none" context="bibliography"/>
+                        <condition position="first"/>
+                        <condition type="legislation"/>
+                      </conditions>
+                      <group parallel-last="issued">
+                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else-if>
+              <else-if type="legal_case">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group parallel-first="authority title issued" delimiter=" " parallel-delimiter-override=", ">
+                      <text macro="juris-title" strip-periods="true" font-style="italic"/>
+                      <choose>
+                        <if>
+                          <conditions match="all">
+                            <condition match="all" type="legal_case" variable="container-title volume"/>
+                            <condition match="none" variable="collection-number"/>
+                          </conditions>
+                          <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+                        </if>
+                      </choose>
+                    </group>
+                    <group delimiter=", ">
+                      <group delimiter=" ">
+                        <text macro="juris-main" strip-periods="true"/>
+                        <text macro="juris-locator" label-form="short" strip-periods="true"/>
+                      </group>
+                      <choose>
+                        <if match="all" variable="archive archive_location">
+                          <group parallel-last="issued submitted">
+                            <group parallel-last-to-first="issued submitted">
+                              <text macro="juris-tail" strip-periods="true"/>
+                            </group>
+                          </group> 
+                        </if>
+                      </choose>
+                    </group>
+                  </group>
+				  <choose>
+				    <!-- Replicating juris-ca hierarchy -->
+				    <if> <!-- Reporter without year as volume-->
+					  <conditions match="all">
+						<condition match="all" variable="container-title volume"/>
+						<condition match="none" variable="collection-number admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</if>
+					<else-if> <!-- online service-->
+						<conditions match="all">
+						  <condition match="all" variable="submitted container-title"/>
+						  <condition match="none" variable="collection-number admin-flag"/>
+					    </conditions>
+						<text macro="ct-jurisdiction-paren" />
+					</else-if>
+					<else-if> <!-- Reporter with [year] and page -->
+					  <conditions match="all">
+						<condition match="all" variable="collection-number container-title page"/>
+						<condition match="none" variable="admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</else-if>
+					<else-if> <!-- Journal with [year] and no page -->
+					  <conditions match="all">
+						<condition match="all" variable="collection-number container-title issue"/>
+						<condition match="none" variable="admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</else-if>
+				  </choose>
+                  <choose>
+                    <if>
+                      <conditions match="all">
+                        <condition match="none" context="bibliography"/>
+                        <condition position="first"/>
+                      </conditions>
+                      <group parallel-last="title-short title">
+                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else-if>
+              <else-if type="hearing">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle"/>
+                  <text macro="juris-title" font-style="italic"/>
+                  <group delimiter=" ">
+                    <text macro="juris-main"/>
+                    <text macro="juris-locator"/>
+                    <choose>
+                      <if context="citation">
+                        <group delimiter=" ">
+                          <text macro="juris-tail"/>
+                          <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="report">
+                <choose>
+                  <if variable="collection-title">
+                    <group delimiter=", ">
+                      <text macro="juris-pretitle"/>
+                      <group>
+                        <text macro="juris-title" quotes="true"/>
+                      </group>
+                      <group delimiter=" ">
+                        <text macro="juris-main"/>
+                        <text macro="juris-locator" label-form="short"/>
+                      </group>
+                    </group>
+                  </if>
+                  <else>
+                    <group delimiter=", ">
+                      <text macro="juris-pretitle"/>
+                      <group delimiter=" ">
+                        <choose>
+                          <if variable="publisher">
+                            <group delimiter="">
+                              <group delimiter=", ">
+                                <text macro="juris-title" font-style="italic"/>
+                                <group delimiter=" ">
+                                  <choose>
+                                    <if is-numeric="number">
+                                      <text term="volume" form="short" strip-periods="true"/>
+                                    </if>
+                                  </choose>
+                                  <number variable="number"/>
+                                </group>
+                              </group>
+                              <text macro="publisher-place-year"/>
+                            </group>
+                            <group delimiter=" " prefix="(" suffix=")">
+                              <text term="collection-editor"/>
+                              <text macro="author-note"/>
+                            </group>
+                          </if>
+                          <else>
+                            <text macro="juris-title" font-style="italic"/>
+                            <text macro="juris-main"/>
+                          </else>
+                        </choose>
+                        <text macro="juris-locator" label-form="short"/>
+                      </group>
+                    </group>
+                  </else>
+                </choose>
+              </else-if>
+              <else-if type="gazette">
+                <group delimiter=" ">
+                  <text macro="juris-title" font-style="italic"/>
+                  <text macro="juris-main"/>
+                </group>
+              </else-if>
+              <else-if type="regulation" variable="authority">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle"/>
+                  <group delimiter=" ">
+                    <text macro="juris-title" font-style="italic"/>
+                    <text macro="juris-main"/>
+                  </group>
+                  <text macro="juris-locator"/>
+                </group>
+              </else-if>            
+              <else-if type="regulation">
+                <group delimiter=", ">
+                  <text macro="juris-title" font-style="italic"/>
+                  <text macro="juris-main"/>
+                  <text macro="juris-locator"/>
+                </group>
+              </else-if>
+            </choose>
+          </if>
+          <else-if country="gb">
+            <choose>
+              <if type="legislation">
+                <group delimiter=", ">
+                  <group delimiter=" ">
+                    <text variable="title" font-style="italic"/>
+                    <text variable="country" form="short" prefix="(" suffix=")"/>
+                  </group>
+                  <choose>
+                    <if variable="collection-number genre volume" match="all">
+                      <group delimiter=" ">
+                        <number variable="collection-number"/>
+                        <text variable="genre"/>
+                      </group>
+                      <number variable="chapter-number" prefix="St "/>
+                      <group delimiter=" ">
+                        <text term="chapter" form="short"/>
+                        <number variable="volume"/>
+                      </group>
+                    </if>
+                    <else>
+                      <date variable="issued" date-parts="year" form="numeric"/>
+                      <group delimiter=" ">
+                        <text term="chapter" form="short"/>
+                        <number variable="volume"/>
+                      </group>
+                    </else>
+                  </choose>
+                  <group parallel-first="issued" parallel-delimiter-override=" ">
+                    <text macro="pinpoint"/>
+                  </group>
+                  <group delimiter=", " parallel-first="issued" parallel-delimiter-override=" ">
+                    <group delimiter=" ">
+                      <text term="in" form="verb"/>
+                      <text variable="container-title"/>
+                    </group>
+                    <group delimiter=" ">
+                      <text term="schedule" form="short"/>
+                      <number variable="page" form="roman" text-case="uppercase"/>
+                    </group>
+                    <group delimiter=" ">
+                      <text term="number" form="short"/>
+                      <number variable="number"/>
+                    </group>
+                  </group>
+                </group>
+              </if>
+              <else-if type="legal_case">
+				<group delimiter=", ">
+				  <text macro="juris-title" font-style="italic"/>
+				  <group delimiter=" ">
+					<choose>
+					  <if variable="collection-number">
+						<number variable="collection-number" prefix="[" suffix="]"/>
+					  </if>
+					  <else-if variable="container-title">
+						<date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+					  </else-if>
+					  <else>
+						<!-- unreported cases -->
+						<group delimiter=", " prefix="(" suffix=")">
+						  <names variable="authority">
+							<name/>
+							<institution institution-parts="short" use-first="1"/>
+						  </names>
+						  <number variable="number"/>
+						  <date variable="issued" date-parts="year-month-day" form="text"/>
+						</group>
+					  </else>
+					</choose>
+					<choose>
+					  <if variable="container-title">
+						<number variable="volume"/>
+						<text variable="container-title" form="short"/>
+					  </if>
+					  <else-if variable="collection-number">
+						<names variable="authority">
+						  <name/>
+						  <institution form="short"/>
+						</names>
+					  </else-if>
+					</choose>
+					<number variable="page-first"/>
+					<text macro="pinpoint"/>
+					<choose>
+						<if variable="container-title">
+							<names variable="authority" prefix="(" suffix=")">
+							  <name/>
+							  <institution institution-parts="short"/>
+							</names>
+						</if>
+					</choose>
+				    <choose>
+						<if>
+						  <conditions match="all">
+							<condition match="none" context="bibliography"/>
+							<condition position="first"/>
+						  </conditions>
+						  <choose>
+							<if>
+							  <conditions match="any">
+								<condition variable="hereinafter"/>
+								<condition variable="title-short"/>
+							  </conditions>
+							  <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
+							</if>
+						  </choose>
+						</if>
+                    </choose>
+				  </group>
+				</group>
+              </else-if>
+            </choose>
+          </else-if>
+          <else-if country="un.int">
+            <group delimiter=", ">
+              <text variable="title" font-style="italic"/>
+              <group delimiter=" "> 
+                <text variable="event"/>
+                <number variable="number"/>
+              </group>
+              <names variable="authority"/>
+              <group delimiter=" ">
+                <number variable="chapter-number" form="ordinal" suffix=" Sess"/>
+              </group>
+              <group delimiter=" ">
+                <text term="supplement" form="short"/>
+                <text term="number" form="short"/>
+                <number variable="volume"/>
+              </group>
+              <group delimiter=" ">
+                <text value="UN Doc"/>
+                <text variable="archive_location"/>
+                <date variable="issued" date-parts="year" prefix="(" suffix=")" form="numeric"/>
+                <number variable="page-first"/>
+                <text macro="pinpoint"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <!-- full form -->
+            <choose>
+              <if type="bill">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle" strip-periods="true"/>
+                  <text macro="juris-title" font-style="italic" strip-periods="true"/>
+                  <text macro="juris-main" strip-periods="true"/>
+                  <group delimiter=" ">
+                    <text macro="juris-locator" label-form="short" strip-periods="true"/>
+                    <text macro="juris-tail" strip-periods="true" prefix="(" suffix=")"/>
+                  </group>
+                </group>
+              </if>
+              <else-if type="legislation">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <text macro="juris-title" font-style="italic" strip-periods="true"/>
+                    <text macro="juris-main"/>
+                    <text macro="juris-locator" label-form="short"/>
+                  </group>
+                  <choose>
+                    <if>
+                      <conditions match="all">
+                        <condition match="none" context="bibliography"/>
+                        <condition position="first"/>
+                        <condition type="legislation"/>
+                      </conditions>
+                      <group parallel-last="title-short title">
+                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else-if>
+              <else-if type="legal_case">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group parallel-first="authority title issued" delimiter=" " parallel-delimiter-override=", ">
+                      <text macro="juris-title" strip-periods="true" font-style="italic"/>
+                      <choose>
+                        <if>
+                          <conditions match="all">
+                            <condition match="all" type="legal_case" variable="container-title volume"/>
+                            <condition match="none" variable="collection-number"/>
+                          </conditions>
+                          <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+                        </if>
+                      </choose>
+                    </group>
+                    <group delimiter=", ">
+                      <group delimiter=" ">
+                        <text macro="juris-main" strip-periods="true"/>
+                        <text macro="juris-locator" label-form="short" strip-periods="true"/>
+                      </group>
+                      <choose>
+                        <if match="all" variable="archive archive_location">
+                          <group parallel-last="archive archive_location submitted">
+                            <group parallel-last-to-first="archive archive_location submitted">
+                              <text macro="juris-tail" strip-periods="true"/>
+                            </group>
+                          </group> 
+                        </if>
+                      </choose>
+                    </group>
+                  </group>
+                  <choose>
+                    <if>
+                      <conditions match="all">
+                        <condition match="none" context="bibliography"/>
+                        <condition position="first"/>
+                      </conditions>
+                      <group parallel-last="title-short title">
+                        <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else-if>
+              <else-if type="hearing">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle"/>
+                  <text macro="juris-title" font-style="italic"/>
+                  <group delimiter=" ">
+                    <text macro="juris-main"/>
+                    <text macro="juris-locator"/>
+                    <choose>
+                      <if context="citation">
+                        <group delimiter=" ">
+                          <text macro="juris-tail"/>
+                          <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="report">
+                <choose>
+                  <if variable="collection-title">
+                    <group delimiter=", ">
+                      <text macro="juris-pretitle"/>
+                      <group>
+                        <text macro="juris-title" quotes="true"/>
+                      </group>
+                      <group delimiter=" ">
+                        <text macro="juris-main"/>
+                        <text macro="juris-locator" label-form="short"/>
+                      </group>
+                    </group>
+                  </if>
+                  <else>
+                    <group delimiter=", ">
+                      <text macro="juris-pretitle"/>
+                      <group delimiter=" ">
+                        <text macro="juris-title" font-style="italic"/>
+                        <text macro="juris-main"/>
+                        <text macro="juris-locator" label-form="short"/>
+                      </group>
+                    </group>
+                  </else>
+                </choose>
+              </else-if>
+              <else-if type="gazette">
+                <group delimiter=" ">
+                  <text macro="juris-title" font-style="italic"/>
+                  <text macro="juris-main"/>
+                </group>
+              </else-if>
+              <else-if type="regulation">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle"/>
+                  <group delimiter=" ">
+                    <text macro="juris-title" font-style="italic"/>
+                    <text macro="juris-main"/>
+                  </group>
+                  <text macro="juris-locator"/>
+                </group>
+              </else-if>
+            </choose>
+          </else>
+        </choose>   
+      </else>
+    </choose>
+  </macro>
+  <macro name="layout-citation">
+    <choose>
+      <if>
+        <conditions match="all">
+          <condition match="any" type="legal_case legislation bill hearing report regulation"/>
+          <condition match="all" variable="jurisdiction"/>
+          <condition match="all" country="ca"/>
+          <condition match="none" variable="gazette-flag admin-flag"/>
+        </conditions>
+        <text macro="jurism"/>
+      </if>
+      <else-if country="gb" type="legislation legal_case">
+        <text macro="jurism" strip-periods="true"/>
+      </else-if>
+      <else-if type="bill" country="un.int">
+        <text macro="jurism"/>
+      </else-if>
+      <!-- Not implemented: ibid only needs capitalize-first if it's the first word in a footnote -->
+      <else-if position="ibid-with-locator">
+        <group delimiter=" ">
+          <text term="ibid" font-style="italic" strip-periods="true"/>
+          <text macro="pinpoint"/>
+        </group>
+      </else-if>
+      <else-if position="ibid">
+        <text term="ibid" font-style="italic" strip-periods="true"/>
+      </else-if>
+      <else-if position="subsequent">
+        <group delimiter=" ">
+          <text macro="short-form" suffix=","/>
+          <text value="supra" font-style="italic"/>
+          <text value="note"/>
+          <text variable="first-reference-note-number"/>
+          <text macro="pinpoint"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <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>
+              <else-if type="patent" match="any">
+                <text macro="render-patent"/>
+              </else-if>
+              <else-if type="manuscript" match="any">
+                <text macro="render-manuscript"/>
+              </else-if>
+              <else-if type="legal_case">
+                <text macro="render-case"/>
+              </else-if>
+              <else-if type="report">
+                <text macro="render-report"/>
+              </else-if>
+              <else-if type="personal_communication">
+                <text macro="render-personal_communication"/>
+              </else-if>
+              <else-if type="treaty">
+                <text macro="render-treaty"/>
+              </else-if>
+              <else-if type="gazette">
+                <text macro="render-gazette"/>
+              </else-if>
+              <else>
+                <text macro="author-note" strip-periods="true"/>
+                <choose>
+                  <if type="article-journal">
+                    <text macro="render-article-journal"/>
+                  </if>
+                  <else-if type="chapter">
+                    <text macro="render-chapter"/>
+                  </else-if>
+                  <else-if type="thesis">
+                    <text macro="render-thesis"/>
+                  </else-if>
+                  <else-if type="article-newspaper" match="any">
+                    <text macro="render-article-newspaper"/>
+                  </else-if>
+                  <else-if type="article-magazine">
+                    <text macro="render-article-magazine"/>
+                  </else-if>
+                  <else-if type="webpage post-weblog" match="any">
+                    <text macro="render-webpage"/>
+                  </else-if>
+                  <else-if type="book">
+                    <text macro="render-book"/>
+                  </else-if>
+                  <else-if type="entry-encyclopedia">
+                    <text macro="render-entry-encyclopedia"/>
+                  </else-if>
+				  <else-if type="paper-conference">
+					<text macro="render-paper-conference"/>
+				  </else-if>
+				  <else-if variable="genre">
+					<text macro="render-article-preprint"/>
+				  </else-if>
+                  <else-if type="article">
+                    <text macro="render-article"/>
+                  </else-if>
+                  <!--                    <else-if type="song" match="any"><text macro="render-song"/></else-if><else-if type="patent" match="any"><text macro="render-patent"/></else-if><else-if type="manuscript" match="any"><text macro="render-manuscript"/></else-if> -->
+                  <else>
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <text variable="title" font-style="italic"/>
+                        <text macro="translator"/>
+                        <text macro="edition"/>
+                      </group>
+                      <text macro="publisher-place-year"/>
+                    </group>
+                  </else>
+                </choose>
+              </else>
+            </choose>
+          </group>
+          <text macro="pinpoint"/>
+          <choose>
+            <if variable="hereinafter">
+              <text variable="hereinafter" prefix="[" suffix="]" font-style="italic"/>
+            </if>
+			<if type="book article-journal chapter article-newspaper post-weblog" variable="author">
+				<!-- Don't show the short title if there's an author that'll be shown instead-->
+			</if>
+            <else-if variable="title-short">
+              <text variable="title-short" prefix="[" suffix="]" font-style="italic"/>
+            </else-if>
+          </choose>
+          <choose>
+            <if type="article-newspaper article-magazine" match="any">
+              <text macro="internet-location"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="layout-bib">
+    <choose>
+      <if>
+        <conditions match="all">
+          <condition match="any" type="legal_case legislation hearing bill gazette report regulation"/>
+          <condition match="all" variable="jurisdiction"/>
+          <condition match="all" country="ca"/>
+        </conditions>
+        <text macro="jurism"/>
+      </if>
+      <else-if country="gb" type="legislation legal_case">
+        <text macro="jurism" strip-periods="true"/>
+      </else-if>
+      <else-if type="bill" country="un.int">
+        <text macro="jurism"/>
+      </else-if>
+      <else-if type="bill legal_case report legislation personal_communication treaty" match="any">
+        <choose>
+          <if type="bill legislation" match="any">
+            <text macro="render-bill"/>
+          </if>
+          <else-if type="legal_case">
+            <text macro="render-case"/>
+          </else-if>
+          <else-if type="report">
+            <text macro="render-report"/>
+          </else-if>
+          <else-if type="personal_communication">
+            <text macro="render-personal_communication"/>
+          </else-if>
+          <else-if type="treaty">
+            <text macro="render-treaty"/>
+          </else-if>
+          <else-if type="gazette">
+            <text macro="render-gazette"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text macro="author-bib" strip-periods="true"/>
+          <choose>
+            <if type="article-journal">
+              <text macro="render-article-journal"/>
+            </if>
+            <else-if type="chapter">
+              <text macro="render-chapter"/>
+            </else-if>
+            <else-if type="thesis">
+              <text macro="render-thesis"/>
+            </else-if>
+            <else-if type="article-newspaper">
+              <text macro="render-article-newspaper"/>
+            </else-if>
+            <else-if type="article-magazine">
+              <text macro="render-article-magazine"/>
+            </else-if>
+            <else-if type="book">
+              <text macro="render-book"/>
+            </else-if>
+            <else-if type="webpage post-weblog" match="any">
+              <text macro="render-webpage"/>
+            </else-if>
+            <else-if type="patent">
+              <text macro="render-patent"/>
+            </else-if>
+            <else-if type="song">
+              <text macro="render-song"/>
+            </else-if>
+            <else-if type="manuscript">
+              <text macro="render-manuscript"/>
+            </else-if>
+            <else-if type="entry-encyclopedia">
+              <text macro="render-entry-encyclopedia"/>
+            </else-if>
+		    <else-if type="paper-conference">
+			  <text macro="render-paper-conference"/>
+			</else-if>
+			<else-if variable="genre">
+              <text macro="render-article-preprint"/>
+            </else-if>
+            <else-if type="article">
+              <text macro="render-article"/>
+            </else-if>
+            <else>
+              <group>
+                <group delimiter=", ">
+                  <text variable="title" font-style="italic"/>
+                  <text macro="edition"/>
+                  <text macro="translator"/>
+                  <text macro="collection-editor"/>
+                </group>
+                <text macro="publisher-place-year"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="symbol" delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <label form="verb" suffix=" "/>
+      <name and="symbol"/>
+    </names>
+  </macro>
+  <macro name="container-title">
+    <text strip-periods="true" variable="container-title" form="short"/>
+  </macro>
+  <macro name="author-note">
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
+      <substitute>
+        <text macro="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-bib">
+    <names variable="author">
+      <name name-as-sort-order="first" and="symbol" sort-separator=", " delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="collection-editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="internet-location">
+    <choose>
+      <if variable="source URL genre" match="any">
+        <group delimiter=" ">
+          <group>
+            <text term="online"/>
+            <text term="in" form="symbol"/>
+          </group>
+          <choose>
+            <if variable="source">
+              <text variable="source" prefix="&#60;" suffix="&#62;"/>
+              <text variable="URL" prefix="[" suffix="]"/>
+            </if>
+            <else-if variable="genre">
+              <text variable="genre" prefix="&#60;" suffix="&#62;"/>
+              <text variable="URL" prefix="[" suffix="]"/>
+            </else-if>
+            <else>
+              <text variable="URL" prefix="&#60;" suffix="&#62;"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="genre">
+    <text variable="genre"/>
+  </macro>
+  <macro name="issued-long">
+    <choose>
+      <if variable="issued">
+        <date variable="issued" delimiter=" ">
+          <date-part name="day"/>
+          <date-part name="month" form="long"/>
+          <date-part name="year" form="long"/>
+        </date>
+      </if>
+      <else-if variable="accessed">
+        <date variable="accessed" form="text"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="submitted-long">
+    <date variable="submitted" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="long"/>
+      <date-part name="year" form="long"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal" text-case="lowercase"/>
+          <text term="edition" form="short" strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <number variable="edition" text-case="lowercase"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="series-info">
+    <group delimiter=" ">
+      <text variable="collection-title" strip-periods="true"/>
+      <number variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="sort-by-type">
+    <choose>
+      <if type="bill legislation" match="any">
+        <text value="1"/>
+      </if>
+      <else-if type="legal_case">
+        <text value="2"/>
+      </else-if>
+      <else-if type="book thesis" match="any">
+        <text value="3"/>
+      </else-if>
+      <else-if type="article-journal chapter article-newspaper article-magazine" match="any">
+        <text value="4"/>
+      </else-if>
+      <else>
+        <text value="5"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
+    right. Only actually need to check for 'first' because w/i cite all the other tests should have been done... -->
+  <macro name="render-chapter">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text term="in" form="short"/>
+      <text macro="editor" strip-periods="true" suffix=", "/> <!-- if there's no editor, no comma-->
+      <group delimiter=", ">
+        <text macro="container-title" font-style="italic"/>
+        <text macro="edition"/>
+      </group>
+    </group>
+    <group delimiter=", ">
+      <text macro="publisher-place-year"/>
+      <number variable="page-first"/>
+    </group>
+  </macro>
+  <macro name="render-article-journal">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
+      <group delimiter=":">
+        <number variable="volume"/>
+        <number variable="issue"/>
+      </group>
+      <text macro="container-title"/>
+      <text variable="collection-title" prefix="(" suffix=")"/>
+      <number variable="page-first"/>
+    </group>
+  </macro>
+  <macro name="render-book">
+    <group delimiter=", ">
+      <text variable="title" font-style="italic"/>
+      <text macro="edition"/>
+      <text macro="translator"/>
+      <text macro="editor"/>
+      <text macro="series-info"/>
+    </group>
+    <text macro="publisher-place-year"/>
+  </macro>
+  <macro name="render-report">
+    <choose>
+      <if variable="committee authority">
+        <!-- Parliamentary reports-->
+        <group delimiter=", ">
+          <names variable="authority"/>
+          <names variable="committee"/>
+          <text variable="title" font-style="italic"/>
+          <number variable="collection-number"/>
+          <group delimiter=" ">
+            <choose>
+              <if is-numeric="number">
+                <group delimiter=" ">
+                  <label variable="number" form="short"/>
+                </group>
+              </if>
+            </choose>
+            <number variable="number"/>
+          </group>
+          <group delimiter=" ">
+            <date variable="issued" prefix="(" suffix=")" date-parts="year-month" form="text"/>
+            <group delimiter=" " prefix="(" suffix=")">
+              <text term="collection-editor"/>
+              <names variable="collection-editor"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else>
+        <!-- Non-parliamentary report-->
+        <group delimiter=", "> 
+          <names variable="authority"/>
+          <text variable="title" font-style="italic"/>
+          <group delimiter=" ">
+            <text term="by"/>
+            <names variable="author"/>
+          </group>
+          <choose>
+            <if variable="call-number">
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="call-number">
+                    <text term="issue" form="verb"/>
+                  </if>
+                </choose>
+                <number variable="call-number"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <text term="issue" form="long"/>
+                  </if>
+                </choose>
+                <number variable="number"/>
+              </group>
+            </else>
+          </choose>
+          <text variable="genre" prefix="(" suffix=")"/>
+        </group>
+        <choose>
+          <if variable="publisher-place">
+            <text macro="publisher-place-year"/>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="render-thesis">
+    <group delimiter=" ">
+      <text variable="title" font-style="italic"/>
+      <text macro="genre" prefix="(" suffix=","/>
+      <text variable="publisher" suffix=","/>
+      <date form="text" variable="issued" date-parts="year" suffix=") [unpublished]"/>
+    </group>
+  </macro>
+  <macro name="render-article-newspaper">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=","/>
+      <text macro="container-title" font-style="italic"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+      <number variable="page-first"/>
+    </group>
+  </macro>
+  <macro name="render-article-magazine">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=""/>
+      <text macro="container-title" font-style="italic"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+      <number variable="page-first"/>
+    </group>
+  </macro>
+  <macro name="render-paper-conference">
+	<group delimiter=" ">
+	  <text variable="title" quotes="true" suffix=""/>
+	  <group delimiter=", ">
+		<group delimiter=", " prefix="(" suffix=")">
+			<text variable="event-title" prefix="Paper delivered at "/>
+			<text variable="event-place"/>
+			<text macro="issued-long"/>
+		</group>
+		<group delimiter=" ">
+			<group delimiter=":">
+				<number variable="volume"/>
+				<number variable="issue"/>
+			</group>
+		  <text variable="publisher"/>
+		  <text variable="collection-title" prefix="(" suffix=")"/>
+		  <number variable="page-first"/>
+		</group>
+	  </group>
+	</group>
+  </macro>
+  <macro name="render-article-preprint">
+	<group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
+      <text variable="genre"/>
+      <text variable="collection-number" prefix="Working Paper "/>
+      <number variable="page-first"/>
+    </group>
+  </macro>  <macro name="render-article">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <group>
+          <text variable="title" quotes="true"/>
+        </group>
+        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+        <text macro="pinpoint"/>
+      </group>
+      <choose>
+        <if variable="publisher URL" match="all">
+          <group delimiter=" ">
+            <text term="online"/>
+            <group>
+              <text value="(pdf)"/>
+              <text term="in" form="symbol"/>
+            </group>
+            <text variable="publisher" font-style="italic"/>
+            <text variable="URL" prefix="&#60;" suffix="&#62;"/>
+            <choose>
+              <if variable="archive">
+                <text variable="archive" prefix="[" suffix="]"/>
+              </if>
+              <else-if variable="archive_location">
+                <text variable="archive_location" prefix="[" suffix="]"/>
+              </else-if>
+            </choose>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="render-webpage">
+    <group delimiter=", ">
+      <text variable="title" quotes="true"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+      <group delimiter=" ">
+        <choose>
+          <if type="post-weblog">
+			<group>
+				<text term="online" form="short"/>
+				<text term="in" form="symbol"/>
+			</group>
+          </if>
+          <else>
+            <group>
+              <text term="online"/>
+              <text term="in" form="symbol"/>
+            </group>
+          </else>
+        </choose>
+        <choose>
+          <if variable="URL genre" match="all">
+            <text variable="container-title" font-style="italic"/>
+            <text variable="genre" prefix="&#60;" suffix="&#62;"/>
+            <text variable="URL" prefix="[" suffix="]"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic"/>
+            <text variable="URL" prefix="&#60;" suffix="&#62;"/>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <!-- cases and bill legislations render the same for biblio and (first) cite -->
+  <macro name="render-bill">
+    <group delimiter=", ">
+      <choose>
+        <if variable="container-title" match="none">
+          <!-- if no volume, assume bill -->
+          <text variable="publisher-place"/>
+          <names variable="authority"/>
+          <text variable="section"/>
+          <number variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <text variable="references" prefix="" suffix=")"/>
+          </group>
+          <number variable="number-of-volumes"/>
+          <number variable="number"/>
+          <group delimiter=" ">
+            <number variable="number"/>
+            <text macro="issued-long" prefix="(" suffix=")"/>
+          </group>
+        </if>
+        <else>
+          <number variable="number" prefix="Bill "/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
+          <number variable="chapter-number"/>
+          <names variable="authority"/>
+          <group delimiter=" ">
+            <date form="text" variable="issued" date-parts="year"/>
+          </group>
+          <text variable="section"/>
+        </else>
+      </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>
+      <number variable="number"/>
+    </group>
+  </macro>
+  <macro name="render-patent">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <number variable="number" prefix="Patent No "/>
+      <text variable="references" prefix=", PCT Patent No "/>
+      <text macro="submitted-long" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="render-song">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text variable="medium" prefix="(" suffix=")"/>
+      <text macro="author-note" strip-periods="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <number variable="call-number"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="render-treaty">
+    <group delimiter=", ">
+      <text variable="title" font-style="italic"/>
+      <date variable="event-date" form="text"/>
+      <group delimiter=" ">
+        <number variable="volume"/>
+        <text variable="container-title"/>
+        <number variable="page-first"/>
+        <text macro="pinpoint"/>
+        <group delimiter=" " prefix="(" suffix=")">
+          <text value="entered into force"/>
+          <date variable="issued" form="text" suffix=","/>
+          <text value="accession by"/>
+          <text variable="version"/>
+          <date variable="original-date" form="text"/>
+        </group>
+      </group>
+    </group>
+  </macro>
+  <macro name="render-manuscript">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text variable="medium" prefix="(" suffix=")"/>
+      <text macro="author-note" strip-periods="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <number variable="call-number"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="render-case">
+    <choose>
+      <if variable="author">
+        <group delimiter=", ">
+          <names variable="authority"/>
+          <date form="numeric" variable="issued"/>
+          <number variable="number"/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic" strip-periods="true"/>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
+          <text variable="container-title" strip-periods="true" font-style="italic"/>
+          <number variable="volume"/>
+          <number variable="page"/>
+        </group>
+      </if>
+      <else-if variable="title" match="none">
+        <group delimiter=", ">
+          <names variable="authority"/>
+          <date form="numeric" variable="issued"/>
+          <number variable="number"/>
+          <group delimiter=" ">
+            <text variable="title" form="short" font-style="italic" strip-periods="true"/>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
+          <text variable="container-title" strip-periods="true" font-style="italic"/>
+          <number variable="volume"/>
+          <number variable="page-first"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+        <text variable="title" font-style="italic" suffix="," strip-periods="true"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <date form="text" variable="issued" date-parts="year"/>
+            <names variable="authority"/>
+            <number variable="page"/>
+          </if>
+          <else>
+            <date form="text" variable="issued" date-parts="year" prefix="[" suffix="]"/>
+            <number variable="volume"/>
+            <text variable="container-title" strip-periods="true"/>
+            <number variable="page-first"/>
+            <!-- COMMENTED OUT FOR 9TH ED  <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/> -->
+          </else>
+        </choose>
+        <!-- <text variable="references" prefix=", "/> -->
+        </group>
+      </else>
+    </choose>
+    <!-- COMMENTED OUT FOR 9TH ED  <text variable="URL" prefix=" (available on " suffix=")"/> -->
+  </macro>
+  <macro name="render-gazette">
+    <group delimiter=", ">
+      <number variable="number"/>
+      <group delimiter=" ">
+        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+        <text value="Gaz"/>
+        <number variable="volume"/>
+      </group>
+      <group delimiter=" ">
+        <number variable="page"/>
+        <text variable="container-title" prefix="(" suffix=")" font-style="italic"/>
+      </group>
+    </group> 
+  </macro>
+  <macro name="render-personal_communication">
+    <group delimiter=" ">
+      <text term="letter" text-case="capitalize-first"/>
+      <text term="from" form="short"/>
+      <names variable="author"/>
+      <text term="recipient" form="verb"/>
+      <names variable="recipient"/>
+      <date form="text" variable="issued" date-parts="year-month-day" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="render-entry-encyclopedia">
+    <!-- test whether the entry is from the JurisClasseur Québec
+          (the only encyclopedic digest with editor information)-->
+    <choose>
+      <if variable="editor">
+        <group delimiter=" ">
+          <group>
+            <text variable="title" quotes="true"/>
+          </group>
+          <group>
+            <text macro="pinpoint" suffix=","/>
+          </group>
+          <text term="in" form="short"/>
+          <text macro="editor" suffix=","/>
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>  
+      </if>
+    </choose>
+  </macro>
+  <macro name="pinpoint">
+    <choose>
+      <if page="page" match="none">
+        <group delimiter=" ">
+          <label form="short" plural="contextual" variable="page"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <label variable="locator" form="short" plural="contextual"/>   
+          <number variable="locator"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="short-form">
+    <!-- Hump to overcome: cannot check against existence of short title.
+    Not implemented: "cited to" for cases construct short casenames adding ref to article -->
+    <choose>
+      <if variable="hereinafter">
+        <text variable="hereinafter" font-style="italic"/>
+      </if>
+      <else-if type="book article-journal chapter article-newspaper post-weblog paper-conference">
+        <names variable="author">
+          <name and="symbol" form="short" delimiter-precedes-last="never"/>
+          <substitute>
+            <names variable="editor">
+              <name and="symbol" form="short"/>
+            </names>
+          </substitute>
+        </names>
+      </else-if>
+      <else-if variable="title-short">
+        <text variable="title-short" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" font-style="italic" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher-place-year">
+	<text term="open-quote" form="short"/>									  
+    <group delimiter=" ">
+      <group>
+        <text variable="publisher-place"/>
+        <text term="open-inner-quote" form="short"/>
+      </group>
+      <text variable="publisher" suffix=","/>
+      <group>
+        <choose>
+          <if>
+            <conditions match="all">
+              <condition type="report"/>
+              <condition variable="publisher" match="none"/>
+            </conditions>
+            <date form="text" variable="issued"/>
+          </if>
+          <else>
+            <date form="text" variable="issued" date-parts="year"/>
+          </else>
+        </choose>
+        <choose>
+          <if>
+            <conditions match="all">
+              <condition match="none" type="chapter"/>
+              <condition match="none" variable="locator"/>
+            </conditions>
+            <text term="close-inner-quote" form="short"/>
+          </if>
+          <else>
+            <text term="close-quote" form="short"/>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <macro name="ct-jurisdiction-paren">
+	<names variable="authority" prefix="(" suffix=")">
+	  <name/>
+	  <institution institution-parts="short"/>
+	</names>
+  </macro>
+  <macro name="local-title-short">
+    <!-- The title form for subsequent citations (of all types) -->
+    <choose>
+      <if position="first">
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+          <else>
+            <text variable="title"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1">
+    <!-- translator needs to be added for chapter book film etc. chapter? -->
+    <layout delimiter="; " suffix=".">
+      <text macro="layout-citation"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;">
+    <sort>
+      <key macro="sort-by-type"/>
+      <key macro="author-bib"/>
+      <key variable="title"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="layout-bib"/>
+    </layout>
+  </bibliography>
+</style>
\ No newline at end of file

From 1c54291976803e503a838d0d8210587d493cc9d4 Mon Sep 17 00:00:00 2001
From: Admin <peter@peterwills.ca>
Date: Wed, 6 Dec 2023 15:20:01 -0500
Subject: [PATCH 06/12] Merge my edits into v9

---
 jm-mcgill-v9-pw-edit.csl | 1673 --------------------------------------
 jm-mcgill-v9.csl         |  258 ++++--
 2 files changed, 199 insertions(+), 1732 deletions(-)
 delete mode 100644 jm-mcgill-v9-pw-edit.csl

diff --git a/jm-mcgill-v9-pw-edit.csl b/jm-mcgill-v9-pw-edit.csl
deleted file mode 100644
index e29d57a..0000000
--- a/jm-mcgill-v9-pw-edit.csl
+++ /dev/null
@@ -1,1673 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.1mlz1" year-range-format="expanded" require-comma-on-symbol="after-number">
-  <info>
-    <title>JM - McGill9e</title>
-    <id>http://juris-m.github.io/styles/jm-mcgill-v9-pw-edit</id>
-    <link href="http://juris-m.github.io/styles/jm-mgcill-v9" rel="self"/>
-    <link href="https://lawjournal.mcgill.ca/fr/manuel-de-reference/" rel="documentation"/>
-    <author>
-      <name>Samuel Gagnon</name>
-      <email>gagnon-samuel@outlook.com</email>
-      <uri>https://github.com/Droitslinguistiques</uri>
-    </author>
-    <contributor>
-      <name>Liam McHugh-Russell</name>
-      <email>liam.mchugh.russell@gmail.com</email>
-    </contributor>
-    <contributor>
-      <name>Frank Bennet</name>
-      <uri>https://juris-m.github.io/</uri>
-    </contributor>
-    <contributor>
-      <name>Florian Martin-Bariteau</name>
-      <email>f.martin-bariteau@umontreal.ca</email>
-      <uri>http://f-mb.github.io/cslegal/</uri>
-    </contributor>
-    <contributor>
-      <name>Gareth Spanglett</name>
-      <email>gspanglett@gmail.com</email>
-      <uri>https://gspanglett.github.io</uri>
-    </contributor>
-    <contributor>
-      <name>Peter Wills</name>
-      <email>peter.wills@law.ox.ac.uk</email>
-    </contributor>
-    <category citation-format="note"/>
-    <category field="law"/>
-    <updated>2022-04-04 18:37:58</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="fr">
-    <style-options jurisdiction-preference="fr"/>
-     <terms>
-      <term name="page" form="short">
-        <single>à la p</single>
-        <multiple>aux pp</multiple>
-      </term>
-      <term name="paragraph" form="short">
-        <single>au para</single>
-        <multiple>aux paras</multiple>
-      </term>
-      <term name="note" form="short">
-        <single>n</single>
-        <multiple>nn</multiple>
-      </term>
-      <term name="issue" form="short">
-        <single>nᵒ</single>
-        <multiple>nᵒ</multiple>
-      </term>
-      <term name="article" form="short">
-        <single>art</single>
-        <multiple>arts</multiple>
-      </term>
-      <term name="accessed">dernière consultation le</term>
-      <term name="issue" form="long">nᵒ</term>
-      <term name="issue" form="verb">nᵒ de catalogue</term>
-      <term name="number" form="long">nᵒ</term>
-      <term name="chapter" form="short">c</term>
-      <term name="schedule" form="long">constitutant l'annexe</term>
-      <term name="schedule" form="short">annexe</term>
-      <term name="collection-editor" form="short">dir</term>
-      <term name="collection-editor" form="long">président :</term>
-      <term name="editor" form="short">dir</term>
-      <term name="editor" form="verb">dir</term>
-      <term name="translator" form="verb">traduit par</term>
-      <term name="in">dans</term>
-      <term name="in" form="verb">reproduit dans</term>
-      <term name="in" form="symbol"> :</term>
-      <term name="online">en ligne</term>
-      <term name="online" form="short">en ligne (blogue)</term>
-      <term name="and" form="symbol">et</term>
-      <term name="supplement" form="short">supp</term>
-      <term name="open-quote" form="short">, </term>
-      <term name="close-quote" form="short">,</term>
-      <term name="open-inner-quote" form="short">,</term>
-      <term name="close-inner-quote" form="short"></term>
-      <term name="letter" form="verb">lettre</term>
-      <term name="from" form="short">de</term>
-      <term name="from" form="verb">du</term>
-      <term name="section" form="short">
-        <single>art</single>
-      <multiple>arts</multiple>
-      </term>
-      <term name="part" form="long">partie</term>
-    </terms>
-  </locale>
-  <locale xml:lang="en">
-    <date form="text">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" suffix=" "/>
-      <date-part name="year"/>
-    </date>
-     <terms>
-      <term name="page" form="short">at</term>
-      <term name="paragraph" form="short">
-        <single>at para</single>
-        <multiple>at paras</multiple>
-      </term>
-      <term name="note" form="short">
-        <single>n</single>
-        <multiple>nn</multiple>
-      </term>
-      <term name="issue" form="short">
-        <single>at no</single>
-        <multiple>at nos</multiple>
-      </term>
-      <term name="accessed">last visited</term>
-      <term name="issue" form="long">No</term>
-      <term name="issue" form="verb">Catalogue No</term>
-      <term name="number" form="long">No</term>
-      <term name="chapter" form="short">c</term>
-      <term name="editor" form="verb-short">ed</term>
-      <term name="editor" form="short">ed</term>
-      <term name="collection-editor" form="short">ed</term>
-      <term name="collection-editor" form="long">Chair:</term>
-      <term name="translator" form="verb">translated by</term>
-      <term name="in" form="short">in</term>
-      <term name="in" form="verb">reprinted in</term>
-      <term name="in" form="symbol">:</term>
-									   
-      <term name="online" form="short">online (blog)</term>
-      <term name="and" form="symbol">&#38;</term>
-      <term name="et-al">et al</term>
-      <term name="from" form="verb">to the</term>
-      <term name="from" form="verb-short">of the</term>
-      <term name="supplement" form="short">Supp</term>
-      <term name="schedule" form="long">being Schedule</term>
-      <term name="schedule" form="short">Appendix</term>
-      <term name="open-quote" form="short"> (</term>
-      <term name="close-quote" form="short">)</term>
-      <term name="open-inner-quote" form="short">:</term>
-      <term name="close-inner-quote" form="short">)</term>
-      <term name="ordinal-02">d</term>
-      <term name="ordinal-03">d</term>
-      <term name="section" form="short">
-        <single>s</single>
-        <multiple>ss</multiple>
-      </term>
-      <term name="section" form="long">
-        <single>art</single>
-        <multiple>arts</multiple>
-      </term>
-      <term name="article" form="short">
-        <single>art</single>
-        <multiple>arts</multiple>
-      </term>
-      <term name="part" form="long">Part</term>
-    </terms>
-  </locale>
-  <!-- Juris-M Macros-->
-  <macro name="juris-pretitle">
-    <text value=""/>
-  </macro>
-  <macro name="juris-title">
-    <text value="[HINT: Install the Myles plugin, available at https://juris-m.github.io/downloads]"/>
-  </macro>
-  <macro name="juris-main">
-    <text value=""/>
-  </macro>
-  <macro name="juris-tail">
-    <text value=""/>
-  </macro>
-  <macro name="juris-pretitle-short">
-    <text value=""/>
-  </macro>
-  <macro name="juris-title-short">
-    <text value=""/>
-  </macro>
-  <macro name="juris-main-short">
-    <text value=""/>
-  </macro>
-  <macro name="juris-tail-short">
-    <text value=""/>
-  </macro>
-  <macro name="juris-locator">
-	<text value=""/>
-  </macro>
-  <macro name="jurism">
-    <choose>
-      <if>
-        <conditions match="all">
-          <condition type="legislation"/>
-          <condition match="none" variable="volume section container-title number"/>
-          <condition match="all" variable="title-short"/>
-        </conditions>
-        <group delimiter=" ">
-          <text macro="juris-locator"/>
-          <text macro="juris-title-short" strip-periods="true"/>
-        </group>
-      </if>
-      <else-if position="ibid-with-locator">
-        <choose>
-          <if type="legislation regulation" match="any">
-            <group delimiter=", ">
-              <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-              <text macro="juris-locator" label-form="short"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-              <text macro="pinpoint"/>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-      <else-if position="ibid">
-        <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-      </else-if>
-      <else-if position="subsequent">
-        <!-- short form -->
-        <group delimiter=" ">
-          <group delimiter=", ">
-            <text macro="local-title-short" font-style="italic" strip-periods="true" suffix=","/>
-            <text value="supra" font-style="italic"/>
-          </group>
-          <choose>
-            <if match="any" type="legislation regulation">
-              <group delimiter=", ">
-                <text variable="first-reference-note-number" prefix="note "/>
-                <text macro="juris-locator" label-form="short" strip-periods="true"/>
-              </group>
-            </if>
-            <else>
-              <text variable="first-reference-note-number" prefix="note "/>            
-              <text macro="pinpoint"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else>
-        <choose>
-          <if country="ca">
-            <!-- full form -->
-            <choose>
-              <if type="bill">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle" strip-periods="true"/>
-                  <text macro="juris-title" font-style="italic" strip-periods="true"/>
-                  <text macro="juris-main" strip-periods="true"/>
-                  <group delimiter=" ">
-                    <text macro="juris-locator" label-form="short" strip-periods="true"/>
-                    <text macro="juris-tail" strip-periods="true" prefix="(" suffix=")"/>
-                  </group>
-                </group>
-              </if>
-              <else-if type="legislation">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <group parallel-first="title" parallel-delimiter-override=", ">
-                      <text macro="juris-title" font-style="italic" strip-periods="true"/>
-                    </group>
-                    <choose>
-                      <if variable="volume page container-title" match="all">
-                        <text macro="juris-locator"/>
-                        <group delimiter=" ">
-                          <text term="part" form="long"/>
-                          <number variable="volume" form="roman" text-case="uppercase"/>
-                          <text term="from" form="verb-short"/>
-                          <text variable="container-title" font-style="italic"/>
-                        </group>
-                        <group delimiter=" ">
-                          <text term="schedule" form="long"/>
-                          <number variable="page"/>
-                          <text term="from" form="verb"/>
-                        </group>
-                      </if>
-                      <else-if variable="page">
-                        <group parallel-first="title" delimiter=", ">
-                          <text macro="juris-locator"/>
-                          <group delimiter=" ">
-                            <text term="schedule" form="verb"/>
-                            <number variable="page"/>
-                            <text term="from" form="verb"/>
-                          </group>
-                        </group>
-                      </else-if>
-                      <else>
-                        <text macro="juris-main" strip-periods="false"/>
-                        <text macro="juris-locator" label-form="short"/>
-                      </else>
-                    </choose>
-                  </group>
-                  <choose>
-                    <if>
-                      <conditions match="all">
-                        <condition match="none" context="bibliography"/>
-                        <condition position="first"/>
-                        <condition type="legislation"/>
-                      </conditions>
-                      <group parallel-last="issued">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else-if>
-              <else-if type="legal_case">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <group parallel-first="authority title issued" delimiter=" " parallel-delimiter-override=", ">
-                      <text macro="juris-title" strip-periods="true" font-style="italic"/>
-                      <choose>
-                        <if>
-                          <conditions match="all">
-                            <condition match="all" type="legal_case" variable="container-title volume"/>
-                            <condition match="none" variable="collection-number"/>
-                          </conditions>
-                          <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-                        </if>
-                      </choose>
-                    </group>
-                    <group delimiter=", ">
-                      <group delimiter=" ">
-                        <text macro="juris-main" strip-periods="true"/>
-                        <text macro="juris-locator" label-form="short" strip-periods="true"/>
-                      </group>
-                      <choose>
-                        <if match="all" variable="archive archive_location">
-                          <group parallel-last="issued submitted">
-                            <group parallel-last-to-first="issued submitted">
-                              <text macro="juris-tail" strip-periods="true"/>
-                            </group>
-                          </group> 
-                        </if>
-                      </choose>
-                    </group>
-                  </group>
-				  <choose>
-				    <!-- Replicating juris-ca hierarchy -->
-				    <if> <!-- Reporter without year as volume-->
-					  <conditions match="all">
-						<condition match="all" variable="container-title volume"/>
-						<condition match="none" variable="collection-number admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</if>
-					<else-if> <!-- online service-->
-						<conditions match="all">
-						  <condition match="all" variable="submitted container-title"/>
-						  <condition match="none" variable="collection-number admin-flag"/>
-					    </conditions>
-						<text macro="ct-jurisdiction-paren" />
-					</else-if>
-					<else-if> <!-- Reporter with [year] and page -->
-					  <conditions match="all">
-						<condition match="all" variable="collection-number container-title page"/>
-						<condition match="none" variable="admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</else-if>
-					<else-if> <!-- Journal with [year] and no page -->
-					  <conditions match="all">
-						<condition match="all" variable="collection-number container-title issue"/>
-						<condition match="none" variable="admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</else-if>
-				  </choose>
-                  <choose>
-                    <if>
-                      <conditions match="all">
-                        <condition match="none" context="bibliography"/>
-                        <condition position="first"/>
-                      </conditions>
-                      <group parallel-last="title-short title">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else-if>
-              <else-if type="hearing">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle"/>
-                  <text macro="juris-title" font-style="italic"/>
-                  <group delimiter=" ">
-                    <text macro="juris-main"/>
-                    <text macro="juris-locator"/>
-                    <choose>
-                      <if context="citation">
-                        <group delimiter=" ">
-                          <text macro="juris-tail"/>
-                          <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
-              </else-if>
-              <else-if type="report">
-                <choose>
-                  <if variable="collection-title">
-                    <group delimiter=", ">
-                      <text macro="juris-pretitle"/>
-                      <group>
-                        <text macro="juris-title" quotes="true"/>
-                      </group>
-                      <group delimiter=" ">
-                        <text macro="juris-main"/>
-                        <text macro="juris-locator" label-form="short"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else>
-                    <group delimiter=", ">
-                      <text macro="juris-pretitle"/>
-                      <group delimiter=" ">
-                        <choose>
-                          <if variable="publisher">
-                            <group delimiter="">
-                              <group delimiter=", ">
-                                <text macro="juris-title" font-style="italic"/>
-                                <group delimiter=" ">
-                                  <choose>
-                                    <if is-numeric="number">
-                                      <text term="volume" form="short" strip-periods="true"/>
-                                    </if>
-                                  </choose>
-                                  <number variable="number"/>
-                                </group>
-                              </group>
-                              <text macro="publisher-place-year"/>
-                            </group>
-                            <group delimiter=" " prefix="(" suffix=")">
-                              <text term="collection-editor"/>
-                              <text macro="author-note"/>
-                            </group>
-                          </if>
-                          <else>
-                            <text macro="juris-title" font-style="italic"/>
-                            <text macro="juris-main"/>
-                          </else>
-                        </choose>
-                        <text macro="juris-locator" label-form="short"/>
-                      </group>
-                    </group>
-                  </else>
-                </choose>
-              </else-if>
-              <else-if type="gazette">
-                <group delimiter=" ">
-                  <text macro="juris-title" font-style="italic"/>
-                  <text macro="juris-main"/>
-                </group>
-              </else-if>
-              <else-if type="regulation" variable="authority">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle"/>
-                  <group delimiter=" ">
-                    <text macro="juris-title" font-style="italic"/>
-                    <text macro="juris-main"/>
-                  </group>
-                  <text macro="juris-locator"/>
-                </group>
-              </else-if>            
-              <else-if type="regulation">
-                <group delimiter=", ">
-                  <text macro="juris-title" font-style="italic"/>
-                  <text macro="juris-main"/>
-                  <text macro="juris-locator"/>
-                </group>
-              </else-if>
-            </choose>
-          </if>
-          <else-if country="gb">
-            <choose>
-              <if type="legislation">
-                <group delimiter=", ">
-                  <group delimiter=" ">
-                    <text variable="title" font-style="italic"/>
-                    <text variable="country" form="short" prefix="(" suffix=")"/>
-                  </group>
-                  <choose>
-                    <if variable="collection-number genre volume" match="all">
-                      <group delimiter=" ">
-                        <number variable="collection-number"/>
-                        <text variable="genre"/>
-                      </group>
-                      <number variable="chapter-number" prefix="St "/>
-                      <group delimiter=" ">
-                        <text term="chapter" form="short"/>
-                        <number variable="volume"/>
-                      </group>
-                    </if>
-                    <else>
-                      <date variable="issued" date-parts="year" form="numeric"/>
-                      <group delimiter=" ">
-                        <text term="chapter" form="short"/>
-                        <number variable="volume"/>
-                      </group>
-                    </else>
-                  </choose>
-                  <group parallel-first="issued" parallel-delimiter-override=" ">
-                    <text macro="pinpoint"/>
-                  </group>
-                  <group delimiter=", " parallel-first="issued" parallel-delimiter-override=" ">
-                    <group delimiter=" ">
-                      <text term="in" form="verb"/>
-                      <text variable="container-title"/>
-                    </group>
-                    <group delimiter=" ">
-                      <text term="schedule" form="short"/>
-                      <number variable="page" form="roman" text-case="uppercase"/>
-                    </group>
-                    <group delimiter=" ">
-                      <text term="number" form="short"/>
-                      <number variable="number"/>
-                    </group>
-                  </group>
-                </group>
-              </if>
-              <else-if type="legal_case">
-				<group delimiter=", ">
-				  <text macro="juris-title" font-style="italic"/>
-				  <group delimiter=" ">
-					<choose>
-					  <if variable="collection-number">
-						<number variable="collection-number" prefix="[" suffix="]"/>
-					  </if>
-					  <else-if variable="container-title">
-						<date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-					  </else-if>
-					  <else>
-						<!-- unreported cases -->
-						<group delimiter=", " prefix="(" suffix=")">
-						  <names variable="authority">
-							<name/>
-							<institution institution-parts="short" use-first="1"/>
-						  </names>
-						  <number variable="number"/>
-						  <date variable="issued" date-parts="year-month-day" form="text"/>
-						</group>
-					  </else>
-					</choose>
-					<choose>
-					  <if variable="container-title">
-						<number variable="volume"/>
-						<text variable="container-title" form="short"/>
-					  </if>
-					  <else-if variable="collection-number">
-						<names variable="authority">
-						  <name/>
-						  <institution form="short"/>
-						</names>
-					  </else-if>
-					</choose>
-					<number variable="page-first"/>
-					<text macro="pinpoint"/>
-					<choose>
-						<if variable="container-title">
-							<names variable="authority" prefix="(" suffix=")">
-							  <name/>
-							  <institution institution-parts="short"/>
-							</names>
-						</if>
-					</choose>
-				    <choose>
-						<if>
-						  <conditions match="all">
-							<condition match="none" context="bibliography"/>
-							<condition position="first"/>
-						  </conditions>
-						  <choose>
-							<if>
-							  <conditions match="any">
-								<condition variable="hereinafter"/>
-								<condition variable="title-short"/>
-							  </conditions>
-							  <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
-							</if>
-						  </choose>
-						</if>
-                    </choose>
-				  </group>
-				</group>
-              </else-if>
-            </choose>
-          </else-if>
-          <else-if country="un.int">
-            <group delimiter=", ">
-              <text variable="title" font-style="italic"/>
-              <group delimiter=" "> 
-                <text variable="event"/>
-                <number variable="number"/>
-              </group>
-              <names variable="authority"/>
-              <group delimiter=" ">
-                <number variable="chapter-number" form="ordinal" suffix=" Sess"/>
-              </group>
-              <group delimiter=" ">
-                <text term="supplement" form="short"/>
-                <text term="number" form="short"/>
-                <number variable="volume"/>
-              </group>
-              <group delimiter=" ">
-                <text value="UN Doc"/>
-                <text variable="archive_location"/>
-                <date variable="issued" date-parts="year" prefix="(" suffix=")" form="numeric"/>
-                <number variable="page-first"/>
-                <text macro="pinpoint"/>
-              </group>
-            </group>
-          </else-if>
-          <else>
-            <!-- full form -->
-            <choose>
-              <if type="bill">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle" strip-periods="true"/>
-                  <text macro="juris-title" font-style="italic" strip-periods="true"/>
-                  <text macro="juris-main" strip-periods="true"/>
-                  <group delimiter=" ">
-                    <text macro="juris-locator" label-form="short" strip-periods="true"/>
-                    <text macro="juris-tail" strip-periods="true" prefix="(" suffix=")"/>
-                  </group>
-                </group>
-              </if>
-              <else-if type="legislation">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <text macro="juris-title" font-style="italic" strip-periods="true"/>
-                    <text macro="juris-main"/>
-                    <text macro="juris-locator" label-form="short"/>
-                  </group>
-                  <choose>
-                    <if>
-                      <conditions match="all">
-                        <condition match="none" context="bibliography"/>
-                        <condition position="first"/>
-                        <condition type="legislation"/>
-                      </conditions>
-                      <group parallel-last="title-short title">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else-if>
-              <else-if type="legal_case">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <group parallel-first="authority title issued" delimiter=" " parallel-delimiter-override=", ">
-                      <text macro="juris-title" strip-periods="true" font-style="italic"/>
-                      <choose>
-                        <if>
-                          <conditions match="all">
-                            <condition match="all" type="legal_case" variable="container-title volume"/>
-                            <condition match="none" variable="collection-number"/>
-                          </conditions>
-                          <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-                        </if>
-                      </choose>
-                    </group>
-                    <group delimiter=", ">
-                      <group delimiter=" ">
-                        <text macro="juris-main" strip-periods="true"/>
-                        <text macro="juris-locator" label-form="short" strip-periods="true"/>
-                      </group>
-                      <choose>
-                        <if match="all" variable="archive archive_location">
-                          <group parallel-last="archive archive_location submitted">
-                            <group parallel-last-to-first="archive archive_location submitted">
-                              <text macro="juris-tail" strip-periods="true"/>
-                            </group>
-                          </group> 
-                        </if>
-                      </choose>
-                    </group>
-                  </group>
-                  <choose>
-                    <if>
-                      <conditions match="all">
-                        <condition match="none" context="bibliography"/>
-                        <condition position="first"/>
-                      </conditions>
-                      <group parallel-last="title-short title">
-                        <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else-if>
-              <else-if type="hearing">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle"/>
-                  <text macro="juris-title" font-style="italic"/>
-                  <group delimiter=" ">
-                    <text macro="juris-main"/>
-                    <text macro="juris-locator"/>
-                    <choose>
-                      <if context="citation">
-                        <group delimiter=" ">
-                          <text macro="juris-tail"/>
-                          <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
-              </else-if>
-              <else-if type="report">
-                <choose>
-                  <if variable="collection-title">
-                    <group delimiter=", ">
-                      <text macro="juris-pretitle"/>
-                      <group>
-                        <text macro="juris-title" quotes="true"/>
-                      </group>
-                      <group delimiter=" ">
-                        <text macro="juris-main"/>
-                        <text macro="juris-locator" label-form="short"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else>
-                    <group delimiter=", ">
-                      <text macro="juris-pretitle"/>
-                      <group delimiter=" ">
-                        <text macro="juris-title" font-style="italic"/>
-                        <text macro="juris-main"/>
-                        <text macro="juris-locator" label-form="short"/>
-                      </group>
-                    </group>
-                  </else>
-                </choose>
-              </else-if>
-              <else-if type="gazette">
-                <group delimiter=" ">
-                  <text macro="juris-title" font-style="italic"/>
-                  <text macro="juris-main"/>
-                </group>
-              </else-if>
-              <else-if type="regulation">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle"/>
-                  <group delimiter=" ">
-                    <text macro="juris-title" font-style="italic"/>
-                    <text macro="juris-main"/>
-                  </group>
-                  <text macro="juris-locator"/>
-                </group>
-              </else-if>
-            </choose>
-          </else>
-        </choose>   
-      </else>
-    </choose>
-  </macro>
-  <macro name="layout-citation">
-    <choose>
-      <if>
-        <conditions match="all">
-          <condition match="any" type="legal_case legislation bill hearing report regulation"/>
-          <condition match="all" variable="jurisdiction"/>
-          <condition match="all" country="ca"/>
-          <condition match="none" variable="gazette-flag admin-flag"/>
-        </conditions>
-        <text macro="jurism"/>
-      </if>
-      <else-if country="gb" type="legislation legal_case">
-        <text macro="jurism" strip-periods="true"/>
-      </else-if>
-      <else-if type="bill" country="un.int">
-        <text macro="jurism"/>
-      </else-if>
-      <!-- Not implemented: ibid only needs capitalize-first if it's the first word in a footnote -->
-      <else-if position="ibid-with-locator">
-        <group delimiter=" ">
-          <text term="ibid" font-style="italic" strip-periods="true"/>
-          <text macro="pinpoint"/>
-        </group>
-      </else-if>
-      <else-if position="ibid">
-        <text term="ibid" font-style="italic" strip-periods="true"/>
-      </else-if>
-      <else-if position="subsequent">
-        <group delimiter=" ">
-          <text macro="short-form" suffix=","/>
-          <text value="supra" font-style="italic"/>
-          <text value="note"/>
-          <text variable="first-reference-note-number"/>
-          <text macro="pinpoint"/>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=" ">
-          <group delimiter=", ">
-            <choose>
-              <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>
-              <else-if type="patent" match="any">
-                <text macro="render-patent"/>
-              </else-if>
-              <else-if type="manuscript" match="any">
-                <text macro="render-manuscript"/>
-              </else-if>
-              <else-if type="legal_case">
-                <text macro="render-case"/>
-              </else-if>
-              <else-if type="report">
-                <text macro="render-report"/>
-              </else-if>
-              <else-if type="personal_communication">
-                <text macro="render-personal_communication"/>
-              </else-if>
-              <else-if type="treaty">
-                <text macro="render-treaty"/>
-              </else-if>
-              <else-if type="gazette">
-                <text macro="render-gazette"/>
-              </else-if>
-              <else>
-                <text macro="author-note" strip-periods="true"/>
-                <choose>
-                  <if type="article-journal">
-                    <text macro="render-article-journal"/>
-                  </if>
-                  <else-if type="chapter">
-                    <text macro="render-chapter"/>
-                  </else-if>
-                  <else-if type="thesis">
-                    <text macro="render-thesis"/>
-                  </else-if>
-                  <else-if type="article-newspaper" match="any">
-                    <text macro="render-article-newspaper"/>
-                  </else-if>
-                  <else-if type="article-magazine">
-                    <text macro="render-article-magazine"/>
-                  </else-if>
-                  <else-if type="webpage post-weblog" match="any">
-                    <text macro="render-webpage"/>
-                  </else-if>
-                  <else-if type="book">
-                    <text macro="render-book"/>
-                  </else-if>
-                  <else-if type="entry-encyclopedia">
-                    <text macro="render-entry-encyclopedia"/>
-                  </else-if>
-				  <else-if type="paper-conference">
-					<text macro="render-paper-conference"/>
-				  </else-if>
-				  <else-if variable="genre">
-					<text macro="render-article-preprint"/>
-				  </else-if>
-                  <else-if type="article">
-                    <text macro="render-article"/>
-                  </else-if>
-                  <!--                    <else-if type="song" match="any"><text macro="render-song"/></else-if><else-if type="patent" match="any"><text macro="render-patent"/></else-if><else-if type="manuscript" match="any"><text macro="render-manuscript"/></else-if> -->
-                  <else>
-                    <group delimiter=" ">
-                      <group delimiter=", ">
-                        <text variable="title" font-style="italic"/>
-                        <text macro="translator"/>
-                        <text macro="edition"/>
-                      </group>
-                      <text macro="publisher-place-year"/>
-                    </group>
-                  </else>
-                </choose>
-              </else>
-            </choose>
-          </group>
-          <text macro="pinpoint"/>
-          <choose>
-            <if variable="hereinafter">
-              <text variable="hereinafter" prefix="[" suffix="]" font-style="italic"/>
-            </if>
-			<if type="book article-journal chapter article-newspaper post-weblog" variable="author">
-				<!-- Don't show the short title if there's an author that'll be shown instead-->
-			</if>
-            <else-if variable="title-short">
-              <text variable="title-short" prefix="[" suffix="]" font-style="italic"/>
-            </else-if>
-          </choose>
-          <choose>
-            <if type="article-newspaper article-magazine" match="any">
-              <text macro="internet-location"/>
-            </if>
-          </choose>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="layout-bib">
-    <choose>
-      <if>
-        <conditions match="all">
-          <condition match="any" type="legal_case legislation hearing bill gazette report regulation"/>
-          <condition match="all" variable="jurisdiction"/>
-          <condition match="all" country="ca"/>
-        </conditions>
-        <text macro="jurism"/>
-      </if>
-      <else-if country="gb" type="legislation legal_case">
-        <text macro="jurism" strip-periods="true"/>
-      </else-if>
-      <else-if type="bill" country="un.int">
-        <text macro="jurism"/>
-      </else-if>
-      <else-if type="bill legal_case report legislation personal_communication treaty" match="any">
-        <choose>
-          <if type="bill legislation" match="any">
-            <text macro="render-bill"/>
-          </if>
-          <else-if type="legal_case">
-            <text macro="render-case"/>
-          </else-if>
-          <else-if type="report">
-            <text macro="render-report"/>
-          </else-if>
-          <else-if type="personal_communication">
-            <text macro="render-personal_communication"/>
-          </else-if>
-          <else-if type="treaty">
-            <text macro="render-treaty"/>
-          </else-if>
-          <else-if type="gazette">
-            <text macro="render-gazette"/>
-          </else-if>
-        </choose>
-      </else-if>
-      <else>
-        <group delimiter=", ">
-          <text macro="author-bib" strip-periods="true"/>
-          <choose>
-            <if type="article-journal">
-              <text macro="render-article-journal"/>
-            </if>
-            <else-if type="chapter">
-              <text macro="render-chapter"/>
-            </else-if>
-            <else-if type="thesis">
-              <text macro="render-thesis"/>
-            </else-if>
-            <else-if type="article-newspaper">
-              <text macro="render-article-newspaper"/>
-            </else-if>
-            <else-if type="article-magazine">
-              <text macro="render-article-magazine"/>
-            </else-if>
-            <else-if type="book">
-              <text macro="render-book"/>
-            </else-if>
-            <else-if type="webpage post-weblog" match="any">
-              <text macro="render-webpage"/>
-            </else-if>
-            <else-if type="patent">
-              <text macro="render-patent"/>
-            </else-if>
-            <else-if type="song">
-              <text macro="render-song"/>
-            </else-if>
-            <else-if type="manuscript">
-              <text macro="render-manuscript"/>
-            </else-if>
-            <else-if type="entry-encyclopedia">
-              <text macro="render-entry-encyclopedia"/>
-            </else-if>
-		    <else-if type="paper-conference">
-			  <text macro="render-paper-conference"/>
-			</else-if>
-			<else-if variable="genre">
-              <text macro="render-article-preprint"/>
-            </else-if>
-            <else-if type="article">
-              <text macro="render-article"/>
-            </else-if>
-            <else>
-              <group>
-                <group delimiter=", ">
-                  <text variable="title" font-style="italic"/>
-                  <text macro="edition"/>
-                  <text macro="translator"/>
-                  <text macro="collection-editor"/>
-                </group>
-                <text macro="publisher-place-year"/>
-              </group>
-            </else>
-          </choose>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name and="symbol" delimiter-precedes-last="never"/>
-      <et-al term="et-al"/>
-      <label form="short" prefix=", "/>
-    </names>
-  </macro>
-  <macro name="translator">
-    <names variable="translator">
-      <label form="verb" suffix=" "/>
-      <name and="symbol"/>
-    </names>
-  </macro>
-  <macro name="container-title">
-    <text strip-periods="true" variable="container-title" form="short"/>
-  </macro>
-  <macro name="author-note">
-    <names variable="author">
-      <name and="symbol" delimiter-precedes-last="never"/>
-      <et-al term="et-al"/>
-      <substitute>
-        <text macro="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-bib">
-    <names variable="author">
-      <name name-as-sort-order="first" and="symbol" sort-separator=", " delimiter-precedes-last="never"/>
-      <et-al term="et-al"/>
-      <label form="short" prefix=", "/>
-      <substitute>
-        <names variable="collection-editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="internet-location">
-    <choose>
-      <if variable="source URL genre" match="any">
-        <group delimiter=" ">
-          <group>
-            <text term="online"/>
-            <text term="in" form="symbol"/>
-          </group>
-          <choose>
-            <if variable="source">
-              <text variable="source" prefix="&#60;" suffix="&#62;"/>
-              <text variable="URL" prefix="[" suffix="]"/>
-            </if>
-            <else-if variable="genre">
-              <text variable="genre" prefix="&#60;" suffix="&#62;"/>
-              <text variable="URL" prefix="[" suffix="]"/>
-            </else-if>
-            <else>
-              <text variable="URL" prefix="&#60;" suffix="&#62;"/>
-            </else>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="genre">
-    <text variable="genre"/>
-  </macro>
-  <macro name="issued-long">
-    <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter=" ">
-          <date-part name="day"/>
-          <date-part name="month" form="long"/>
-          <date-part name="year" form="long"/>
-        </date>
-      </if>
-      <else-if variable="accessed">
-        <date variable="accessed" form="text"/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="submitted-long">
-    <date variable="submitted" delimiter=" ">
-      <date-part name="day"/>
-      <date-part name="month" form="long"/>
-      <date-part name="year" form="long"/>
-    </date>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal" text-case="lowercase"/>
-          <text term="edition" form="short" strip-periods="true"/>
-        </group>
-      </if>
-      <else>
-        <number variable="edition" text-case="lowercase"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="series-info">
-    <group delimiter=" ">
-      <text variable="collection-title" strip-periods="true"/>
-      <number variable="collection-number"/>
-    </group>
-  </macro>
-  <macro name="sort-by-type">
-    <choose>
-      <if type="bill legislation" match="any">
-        <text value="1"/>
-      </if>
-      <else-if type="legal_case">
-        <text value="2"/>
-      </else-if>
-      <else-if type="book thesis" match="any">
-        <text value="3"/>
-      </else-if>
-      <else-if type="article-journal chapter article-newspaper article-magazine" match="any">
-        <text value="4"/>
-      </else-if>
-      <else>
-        <text value="5"/>
-      </else>
-    </choose>
-  </macro>
-  <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
-    right. Only actually need to check for 'first' because w/i cite all the other tests should have been done... -->
-  <macro name="render-chapter">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <text term="in" form="short"/>
-      <text macro="editor" strip-periods="true" suffix=", "/> <!-- if there's no editor, no comma-->
-      <group delimiter=", ">
-        <text macro="container-title" font-style="italic"/>
-        <text macro="edition"/>
-      </group>
-    </group>
-    <group delimiter=", ">
-      <text macro="publisher-place-year"/>
-      <number variable="page-first"/>
-    </group>
-  </macro>
-  <macro name="render-article-journal">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
-      <group delimiter=":">
-        <number variable="volume"/>
-        <number variable="issue"/>
-      </group>
-      <text macro="container-title"/>
-      <text variable="collection-title" prefix="(" suffix=")"/>
-      <number variable="page-first"/>
-    </group>
-  </macro>
-  <macro name="render-book">
-    <group delimiter=", ">
-      <text variable="title" font-style="italic"/>
-      <text macro="edition"/>
-      <text macro="translator"/>
-      <text macro="editor"/>
-      <text macro="series-info"/>
-    </group>
-    <text macro="publisher-place-year"/>
-  </macro>
-  <macro name="render-report">
-    <choose>
-      <if variable="committee authority">
-        <!-- Parliamentary reports-->
-        <group delimiter=", ">
-          <names variable="authority"/>
-          <names variable="committee"/>
-          <text variable="title" font-style="italic"/>
-          <number variable="collection-number"/>
-          <group delimiter=" ">
-            <choose>
-              <if is-numeric="number">
-                <group delimiter=" ">
-                  <label variable="number" form="short"/>
-                </group>
-              </if>
-            </choose>
-            <number variable="number"/>
-          </group>
-          <group delimiter=" ">
-            <date variable="issued" prefix="(" suffix=")" date-parts="year-month" form="text"/>
-            <group delimiter=" " prefix="(" suffix=")">
-              <text term="collection-editor"/>
-              <names variable="collection-editor"/>
-            </group>
-          </group>
-        </group>
-      </if>
-      <else>
-        <!-- Non-parliamentary report-->
-        <group delimiter=", "> 
-          <names variable="authority"/>
-          <text variable="title" font-style="italic"/>
-          <group delimiter=" ">
-            <text term="by"/>
-            <names variable="author"/>
-          </group>
-          <choose>
-            <if variable="call-number">
-              <group delimiter=" ">
-                <choose>
-                  <if is-numeric="call-number">
-                    <text term="issue" form="verb"/>
-                  </if>
-                </choose>
-                <number variable="call-number"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <choose>
-                  <if is-numeric="number">
-                    <text term="issue" form="long"/>
-                  </if>
-                </choose>
-                <number variable="number"/>
-              </group>
-            </else>
-          </choose>
-          <text variable="genre" prefix="(" suffix=")"/>
-        </group>
-        <choose>
-          <if variable="publisher-place">
-            <text macro="publisher-place-year"/>
-          </if>
-        </choose>
-      </else>
-    </choose>
-  </macro>
-  <macro name="render-thesis">
-    <group delimiter=" ">
-      <text variable="title" font-style="italic"/>
-      <text macro="genre" prefix="(" suffix=","/>
-      <text variable="publisher" suffix=","/>
-      <date form="text" variable="issued" date-parts="year" suffix=") [unpublished]"/>
-    </group>
-  </macro>
-  <macro name="render-article-newspaper">
-    <group delimiter=" ">
-      <text variable="title" quotes="true" suffix=","/>
-      <text macro="container-title" font-style="italic"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-      <number variable="page-first"/>
-    </group>
-  </macro>
-  <macro name="render-article-magazine">
-    <group delimiter=" ">
-      <text variable="title" quotes="true" suffix=""/>
-      <text macro="container-title" font-style="italic"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-      <number variable="page-first"/>
-    </group>
-  </macro>
-  <macro name="render-paper-conference">
-	<group delimiter=" ">
-	  <text variable="title" quotes="true" suffix=""/>
-	  <group delimiter=", ">
-		<group delimiter=", " prefix="(" suffix=")">
-			<text variable="event-title" prefix="Paper delivered at "/>
-			<text variable="event-place"/>
-			<text macro="issued-long"/>
-		</group>
-		<group delimiter=" ">
-			<group delimiter=":">
-				<number variable="volume"/>
-				<number variable="issue"/>
-			</group>
-		  <text variable="publisher"/>
-		  <text variable="collection-title" prefix="(" suffix=")"/>
-		  <number variable="page-first"/>
-		</group>
-	  </group>
-	</group>
-  </macro>
-  <macro name="render-article-preprint">
-	<group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
-      <text variable="genre"/>
-      <text variable="collection-number" prefix="Working Paper "/>
-      <number variable="page-first"/>
-    </group>
-  </macro>  <macro name="render-article">
-    <group delimiter=", ">
-      <group delimiter=" ">
-        <group>
-          <text variable="title" quotes="true"/>
-        </group>
-        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-        <text macro="pinpoint"/>
-      </group>
-      <choose>
-        <if variable="publisher URL" match="all">
-          <group delimiter=" ">
-            <text term="online"/>
-            <group>
-              <text value="(pdf)"/>
-              <text term="in" form="symbol"/>
-            </group>
-            <text variable="publisher" font-style="italic"/>
-            <text variable="URL" prefix="&#60;" suffix="&#62;"/>
-            <choose>
-              <if variable="archive">
-                <text variable="archive" prefix="[" suffix="]"/>
-              </if>
-              <else-if variable="archive_location">
-                <text variable="archive_location" prefix="[" suffix="]"/>
-              </else-if>
-            </choose>
-          </group>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="render-webpage">
-    <group delimiter=", ">
-      <text variable="title" quotes="true"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-      <group delimiter=" ">
-        <choose>
-          <if type="post-weblog">
-			<group>
-				<text term="online" form="short"/>
-				<text term="in" form="symbol"/>
-			</group>
-          </if>
-          <else>
-            <group>
-              <text term="online"/>
-              <text term="in" form="symbol"/>
-            </group>
-          </else>
-        </choose>
-        <choose>
-          <if variable="URL genre" match="all">
-            <text variable="container-title" font-style="italic"/>
-            <text variable="genre" prefix="&#60;" suffix="&#62;"/>
-            <text variable="URL" prefix="[" suffix="]"/>
-          </if>
-          <else>
-            <text variable="container-title" font-style="italic"/>
-            <text variable="URL" prefix="&#60;" suffix="&#62;"/>
-          </else>
-        </choose>
-      </group>
-    </group>
-  </macro>
-  <!-- cases and bill legislations render the same for biblio and (first) cite -->
-  <macro name="render-bill">
-    <group delimiter=", ">
-      <choose>
-        <if variable="container-title" match="none">
-          <!-- if no volume, assume bill -->
-          <text variable="publisher-place"/>
-          <names variable="authority"/>
-          <text variable="section"/>
-          <number variable="chapter-number"/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic"/>
-            <text variable="references" prefix="" suffix=")"/>
-          </group>
-          <number variable="number-of-volumes"/>
-          <number variable="number"/>
-          <group delimiter=" ">
-            <number variable="number"/>
-            <text macro="issued-long" prefix="(" suffix=")"/>
-          </group>
-        </if>
-        <else>
-          <number variable="number" prefix="Bill "/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <number variable="chapter-number"/>
-          <names variable="authority"/>
-          <group delimiter=" ">
-            <date form="text" variable="issued" date-parts="year"/>
-          </group>
-          <text variable="section"/>
-        </else>
-      </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>
-      <number variable="number"/>
-    </group>
-  </macro>
-  <macro name="render-patent">
-    <group delimiter=" ">
-      <text variable="title" quotes="true" suffix=","/>
-      <text variable="publisher-place"/>
-      <number variable="number" prefix="Patent No "/>
-      <text variable="references" prefix=", PCT Patent No "/>
-      <text macro="submitted-long" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="render-song">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <text variable="medium" prefix="(" suffix=")"/>
-      <text macro="author-note" strip-periods="true" suffix=","/>
-      <text variable="publisher-place"/>
-      <number variable="call-number"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="render-treaty">
-    <group delimiter=", ">
-      <text variable="title" font-style="italic"/>
-      <date variable="event-date" form="text"/>
-      <group delimiter=" ">
-        <number variable="volume"/>
-        <text variable="container-title"/>
-        <number variable="page-first"/>
-        <text macro="pinpoint"/>
-        <group delimiter=" " prefix="(" suffix=")">
-          <text value="entered into force"/>
-          <date variable="issued" form="text" suffix=","/>
-          <text value="accession by"/>
-          <text variable="version"/>
-          <date variable="original-date" form="text"/>
-        </group>
-      </group>
-    </group>
-  </macro>
-  <macro name="render-manuscript">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <text variable="medium" prefix="(" suffix=")"/>
-      <text macro="author-note" strip-periods="true" suffix=","/>
-      <text variable="publisher-place"/>
-      <number variable="call-number"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="render-case">
-    <choose>
-      <if variable="author">
-        <group delimiter=", ">
-          <names variable="authority"/>
-          <date form="numeric" variable="issued"/>
-          <number variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <number variable="volume"/>
-          <number variable="page"/>
-        </group>
-      </if>
-      <else-if variable="title" match="none">
-        <group delimiter=", ">
-          <names variable="authority"/>
-          <date form="numeric" variable="issued"/>
-          <number variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" form="short" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <number variable="volume"/>
-          <number variable="page-first"/>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=" ">
-        <text variable="title" font-style="italic" suffix="," strip-periods="true"/>
-        <choose>
-          <if variable="container-title" match="none">
-            <date form="text" variable="issued" date-parts="year"/>
-            <names variable="authority"/>
-            <number variable="page"/>
-          </if>
-          <else>
-            <date form="text" variable="issued" date-parts="year" prefix="[" suffix="]"/>
-            <number variable="volume"/>
-            <text variable="container-title" strip-periods="true"/>
-            <number variable="page-first"/>
-            <!-- COMMENTED OUT FOR 9TH ED  <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/> -->
-          </else>
-        </choose>
-        <!-- <text variable="references" prefix=", "/> -->
-        </group>
-      </else>
-    </choose>
-    <!-- COMMENTED OUT FOR 9TH ED  <text variable="URL" prefix=" (available on " suffix=")"/> -->
-  </macro>
-  <macro name="render-gazette">
-    <group delimiter=", ">
-      <number variable="number"/>
-      <group delimiter=" ">
-        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-        <text value="Gaz"/>
-        <number variable="volume"/>
-      </group>
-      <group delimiter=" ">
-        <number variable="page"/>
-        <text variable="container-title" prefix="(" suffix=")" font-style="italic"/>
-      </group>
-    </group> 
-  </macro>
-  <macro name="render-personal_communication">
-    <group delimiter=" ">
-      <text term="letter" text-case="capitalize-first"/>
-      <text term="from" form="short"/>
-      <names variable="author"/>
-      <text term="recipient" form="verb"/>
-      <names variable="recipient"/>
-      <date form="text" variable="issued" date-parts="year-month-day" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="render-entry-encyclopedia">
-    <!-- test whether the entry is from the JurisClasseur Québec
-          (the only encyclopedic digest with editor information)-->
-    <choose>
-      <if variable="editor">
-        <group delimiter=" ">
-          <group>
-            <text variable="title" quotes="true"/>
-          </group>
-          <group>
-            <text macro="pinpoint" suffix=","/>
-          </group>
-          <text term="in" form="short"/>
-          <text macro="editor" suffix=","/>
-          <text variable="container-title"/>
-          <text variable="collection-title"/>
-        </group>  
-      </if>
-    </choose>
-  </macro>
-  <macro name="pinpoint">
-    <choose>
-      <if page="page" match="none">
-        <group delimiter=" ">
-          <label form="short" plural="contextual" variable="page"/>
-        </group>
-      </if>
-      <else>
-        <group delimiter=" ">
-          <label variable="locator" form="short" plural="contextual"/>   
-          <number variable="locator"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="short-form">
-    <!-- Hump to overcome: cannot check against existence of short title.
-    Not implemented: "cited to" for cases construct short casenames adding ref to article -->
-    <choose>
-      <if variable="hereinafter">
-        <text variable="hereinafter" font-style="italic"/>
-      </if>
-      <else-if type="book article-journal chapter article-newspaper post-weblog paper-conference">
-        <names variable="author">
-          <name and="symbol" form="short" delimiter-precedes-last="never"/>
-          <substitute>
-            <names variable="editor">
-              <name and="symbol" form="short"/>
-            </names>
-          </substitute>
-        </names>
-      </else-if>
-      <else-if variable="title-short">
-        <text variable="title-short" font-style="italic"/>
-      </else-if>
-      <else>
-        <text variable="title" font-style="italic" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher-place-year">
-	<text term="open-quote" form="short"/>									  
-    <group delimiter=" ">
-      <group>
-        <text variable="publisher-place"/>
-        <text term="open-inner-quote" form="short"/>
-      </group>
-      <text variable="publisher" suffix=","/>
-      <group>
-        <choose>
-          <if>
-            <conditions match="all">
-              <condition type="report"/>
-              <condition variable="publisher" match="none"/>
-            </conditions>
-            <date form="text" variable="issued"/>
-          </if>
-          <else>
-            <date form="text" variable="issued" date-parts="year"/>
-          </else>
-        </choose>
-        <choose>
-          <if>
-            <conditions match="all">
-              <condition match="none" type="chapter"/>
-              <condition match="none" variable="locator"/>
-            </conditions>
-            <text term="close-inner-quote" form="short"/>
-          </if>
-          <else>
-            <text term="close-quote" form="short"/>
-          </else>
-        </choose>
-      </group>
-    </group>
-  </macro>
-  <macro name="ct-jurisdiction-paren">
-	<names variable="authority" prefix="(" suffix=")">
-	  <name/>
-	  <institution institution-parts="short"/>
-	</names>
-  </macro>
-  <macro name="local-title-short">
-    <!-- The title form for subsequent citations (of all types) -->
-    <choose>
-      <if position="first">
-        <choose>
-          <if variable="hereinafter">
-            <text variable="hereinafter"/>
-          </if>
-          <else-if variable="title-short">
-            <text variable="title-short"/>
-          </else-if>
-        </choose>
-      </if>
-      <else>
-        <choose>
-          <if variable="hereinafter">
-            <text variable="hereinafter"/>
-          </if>
-          <else-if variable="title-short">
-            <text variable="title-short"/>
-          </else-if>
-          <else>
-            <text variable="title"/>
-          </else>
-        </choose>
-      </else>
-    </choose>
-  </macro>
-  <citation et-al-min="4" et-al-use-first="1">
-    <!-- translator needs to be added for chapter book film etc. chapter? -->
-    <layout delimiter="; " suffix=".">
-      <text macro="layout-citation"/>
-    </layout>
-  </citation>
-  <bibliography et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;">
-    <sort>
-      <key macro="sort-by-type"/>
-      <key macro="author-bib"/>
-      <key variable="title"/>
-      <key variable="issued"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="layout-bib"/>
-    </layout>
-  </bibliography>
-</style>
\ No newline at end of file
diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index 2951baa..e29d57a 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.1mlz1" year-range-format="expanded" require-comma-on-symbol="after-number">
   <info>
-    <title>JM - Canadian Guide to Uniform Legal Citation (9th edition) / Manuel canadien de la référence juridique (9ᵉ édition)</title>
-    <id>http://juris-m.github.io/styles/jm-mcgill-v9</id>
+    <title>JM - McGill9e</title>
+    <id>http://juris-m.github.io/styles/jm-mcgill-v9-pw-edit</id>
     <link href="http://juris-m.github.io/styles/jm-mgcill-v9" rel="self"/>
     <link href="https://lawjournal.mcgill.ca/fr/manuel-de-reference/" rel="documentation"/>
     <author>
@@ -28,9 +28,13 @@
       <email>gspanglett@gmail.com</email>
       <uri>https://gspanglett.github.io</uri>
     </contributor>
+    <contributor>
+      <name>Peter Wills</name>
+      <email>peter.wills@law.ox.ac.uk</email>
+    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2022-03-09T22:53:52+00:00</updated>
+    <updated>2022-04-04 18:37:58</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="fr">
@@ -122,7 +126,7 @@
       <term name="in" form="short">in</term>
       <term name="in" form="verb">reprinted in</term>
       <term name="in" form="symbol">:</term>
-      <term name="online">online</term>
+									   
       <term name="online" form="short">online (blog)</term>
       <term name="and" form="symbol">&#38;</term>
       <term name="et-al">et al</term>
@@ -178,7 +182,7 @@
     <text value=""/>
   </macro>
   <macro name="juris-locator">
-    <text value=""/>
+	<text value=""/>
   </macro>
   <macro name="jurism">
     <choose>
@@ -204,7 +208,7 @@
           <else>
             <group delimiter=" ">
               <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-              <text macro="juris-locator" label-form="short"/>
+              <text macro="pinpoint"/>
             </group>
           </else>
         </choose>
@@ -216,7 +220,7 @@
         <!-- short form -->
         <group delimiter=" ">
           <group delimiter=", ">
-            <text macro="juris-title-short" font-style="italic" strip-periods="true"/>
+            <text macro="local-title-short" font-style="italic" strip-periods="true" suffix=","/>
             <text value="supra" font-style="italic"/>
           </group>
           <choose>
@@ -228,7 +232,7 @@
             </if>
             <else>
               <text variable="first-reference-note-number" prefix="note "/>            
-              <text macro="juris-locator" label-form="short" strip-periods="true"/>
+              <text macro="pinpoint"/>
             </else>
           </choose>
         </group>
@@ -317,7 +321,7 @@
                     </group>
                     <group delimiter=", ">
                       <group delimiter=" ">
-                        <text macro="juris-main"/>
+                        <text macro="juris-main" strip-periods="true"/>
                         <text macro="juris-locator" label-form="short" strip-periods="true"/>
                       </group>
                       <choose>
@@ -331,6 +335,37 @@
                       </choose>
                     </group>
                   </group>
+				  <choose>
+				    <!-- Replicating juris-ca hierarchy -->
+				    <if> <!-- Reporter without year as volume-->
+					  <conditions match="all">
+						<condition match="all" variable="container-title volume"/>
+						<condition match="none" variable="collection-number admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</if>
+					<else-if> <!-- online service-->
+						<conditions match="all">
+						  <condition match="all" variable="submitted container-title"/>
+						  <condition match="none" variable="collection-number admin-flag"/>
+					    </conditions>
+						<text macro="ct-jurisdiction-paren" />
+					</else-if>
+					<else-if> <!-- Reporter with [year] and page -->
+					  <conditions match="all">
+						<condition match="all" variable="collection-number container-title page"/>
+						<condition match="none" variable="admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</else-if>
+					<else-if> <!-- Journal with [year] and no page -->
+					  <conditions match="all">
+						<condition match="all" variable="collection-number container-title issue"/>
+						<condition match="none" variable="admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</else-if>
+				  </choose>
                   <choose>
                     <if>
                       <conditions match="all">
@@ -485,44 +520,69 @@
                 </group>
               </if>
               <else-if type="legal_case">
-                <group delimiter=", ">
-                  <text macro="juris-title" font-style="italic"/>
-                  <group delimiter=" ">
-                    <choose>
-                      <if variable="collection-number">
-                        <number variable="collection-number" prefix="[" suffix="]"/>
-                      </if>
-                      <else-if variable="container-title">
-                        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-                      </else-if>
-                      <else>
-                        <!-- unreported cases -->
-                        <group delimiter=", " prefix="(" suffix=")">
-                          <names variable="authority">
-                            <name/>
-                            <institution institution-parts="short" use-first="1"/>
-                          </names>
-                          <number variable="number"/>
-                          <date variable="issued" date-parts="year-month-day" form="text"/>
-                        </group>
-                      </else>
+				<group delimiter=", ">
+				  <text macro="juris-title" font-style="italic"/>
+				  <group delimiter=" ">
+					<choose>
+					  <if variable="collection-number">
+						<number variable="collection-number" prefix="[" suffix="]"/>
+					  </if>
+					  <else-if variable="container-title">
+						<date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+					  </else-if>
+					  <else>
+						<!-- unreported cases -->
+						<group delimiter=", " prefix="(" suffix=")">
+						  <names variable="authority">
+							<name/>
+							<institution institution-parts="short" use-first="1"/>
+						  </names>
+						  <number variable="number"/>
+						  <date variable="issued" date-parts="year-month-day" form="text"/>
+						</group>
+					  </else>
+					</choose>
+					<choose>
+					  <if variable="container-title">
+						<number variable="volume"/>
+						<text variable="container-title" form="short"/>
+					  </if>
+					  <else-if variable="collection-number">
+						<names variable="authority">
+						  <name/>
+						  <institution form="short"/>
+						</names>
+					  </else-if>
+					</choose>
+					<number variable="page-first"/>
+					<text macro="pinpoint"/>
+					<choose>
+						<if variable="container-title">
+							<names variable="authority" prefix="(" suffix=")">
+							  <name/>
+							  <institution institution-parts="short"/>
+							</names>
+						</if>
+					</choose>
+				    <choose>
+						<if>
+						  <conditions match="all">
+							<condition match="none" context="bibliography"/>
+							<condition position="first"/>
+						  </conditions>
+						  <choose>
+							<if>
+							  <conditions match="any">
+								<condition variable="hereinafter"/>
+								<condition variable="title-short"/>
+							  </conditions>
+							  <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
+							</if>
+						  </choose>
+						</if>
                     </choose>
-                    <choose>
-                      <if variable="container-title">
-                        <number variable="volume"/>
-                        <text variable="container-title" form="short"/>
-                      </if>
-                      <else-if variable="collection-number">
-                        <names variable="authority">
-                          <name/>
-                          <institution form="short"/>
-                        </names>
-                      </else-if>
-                    </choose>
-                    <number variable="page-first"/>
-                  </group>
-                  <text macro="pinpoint"/>
-                </group>
+				  </group>
+				</group>
               </else-if>
             </choose>
           </else-if>
@@ -624,7 +684,7 @@
                         <condition position="first"/>
                       </conditions>
                       <group parallel-last="title-short title">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                        <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
                       </group>
                     </if>
                   </choose>
@@ -793,6 +853,12 @@
                   <else-if type="entry-encyclopedia">
                     <text macro="render-entry-encyclopedia"/>
                   </else-if>
+				  <else-if type="paper-conference">
+					<text macro="render-paper-conference"/>
+				  </else-if>
+				  <else-if variable="genre">
+					<text macro="render-article-preprint"/>
+				  </else-if>
                   <else-if type="article">
                     <text macro="render-article"/>
                   </else-if>
@@ -816,6 +882,9 @@
             <if variable="hereinafter">
               <text variable="hereinafter" prefix="[" suffix="]" font-style="italic"/>
             </if>
+			<if type="book article-journal chapter article-newspaper post-weblog" variable="author">
+				<!-- Don't show the short title if there's an author that'll be shown instead-->
+			</if>
             <else-if variable="title-short">
               <text variable="title-short" prefix="[" suffix="]" font-style="italic"/>
             </else-if>
@@ -903,6 +972,12 @@
             </else-if>
             <else-if type="entry-encyclopedia">
               <text macro="render-entry-encyclopedia"/>
+            </else-if>
+		    <else-if type="paper-conference">
+			  <text macro="render-paper-conference"/>
+			</else-if>
+			<else-if variable="genre">
+              <text macro="render-article-preprint"/>
             </else-if>
             <else-if type="article">
               <text macro="render-article"/>
@@ -1048,14 +1123,14 @@
   <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
     right. Only actually need to check for 'first' because w/i cite all the other tests should have been done... -->
   <macro name="render-chapter">
-    <group delimiter=", ">
-      <group delimiter=" ">
-        <text variable="title" quotes="true"/>
-        <text term="in" form="short"/>
-        <text macro="editor" strip-periods="true"/>
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text term="in" form="short"/>
+      <text macro="editor" strip-periods="true" suffix=", "/> <!-- if there's no editor, no comma-->
+      <group delimiter=", ">
+        <text macro="container-title" font-style="italic"/>
+        <text macro="edition"/>
       </group>
-      <text macro="container-title" font-style="italic"/>
-      <text macro="edition"/>
     </group>
     <group delimiter=", ">
       <text macro="publisher-place-year"/>
@@ -1178,7 +1253,36 @@
       <number variable="page-first"/>
     </group>
   </macro>
-  <macro name="render-article">
+  <macro name="render-paper-conference">
+	<group delimiter=" ">
+	  <text variable="title" quotes="true" suffix=""/>
+	  <group delimiter=", ">
+		<group delimiter=", " prefix="(" suffix=")">
+			<text variable="event-title" prefix="Paper delivered at "/>
+			<text variable="event-place"/>
+			<text macro="issued-long"/>
+		</group>
+		<group delimiter=" ">
+			<group delimiter=":">
+				<number variable="volume"/>
+				<number variable="issue"/>
+			</group>
+		  <text variable="publisher"/>
+		  <text variable="collection-title" prefix="(" suffix=")"/>
+		  <number variable="page-first"/>
+		</group>
+	  </group>
+	</group>
+  </macro>
+  <macro name="render-article-preprint">
+	<group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
+      <text variable="genre"/>
+      <text variable="collection-number" prefix="Working Paper "/>
+      <number variable="page-first"/>
+    </group>
+  </macro>  <macro name="render-article">
     <group delimiter=", ">
       <group delimiter=" ">
         <group>
@@ -1217,8 +1321,10 @@
       <group delimiter=" ">
         <choose>
           <if type="post-weblog">
-            <text term="online" form="short"/>
-            <text term="in" form="symbol"/>
+			<group>
+				<text term="online" form="short"/>
+				<text term="in" form="symbol"/>
+			</group>
           </if>
           <else>
             <group>
@@ -1459,7 +1565,7 @@
       <if variable="hereinafter">
         <text variable="hereinafter" font-style="italic"/>
       </if>
-      <else-if type="book article-journal chapter article-newspaper post-weblog">
+      <else-if type="book article-journal chapter article-newspaper post-weblog paper-conference">
         <names variable="author">
           <name and="symbol" form="short" delimiter-precedes-last="never"/>
           <substitute>
@@ -1478,7 +1584,7 @@
     </choose>
   </macro>
   <macro name="publisher-place-year">
-    <text term="open-quote" form="short"/>
+	<text term="open-quote" form="short"/>									  
     <group delimiter=" ">
       <group>
         <text variable="publisher-place"/>
@@ -1513,6 +1619,40 @@
       </group>
     </group>
   </macro>
+  <macro name="ct-jurisdiction-paren">
+	<names variable="authority" prefix="(" suffix=")">
+	  <name/>
+	  <institution institution-parts="short"/>
+	</names>
+  </macro>
+  <macro name="local-title-short">
+    <!-- The title form for subsequent citations (of all types) -->
+    <choose>
+      <if position="first">
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+          <else>
+            <text variable="title"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
   <citation et-al-min="4" et-al-use-first="1">
     <!-- translator needs to be added for chapter book film etc. chapter? -->
     <layout delimiter="; " suffix=".">

From 65d2b233680619b403f58481be5f6f079ff90eb7 Mon Sep 17 00:00:00 2001
From: Admin <peter@peterwills.ca>
Date: Wed, 6 Dec 2023 15:34:26 -0500
Subject: [PATCH 07/12] Revert "Merge my edits into v9"

This reverts commit 1c54291976803e503a838d0d8210587d493cc9d4.
---
 jm-mcgill-v9-pw-edit.csl | 1673 ++++++++++++++++++++++++++++++++++++++
 jm-mcgill-v9.csl         |  258 ++----
 2 files changed, 1732 insertions(+), 199 deletions(-)
 create mode 100644 jm-mcgill-v9-pw-edit.csl

diff --git a/jm-mcgill-v9-pw-edit.csl b/jm-mcgill-v9-pw-edit.csl
new file mode 100644
index 0000000..e29d57a
--- /dev/null
+++ b/jm-mcgill-v9-pw-edit.csl
@@ -0,0 +1,1673 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.1mlz1" year-range-format="expanded" require-comma-on-symbol="after-number">
+  <info>
+    <title>JM - McGill9e</title>
+    <id>http://juris-m.github.io/styles/jm-mcgill-v9-pw-edit</id>
+    <link href="http://juris-m.github.io/styles/jm-mgcill-v9" rel="self"/>
+    <link href="https://lawjournal.mcgill.ca/fr/manuel-de-reference/" rel="documentation"/>
+    <author>
+      <name>Samuel Gagnon</name>
+      <email>gagnon-samuel@outlook.com</email>
+      <uri>https://github.com/Droitslinguistiques</uri>
+    </author>
+    <contributor>
+      <name>Liam McHugh-Russell</name>
+      <email>liam.mchugh.russell@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Frank Bennet</name>
+      <uri>https://juris-m.github.io/</uri>
+    </contributor>
+    <contributor>
+      <name>Florian Martin-Bariteau</name>
+      <email>f.martin-bariteau@umontreal.ca</email>
+      <uri>http://f-mb.github.io/cslegal/</uri>
+    </contributor>
+    <contributor>
+      <name>Gareth Spanglett</name>
+      <email>gspanglett@gmail.com</email>
+      <uri>https://gspanglett.github.io</uri>
+    </contributor>
+    <contributor>
+      <name>Peter Wills</name>
+      <email>peter.wills@law.ox.ac.uk</email>
+    </contributor>
+    <category citation-format="note"/>
+    <category field="law"/>
+    <updated>2022-04-04 18:37:58</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="fr">
+    <style-options jurisdiction-preference="fr"/>
+     <terms>
+      <term name="page" form="short">
+        <single>à la p</single>
+        <multiple>aux pp</multiple>
+      </term>
+      <term name="paragraph" form="short">
+        <single>au para</single>
+        <multiple>aux paras</multiple>
+      </term>
+      <term name="note" form="short">
+        <single>n</single>
+        <multiple>nn</multiple>
+      </term>
+      <term name="issue" form="short">
+        <single>nᵒ</single>
+        <multiple>nᵒ</multiple>
+      </term>
+      <term name="article" form="short">
+        <single>art</single>
+        <multiple>arts</multiple>
+      </term>
+      <term name="accessed">dernière consultation le</term>
+      <term name="issue" form="long">nᵒ</term>
+      <term name="issue" form="verb">nᵒ de catalogue</term>
+      <term name="number" form="long">nᵒ</term>
+      <term name="chapter" form="short">c</term>
+      <term name="schedule" form="long">constitutant l'annexe</term>
+      <term name="schedule" form="short">annexe</term>
+      <term name="collection-editor" form="short">dir</term>
+      <term name="collection-editor" form="long">président :</term>
+      <term name="editor" form="short">dir</term>
+      <term name="editor" form="verb">dir</term>
+      <term name="translator" form="verb">traduit par</term>
+      <term name="in">dans</term>
+      <term name="in" form="verb">reproduit dans</term>
+      <term name="in" form="symbol"> :</term>
+      <term name="online">en ligne</term>
+      <term name="online" form="short">en ligne (blogue)</term>
+      <term name="and" form="symbol">et</term>
+      <term name="supplement" form="short">supp</term>
+      <term name="open-quote" form="short">, </term>
+      <term name="close-quote" form="short">,</term>
+      <term name="open-inner-quote" form="short">,</term>
+      <term name="close-inner-quote" form="short"></term>
+      <term name="letter" form="verb">lettre</term>
+      <term name="from" form="short">de</term>
+      <term name="from" form="verb">du</term>
+      <term name="section" form="short">
+        <single>art</single>
+      <multiple>arts</multiple>
+      </term>
+      <term name="part" form="long">partie</term>
+    </terms>
+  </locale>
+  <locale xml:lang="en">
+    <date form="text">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" suffix=" "/>
+      <date-part name="year"/>
+    </date>
+     <terms>
+      <term name="page" form="short">at</term>
+      <term name="paragraph" form="short">
+        <single>at para</single>
+        <multiple>at paras</multiple>
+      </term>
+      <term name="note" form="short">
+        <single>n</single>
+        <multiple>nn</multiple>
+      </term>
+      <term name="issue" form="short">
+        <single>at no</single>
+        <multiple>at nos</multiple>
+      </term>
+      <term name="accessed">last visited</term>
+      <term name="issue" form="long">No</term>
+      <term name="issue" form="verb">Catalogue No</term>
+      <term name="number" form="long">No</term>
+      <term name="chapter" form="short">c</term>
+      <term name="editor" form="verb-short">ed</term>
+      <term name="editor" form="short">ed</term>
+      <term name="collection-editor" form="short">ed</term>
+      <term name="collection-editor" form="long">Chair:</term>
+      <term name="translator" form="verb">translated by</term>
+      <term name="in" form="short">in</term>
+      <term name="in" form="verb">reprinted in</term>
+      <term name="in" form="symbol">:</term>
+									   
+      <term name="online" form="short">online (blog)</term>
+      <term name="and" form="symbol">&#38;</term>
+      <term name="et-al">et al</term>
+      <term name="from" form="verb">to the</term>
+      <term name="from" form="verb-short">of the</term>
+      <term name="supplement" form="short">Supp</term>
+      <term name="schedule" form="long">being Schedule</term>
+      <term name="schedule" form="short">Appendix</term>
+      <term name="open-quote" form="short"> (</term>
+      <term name="close-quote" form="short">)</term>
+      <term name="open-inner-quote" form="short">:</term>
+      <term name="close-inner-quote" form="short">)</term>
+      <term name="ordinal-02">d</term>
+      <term name="ordinal-03">d</term>
+      <term name="section" form="short">
+        <single>s</single>
+        <multiple>ss</multiple>
+      </term>
+      <term name="section" form="long">
+        <single>art</single>
+        <multiple>arts</multiple>
+      </term>
+      <term name="article" form="short">
+        <single>art</single>
+        <multiple>arts</multiple>
+      </term>
+      <term name="part" form="long">Part</term>
+    </terms>
+  </locale>
+  <!-- Juris-M Macros-->
+  <macro name="juris-pretitle">
+    <text value=""/>
+  </macro>
+  <macro name="juris-title">
+    <text value="[HINT: Install the Myles plugin, available at https://juris-m.github.io/downloads]"/>
+  </macro>
+  <macro name="juris-main">
+    <text value=""/>
+  </macro>
+  <macro name="juris-tail">
+    <text value=""/>
+  </macro>
+  <macro name="juris-pretitle-short">
+    <text value=""/>
+  </macro>
+  <macro name="juris-title-short">
+    <text value=""/>
+  </macro>
+  <macro name="juris-main-short">
+    <text value=""/>
+  </macro>
+  <macro name="juris-tail-short">
+    <text value=""/>
+  </macro>
+  <macro name="juris-locator">
+	<text value=""/>
+  </macro>
+  <macro name="jurism">
+    <choose>
+      <if>
+        <conditions match="all">
+          <condition type="legislation"/>
+          <condition match="none" variable="volume section container-title number"/>
+          <condition match="all" variable="title-short"/>
+        </conditions>
+        <group delimiter=" ">
+          <text macro="juris-locator"/>
+          <text macro="juris-title-short" strip-periods="true"/>
+        </group>
+      </if>
+      <else-if position="ibid-with-locator">
+        <choose>
+          <if type="legislation regulation" match="any">
+            <group delimiter=", ">
+              <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
+              <text macro="juris-locator" label-form="short"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
+              <text macro="pinpoint"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if position="ibid">
+        <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
+      </else-if>
+      <else-if position="subsequent">
+        <!-- short form -->
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <text macro="local-title-short" font-style="italic" strip-periods="true" suffix=","/>
+            <text value="supra" font-style="italic"/>
+          </group>
+          <choose>
+            <if match="any" type="legislation regulation">
+              <group delimiter=", ">
+                <text variable="first-reference-note-number" prefix="note "/>
+                <text macro="juris-locator" label-form="short" strip-periods="true"/>
+              </group>
+            </if>
+            <else>
+              <text variable="first-reference-note-number" prefix="note "/>            
+              <text macro="pinpoint"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else>
+        <choose>
+          <if country="ca">
+            <!-- full form -->
+            <choose>
+              <if type="bill">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle" strip-periods="true"/>
+                  <text macro="juris-title" font-style="italic" strip-periods="true"/>
+                  <text macro="juris-main" strip-periods="true"/>
+                  <group delimiter=" ">
+                    <text macro="juris-locator" label-form="short" strip-periods="true"/>
+                    <text macro="juris-tail" strip-periods="true" prefix="(" suffix=")"/>
+                  </group>
+                </group>
+              </if>
+              <else-if type="legislation">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group parallel-first="title" parallel-delimiter-override=", ">
+                      <text macro="juris-title" font-style="italic" strip-periods="true"/>
+                    </group>
+                    <choose>
+                      <if variable="volume page container-title" match="all">
+                        <text macro="juris-locator"/>
+                        <group delimiter=" ">
+                          <text term="part" form="long"/>
+                          <number variable="volume" form="roman" text-case="uppercase"/>
+                          <text term="from" form="verb-short"/>
+                          <text variable="container-title" font-style="italic"/>
+                        </group>
+                        <group delimiter=" ">
+                          <text term="schedule" form="long"/>
+                          <number variable="page"/>
+                          <text term="from" form="verb"/>
+                        </group>
+                      </if>
+                      <else-if variable="page">
+                        <group parallel-first="title" delimiter=", ">
+                          <text macro="juris-locator"/>
+                          <group delimiter=" ">
+                            <text term="schedule" form="verb"/>
+                            <number variable="page"/>
+                            <text term="from" form="verb"/>
+                          </group>
+                        </group>
+                      </else-if>
+                      <else>
+                        <text macro="juris-main" strip-periods="false"/>
+                        <text macro="juris-locator" label-form="short"/>
+                      </else>
+                    </choose>
+                  </group>
+                  <choose>
+                    <if>
+                      <conditions match="all">
+                        <condition match="none" context="bibliography"/>
+                        <condition position="first"/>
+                        <condition type="legislation"/>
+                      </conditions>
+                      <group parallel-last="issued">
+                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else-if>
+              <else-if type="legal_case">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group parallel-first="authority title issued" delimiter=" " parallel-delimiter-override=", ">
+                      <text macro="juris-title" strip-periods="true" font-style="italic"/>
+                      <choose>
+                        <if>
+                          <conditions match="all">
+                            <condition match="all" type="legal_case" variable="container-title volume"/>
+                            <condition match="none" variable="collection-number"/>
+                          </conditions>
+                          <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+                        </if>
+                      </choose>
+                    </group>
+                    <group delimiter=", ">
+                      <group delimiter=" ">
+                        <text macro="juris-main" strip-periods="true"/>
+                        <text macro="juris-locator" label-form="short" strip-periods="true"/>
+                      </group>
+                      <choose>
+                        <if match="all" variable="archive archive_location">
+                          <group parallel-last="issued submitted">
+                            <group parallel-last-to-first="issued submitted">
+                              <text macro="juris-tail" strip-periods="true"/>
+                            </group>
+                          </group> 
+                        </if>
+                      </choose>
+                    </group>
+                  </group>
+				  <choose>
+				    <!-- Replicating juris-ca hierarchy -->
+				    <if> <!-- Reporter without year as volume-->
+					  <conditions match="all">
+						<condition match="all" variable="container-title volume"/>
+						<condition match="none" variable="collection-number admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</if>
+					<else-if> <!-- online service-->
+						<conditions match="all">
+						  <condition match="all" variable="submitted container-title"/>
+						  <condition match="none" variable="collection-number admin-flag"/>
+					    </conditions>
+						<text macro="ct-jurisdiction-paren" />
+					</else-if>
+					<else-if> <!-- Reporter with [year] and page -->
+					  <conditions match="all">
+						<condition match="all" variable="collection-number container-title page"/>
+						<condition match="none" variable="admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</else-if>
+					<else-if> <!-- Journal with [year] and no page -->
+					  <conditions match="all">
+						<condition match="all" variable="collection-number container-title issue"/>
+						<condition match="none" variable="admin-flag"/>
+					  </conditions>
+					  <text macro="ct-jurisdiction-paren" />
+					</else-if>
+				  </choose>
+                  <choose>
+                    <if>
+                      <conditions match="all">
+                        <condition match="none" context="bibliography"/>
+                        <condition position="first"/>
+                      </conditions>
+                      <group parallel-last="title-short title">
+                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else-if>
+              <else-if type="hearing">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle"/>
+                  <text macro="juris-title" font-style="italic"/>
+                  <group delimiter=" ">
+                    <text macro="juris-main"/>
+                    <text macro="juris-locator"/>
+                    <choose>
+                      <if context="citation">
+                        <group delimiter=" ">
+                          <text macro="juris-tail"/>
+                          <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="report">
+                <choose>
+                  <if variable="collection-title">
+                    <group delimiter=", ">
+                      <text macro="juris-pretitle"/>
+                      <group>
+                        <text macro="juris-title" quotes="true"/>
+                      </group>
+                      <group delimiter=" ">
+                        <text macro="juris-main"/>
+                        <text macro="juris-locator" label-form="short"/>
+                      </group>
+                    </group>
+                  </if>
+                  <else>
+                    <group delimiter=", ">
+                      <text macro="juris-pretitle"/>
+                      <group delimiter=" ">
+                        <choose>
+                          <if variable="publisher">
+                            <group delimiter="">
+                              <group delimiter=", ">
+                                <text macro="juris-title" font-style="italic"/>
+                                <group delimiter=" ">
+                                  <choose>
+                                    <if is-numeric="number">
+                                      <text term="volume" form="short" strip-periods="true"/>
+                                    </if>
+                                  </choose>
+                                  <number variable="number"/>
+                                </group>
+                              </group>
+                              <text macro="publisher-place-year"/>
+                            </group>
+                            <group delimiter=" " prefix="(" suffix=")">
+                              <text term="collection-editor"/>
+                              <text macro="author-note"/>
+                            </group>
+                          </if>
+                          <else>
+                            <text macro="juris-title" font-style="italic"/>
+                            <text macro="juris-main"/>
+                          </else>
+                        </choose>
+                        <text macro="juris-locator" label-form="short"/>
+                      </group>
+                    </group>
+                  </else>
+                </choose>
+              </else-if>
+              <else-if type="gazette">
+                <group delimiter=" ">
+                  <text macro="juris-title" font-style="italic"/>
+                  <text macro="juris-main"/>
+                </group>
+              </else-if>
+              <else-if type="regulation" variable="authority">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle"/>
+                  <group delimiter=" ">
+                    <text macro="juris-title" font-style="italic"/>
+                    <text macro="juris-main"/>
+                  </group>
+                  <text macro="juris-locator"/>
+                </group>
+              </else-if>            
+              <else-if type="regulation">
+                <group delimiter=", ">
+                  <text macro="juris-title" font-style="italic"/>
+                  <text macro="juris-main"/>
+                  <text macro="juris-locator"/>
+                </group>
+              </else-if>
+            </choose>
+          </if>
+          <else-if country="gb">
+            <choose>
+              <if type="legislation">
+                <group delimiter=", ">
+                  <group delimiter=" ">
+                    <text variable="title" font-style="italic"/>
+                    <text variable="country" form="short" prefix="(" suffix=")"/>
+                  </group>
+                  <choose>
+                    <if variable="collection-number genre volume" match="all">
+                      <group delimiter=" ">
+                        <number variable="collection-number"/>
+                        <text variable="genre"/>
+                      </group>
+                      <number variable="chapter-number" prefix="St "/>
+                      <group delimiter=" ">
+                        <text term="chapter" form="short"/>
+                        <number variable="volume"/>
+                      </group>
+                    </if>
+                    <else>
+                      <date variable="issued" date-parts="year" form="numeric"/>
+                      <group delimiter=" ">
+                        <text term="chapter" form="short"/>
+                        <number variable="volume"/>
+                      </group>
+                    </else>
+                  </choose>
+                  <group parallel-first="issued" parallel-delimiter-override=" ">
+                    <text macro="pinpoint"/>
+                  </group>
+                  <group delimiter=", " parallel-first="issued" parallel-delimiter-override=" ">
+                    <group delimiter=" ">
+                      <text term="in" form="verb"/>
+                      <text variable="container-title"/>
+                    </group>
+                    <group delimiter=" ">
+                      <text term="schedule" form="short"/>
+                      <number variable="page" form="roman" text-case="uppercase"/>
+                    </group>
+                    <group delimiter=" ">
+                      <text term="number" form="short"/>
+                      <number variable="number"/>
+                    </group>
+                  </group>
+                </group>
+              </if>
+              <else-if type="legal_case">
+				<group delimiter=", ">
+				  <text macro="juris-title" font-style="italic"/>
+				  <group delimiter=" ">
+					<choose>
+					  <if variable="collection-number">
+						<number variable="collection-number" prefix="[" suffix="]"/>
+					  </if>
+					  <else-if variable="container-title">
+						<date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+					  </else-if>
+					  <else>
+						<!-- unreported cases -->
+						<group delimiter=", " prefix="(" suffix=")">
+						  <names variable="authority">
+							<name/>
+							<institution institution-parts="short" use-first="1"/>
+						  </names>
+						  <number variable="number"/>
+						  <date variable="issued" date-parts="year-month-day" form="text"/>
+						</group>
+					  </else>
+					</choose>
+					<choose>
+					  <if variable="container-title">
+						<number variable="volume"/>
+						<text variable="container-title" form="short"/>
+					  </if>
+					  <else-if variable="collection-number">
+						<names variable="authority">
+						  <name/>
+						  <institution form="short"/>
+						</names>
+					  </else-if>
+					</choose>
+					<number variable="page-first"/>
+					<text macro="pinpoint"/>
+					<choose>
+						<if variable="container-title">
+							<names variable="authority" prefix="(" suffix=")">
+							  <name/>
+							  <institution institution-parts="short"/>
+							</names>
+						</if>
+					</choose>
+				    <choose>
+						<if>
+						  <conditions match="all">
+							<condition match="none" context="bibliography"/>
+							<condition position="first"/>
+						  </conditions>
+						  <choose>
+							<if>
+							  <conditions match="any">
+								<condition variable="hereinafter"/>
+								<condition variable="title-short"/>
+							  </conditions>
+							  <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
+							</if>
+						  </choose>
+						</if>
+                    </choose>
+				  </group>
+				</group>
+              </else-if>
+            </choose>
+          </else-if>
+          <else-if country="un.int">
+            <group delimiter=", ">
+              <text variable="title" font-style="italic"/>
+              <group delimiter=" "> 
+                <text variable="event"/>
+                <number variable="number"/>
+              </group>
+              <names variable="authority"/>
+              <group delimiter=" ">
+                <number variable="chapter-number" form="ordinal" suffix=" Sess"/>
+              </group>
+              <group delimiter=" ">
+                <text term="supplement" form="short"/>
+                <text term="number" form="short"/>
+                <number variable="volume"/>
+              </group>
+              <group delimiter=" ">
+                <text value="UN Doc"/>
+                <text variable="archive_location"/>
+                <date variable="issued" date-parts="year" prefix="(" suffix=")" form="numeric"/>
+                <number variable="page-first"/>
+                <text macro="pinpoint"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <!-- full form -->
+            <choose>
+              <if type="bill">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle" strip-periods="true"/>
+                  <text macro="juris-title" font-style="italic" strip-periods="true"/>
+                  <text macro="juris-main" strip-periods="true"/>
+                  <group delimiter=" ">
+                    <text macro="juris-locator" label-form="short" strip-periods="true"/>
+                    <text macro="juris-tail" strip-periods="true" prefix="(" suffix=")"/>
+                  </group>
+                </group>
+              </if>
+              <else-if type="legislation">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <text macro="juris-title" font-style="italic" strip-periods="true"/>
+                    <text macro="juris-main"/>
+                    <text macro="juris-locator" label-form="short"/>
+                  </group>
+                  <choose>
+                    <if>
+                      <conditions match="all">
+                        <condition match="none" context="bibliography"/>
+                        <condition position="first"/>
+                        <condition type="legislation"/>
+                      </conditions>
+                      <group parallel-last="title-short title">
+                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else-if>
+              <else-if type="legal_case">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group parallel-first="authority title issued" delimiter=" " parallel-delimiter-override=", ">
+                      <text macro="juris-title" strip-periods="true" font-style="italic"/>
+                      <choose>
+                        <if>
+                          <conditions match="all">
+                            <condition match="all" type="legal_case" variable="container-title volume"/>
+                            <condition match="none" variable="collection-number"/>
+                          </conditions>
+                          <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+                        </if>
+                      </choose>
+                    </group>
+                    <group delimiter=", ">
+                      <group delimiter=" ">
+                        <text macro="juris-main" strip-periods="true"/>
+                        <text macro="juris-locator" label-form="short" strip-periods="true"/>
+                      </group>
+                      <choose>
+                        <if match="all" variable="archive archive_location">
+                          <group parallel-last="archive archive_location submitted">
+                            <group parallel-last-to-first="archive archive_location submitted">
+                              <text macro="juris-tail" strip-periods="true"/>
+                            </group>
+                          </group> 
+                        </if>
+                      </choose>
+                    </group>
+                  </group>
+                  <choose>
+                    <if>
+                      <conditions match="all">
+                        <condition match="none" context="bibliography"/>
+                        <condition position="first"/>
+                      </conditions>
+                      <group parallel-last="title-short title">
+                        <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else-if>
+              <else-if type="hearing">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle"/>
+                  <text macro="juris-title" font-style="italic"/>
+                  <group delimiter=" ">
+                    <text macro="juris-main"/>
+                    <text macro="juris-locator"/>
+                    <choose>
+                      <if context="citation">
+                        <group delimiter=" ">
+                          <text macro="juris-tail"/>
+                          <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="report">
+                <choose>
+                  <if variable="collection-title">
+                    <group delimiter=", ">
+                      <text macro="juris-pretitle"/>
+                      <group>
+                        <text macro="juris-title" quotes="true"/>
+                      </group>
+                      <group delimiter=" ">
+                        <text macro="juris-main"/>
+                        <text macro="juris-locator" label-form="short"/>
+                      </group>
+                    </group>
+                  </if>
+                  <else>
+                    <group delimiter=", ">
+                      <text macro="juris-pretitle"/>
+                      <group delimiter=" ">
+                        <text macro="juris-title" font-style="italic"/>
+                        <text macro="juris-main"/>
+                        <text macro="juris-locator" label-form="short"/>
+                      </group>
+                    </group>
+                  </else>
+                </choose>
+              </else-if>
+              <else-if type="gazette">
+                <group delimiter=" ">
+                  <text macro="juris-title" font-style="italic"/>
+                  <text macro="juris-main"/>
+                </group>
+              </else-if>
+              <else-if type="regulation">
+                <group delimiter=", ">
+                  <text macro="juris-pretitle"/>
+                  <group delimiter=" ">
+                    <text macro="juris-title" font-style="italic"/>
+                    <text macro="juris-main"/>
+                  </group>
+                  <text macro="juris-locator"/>
+                </group>
+              </else-if>
+            </choose>
+          </else>
+        </choose>   
+      </else>
+    </choose>
+  </macro>
+  <macro name="layout-citation">
+    <choose>
+      <if>
+        <conditions match="all">
+          <condition match="any" type="legal_case legislation bill hearing report regulation"/>
+          <condition match="all" variable="jurisdiction"/>
+          <condition match="all" country="ca"/>
+          <condition match="none" variable="gazette-flag admin-flag"/>
+        </conditions>
+        <text macro="jurism"/>
+      </if>
+      <else-if country="gb" type="legislation legal_case">
+        <text macro="jurism" strip-periods="true"/>
+      </else-if>
+      <else-if type="bill" country="un.int">
+        <text macro="jurism"/>
+      </else-if>
+      <!-- Not implemented: ibid only needs capitalize-first if it's the first word in a footnote -->
+      <else-if position="ibid-with-locator">
+        <group delimiter=" ">
+          <text term="ibid" font-style="italic" strip-periods="true"/>
+          <text macro="pinpoint"/>
+        </group>
+      </else-if>
+      <else-if position="ibid">
+        <text term="ibid" font-style="italic" strip-periods="true"/>
+      </else-if>
+      <else-if position="subsequent">
+        <group delimiter=" ">
+          <text macro="short-form" suffix=","/>
+          <text value="supra" font-style="italic"/>
+          <text value="note"/>
+          <text variable="first-reference-note-number"/>
+          <text macro="pinpoint"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <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>
+              <else-if type="patent" match="any">
+                <text macro="render-patent"/>
+              </else-if>
+              <else-if type="manuscript" match="any">
+                <text macro="render-manuscript"/>
+              </else-if>
+              <else-if type="legal_case">
+                <text macro="render-case"/>
+              </else-if>
+              <else-if type="report">
+                <text macro="render-report"/>
+              </else-if>
+              <else-if type="personal_communication">
+                <text macro="render-personal_communication"/>
+              </else-if>
+              <else-if type="treaty">
+                <text macro="render-treaty"/>
+              </else-if>
+              <else-if type="gazette">
+                <text macro="render-gazette"/>
+              </else-if>
+              <else>
+                <text macro="author-note" strip-periods="true"/>
+                <choose>
+                  <if type="article-journal">
+                    <text macro="render-article-journal"/>
+                  </if>
+                  <else-if type="chapter">
+                    <text macro="render-chapter"/>
+                  </else-if>
+                  <else-if type="thesis">
+                    <text macro="render-thesis"/>
+                  </else-if>
+                  <else-if type="article-newspaper" match="any">
+                    <text macro="render-article-newspaper"/>
+                  </else-if>
+                  <else-if type="article-magazine">
+                    <text macro="render-article-magazine"/>
+                  </else-if>
+                  <else-if type="webpage post-weblog" match="any">
+                    <text macro="render-webpage"/>
+                  </else-if>
+                  <else-if type="book">
+                    <text macro="render-book"/>
+                  </else-if>
+                  <else-if type="entry-encyclopedia">
+                    <text macro="render-entry-encyclopedia"/>
+                  </else-if>
+				  <else-if type="paper-conference">
+					<text macro="render-paper-conference"/>
+				  </else-if>
+				  <else-if variable="genre">
+					<text macro="render-article-preprint"/>
+				  </else-if>
+                  <else-if type="article">
+                    <text macro="render-article"/>
+                  </else-if>
+                  <!--                    <else-if type="song" match="any"><text macro="render-song"/></else-if><else-if type="patent" match="any"><text macro="render-patent"/></else-if><else-if type="manuscript" match="any"><text macro="render-manuscript"/></else-if> -->
+                  <else>
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <text variable="title" font-style="italic"/>
+                        <text macro="translator"/>
+                        <text macro="edition"/>
+                      </group>
+                      <text macro="publisher-place-year"/>
+                    </group>
+                  </else>
+                </choose>
+              </else>
+            </choose>
+          </group>
+          <text macro="pinpoint"/>
+          <choose>
+            <if variable="hereinafter">
+              <text variable="hereinafter" prefix="[" suffix="]" font-style="italic"/>
+            </if>
+			<if type="book article-journal chapter article-newspaper post-weblog" variable="author">
+				<!-- Don't show the short title if there's an author that'll be shown instead-->
+			</if>
+            <else-if variable="title-short">
+              <text variable="title-short" prefix="[" suffix="]" font-style="italic"/>
+            </else-if>
+          </choose>
+          <choose>
+            <if type="article-newspaper article-magazine" match="any">
+              <text macro="internet-location"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="layout-bib">
+    <choose>
+      <if>
+        <conditions match="all">
+          <condition match="any" type="legal_case legislation hearing bill gazette report regulation"/>
+          <condition match="all" variable="jurisdiction"/>
+          <condition match="all" country="ca"/>
+        </conditions>
+        <text macro="jurism"/>
+      </if>
+      <else-if country="gb" type="legislation legal_case">
+        <text macro="jurism" strip-periods="true"/>
+      </else-if>
+      <else-if type="bill" country="un.int">
+        <text macro="jurism"/>
+      </else-if>
+      <else-if type="bill legal_case report legislation personal_communication treaty" match="any">
+        <choose>
+          <if type="bill legislation" match="any">
+            <text macro="render-bill"/>
+          </if>
+          <else-if type="legal_case">
+            <text macro="render-case"/>
+          </else-if>
+          <else-if type="report">
+            <text macro="render-report"/>
+          </else-if>
+          <else-if type="personal_communication">
+            <text macro="render-personal_communication"/>
+          </else-if>
+          <else-if type="treaty">
+            <text macro="render-treaty"/>
+          </else-if>
+          <else-if type="gazette">
+            <text macro="render-gazette"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text macro="author-bib" strip-periods="true"/>
+          <choose>
+            <if type="article-journal">
+              <text macro="render-article-journal"/>
+            </if>
+            <else-if type="chapter">
+              <text macro="render-chapter"/>
+            </else-if>
+            <else-if type="thesis">
+              <text macro="render-thesis"/>
+            </else-if>
+            <else-if type="article-newspaper">
+              <text macro="render-article-newspaper"/>
+            </else-if>
+            <else-if type="article-magazine">
+              <text macro="render-article-magazine"/>
+            </else-if>
+            <else-if type="book">
+              <text macro="render-book"/>
+            </else-if>
+            <else-if type="webpage post-weblog" match="any">
+              <text macro="render-webpage"/>
+            </else-if>
+            <else-if type="patent">
+              <text macro="render-patent"/>
+            </else-if>
+            <else-if type="song">
+              <text macro="render-song"/>
+            </else-if>
+            <else-if type="manuscript">
+              <text macro="render-manuscript"/>
+            </else-if>
+            <else-if type="entry-encyclopedia">
+              <text macro="render-entry-encyclopedia"/>
+            </else-if>
+		    <else-if type="paper-conference">
+			  <text macro="render-paper-conference"/>
+			</else-if>
+			<else-if variable="genre">
+              <text macro="render-article-preprint"/>
+            </else-if>
+            <else-if type="article">
+              <text macro="render-article"/>
+            </else-if>
+            <else>
+              <group>
+                <group delimiter=", ">
+                  <text variable="title" font-style="italic"/>
+                  <text macro="edition"/>
+                  <text macro="translator"/>
+                  <text macro="collection-editor"/>
+                </group>
+                <text macro="publisher-place-year"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="symbol" delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <label form="verb" suffix=" "/>
+      <name and="symbol"/>
+    </names>
+  </macro>
+  <macro name="container-title">
+    <text strip-periods="true" variable="container-title" form="short"/>
+  </macro>
+  <macro name="author-note">
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
+      <substitute>
+        <text macro="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-bib">
+    <names variable="author">
+      <name name-as-sort-order="first" and="symbol" sort-separator=", " delimiter-precedes-last="never"/>
+      <et-al term="et-al"/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="collection-editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="internet-location">
+    <choose>
+      <if variable="source URL genre" match="any">
+        <group delimiter=" ">
+          <group>
+            <text term="online"/>
+            <text term="in" form="symbol"/>
+          </group>
+          <choose>
+            <if variable="source">
+              <text variable="source" prefix="&#60;" suffix="&#62;"/>
+              <text variable="URL" prefix="[" suffix="]"/>
+            </if>
+            <else-if variable="genre">
+              <text variable="genre" prefix="&#60;" suffix="&#62;"/>
+              <text variable="URL" prefix="[" suffix="]"/>
+            </else-if>
+            <else>
+              <text variable="URL" prefix="&#60;" suffix="&#62;"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="genre">
+    <text variable="genre"/>
+  </macro>
+  <macro name="issued-long">
+    <choose>
+      <if variable="issued">
+        <date variable="issued" delimiter=" ">
+          <date-part name="day"/>
+          <date-part name="month" form="long"/>
+          <date-part name="year" form="long"/>
+        </date>
+      </if>
+      <else-if variable="accessed">
+        <date variable="accessed" form="text"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="submitted-long">
+    <date variable="submitted" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="long"/>
+      <date-part name="year" form="long"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal" text-case="lowercase"/>
+          <text term="edition" form="short" strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <number variable="edition" text-case="lowercase"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="series-info">
+    <group delimiter=" ">
+      <text variable="collection-title" strip-periods="true"/>
+      <number variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="sort-by-type">
+    <choose>
+      <if type="bill legislation" match="any">
+        <text value="1"/>
+      </if>
+      <else-if type="legal_case">
+        <text value="2"/>
+      </else-if>
+      <else-if type="book thesis" match="any">
+        <text value="3"/>
+      </else-if>
+      <else-if type="article-journal chapter article-newspaper article-magazine" match="any">
+        <text value="4"/>
+      </else-if>
+      <else>
+        <text value="5"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
+    right. Only actually need to check for 'first' because w/i cite all the other tests should have been done... -->
+  <macro name="render-chapter">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text term="in" form="short"/>
+      <text macro="editor" strip-periods="true" suffix=", "/> <!-- if there's no editor, no comma-->
+      <group delimiter=", ">
+        <text macro="container-title" font-style="italic"/>
+        <text macro="edition"/>
+      </group>
+    </group>
+    <group delimiter=", ">
+      <text macro="publisher-place-year"/>
+      <number variable="page-first"/>
+    </group>
+  </macro>
+  <macro name="render-article-journal">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
+      <group delimiter=":">
+        <number variable="volume"/>
+        <number variable="issue"/>
+      </group>
+      <text macro="container-title"/>
+      <text variable="collection-title" prefix="(" suffix=")"/>
+      <number variable="page-first"/>
+    </group>
+  </macro>
+  <macro name="render-book">
+    <group delimiter=", ">
+      <text variable="title" font-style="italic"/>
+      <text macro="edition"/>
+      <text macro="translator"/>
+      <text macro="editor"/>
+      <text macro="series-info"/>
+    </group>
+    <text macro="publisher-place-year"/>
+  </macro>
+  <macro name="render-report">
+    <choose>
+      <if variable="committee authority">
+        <!-- Parliamentary reports-->
+        <group delimiter=", ">
+          <names variable="authority"/>
+          <names variable="committee"/>
+          <text variable="title" font-style="italic"/>
+          <number variable="collection-number"/>
+          <group delimiter=" ">
+            <choose>
+              <if is-numeric="number">
+                <group delimiter=" ">
+                  <label variable="number" form="short"/>
+                </group>
+              </if>
+            </choose>
+            <number variable="number"/>
+          </group>
+          <group delimiter=" ">
+            <date variable="issued" prefix="(" suffix=")" date-parts="year-month" form="text"/>
+            <group delimiter=" " prefix="(" suffix=")">
+              <text term="collection-editor"/>
+              <names variable="collection-editor"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else>
+        <!-- Non-parliamentary report-->
+        <group delimiter=", "> 
+          <names variable="authority"/>
+          <text variable="title" font-style="italic"/>
+          <group delimiter=" ">
+            <text term="by"/>
+            <names variable="author"/>
+          </group>
+          <choose>
+            <if variable="call-number">
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="call-number">
+                    <text term="issue" form="verb"/>
+                  </if>
+                </choose>
+                <number variable="call-number"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <text term="issue" form="long"/>
+                  </if>
+                </choose>
+                <number variable="number"/>
+              </group>
+            </else>
+          </choose>
+          <text variable="genre" prefix="(" suffix=")"/>
+        </group>
+        <choose>
+          <if variable="publisher-place">
+            <text macro="publisher-place-year"/>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="render-thesis">
+    <group delimiter=" ">
+      <text variable="title" font-style="italic"/>
+      <text macro="genre" prefix="(" suffix=","/>
+      <text variable="publisher" suffix=","/>
+      <date form="text" variable="issued" date-parts="year" suffix=") [unpublished]"/>
+    </group>
+  </macro>
+  <macro name="render-article-newspaper">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=","/>
+      <text macro="container-title" font-style="italic"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+      <number variable="page-first"/>
+    </group>
+  </macro>
+  <macro name="render-article-magazine">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=""/>
+      <text macro="container-title" font-style="italic"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+      <number variable="page-first"/>
+    </group>
+  </macro>
+  <macro name="render-paper-conference">
+	<group delimiter=" ">
+	  <text variable="title" quotes="true" suffix=""/>
+	  <group delimiter=", ">
+		<group delimiter=", " prefix="(" suffix=")">
+			<text variable="event-title" prefix="Paper delivered at "/>
+			<text variable="event-place"/>
+			<text macro="issued-long"/>
+		</group>
+		<group delimiter=" ">
+			<group delimiter=":">
+				<number variable="volume"/>
+				<number variable="issue"/>
+			</group>
+		  <text variable="publisher"/>
+		  <text variable="collection-title" prefix="(" suffix=")"/>
+		  <number variable="page-first"/>
+		</group>
+	  </group>
+	</group>
+  </macro>
+  <macro name="render-article-preprint">
+	<group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
+      <text variable="genre"/>
+      <text variable="collection-number" prefix="Working Paper "/>
+      <number variable="page-first"/>
+    </group>
+  </macro>  <macro name="render-article">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <group>
+          <text variable="title" quotes="true"/>
+        </group>
+        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+        <text macro="pinpoint"/>
+      </group>
+      <choose>
+        <if variable="publisher URL" match="all">
+          <group delimiter=" ">
+            <text term="online"/>
+            <group>
+              <text value="(pdf)"/>
+              <text term="in" form="symbol"/>
+            </group>
+            <text variable="publisher" font-style="italic"/>
+            <text variable="URL" prefix="&#60;" suffix="&#62;"/>
+            <choose>
+              <if variable="archive">
+                <text variable="archive" prefix="[" suffix="]"/>
+              </if>
+              <else-if variable="archive_location">
+                <text variable="archive_location" prefix="[" suffix="]"/>
+              </else-if>
+            </choose>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="render-webpage">
+    <group delimiter=", ">
+      <text variable="title" quotes="true"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+      <group delimiter=" ">
+        <choose>
+          <if type="post-weblog">
+			<group>
+				<text term="online" form="short"/>
+				<text term="in" form="symbol"/>
+			</group>
+          </if>
+          <else>
+            <group>
+              <text term="online"/>
+              <text term="in" form="symbol"/>
+            </group>
+          </else>
+        </choose>
+        <choose>
+          <if variable="URL genre" match="all">
+            <text variable="container-title" font-style="italic"/>
+            <text variable="genre" prefix="&#60;" suffix="&#62;"/>
+            <text variable="URL" prefix="[" suffix="]"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic"/>
+            <text variable="URL" prefix="&#60;" suffix="&#62;"/>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <!-- cases and bill legislations render the same for biblio and (first) cite -->
+  <macro name="render-bill">
+    <group delimiter=", ">
+      <choose>
+        <if variable="container-title" match="none">
+          <!-- if no volume, assume bill -->
+          <text variable="publisher-place"/>
+          <names variable="authority"/>
+          <text variable="section"/>
+          <number variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <text variable="references" prefix="" suffix=")"/>
+          </group>
+          <number variable="number-of-volumes"/>
+          <number variable="number"/>
+          <group delimiter=" ">
+            <number variable="number"/>
+            <text macro="issued-long" prefix="(" suffix=")"/>
+          </group>
+        </if>
+        <else>
+          <number variable="number" prefix="Bill "/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
+          <number variable="chapter-number"/>
+          <names variable="authority"/>
+          <group delimiter=" ">
+            <date form="text" variable="issued" date-parts="year"/>
+          </group>
+          <text variable="section"/>
+        </else>
+      </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>
+      <number variable="number"/>
+    </group>
+  </macro>
+  <macro name="render-patent">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <number variable="number" prefix="Patent No "/>
+      <text variable="references" prefix=", PCT Patent No "/>
+      <text macro="submitted-long" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="render-song">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text variable="medium" prefix="(" suffix=")"/>
+      <text macro="author-note" strip-periods="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <number variable="call-number"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="render-treaty">
+    <group delimiter=", ">
+      <text variable="title" font-style="italic"/>
+      <date variable="event-date" form="text"/>
+      <group delimiter=" ">
+        <number variable="volume"/>
+        <text variable="container-title"/>
+        <number variable="page-first"/>
+        <text macro="pinpoint"/>
+        <group delimiter=" " prefix="(" suffix=")">
+          <text value="entered into force"/>
+          <date variable="issued" form="text" suffix=","/>
+          <text value="accession by"/>
+          <text variable="version"/>
+          <date variable="original-date" form="text"/>
+        </group>
+      </group>
+    </group>
+  </macro>
+  <macro name="render-manuscript">
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text variable="medium" prefix="(" suffix=")"/>
+      <text macro="author-note" strip-periods="true" suffix=","/>
+      <text variable="publisher-place"/>
+      <number variable="call-number"/>
+      <text macro="issued-long" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="render-case">
+    <choose>
+      <if variable="author">
+        <group delimiter=", ">
+          <names variable="authority"/>
+          <date form="numeric" variable="issued"/>
+          <number variable="number"/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic" strip-periods="true"/>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
+          <text variable="container-title" strip-periods="true" font-style="italic"/>
+          <number variable="volume"/>
+          <number variable="page"/>
+        </group>
+      </if>
+      <else-if variable="title" match="none">
+        <group delimiter=", ">
+          <names variable="authority"/>
+          <date form="numeric" variable="issued"/>
+          <number variable="number"/>
+          <group delimiter=" ">
+            <text variable="title" form="short" font-style="italic" strip-periods="true"/>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
+          <text variable="container-title" strip-periods="true" font-style="italic"/>
+          <number variable="volume"/>
+          <number variable="page-first"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+        <text variable="title" font-style="italic" suffix="," strip-periods="true"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <date form="text" variable="issued" date-parts="year"/>
+            <names variable="authority"/>
+            <number variable="page"/>
+          </if>
+          <else>
+            <date form="text" variable="issued" date-parts="year" prefix="[" suffix="]"/>
+            <number variable="volume"/>
+            <text variable="container-title" strip-periods="true"/>
+            <number variable="page-first"/>
+            <!-- COMMENTED OUT FOR 9TH ED  <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/> -->
+          </else>
+        </choose>
+        <!-- <text variable="references" prefix=", "/> -->
+        </group>
+      </else>
+    </choose>
+    <!-- COMMENTED OUT FOR 9TH ED  <text variable="URL" prefix=" (available on " suffix=")"/> -->
+  </macro>
+  <macro name="render-gazette">
+    <group delimiter=", ">
+      <number variable="number"/>
+      <group delimiter=" ">
+        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+        <text value="Gaz"/>
+        <number variable="volume"/>
+      </group>
+      <group delimiter=" ">
+        <number variable="page"/>
+        <text variable="container-title" prefix="(" suffix=")" font-style="italic"/>
+      </group>
+    </group> 
+  </macro>
+  <macro name="render-personal_communication">
+    <group delimiter=" ">
+      <text term="letter" text-case="capitalize-first"/>
+      <text term="from" form="short"/>
+      <names variable="author"/>
+      <text term="recipient" form="verb"/>
+      <names variable="recipient"/>
+      <date form="text" variable="issued" date-parts="year-month-day" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="render-entry-encyclopedia">
+    <!-- test whether the entry is from the JurisClasseur Québec
+          (the only encyclopedic digest with editor information)-->
+    <choose>
+      <if variable="editor">
+        <group delimiter=" ">
+          <group>
+            <text variable="title" quotes="true"/>
+          </group>
+          <group>
+            <text macro="pinpoint" suffix=","/>
+          </group>
+          <text term="in" form="short"/>
+          <text macro="editor" suffix=","/>
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>  
+      </if>
+    </choose>
+  </macro>
+  <macro name="pinpoint">
+    <choose>
+      <if page="page" match="none">
+        <group delimiter=" ">
+          <label form="short" plural="contextual" variable="page"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <label variable="locator" form="short" plural="contextual"/>   
+          <number variable="locator"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="short-form">
+    <!-- Hump to overcome: cannot check against existence of short title.
+    Not implemented: "cited to" for cases construct short casenames adding ref to article -->
+    <choose>
+      <if variable="hereinafter">
+        <text variable="hereinafter" font-style="italic"/>
+      </if>
+      <else-if type="book article-journal chapter article-newspaper post-weblog paper-conference">
+        <names variable="author">
+          <name and="symbol" form="short" delimiter-precedes-last="never"/>
+          <substitute>
+            <names variable="editor">
+              <name and="symbol" form="short"/>
+            </names>
+          </substitute>
+        </names>
+      </else-if>
+      <else-if variable="title-short">
+        <text variable="title-short" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" font-style="italic" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher-place-year">
+	<text term="open-quote" form="short"/>									  
+    <group delimiter=" ">
+      <group>
+        <text variable="publisher-place"/>
+        <text term="open-inner-quote" form="short"/>
+      </group>
+      <text variable="publisher" suffix=","/>
+      <group>
+        <choose>
+          <if>
+            <conditions match="all">
+              <condition type="report"/>
+              <condition variable="publisher" match="none"/>
+            </conditions>
+            <date form="text" variable="issued"/>
+          </if>
+          <else>
+            <date form="text" variable="issued" date-parts="year"/>
+          </else>
+        </choose>
+        <choose>
+          <if>
+            <conditions match="all">
+              <condition match="none" type="chapter"/>
+              <condition match="none" variable="locator"/>
+            </conditions>
+            <text term="close-inner-quote" form="short"/>
+          </if>
+          <else>
+            <text term="close-quote" form="short"/>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <macro name="ct-jurisdiction-paren">
+	<names variable="authority" prefix="(" suffix=")">
+	  <name/>
+	  <institution institution-parts="short"/>
+	</names>
+  </macro>
+  <macro name="local-title-short">
+    <!-- The title form for subsequent citations (of all types) -->
+    <choose>
+      <if position="first">
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+          <else>
+            <text variable="title"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1">
+    <!-- translator needs to be added for chapter book film etc. chapter? -->
+    <layout delimiter="; " suffix=".">
+      <text macro="layout-citation"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;">
+    <sort>
+      <key macro="sort-by-type"/>
+      <key macro="author-bib"/>
+      <key variable="title"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="layout-bib"/>
+    </layout>
+  </bibliography>
+</style>
\ No newline at end of file
diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index e29d57a..2951baa 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.1mlz1" year-range-format="expanded" require-comma-on-symbol="after-number">
   <info>
-    <title>JM - McGill9e</title>
-    <id>http://juris-m.github.io/styles/jm-mcgill-v9-pw-edit</id>
+    <title>JM - Canadian Guide to Uniform Legal Citation (9th edition) / Manuel canadien de la référence juridique (9ᵉ édition)</title>
+    <id>http://juris-m.github.io/styles/jm-mcgill-v9</id>
     <link href="http://juris-m.github.io/styles/jm-mgcill-v9" rel="self"/>
     <link href="https://lawjournal.mcgill.ca/fr/manuel-de-reference/" rel="documentation"/>
     <author>
@@ -28,13 +28,9 @@
       <email>gspanglett@gmail.com</email>
       <uri>https://gspanglett.github.io</uri>
     </contributor>
-    <contributor>
-      <name>Peter Wills</name>
-      <email>peter.wills@law.ox.ac.uk</email>
-    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2022-04-04 18:37:58</updated>
+    <updated>2022-03-09T22:53:52+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="fr">
@@ -126,7 +122,7 @@
       <term name="in" form="short">in</term>
       <term name="in" form="verb">reprinted in</term>
       <term name="in" form="symbol">:</term>
-									   
+      <term name="online">online</term>
       <term name="online" form="short">online (blog)</term>
       <term name="and" form="symbol">&#38;</term>
       <term name="et-al">et al</term>
@@ -182,7 +178,7 @@
     <text value=""/>
   </macro>
   <macro name="juris-locator">
-	<text value=""/>
+    <text value=""/>
   </macro>
   <macro name="jurism">
     <choose>
@@ -208,7 +204,7 @@
           <else>
             <group delimiter=" ">
               <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-              <text macro="pinpoint"/>
+              <text macro="juris-locator" label-form="short"/>
             </group>
           </else>
         </choose>
@@ -220,7 +216,7 @@
         <!-- short form -->
         <group delimiter=" ">
           <group delimiter=", ">
-            <text macro="local-title-short" font-style="italic" strip-periods="true" suffix=","/>
+            <text macro="juris-title-short" font-style="italic" strip-periods="true"/>
             <text value="supra" font-style="italic"/>
           </group>
           <choose>
@@ -232,7 +228,7 @@
             </if>
             <else>
               <text variable="first-reference-note-number" prefix="note "/>            
-              <text macro="pinpoint"/>
+              <text macro="juris-locator" label-form="short" strip-periods="true"/>
             </else>
           </choose>
         </group>
@@ -321,7 +317,7 @@
                     </group>
                     <group delimiter=", ">
                       <group delimiter=" ">
-                        <text macro="juris-main" strip-periods="true"/>
+                        <text macro="juris-main"/>
                         <text macro="juris-locator" label-form="short" strip-periods="true"/>
                       </group>
                       <choose>
@@ -335,37 +331,6 @@
                       </choose>
                     </group>
                   </group>
-				  <choose>
-				    <!-- Replicating juris-ca hierarchy -->
-				    <if> <!-- Reporter without year as volume-->
-					  <conditions match="all">
-						<condition match="all" variable="container-title volume"/>
-						<condition match="none" variable="collection-number admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</if>
-					<else-if> <!-- online service-->
-						<conditions match="all">
-						  <condition match="all" variable="submitted container-title"/>
-						  <condition match="none" variable="collection-number admin-flag"/>
-					    </conditions>
-						<text macro="ct-jurisdiction-paren" />
-					</else-if>
-					<else-if> <!-- Reporter with [year] and page -->
-					  <conditions match="all">
-						<condition match="all" variable="collection-number container-title page"/>
-						<condition match="none" variable="admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</else-if>
-					<else-if> <!-- Journal with [year] and no page -->
-					  <conditions match="all">
-						<condition match="all" variable="collection-number container-title issue"/>
-						<condition match="none" variable="admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</else-if>
-				  </choose>
                   <choose>
                     <if>
                       <conditions match="all">
@@ -520,69 +485,44 @@
                 </group>
               </if>
               <else-if type="legal_case">
-				<group delimiter=", ">
-				  <text macro="juris-title" font-style="italic"/>
-				  <group delimiter=" ">
-					<choose>
-					  <if variable="collection-number">
-						<number variable="collection-number" prefix="[" suffix="]"/>
-					  </if>
-					  <else-if variable="container-title">
-						<date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-					  </else-if>
-					  <else>
-						<!-- unreported cases -->
-						<group delimiter=", " prefix="(" suffix=")">
-						  <names variable="authority">
-							<name/>
-							<institution institution-parts="short" use-first="1"/>
-						  </names>
-						  <number variable="number"/>
-						  <date variable="issued" date-parts="year-month-day" form="text"/>
-						</group>
-					  </else>
-					</choose>
-					<choose>
-					  <if variable="container-title">
-						<number variable="volume"/>
-						<text variable="container-title" form="short"/>
-					  </if>
-					  <else-if variable="collection-number">
-						<names variable="authority">
-						  <name/>
-						  <institution form="short"/>
-						</names>
-					  </else-if>
-					</choose>
-					<number variable="page-first"/>
-					<text macro="pinpoint"/>
-					<choose>
-						<if variable="container-title">
-							<names variable="authority" prefix="(" suffix=")">
-							  <name/>
-							  <institution institution-parts="short"/>
-							</names>
-						</if>
-					</choose>
-				    <choose>
-						<if>
-						  <conditions match="all">
-							<condition match="none" context="bibliography"/>
-							<condition position="first"/>
-						  </conditions>
-						  <choose>
-							<if>
-							  <conditions match="any">
-								<condition variable="hereinafter"/>
-								<condition variable="title-short"/>
-							  </conditions>
-							  <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
-							</if>
-						  </choose>
-						</if>
+                <group delimiter=", ">
+                  <text macro="juris-title" font-style="italic"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="collection-number">
+                        <number variable="collection-number" prefix="[" suffix="]"/>
+                      </if>
+                      <else-if variable="container-title">
+                        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
+                      </else-if>
+                      <else>
+                        <!-- unreported cases -->
+                        <group delimiter=", " prefix="(" suffix=")">
+                          <names variable="authority">
+                            <name/>
+                            <institution institution-parts="short" use-first="1"/>
+                          </names>
+                          <number variable="number"/>
+                          <date variable="issued" date-parts="year-month-day" form="text"/>
+                        </group>
+                      </else>
                     </choose>
-				  </group>
-				</group>
+                    <choose>
+                      <if variable="container-title">
+                        <number variable="volume"/>
+                        <text variable="container-title" form="short"/>
+                      </if>
+                      <else-if variable="collection-number">
+                        <names variable="authority">
+                          <name/>
+                          <institution form="short"/>
+                        </names>
+                      </else-if>
+                    </choose>
+                    <number variable="page-first"/>
+                  </group>
+                  <text macro="pinpoint"/>
+                </group>
               </else-if>
             </choose>
           </else-if>
@@ -684,7 +624,7 @@
                         <condition position="first"/>
                       </conditions>
                       <group parallel-last="title-short title">
-                        <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
+                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
                       </group>
                     </if>
                   </choose>
@@ -853,12 +793,6 @@
                   <else-if type="entry-encyclopedia">
                     <text macro="render-entry-encyclopedia"/>
                   </else-if>
-				  <else-if type="paper-conference">
-					<text macro="render-paper-conference"/>
-				  </else-if>
-				  <else-if variable="genre">
-					<text macro="render-article-preprint"/>
-				  </else-if>
                   <else-if type="article">
                     <text macro="render-article"/>
                   </else-if>
@@ -882,9 +816,6 @@
             <if variable="hereinafter">
               <text variable="hereinafter" prefix="[" suffix="]" font-style="italic"/>
             </if>
-			<if type="book article-journal chapter article-newspaper post-weblog" variable="author">
-				<!-- Don't show the short title if there's an author that'll be shown instead-->
-			</if>
             <else-if variable="title-short">
               <text variable="title-short" prefix="[" suffix="]" font-style="italic"/>
             </else-if>
@@ -972,12 +903,6 @@
             </else-if>
             <else-if type="entry-encyclopedia">
               <text macro="render-entry-encyclopedia"/>
-            </else-if>
-		    <else-if type="paper-conference">
-			  <text macro="render-paper-conference"/>
-			</else-if>
-			<else-if variable="genre">
-              <text macro="render-article-preprint"/>
             </else-if>
             <else-if type="article">
               <text macro="render-article"/>
@@ -1123,14 +1048,14 @@
   <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
     right. Only actually need to check for 'first' because w/i cite all the other tests should have been done... -->
   <macro name="render-chapter">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <text term="in" form="short"/>
-      <text macro="editor" strip-periods="true" suffix=", "/> <!-- if there's no editor, no comma-->
-      <group delimiter=", ">
-        <text macro="container-title" font-style="italic"/>
-        <text macro="edition"/>
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <text variable="title" quotes="true"/>
+        <text term="in" form="short"/>
+        <text macro="editor" strip-periods="true"/>
       </group>
+      <text macro="container-title" font-style="italic"/>
+      <text macro="edition"/>
     </group>
     <group delimiter=", ">
       <text macro="publisher-place-year"/>
@@ -1253,36 +1178,7 @@
       <number variable="page-first"/>
     </group>
   </macro>
-  <macro name="render-paper-conference">
-	<group delimiter=" ">
-	  <text variable="title" quotes="true" suffix=""/>
-	  <group delimiter=", ">
-		<group delimiter=", " prefix="(" suffix=")">
-			<text variable="event-title" prefix="Paper delivered at "/>
-			<text variable="event-place"/>
-			<text macro="issued-long"/>
-		</group>
-		<group delimiter=" ">
-			<group delimiter=":">
-				<number variable="volume"/>
-				<number variable="issue"/>
-			</group>
-		  <text variable="publisher"/>
-		  <text variable="collection-title" prefix="(" suffix=")"/>
-		  <number variable="page-first"/>
-		</group>
-	  </group>
-	</group>
-  </macro>
-  <macro name="render-article-preprint">
-	<group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
-      <text variable="genre"/>
-      <text variable="collection-number" prefix="Working Paper "/>
-      <number variable="page-first"/>
-    </group>
-  </macro>  <macro name="render-article">
+  <macro name="render-article">
     <group delimiter=", ">
       <group delimiter=" ">
         <group>
@@ -1321,10 +1217,8 @@
       <group delimiter=" ">
         <choose>
           <if type="post-weblog">
-			<group>
-				<text term="online" form="short"/>
-				<text term="in" form="symbol"/>
-			</group>
+            <text term="online" form="short"/>
+            <text term="in" form="symbol"/>
           </if>
           <else>
             <group>
@@ -1565,7 +1459,7 @@
       <if variable="hereinafter">
         <text variable="hereinafter" font-style="italic"/>
       </if>
-      <else-if type="book article-journal chapter article-newspaper post-weblog paper-conference">
+      <else-if type="book article-journal chapter article-newspaper post-weblog">
         <names variable="author">
           <name and="symbol" form="short" delimiter-precedes-last="never"/>
           <substitute>
@@ -1584,7 +1478,7 @@
     </choose>
   </macro>
   <macro name="publisher-place-year">
-	<text term="open-quote" form="short"/>									  
+    <text term="open-quote" form="short"/>
     <group delimiter=" ">
       <group>
         <text variable="publisher-place"/>
@@ -1619,40 +1513,6 @@
       </group>
     </group>
   </macro>
-  <macro name="ct-jurisdiction-paren">
-	<names variable="authority" prefix="(" suffix=")">
-	  <name/>
-	  <institution institution-parts="short"/>
-	</names>
-  </macro>
-  <macro name="local-title-short">
-    <!-- The title form for subsequent citations (of all types) -->
-    <choose>
-      <if position="first">
-        <choose>
-          <if variable="hereinafter">
-            <text variable="hereinafter"/>
-          </if>
-          <else-if variable="title-short">
-            <text variable="title-short"/>
-          </else-if>
-        </choose>
-      </if>
-      <else>
-        <choose>
-          <if variable="hereinafter">
-            <text variable="hereinafter"/>
-          </if>
-          <else-if variable="title-short">
-            <text variable="title-short"/>
-          </else-if>
-          <else>
-            <text variable="title"/>
-          </else>
-        </choose>
-      </else>
-    </choose>
-  </macro>
   <citation et-al-min="4" et-al-use-first="1">
     <!-- translator needs to be added for chapter book film etc. chapter? -->
     <layout delimiter="; " suffix=".">

From a64c538f3d7f0e4ac2757d5414df9addd0b8c5f2 Mon Sep 17 00:00:00 2001
From: Admin <peter@peterwills.ca>
Date: Wed, 6 Dec 2023 15:48:58 -0500
Subject: [PATCH 08/12] - fIx blog identifier - handle conference papers -
 handle preprints - Don't show short title if author will be shown instead -
 Handle chapters without editors

---
 jm-mcgill-v9-pw-edit.csl | 1673 --------------------------------------
 jm-mcgill-v9.csl         |  153 +++-
 2 files changed, 134 insertions(+), 1692 deletions(-)
 delete mode 100644 jm-mcgill-v9-pw-edit.csl

diff --git a/jm-mcgill-v9-pw-edit.csl b/jm-mcgill-v9-pw-edit.csl
deleted file mode 100644
index e29d57a..0000000
--- a/jm-mcgill-v9-pw-edit.csl
+++ /dev/null
@@ -1,1673 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.1mlz1" year-range-format="expanded" require-comma-on-symbol="after-number">
-  <info>
-    <title>JM - McGill9e</title>
-    <id>http://juris-m.github.io/styles/jm-mcgill-v9-pw-edit</id>
-    <link href="http://juris-m.github.io/styles/jm-mgcill-v9" rel="self"/>
-    <link href="https://lawjournal.mcgill.ca/fr/manuel-de-reference/" rel="documentation"/>
-    <author>
-      <name>Samuel Gagnon</name>
-      <email>gagnon-samuel@outlook.com</email>
-      <uri>https://github.com/Droitslinguistiques</uri>
-    </author>
-    <contributor>
-      <name>Liam McHugh-Russell</name>
-      <email>liam.mchugh.russell@gmail.com</email>
-    </contributor>
-    <contributor>
-      <name>Frank Bennet</name>
-      <uri>https://juris-m.github.io/</uri>
-    </contributor>
-    <contributor>
-      <name>Florian Martin-Bariteau</name>
-      <email>f.martin-bariteau@umontreal.ca</email>
-      <uri>http://f-mb.github.io/cslegal/</uri>
-    </contributor>
-    <contributor>
-      <name>Gareth Spanglett</name>
-      <email>gspanglett@gmail.com</email>
-      <uri>https://gspanglett.github.io</uri>
-    </contributor>
-    <contributor>
-      <name>Peter Wills</name>
-      <email>peter.wills@law.ox.ac.uk</email>
-    </contributor>
-    <category citation-format="note"/>
-    <category field="law"/>
-    <updated>2022-04-04 18:37:58</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="fr">
-    <style-options jurisdiction-preference="fr"/>
-     <terms>
-      <term name="page" form="short">
-        <single>à la p</single>
-        <multiple>aux pp</multiple>
-      </term>
-      <term name="paragraph" form="short">
-        <single>au para</single>
-        <multiple>aux paras</multiple>
-      </term>
-      <term name="note" form="short">
-        <single>n</single>
-        <multiple>nn</multiple>
-      </term>
-      <term name="issue" form="short">
-        <single>nᵒ</single>
-        <multiple>nᵒ</multiple>
-      </term>
-      <term name="article" form="short">
-        <single>art</single>
-        <multiple>arts</multiple>
-      </term>
-      <term name="accessed">dernière consultation le</term>
-      <term name="issue" form="long">nᵒ</term>
-      <term name="issue" form="verb">nᵒ de catalogue</term>
-      <term name="number" form="long">nᵒ</term>
-      <term name="chapter" form="short">c</term>
-      <term name="schedule" form="long">constitutant l'annexe</term>
-      <term name="schedule" form="short">annexe</term>
-      <term name="collection-editor" form="short">dir</term>
-      <term name="collection-editor" form="long">président :</term>
-      <term name="editor" form="short">dir</term>
-      <term name="editor" form="verb">dir</term>
-      <term name="translator" form="verb">traduit par</term>
-      <term name="in">dans</term>
-      <term name="in" form="verb">reproduit dans</term>
-      <term name="in" form="symbol"> :</term>
-      <term name="online">en ligne</term>
-      <term name="online" form="short">en ligne (blogue)</term>
-      <term name="and" form="symbol">et</term>
-      <term name="supplement" form="short">supp</term>
-      <term name="open-quote" form="short">, </term>
-      <term name="close-quote" form="short">,</term>
-      <term name="open-inner-quote" form="short">,</term>
-      <term name="close-inner-quote" form="short"></term>
-      <term name="letter" form="verb">lettre</term>
-      <term name="from" form="short">de</term>
-      <term name="from" form="verb">du</term>
-      <term name="section" form="short">
-        <single>art</single>
-      <multiple>arts</multiple>
-      </term>
-      <term name="part" form="long">partie</term>
-    </terms>
-  </locale>
-  <locale xml:lang="en">
-    <date form="text">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" suffix=" "/>
-      <date-part name="year"/>
-    </date>
-     <terms>
-      <term name="page" form="short">at</term>
-      <term name="paragraph" form="short">
-        <single>at para</single>
-        <multiple>at paras</multiple>
-      </term>
-      <term name="note" form="short">
-        <single>n</single>
-        <multiple>nn</multiple>
-      </term>
-      <term name="issue" form="short">
-        <single>at no</single>
-        <multiple>at nos</multiple>
-      </term>
-      <term name="accessed">last visited</term>
-      <term name="issue" form="long">No</term>
-      <term name="issue" form="verb">Catalogue No</term>
-      <term name="number" form="long">No</term>
-      <term name="chapter" form="short">c</term>
-      <term name="editor" form="verb-short">ed</term>
-      <term name="editor" form="short">ed</term>
-      <term name="collection-editor" form="short">ed</term>
-      <term name="collection-editor" form="long">Chair:</term>
-      <term name="translator" form="verb">translated by</term>
-      <term name="in" form="short">in</term>
-      <term name="in" form="verb">reprinted in</term>
-      <term name="in" form="symbol">:</term>
-									   
-      <term name="online" form="short">online (blog)</term>
-      <term name="and" form="symbol">&#38;</term>
-      <term name="et-al">et al</term>
-      <term name="from" form="verb">to the</term>
-      <term name="from" form="verb-short">of the</term>
-      <term name="supplement" form="short">Supp</term>
-      <term name="schedule" form="long">being Schedule</term>
-      <term name="schedule" form="short">Appendix</term>
-      <term name="open-quote" form="short"> (</term>
-      <term name="close-quote" form="short">)</term>
-      <term name="open-inner-quote" form="short">:</term>
-      <term name="close-inner-quote" form="short">)</term>
-      <term name="ordinal-02">d</term>
-      <term name="ordinal-03">d</term>
-      <term name="section" form="short">
-        <single>s</single>
-        <multiple>ss</multiple>
-      </term>
-      <term name="section" form="long">
-        <single>art</single>
-        <multiple>arts</multiple>
-      </term>
-      <term name="article" form="short">
-        <single>art</single>
-        <multiple>arts</multiple>
-      </term>
-      <term name="part" form="long">Part</term>
-    </terms>
-  </locale>
-  <!-- Juris-M Macros-->
-  <macro name="juris-pretitle">
-    <text value=""/>
-  </macro>
-  <macro name="juris-title">
-    <text value="[HINT: Install the Myles plugin, available at https://juris-m.github.io/downloads]"/>
-  </macro>
-  <macro name="juris-main">
-    <text value=""/>
-  </macro>
-  <macro name="juris-tail">
-    <text value=""/>
-  </macro>
-  <macro name="juris-pretitle-short">
-    <text value=""/>
-  </macro>
-  <macro name="juris-title-short">
-    <text value=""/>
-  </macro>
-  <macro name="juris-main-short">
-    <text value=""/>
-  </macro>
-  <macro name="juris-tail-short">
-    <text value=""/>
-  </macro>
-  <macro name="juris-locator">
-	<text value=""/>
-  </macro>
-  <macro name="jurism">
-    <choose>
-      <if>
-        <conditions match="all">
-          <condition type="legislation"/>
-          <condition match="none" variable="volume section container-title number"/>
-          <condition match="all" variable="title-short"/>
-        </conditions>
-        <group delimiter=" ">
-          <text macro="juris-locator"/>
-          <text macro="juris-title-short" strip-periods="true"/>
-        </group>
-      </if>
-      <else-if position="ibid-with-locator">
-        <choose>
-          <if type="legislation regulation" match="any">
-            <group delimiter=", ">
-              <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-              <text macro="juris-locator" label-form="short"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-              <text macro="pinpoint"/>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-      <else-if position="ibid">
-        <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-      </else-if>
-      <else-if position="subsequent">
-        <!-- short form -->
-        <group delimiter=" ">
-          <group delimiter=", ">
-            <text macro="local-title-short" font-style="italic" strip-periods="true" suffix=","/>
-            <text value="supra" font-style="italic"/>
-          </group>
-          <choose>
-            <if match="any" type="legislation regulation">
-              <group delimiter=", ">
-                <text variable="first-reference-note-number" prefix="note "/>
-                <text macro="juris-locator" label-form="short" strip-periods="true"/>
-              </group>
-            </if>
-            <else>
-              <text variable="first-reference-note-number" prefix="note "/>            
-              <text macro="pinpoint"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else>
-        <choose>
-          <if country="ca">
-            <!-- full form -->
-            <choose>
-              <if type="bill">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle" strip-periods="true"/>
-                  <text macro="juris-title" font-style="italic" strip-periods="true"/>
-                  <text macro="juris-main" strip-periods="true"/>
-                  <group delimiter=" ">
-                    <text macro="juris-locator" label-form="short" strip-periods="true"/>
-                    <text macro="juris-tail" strip-periods="true" prefix="(" suffix=")"/>
-                  </group>
-                </group>
-              </if>
-              <else-if type="legislation">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <group parallel-first="title" parallel-delimiter-override=", ">
-                      <text macro="juris-title" font-style="italic" strip-periods="true"/>
-                    </group>
-                    <choose>
-                      <if variable="volume page container-title" match="all">
-                        <text macro="juris-locator"/>
-                        <group delimiter=" ">
-                          <text term="part" form="long"/>
-                          <number variable="volume" form="roman" text-case="uppercase"/>
-                          <text term="from" form="verb-short"/>
-                          <text variable="container-title" font-style="italic"/>
-                        </group>
-                        <group delimiter=" ">
-                          <text term="schedule" form="long"/>
-                          <number variable="page"/>
-                          <text term="from" form="verb"/>
-                        </group>
-                      </if>
-                      <else-if variable="page">
-                        <group parallel-first="title" delimiter=", ">
-                          <text macro="juris-locator"/>
-                          <group delimiter=" ">
-                            <text term="schedule" form="verb"/>
-                            <number variable="page"/>
-                            <text term="from" form="verb"/>
-                          </group>
-                        </group>
-                      </else-if>
-                      <else>
-                        <text macro="juris-main" strip-periods="false"/>
-                        <text macro="juris-locator" label-form="short"/>
-                      </else>
-                    </choose>
-                  </group>
-                  <choose>
-                    <if>
-                      <conditions match="all">
-                        <condition match="none" context="bibliography"/>
-                        <condition position="first"/>
-                        <condition type="legislation"/>
-                      </conditions>
-                      <group parallel-last="issued">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else-if>
-              <else-if type="legal_case">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <group parallel-first="authority title issued" delimiter=" " parallel-delimiter-override=", ">
-                      <text macro="juris-title" strip-periods="true" font-style="italic"/>
-                      <choose>
-                        <if>
-                          <conditions match="all">
-                            <condition match="all" type="legal_case" variable="container-title volume"/>
-                            <condition match="none" variable="collection-number"/>
-                          </conditions>
-                          <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-                        </if>
-                      </choose>
-                    </group>
-                    <group delimiter=", ">
-                      <group delimiter=" ">
-                        <text macro="juris-main" strip-periods="true"/>
-                        <text macro="juris-locator" label-form="short" strip-periods="true"/>
-                      </group>
-                      <choose>
-                        <if match="all" variable="archive archive_location">
-                          <group parallel-last="issued submitted">
-                            <group parallel-last-to-first="issued submitted">
-                              <text macro="juris-tail" strip-periods="true"/>
-                            </group>
-                          </group> 
-                        </if>
-                      </choose>
-                    </group>
-                  </group>
-				  <choose>
-				    <!-- Replicating juris-ca hierarchy -->
-				    <if> <!-- Reporter without year as volume-->
-					  <conditions match="all">
-						<condition match="all" variable="container-title volume"/>
-						<condition match="none" variable="collection-number admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</if>
-					<else-if> <!-- online service-->
-						<conditions match="all">
-						  <condition match="all" variable="submitted container-title"/>
-						  <condition match="none" variable="collection-number admin-flag"/>
-					    </conditions>
-						<text macro="ct-jurisdiction-paren" />
-					</else-if>
-					<else-if> <!-- Reporter with [year] and page -->
-					  <conditions match="all">
-						<condition match="all" variable="collection-number container-title page"/>
-						<condition match="none" variable="admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</else-if>
-					<else-if> <!-- Journal with [year] and no page -->
-					  <conditions match="all">
-						<condition match="all" variable="collection-number container-title issue"/>
-						<condition match="none" variable="admin-flag"/>
-					  </conditions>
-					  <text macro="ct-jurisdiction-paren" />
-					</else-if>
-				  </choose>
-                  <choose>
-                    <if>
-                      <conditions match="all">
-                        <condition match="none" context="bibliography"/>
-                        <condition position="first"/>
-                      </conditions>
-                      <group parallel-last="title-short title">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else-if>
-              <else-if type="hearing">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle"/>
-                  <text macro="juris-title" font-style="italic"/>
-                  <group delimiter=" ">
-                    <text macro="juris-main"/>
-                    <text macro="juris-locator"/>
-                    <choose>
-                      <if context="citation">
-                        <group delimiter=" ">
-                          <text macro="juris-tail"/>
-                          <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
-              </else-if>
-              <else-if type="report">
-                <choose>
-                  <if variable="collection-title">
-                    <group delimiter=", ">
-                      <text macro="juris-pretitle"/>
-                      <group>
-                        <text macro="juris-title" quotes="true"/>
-                      </group>
-                      <group delimiter=" ">
-                        <text macro="juris-main"/>
-                        <text macro="juris-locator" label-form="short"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else>
-                    <group delimiter=", ">
-                      <text macro="juris-pretitle"/>
-                      <group delimiter=" ">
-                        <choose>
-                          <if variable="publisher">
-                            <group delimiter="">
-                              <group delimiter=", ">
-                                <text macro="juris-title" font-style="italic"/>
-                                <group delimiter=" ">
-                                  <choose>
-                                    <if is-numeric="number">
-                                      <text term="volume" form="short" strip-periods="true"/>
-                                    </if>
-                                  </choose>
-                                  <number variable="number"/>
-                                </group>
-                              </group>
-                              <text macro="publisher-place-year"/>
-                            </group>
-                            <group delimiter=" " prefix="(" suffix=")">
-                              <text term="collection-editor"/>
-                              <text macro="author-note"/>
-                            </group>
-                          </if>
-                          <else>
-                            <text macro="juris-title" font-style="italic"/>
-                            <text macro="juris-main"/>
-                          </else>
-                        </choose>
-                        <text macro="juris-locator" label-form="short"/>
-                      </group>
-                    </group>
-                  </else>
-                </choose>
-              </else-if>
-              <else-if type="gazette">
-                <group delimiter=" ">
-                  <text macro="juris-title" font-style="italic"/>
-                  <text macro="juris-main"/>
-                </group>
-              </else-if>
-              <else-if type="regulation" variable="authority">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle"/>
-                  <group delimiter=" ">
-                    <text macro="juris-title" font-style="italic"/>
-                    <text macro="juris-main"/>
-                  </group>
-                  <text macro="juris-locator"/>
-                </group>
-              </else-if>            
-              <else-if type="regulation">
-                <group delimiter=", ">
-                  <text macro="juris-title" font-style="italic"/>
-                  <text macro="juris-main"/>
-                  <text macro="juris-locator"/>
-                </group>
-              </else-if>
-            </choose>
-          </if>
-          <else-if country="gb">
-            <choose>
-              <if type="legislation">
-                <group delimiter=", ">
-                  <group delimiter=" ">
-                    <text variable="title" font-style="italic"/>
-                    <text variable="country" form="short" prefix="(" suffix=")"/>
-                  </group>
-                  <choose>
-                    <if variable="collection-number genre volume" match="all">
-                      <group delimiter=" ">
-                        <number variable="collection-number"/>
-                        <text variable="genre"/>
-                      </group>
-                      <number variable="chapter-number" prefix="St "/>
-                      <group delimiter=" ">
-                        <text term="chapter" form="short"/>
-                        <number variable="volume"/>
-                      </group>
-                    </if>
-                    <else>
-                      <date variable="issued" date-parts="year" form="numeric"/>
-                      <group delimiter=" ">
-                        <text term="chapter" form="short"/>
-                        <number variable="volume"/>
-                      </group>
-                    </else>
-                  </choose>
-                  <group parallel-first="issued" parallel-delimiter-override=" ">
-                    <text macro="pinpoint"/>
-                  </group>
-                  <group delimiter=", " parallel-first="issued" parallel-delimiter-override=" ">
-                    <group delimiter=" ">
-                      <text term="in" form="verb"/>
-                      <text variable="container-title"/>
-                    </group>
-                    <group delimiter=" ">
-                      <text term="schedule" form="short"/>
-                      <number variable="page" form="roman" text-case="uppercase"/>
-                    </group>
-                    <group delimiter=" ">
-                      <text term="number" form="short"/>
-                      <number variable="number"/>
-                    </group>
-                  </group>
-                </group>
-              </if>
-              <else-if type="legal_case">
-				<group delimiter=", ">
-				  <text macro="juris-title" font-style="italic"/>
-				  <group delimiter=" ">
-					<choose>
-					  <if variable="collection-number">
-						<number variable="collection-number" prefix="[" suffix="]"/>
-					  </if>
-					  <else-if variable="container-title">
-						<date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-					  </else-if>
-					  <else>
-						<!-- unreported cases -->
-						<group delimiter=", " prefix="(" suffix=")">
-						  <names variable="authority">
-							<name/>
-							<institution institution-parts="short" use-first="1"/>
-						  </names>
-						  <number variable="number"/>
-						  <date variable="issued" date-parts="year-month-day" form="text"/>
-						</group>
-					  </else>
-					</choose>
-					<choose>
-					  <if variable="container-title">
-						<number variable="volume"/>
-						<text variable="container-title" form="short"/>
-					  </if>
-					  <else-if variable="collection-number">
-						<names variable="authority">
-						  <name/>
-						  <institution form="short"/>
-						</names>
-					  </else-if>
-					</choose>
-					<number variable="page-first"/>
-					<text macro="pinpoint"/>
-					<choose>
-						<if variable="container-title">
-							<names variable="authority" prefix="(" suffix=")">
-							  <name/>
-							  <institution institution-parts="short"/>
-							</names>
-						</if>
-					</choose>
-				    <choose>
-						<if>
-						  <conditions match="all">
-							<condition match="none" context="bibliography"/>
-							<condition position="first"/>
-						  </conditions>
-						  <choose>
-							<if>
-							  <conditions match="any">
-								<condition variable="hereinafter"/>
-								<condition variable="title-short"/>
-							  </conditions>
-							  <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
-							</if>
-						  </choose>
-						</if>
-                    </choose>
-				  </group>
-				</group>
-              </else-if>
-            </choose>
-          </else-if>
-          <else-if country="un.int">
-            <group delimiter=", ">
-              <text variable="title" font-style="italic"/>
-              <group delimiter=" "> 
-                <text variable="event"/>
-                <number variable="number"/>
-              </group>
-              <names variable="authority"/>
-              <group delimiter=" ">
-                <number variable="chapter-number" form="ordinal" suffix=" Sess"/>
-              </group>
-              <group delimiter=" ">
-                <text term="supplement" form="short"/>
-                <text term="number" form="short"/>
-                <number variable="volume"/>
-              </group>
-              <group delimiter=" ">
-                <text value="UN Doc"/>
-                <text variable="archive_location"/>
-                <date variable="issued" date-parts="year" prefix="(" suffix=")" form="numeric"/>
-                <number variable="page-first"/>
-                <text macro="pinpoint"/>
-              </group>
-            </group>
-          </else-if>
-          <else>
-            <!-- full form -->
-            <choose>
-              <if type="bill">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle" strip-periods="true"/>
-                  <text macro="juris-title" font-style="italic" strip-periods="true"/>
-                  <text macro="juris-main" strip-periods="true"/>
-                  <group delimiter=" ">
-                    <text macro="juris-locator" label-form="short" strip-periods="true"/>
-                    <text macro="juris-tail" strip-periods="true" prefix="(" suffix=")"/>
-                  </group>
-                </group>
-              </if>
-              <else-if type="legislation">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <text macro="juris-title" font-style="italic" strip-periods="true"/>
-                    <text macro="juris-main"/>
-                    <text macro="juris-locator" label-form="short"/>
-                  </group>
-                  <choose>
-                    <if>
-                      <conditions match="all">
-                        <condition match="none" context="bibliography"/>
-                        <condition position="first"/>
-                        <condition type="legislation"/>
-                      </conditions>
-                      <group parallel-last="title-short title">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else-if>
-              <else-if type="legal_case">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <group parallel-first="authority title issued" delimiter=" " parallel-delimiter-override=", ">
-                      <text macro="juris-title" strip-periods="true" font-style="italic"/>
-                      <choose>
-                        <if>
-                          <conditions match="all">
-                            <condition match="all" type="legal_case" variable="container-title volume"/>
-                            <condition match="none" variable="collection-number"/>
-                          </conditions>
-                          <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-                        </if>
-                      </choose>
-                    </group>
-                    <group delimiter=", ">
-                      <group delimiter=" ">
-                        <text macro="juris-main" strip-periods="true"/>
-                        <text macro="juris-locator" label-form="short" strip-periods="true"/>
-                      </group>
-                      <choose>
-                        <if match="all" variable="archive archive_location">
-                          <group parallel-last="archive archive_location submitted">
-                            <group parallel-last-to-first="archive archive_location submitted">
-                              <text macro="juris-tail" strip-periods="true"/>
-                            </group>
-                          </group> 
-                        </if>
-                      </choose>
-                    </group>
-                  </group>
-                  <choose>
-                    <if>
-                      <conditions match="all">
-                        <condition match="none" context="bibliography"/>
-                        <condition position="first"/>
-                      </conditions>
-                      <group parallel-last="title-short title">
-                        <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </else-if>
-              <else-if type="hearing">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle"/>
-                  <text macro="juris-title" font-style="italic"/>
-                  <group delimiter=" ">
-                    <text macro="juris-main"/>
-                    <text macro="juris-locator"/>
-                    <choose>
-                      <if context="citation">
-                        <group delimiter=" ">
-                          <text macro="juris-tail"/>
-                          <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
-                        </group>
-                      </if>
-                    </choose>
-                  </group>
-                </group>
-              </else-if>
-              <else-if type="report">
-                <choose>
-                  <if variable="collection-title">
-                    <group delimiter=", ">
-                      <text macro="juris-pretitle"/>
-                      <group>
-                        <text macro="juris-title" quotes="true"/>
-                      </group>
-                      <group delimiter=" ">
-                        <text macro="juris-main"/>
-                        <text macro="juris-locator" label-form="short"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else>
-                    <group delimiter=", ">
-                      <text macro="juris-pretitle"/>
-                      <group delimiter=" ">
-                        <text macro="juris-title" font-style="italic"/>
-                        <text macro="juris-main"/>
-                        <text macro="juris-locator" label-form="short"/>
-                      </group>
-                    </group>
-                  </else>
-                </choose>
-              </else-if>
-              <else-if type="gazette">
-                <group delimiter=" ">
-                  <text macro="juris-title" font-style="italic"/>
-                  <text macro="juris-main"/>
-                </group>
-              </else-if>
-              <else-if type="regulation">
-                <group delimiter=", ">
-                  <text macro="juris-pretitle"/>
-                  <group delimiter=" ">
-                    <text macro="juris-title" font-style="italic"/>
-                    <text macro="juris-main"/>
-                  </group>
-                  <text macro="juris-locator"/>
-                </group>
-              </else-if>
-            </choose>
-          </else>
-        </choose>   
-      </else>
-    </choose>
-  </macro>
-  <macro name="layout-citation">
-    <choose>
-      <if>
-        <conditions match="all">
-          <condition match="any" type="legal_case legislation bill hearing report regulation"/>
-          <condition match="all" variable="jurisdiction"/>
-          <condition match="all" country="ca"/>
-          <condition match="none" variable="gazette-flag admin-flag"/>
-        </conditions>
-        <text macro="jurism"/>
-      </if>
-      <else-if country="gb" type="legislation legal_case">
-        <text macro="jurism" strip-periods="true"/>
-      </else-if>
-      <else-if type="bill" country="un.int">
-        <text macro="jurism"/>
-      </else-if>
-      <!-- Not implemented: ibid only needs capitalize-first if it's the first word in a footnote -->
-      <else-if position="ibid-with-locator">
-        <group delimiter=" ">
-          <text term="ibid" font-style="italic" strip-periods="true"/>
-          <text macro="pinpoint"/>
-        </group>
-      </else-if>
-      <else-if position="ibid">
-        <text term="ibid" font-style="italic" strip-periods="true"/>
-      </else-if>
-      <else-if position="subsequent">
-        <group delimiter=" ">
-          <text macro="short-form" suffix=","/>
-          <text value="supra" font-style="italic"/>
-          <text value="note"/>
-          <text variable="first-reference-note-number"/>
-          <text macro="pinpoint"/>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=" ">
-          <group delimiter=", ">
-            <choose>
-              <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>
-              <else-if type="patent" match="any">
-                <text macro="render-patent"/>
-              </else-if>
-              <else-if type="manuscript" match="any">
-                <text macro="render-manuscript"/>
-              </else-if>
-              <else-if type="legal_case">
-                <text macro="render-case"/>
-              </else-if>
-              <else-if type="report">
-                <text macro="render-report"/>
-              </else-if>
-              <else-if type="personal_communication">
-                <text macro="render-personal_communication"/>
-              </else-if>
-              <else-if type="treaty">
-                <text macro="render-treaty"/>
-              </else-if>
-              <else-if type="gazette">
-                <text macro="render-gazette"/>
-              </else-if>
-              <else>
-                <text macro="author-note" strip-periods="true"/>
-                <choose>
-                  <if type="article-journal">
-                    <text macro="render-article-journal"/>
-                  </if>
-                  <else-if type="chapter">
-                    <text macro="render-chapter"/>
-                  </else-if>
-                  <else-if type="thesis">
-                    <text macro="render-thesis"/>
-                  </else-if>
-                  <else-if type="article-newspaper" match="any">
-                    <text macro="render-article-newspaper"/>
-                  </else-if>
-                  <else-if type="article-magazine">
-                    <text macro="render-article-magazine"/>
-                  </else-if>
-                  <else-if type="webpage post-weblog" match="any">
-                    <text macro="render-webpage"/>
-                  </else-if>
-                  <else-if type="book">
-                    <text macro="render-book"/>
-                  </else-if>
-                  <else-if type="entry-encyclopedia">
-                    <text macro="render-entry-encyclopedia"/>
-                  </else-if>
-				  <else-if type="paper-conference">
-					<text macro="render-paper-conference"/>
-				  </else-if>
-				  <else-if variable="genre">
-					<text macro="render-article-preprint"/>
-				  </else-if>
-                  <else-if type="article">
-                    <text macro="render-article"/>
-                  </else-if>
-                  <!--                    <else-if type="song" match="any"><text macro="render-song"/></else-if><else-if type="patent" match="any"><text macro="render-patent"/></else-if><else-if type="manuscript" match="any"><text macro="render-manuscript"/></else-if> -->
-                  <else>
-                    <group delimiter=" ">
-                      <group delimiter=", ">
-                        <text variable="title" font-style="italic"/>
-                        <text macro="translator"/>
-                        <text macro="edition"/>
-                      </group>
-                      <text macro="publisher-place-year"/>
-                    </group>
-                  </else>
-                </choose>
-              </else>
-            </choose>
-          </group>
-          <text macro="pinpoint"/>
-          <choose>
-            <if variable="hereinafter">
-              <text variable="hereinafter" prefix="[" suffix="]" font-style="italic"/>
-            </if>
-			<if type="book article-journal chapter article-newspaper post-weblog" variable="author">
-				<!-- Don't show the short title if there's an author that'll be shown instead-->
-			</if>
-            <else-if variable="title-short">
-              <text variable="title-short" prefix="[" suffix="]" font-style="italic"/>
-            </else-if>
-          </choose>
-          <choose>
-            <if type="article-newspaper article-magazine" match="any">
-              <text macro="internet-location"/>
-            </if>
-          </choose>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="layout-bib">
-    <choose>
-      <if>
-        <conditions match="all">
-          <condition match="any" type="legal_case legislation hearing bill gazette report regulation"/>
-          <condition match="all" variable="jurisdiction"/>
-          <condition match="all" country="ca"/>
-        </conditions>
-        <text macro="jurism"/>
-      </if>
-      <else-if country="gb" type="legislation legal_case">
-        <text macro="jurism" strip-periods="true"/>
-      </else-if>
-      <else-if type="bill" country="un.int">
-        <text macro="jurism"/>
-      </else-if>
-      <else-if type="bill legal_case report legislation personal_communication treaty" match="any">
-        <choose>
-          <if type="bill legislation" match="any">
-            <text macro="render-bill"/>
-          </if>
-          <else-if type="legal_case">
-            <text macro="render-case"/>
-          </else-if>
-          <else-if type="report">
-            <text macro="render-report"/>
-          </else-if>
-          <else-if type="personal_communication">
-            <text macro="render-personal_communication"/>
-          </else-if>
-          <else-if type="treaty">
-            <text macro="render-treaty"/>
-          </else-if>
-          <else-if type="gazette">
-            <text macro="render-gazette"/>
-          </else-if>
-        </choose>
-      </else-if>
-      <else>
-        <group delimiter=", ">
-          <text macro="author-bib" strip-periods="true"/>
-          <choose>
-            <if type="article-journal">
-              <text macro="render-article-journal"/>
-            </if>
-            <else-if type="chapter">
-              <text macro="render-chapter"/>
-            </else-if>
-            <else-if type="thesis">
-              <text macro="render-thesis"/>
-            </else-if>
-            <else-if type="article-newspaper">
-              <text macro="render-article-newspaper"/>
-            </else-if>
-            <else-if type="article-magazine">
-              <text macro="render-article-magazine"/>
-            </else-if>
-            <else-if type="book">
-              <text macro="render-book"/>
-            </else-if>
-            <else-if type="webpage post-weblog" match="any">
-              <text macro="render-webpage"/>
-            </else-if>
-            <else-if type="patent">
-              <text macro="render-patent"/>
-            </else-if>
-            <else-if type="song">
-              <text macro="render-song"/>
-            </else-if>
-            <else-if type="manuscript">
-              <text macro="render-manuscript"/>
-            </else-if>
-            <else-if type="entry-encyclopedia">
-              <text macro="render-entry-encyclopedia"/>
-            </else-if>
-		    <else-if type="paper-conference">
-			  <text macro="render-paper-conference"/>
-			</else-if>
-			<else-if variable="genre">
-              <text macro="render-article-preprint"/>
-            </else-if>
-            <else-if type="article">
-              <text macro="render-article"/>
-            </else-if>
-            <else>
-              <group>
-                <group delimiter=", ">
-                  <text variable="title" font-style="italic"/>
-                  <text macro="edition"/>
-                  <text macro="translator"/>
-                  <text macro="collection-editor"/>
-                </group>
-                <text macro="publisher-place-year"/>
-              </group>
-            </else>
-          </choose>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name and="symbol" delimiter-precedes-last="never"/>
-      <et-al term="et-al"/>
-      <label form="short" prefix=", "/>
-    </names>
-  </macro>
-  <macro name="translator">
-    <names variable="translator">
-      <label form="verb" suffix=" "/>
-      <name and="symbol"/>
-    </names>
-  </macro>
-  <macro name="container-title">
-    <text strip-periods="true" variable="container-title" form="short"/>
-  </macro>
-  <macro name="author-note">
-    <names variable="author">
-      <name and="symbol" delimiter-precedes-last="never"/>
-      <et-al term="et-al"/>
-      <substitute>
-        <text macro="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-bib">
-    <names variable="author">
-      <name name-as-sort-order="first" and="symbol" sort-separator=", " delimiter-precedes-last="never"/>
-      <et-al term="et-al"/>
-      <label form="short" prefix=", "/>
-      <substitute>
-        <names variable="collection-editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="internet-location">
-    <choose>
-      <if variable="source URL genre" match="any">
-        <group delimiter=" ">
-          <group>
-            <text term="online"/>
-            <text term="in" form="symbol"/>
-          </group>
-          <choose>
-            <if variable="source">
-              <text variable="source" prefix="&#60;" suffix="&#62;"/>
-              <text variable="URL" prefix="[" suffix="]"/>
-            </if>
-            <else-if variable="genre">
-              <text variable="genre" prefix="&#60;" suffix="&#62;"/>
-              <text variable="URL" prefix="[" suffix="]"/>
-            </else-if>
-            <else>
-              <text variable="URL" prefix="&#60;" suffix="&#62;"/>
-            </else>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="genre">
-    <text variable="genre"/>
-  </macro>
-  <macro name="issued-long">
-    <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter=" ">
-          <date-part name="day"/>
-          <date-part name="month" form="long"/>
-          <date-part name="year" form="long"/>
-        </date>
-      </if>
-      <else-if variable="accessed">
-        <date variable="accessed" form="text"/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="submitted-long">
-    <date variable="submitted" delimiter=" ">
-      <date-part name="day"/>
-      <date-part name="month" form="long"/>
-      <date-part name="year" form="long"/>
-    </date>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal" text-case="lowercase"/>
-          <text term="edition" form="short" strip-periods="true"/>
-        </group>
-      </if>
-      <else>
-        <number variable="edition" text-case="lowercase"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="series-info">
-    <group delimiter=" ">
-      <text variable="collection-title" strip-periods="true"/>
-      <number variable="collection-number"/>
-    </group>
-  </macro>
-  <macro name="sort-by-type">
-    <choose>
-      <if type="bill legislation" match="any">
-        <text value="1"/>
-      </if>
-      <else-if type="legal_case">
-        <text value="2"/>
-      </else-if>
-      <else-if type="book thesis" match="any">
-        <text value="3"/>
-      </else-if>
-      <else-if type="article-journal chapter article-newspaper article-magazine" match="any">
-        <text value="4"/>
-      </else-if>
-      <else>
-        <text value="5"/>
-      </else>
-    </choose>
-  </macro>
-  <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
-    right. Only actually need to check for 'first' because w/i cite all the other tests should have been done... -->
-  <macro name="render-chapter">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <text term="in" form="short"/>
-      <text macro="editor" strip-periods="true" suffix=", "/> <!-- if there's no editor, no comma-->
-      <group delimiter=", ">
-        <text macro="container-title" font-style="italic"/>
-        <text macro="edition"/>
-      </group>
-    </group>
-    <group delimiter=", ">
-      <text macro="publisher-place-year"/>
-      <number variable="page-first"/>
-    </group>
-  </macro>
-  <macro name="render-article-journal">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
-      <group delimiter=":">
-        <number variable="volume"/>
-        <number variable="issue"/>
-      </group>
-      <text macro="container-title"/>
-      <text variable="collection-title" prefix="(" suffix=")"/>
-      <number variable="page-first"/>
-    </group>
-  </macro>
-  <macro name="render-book">
-    <group delimiter=", ">
-      <text variable="title" font-style="italic"/>
-      <text macro="edition"/>
-      <text macro="translator"/>
-      <text macro="editor"/>
-      <text macro="series-info"/>
-    </group>
-    <text macro="publisher-place-year"/>
-  </macro>
-  <macro name="render-report">
-    <choose>
-      <if variable="committee authority">
-        <!-- Parliamentary reports-->
-        <group delimiter=", ">
-          <names variable="authority"/>
-          <names variable="committee"/>
-          <text variable="title" font-style="italic"/>
-          <number variable="collection-number"/>
-          <group delimiter=" ">
-            <choose>
-              <if is-numeric="number">
-                <group delimiter=" ">
-                  <label variable="number" form="short"/>
-                </group>
-              </if>
-            </choose>
-            <number variable="number"/>
-          </group>
-          <group delimiter=" ">
-            <date variable="issued" prefix="(" suffix=")" date-parts="year-month" form="text"/>
-            <group delimiter=" " prefix="(" suffix=")">
-              <text term="collection-editor"/>
-              <names variable="collection-editor"/>
-            </group>
-          </group>
-        </group>
-      </if>
-      <else>
-        <!-- Non-parliamentary report-->
-        <group delimiter=", "> 
-          <names variable="authority"/>
-          <text variable="title" font-style="italic"/>
-          <group delimiter=" ">
-            <text term="by"/>
-            <names variable="author"/>
-          </group>
-          <choose>
-            <if variable="call-number">
-              <group delimiter=" ">
-                <choose>
-                  <if is-numeric="call-number">
-                    <text term="issue" form="verb"/>
-                  </if>
-                </choose>
-                <number variable="call-number"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <choose>
-                  <if is-numeric="number">
-                    <text term="issue" form="long"/>
-                  </if>
-                </choose>
-                <number variable="number"/>
-              </group>
-            </else>
-          </choose>
-          <text variable="genre" prefix="(" suffix=")"/>
-        </group>
-        <choose>
-          <if variable="publisher-place">
-            <text macro="publisher-place-year"/>
-          </if>
-        </choose>
-      </else>
-    </choose>
-  </macro>
-  <macro name="render-thesis">
-    <group delimiter=" ">
-      <text variable="title" font-style="italic"/>
-      <text macro="genre" prefix="(" suffix=","/>
-      <text variable="publisher" suffix=","/>
-      <date form="text" variable="issued" date-parts="year" suffix=") [unpublished]"/>
-    </group>
-  </macro>
-  <macro name="render-article-newspaper">
-    <group delimiter=" ">
-      <text variable="title" quotes="true" suffix=","/>
-      <text macro="container-title" font-style="italic"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-      <number variable="page-first"/>
-    </group>
-  </macro>
-  <macro name="render-article-magazine">
-    <group delimiter=" ">
-      <text variable="title" quotes="true" suffix=""/>
-      <text macro="container-title" font-style="italic"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-      <number variable="page-first"/>
-    </group>
-  </macro>
-  <macro name="render-paper-conference">
-	<group delimiter=" ">
-	  <text variable="title" quotes="true" suffix=""/>
-	  <group delimiter=", ">
-		<group delimiter=", " prefix="(" suffix=")">
-			<text variable="event-title" prefix="Paper delivered at "/>
-			<text variable="event-place"/>
-			<text macro="issued-long"/>
-		</group>
-		<group delimiter=" ">
-			<group delimiter=":">
-				<number variable="volume"/>
-				<number variable="issue"/>
-			</group>
-		  <text variable="publisher"/>
-		  <text variable="collection-title" prefix="(" suffix=")"/>
-		  <number variable="page-first"/>
-		</group>
-	  </group>
-	</group>
-  </macro>
-  <macro name="render-article-preprint">
-	<group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
-      <text variable="genre"/>
-      <text variable="collection-number" prefix="Working Paper "/>
-      <number variable="page-first"/>
-    </group>
-  </macro>  <macro name="render-article">
-    <group delimiter=", ">
-      <group delimiter=" ">
-        <group>
-          <text variable="title" quotes="true"/>
-        </group>
-        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-        <text macro="pinpoint"/>
-      </group>
-      <choose>
-        <if variable="publisher URL" match="all">
-          <group delimiter=" ">
-            <text term="online"/>
-            <group>
-              <text value="(pdf)"/>
-              <text term="in" form="symbol"/>
-            </group>
-            <text variable="publisher" font-style="italic"/>
-            <text variable="URL" prefix="&#60;" suffix="&#62;"/>
-            <choose>
-              <if variable="archive">
-                <text variable="archive" prefix="[" suffix="]"/>
-              </if>
-              <else-if variable="archive_location">
-                <text variable="archive_location" prefix="[" suffix="]"/>
-              </else-if>
-            </choose>
-          </group>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="render-webpage">
-    <group delimiter=", ">
-      <text variable="title" quotes="true"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-      <group delimiter=" ">
-        <choose>
-          <if type="post-weblog">
-			<group>
-				<text term="online" form="short"/>
-				<text term="in" form="symbol"/>
-			</group>
-          </if>
-          <else>
-            <group>
-              <text term="online"/>
-              <text term="in" form="symbol"/>
-            </group>
-          </else>
-        </choose>
-        <choose>
-          <if variable="URL genre" match="all">
-            <text variable="container-title" font-style="italic"/>
-            <text variable="genre" prefix="&#60;" suffix="&#62;"/>
-            <text variable="URL" prefix="[" suffix="]"/>
-          </if>
-          <else>
-            <text variable="container-title" font-style="italic"/>
-            <text variable="URL" prefix="&#60;" suffix="&#62;"/>
-          </else>
-        </choose>
-      </group>
-    </group>
-  </macro>
-  <!-- cases and bill legislations render the same for biblio and (first) cite -->
-  <macro name="render-bill">
-    <group delimiter=", ">
-      <choose>
-        <if variable="container-title" match="none">
-          <!-- if no volume, assume bill -->
-          <text variable="publisher-place"/>
-          <names variable="authority"/>
-          <text variable="section"/>
-          <number variable="chapter-number"/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic"/>
-            <text variable="references" prefix="" suffix=")"/>
-          </group>
-          <number variable="number-of-volumes"/>
-          <number variable="number"/>
-          <group delimiter=" ">
-            <number variable="number"/>
-            <text macro="issued-long" prefix="(" suffix=")"/>
-          </group>
-        </if>
-        <else>
-          <number variable="number" prefix="Bill "/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <number variable="chapter-number"/>
-          <names variable="authority"/>
-          <group delimiter=" ">
-            <date form="text" variable="issued" date-parts="year"/>
-          </group>
-          <text variable="section"/>
-        </else>
-      </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>
-      <number variable="number"/>
-    </group>
-  </macro>
-  <macro name="render-patent">
-    <group delimiter=" ">
-      <text variable="title" quotes="true" suffix=","/>
-      <text variable="publisher-place"/>
-      <number variable="number" prefix="Patent No "/>
-      <text variable="references" prefix=", PCT Patent No "/>
-      <text macro="submitted-long" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="render-song">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <text variable="medium" prefix="(" suffix=")"/>
-      <text macro="author-note" strip-periods="true" suffix=","/>
-      <text variable="publisher-place"/>
-      <number variable="call-number"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="render-treaty">
-    <group delimiter=", ">
-      <text variable="title" font-style="italic"/>
-      <date variable="event-date" form="text"/>
-      <group delimiter=" ">
-        <number variable="volume"/>
-        <text variable="container-title"/>
-        <number variable="page-first"/>
-        <text macro="pinpoint"/>
-        <group delimiter=" " prefix="(" suffix=")">
-          <text value="entered into force"/>
-          <date variable="issued" form="text" suffix=","/>
-          <text value="accession by"/>
-          <text variable="version"/>
-          <date variable="original-date" form="text"/>
-        </group>
-      </group>
-    </group>
-  </macro>
-  <macro name="render-manuscript">
-    <group delimiter=" ">
-      <text variable="title" quotes="true"/>
-      <text variable="medium" prefix="(" suffix=")"/>
-      <text macro="author-note" strip-periods="true" suffix=","/>
-      <text variable="publisher-place"/>
-      <number variable="call-number"/>
-      <text macro="issued-long" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="render-case">
-    <choose>
-      <if variable="author">
-        <group delimiter=", ">
-          <names variable="authority"/>
-          <date form="numeric" variable="issued"/>
-          <number variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <number variable="volume"/>
-          <number variable="page"/>
-        </group>
-      </if>
-      <else-if variable="title" match="none">
-        <group delimiter=", ">
-          <names variable="authority"/>
-          <date form="numeric" variable="issued"/>
-          <number variable="number"/>
-          <group delimiter=" ">
-            <text variable="title" form="short" font-style="italic" strip-periods="true"/>
-            <text variable="references" prefix="(" suffix=")"/>
-          </group>
-          <text variable="container-title" strip-periods="true" font-style="italic"/>
-          <number variable="volume"/>
-          <number variable="page-first"/>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=" ">
-        <text variable="title" font-style="italic" suffix="," strip-periods="true"/>
-        <choose>
-          <if variable="container-title" match="none">
-            <date form="text" variable="issued" date-parts="year"/>
-            <names variable="authority"/>
-            <number variable="page"/>
-          </if>
-          <else>
-            <date form="text" variable="issued" date-parts="year" prefix="[" suffix="]"/>
-            <number variable="volume"/>
-            <text variable="container-title" strip-periods="true"/>
-            <number variable="page-first"/>
-            <!-- COMMENTED OUT FOR 9TH ED  <text variable="authority" prefix=" (" suffix=")" strip-periods="true"/> -->
-          </else>
-        </choose>
-        <!-- <text variable="references" prefix=", "/> -->
-        </group>
-      </else>
-    </choose>
-    <!-- COMMENTED OUT FOR 9TH ED  <text variable="URL" prefix=" (available on " suffix=")"/> -->
-  </macro>
-  <macro name="render-gazette">
-    <group delimiter=", ">
-      <number variable="number"/>
-      <group delimiter=" ">
-        <date variable="issued" form="numeric" date-parts="year" prefix="(" suffix=")"/>
-        <text value="Gaz"/>
-        <number variable="volume"/>
-      </group>
-      <group delimiter=" ">
-        <number variable="page"/>
-        <text variable="container-title" prefix="(" suffix=")" font-style="italic"/>
-      </group>
-    </group> 
-  </macro>
-  <macro name="render-personal_communication">
-    <group delimiter=" ">
-      <text term="letter" text-case="capitalize-first"/>
-      <text term="from" form="short"/>
-      <names variable="author"/>
-      <text term="recipient" form="verb"/>
-      <names variable="recipient"/>
-      <date form="text" variable="issued" date-parts="year-month-day" prefix="(" suffix=")"/>
-    </group>
-  </macro>
-  <macro name="render-entry-encyclopedia">
-    <!-- test whether the entry is from the JurisClasseur Québec
-          (the only encyclopedic digest with editor information)-->
-    <choose>
-      <if variable="editor">
-        <group delimiter=" ">
-          <group>
-            <text variable="title" quotes="true"/>
-          </group>
-          <group>
-            <text macro="pinpoint" suffix=","/>
-          </group>
-          <text term="in" form="short"/>
-          <text macro="editor" suffix=","/>
-          <text variable="container-title"/>
-          <text variable="collection-title"/>
-        </group>  
-      </if>
-    </choose>
-  </macro>
-  <macro name="pinpoint">
-    <choose>
-      <if page="page" match="none">
-        <group delimiter=" ">
-          <label form="short" plural="contextual" variable="page"/>
-        </group>
-      </if>
-      <else>
-        <group delimiter=" ">
-          <label variable="locator" form="short" plural="contextual"/>   
-          <number variable="locator"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="short-form">
-    <!-- Hump to overcome: cannot check against existence of short title.
-    Not implemented: "cited to" for cases construct short casenames adding ref to article -->
-    <choose>
-      <if variable="hereinafter">
-        <text variable="hereinafter" font-style="italic"/>
-      </if>
-      <else-if type="book article-journal chapter article-newspaper post-weblog paper-conference">
-        <names variable="author">
-          <name and="symbol" form="short" delimiter-precedes-last="never"/>
-          <substitute>
-            <names variable="editor">
-              <name and="symbol" form="short"/>
-            </names>
-          </substitute>
-        </names>
-      </else-if>
-      <else-if variable="title-short">
-        <text variable="title-short" font-style="italic"/>
-      </else-if>
-      <else>
-        <text variable="title" font-style="italic" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher-place-year">
-	<text term="open-quote" form="short"/>									  
-    <group delimiter=" ">
-      <group>
-        <text variable="publisher-place"/>
-        <text term="open-inner-quote" form="short"/>
-      </group>
-      <text variable="publisher" suffix=","/>
-      <group>
-        <choose>
-          <if>
-            <conditions match="all">
-              <condition type="report"/>
-              <condition variable="publisher" match="none"/>
-            </conditions>
-            <date form="text" variable="issued"/>
-          </if>
-          <else>
-            <date form="text" variable="issued" date-parts="year"/>
-          </else>
-        </choose>
-        <choose>
-          <if>
-            <conditions match="all">
-              <condition match="none" type="chapter"/>
-              <condition match="none" variable="locator"/>
-            </conditions>
-            <text term="close-inner-quote" form="short"/>
-          </if>
-          <else>
-            <text term="close-quote" form="short"/>
-          </else>
-        </choose>
-      </group>
-    </group>
-  </macro>
-  <macro name="ct-jurisdiction-paren">
-	<names variable="authority" prefix="(" suffix=")">
-	  <name/>
-	  <institution institution-parts="short"/>
-	</names>
-  </macro>
-  <macro name="local-title-short">
-    <!-- The title form for subsequent citations (of all types) -->
-    <choose>
-      <if position="first">
-        <choose>
-          <if variable="hereinafter">
-            <text variable="hereinafter"/>
-          </if>
-          <else-if variable="title-short">
-            <text variable="title-short"/>
-          </else-if>
-        </choose>
-      </if>
-      <else>
-        <choose>
-          <if variable="hereinafter">
-            <text variable="hereinafter"/>
-          </if>
-          <else-if variable="title-short">
-            <text variable="title-short"/>
-          </else-if>
-          <else>
-            <text variable="title"/>
-          </else>
-        </choose>
-      </else>
-    </choose>
-  </macro>
-  <citation et-al-min="4" et-al-use-first="1">
-    <!-- translator needs to be added for chapter book film etc. chapter? -->
-    <layout delimiter="; " suffix=".">
-      <text macro="layout-citation"/>
-    </layout>
-  </citation>
-  <bibliography et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;">
-    <sort>
-      <key macro="sort-by-type"/>
-      <key macro="author-bib"/>
-      <key variable="title"/>
-      <key variable="issued"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="layout-bib"/>
-    </layout>
-  </bibliography>
-</style>
\ No newline at end of file
diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index 2951baa..dc14c49 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -28,9 +28,13 @@
       <email>gspanglett@gmail.com</email>
       <uri>https://gspanglett.github.io</uri>
     </contributor>
+    <contributor>
+      <name>Peter Wills</name>
+      <email>peter.wills@law.ox.ac.uk</email>
+    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2022-03-09T22:53:52+00:00</updated>
+    <updated>2022-12-06 15:37:58</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="fr">
@@ -122,7 +126,7 @@
       <term name="in" form="short">in</term>
       <term name="in" form="verb">reprinted in</term>
       <term name="in" form="symbol">:</term>
-      <term name="online">online</term>
+									   
       <term name="online" form="short">online (blog)</term>
       <term name="and" form="symbol">&#38;</term>
       <term name="et-al">et al</term>
@@ -204,7 +208,7 @@
           <else>
             <group delimiter=" ">
               <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-              <text macro="juris-locator" label-form="short"/>
+              <text macro="pinpoint"/>
             </group>
           </else>
         </choose>
@@ -216,7 +220,7 @@
         <!-- short form -->
         <group delimiter=" ">
           <group delimiter=", ">
-            <text macro="juris-title-short" font-style="italic" strip-periods="true"/>
+            <text macro="local-title-short" font-style="italic" strip-periods="true" suffix=","/>
             <text value="supra" font-style="italic"/>
           </group>
           <choose>
@@ -228,7 +232,7 @@
             </if>
             <else>
               <text variable="first-reference-note-number" prefix="note "/>            
-              <text macro="juris-locator" label-form="short" strip-periods="true"/>
+              <text macro="pinpoint"/>
             </else>
           </choose>
         </group>
@@ -317,7 +321,7 @@
                     </group>
                     <group delimiter=", ">
                       <group delimiter=" ">
-                        <text macro="juris-main"/>
+                        <text macro="juris-main" strip-periods="true"/>
                         <text macro="juris-locator" label-form="short" strip-periods="true"/>
                       </group>
                       <choose>
@@ -331,6 +335,37 @@
                       </choose>
                     </group>
                   </group>
+                  <choose>
+                    <!-- Replicating juris-ca hierarchy -->
+                    <if> <!-- Reporter without year as volume-->
+                      <conditions match="all">
+                        <condition match="all" variable="container-title volume"/>
+                        <condition match="none" variable="collection-number admin-flag"/>
+                      </conditions>
+                      <text macro="ct-jurisdiction-paren" />
+                    </if>
+                    <else-if> <!-- online service-->
+                      <conditions match="all">
+                        <condition match="all" variable="submitted container-title"/>
+                        <condition match="none" variable="collection-number admin-flag"/>
+                      </conditions>
+                      <text macro="ct-jurisdiction-paren" />
+                    </else-if>
+                    <else-if> <!-- Reporter with [year] and page -->
+                      <conditions match="all">
+                        <condition match="all" variable="collection-number container-title page"/>
+                        <condition match="none" variable="admin-flag"/>
+                      </conditions>
+                      <text macro="ct-jurisdiction-paren" />
+                    </else-if>
+                    <else-if> <!-- Journal with [year] and no page -->
+                      <conditions match="all">
+                        <condition match="all" variable="collection-number container-title issue"/>
+                        <condition match="none" variable="admin-flag"/>
+                      </conditions>
+                      <text macro="ct-jurisdiction-paren" />
+                    </else-if>
+                  </choose>
                   <choose>
                     <if>
                       <conditions match="all">
@@ -624,7 +659,7 @@
                         <condition position="first"/>
                       </conditions>
                       <group parallel-last="title-short title">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                        <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
                       </group>
                     </if>
                   </choose>
@@ -793,6 +828,12 @@
                   <else-if type="entry-encyclopedia">
                     <text macro="render-entry-encyclopedia"/>
                   </else-if>
+                  <else-if type="paper-conference">
+                    <text macro="render-paper-conference"/>
+                  </else-if>
+                  <else-if variable="genre">
+                    <text macro="render-article-preprint"/>
+                  </else-if>
                   <else-if type="article">
                     <text macro="render-article"/>
                   </else-if>
@@ -816,6 +857,9 @@
             <if variable="hereinafter">
               <text variable="hereinafter" prefix="[" suffix="]" font-style="italic"/>
             </if>
+            <if type="book article-journal chapter article-newspaper post-weblog" variable="author">
+              <!-- Don't show the short title if there's an author that'll be shown instead-->
+            </if>
             <else-if variable="title-short">
               <text variable="title-short" prefix="[" suffix="]" font-style="italic"/>
             </else-if>
@@ -904,6 +948,12 @@
             <else-if type="entry-encyclopedia">
               <text macro="render-entry-encyclopedia"/>
             </else-if>
+            <else-if type="paper-conference">
+              <text macro="render-paper-conference"/>
+            </else-if>
+            <else-if variable="genre">
+              <text macro="render-article-preprint"/>
+            </else-if>
             <else-if type="article">
               <text macro="render-article"/>
             </else-if>
@@ -1048,14 +1098,14 @@
   <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
     right. Only actually need to check for 'first' because w/i cite all the other tests should have been done... -->
   <macro name="render-chapter">
-    <group delimiter=", ">
-      <group delimiter=" ">
-        <text variable="title" quotes="true"/>
-        <text term="in" form="short"/>
-        <text macro="editor" strip-periods="true"/>
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text term="in" form="short"/>
+      <text macro="editor" strip-periods="true" suffix=", "/> <!-- if there's no editor, no comma-->
+      <group delimiter=", ">
+        <text macro="container-title" font-style="italic"/>
+        <text macro="edition"/>
       </group>
-      <text macro="container-title" font-style="italic"/>
-      <text macro="edition"/>
     </group>
     <group delimiter=", ">
       <text macro="publisher-place-year"/>
@@ -1178,7 +1228,36 @@
       <number variable="page-first"/>
     </group>
   </macro>
-  <macro name="render-article">
+  <macro name="render-paper-conference">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=""/>
+      <group delimiter=", ">
+        <group delimiter=", " prefix="(" suffix=")">
+          <text variable="event-title" prefix="Paper delivered at "/>
+          <text variable="event-place"/>
+          <text macro="issued-long"/>
+        </group>
+        <group delimiter=" ">
+          <group delimiter=":">
+            <number variable="volume"/>
+            <number variable="issue"/>
+          </group>
+          <text variable="publisher"/>
+          <text variable="collection-title" prefix="(" suffix=")"/>
+          <number variable="page-first"/>
+        </group>
+      </group>
+	  </group>
+  </macro>
+  <macro name="render-article-preprint">
+	  <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
+      <text variable="genre"/>
+      <text variable="collection-number" prefix="Working Paper "/>
+      <number variable="page-first"/>
+    </group>
+  </macro>  <macro name="render-article">
     <group delimiter=", ">
       <group delimiter=" ">
         <group>
@@ -1217,8 +1296,10 @@
       <group delimiter=" ">
         <choose>
           <if type="post-weblog">
-            <text term="online" form="short"/>
-            <text term="in" form="symbol"/>
+            <group>
+              <text term="online" form="short"/>
+              <text term="in" form="symbol"/>
+            </group>
           </if>
           <else>
             <group>
@@ -1459,7 +1540,7 @@
       <if variable="hereinafter">
         <text variable="hereinafter" font-style="italic"/>
       </if>
-      <else-if type="book article-journal chapter article-newspaper post-weblog">
+      <else-if type="book article-journal chapter article-newspaper post-weblog paper-conference">
         <names variable="author">
           <name and="symbol" form="short" delimiter-precedes-last="never"/>
           <substitute>
@@ -1478,7 +1559,7 @@
     </choose>
   </macro>
   <macro name="publisher-place-year">
-    <text term="open-quote" form="short"/>
+  	<text term="open-quote" form="short"/>									  
     <group delimiter=" ">
       <group>
         <text variable="publisher-place"/>
@@ -1513,6 +1594,40 @@
       </group>
     </group>
   </macro>
+  <macro name="ct-jurisdiction-paren">
+    <names variable="authority" prefix="(" suffix=")">
+      <name/>
+      <institution institution-parts="short"/>
+    </names>
+  </macro>
+  <macro name="local-title-short">
+    <!-- The title form for subsequent citations (of all types) -->
+    <choose>
+      <if position="first">
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+          <else>
+            <text variable="title"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
   <citation et-al-min="4" et-al-use-first="1">
     <!-- translator needs to be added for chapter book film etc. chapter? -->
     <layout delimiter="; " suffix=".">

From cde2a4ad2a9b77b660344e4bd5f72a302e1fca29 Mon Sep 17 00:00:00 2001
From: Peter Wills <peter@peterwills.ca>
Date: Fri, 14 Apr 2023 14:42:23 -0700
Subject: [PATCH 09/12] Ensure open paren (open-quote) added if no place

---
 jm-mcgill-v9.csl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index dc14c49..9186e2e 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1561,6 +1561,7 @@
   <macro name="publisher-place-year">
   	<text term="open-quote" form="short"/>									  
     <group delimiter=" ">
+      <text term="open-quote" form="short"/>
       <group>
         <text variable="publisher-place"/>
         <text term="open-inner-quote" form="short"/>

From ce4d45261c679dd55a18e0b269332722fd5672da Mon Sep 17 00:00:00 2001
From: Peter Wills <peter@peterwills.ca>
Date: Fri, 14 Apr 2023 14:47:03 -0700
Subject: [PATCH 10/12] Revert "Ensure open paren (open-quote) added if no
 place"

This reverts commit f6e4adea4f6a3fafc7759b59e966352c8c185b08.
---
 jm-mcgill-v9.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index 9186e2e..21b47a0 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1561,8 +1561,8 @@
   <macro name="publisher-place-year">
   	<text term="open-quote" form="short"/>									  
     <group delimiter=" ">
-      <text term="open-quote" form="short"/>
       <group>
+        <text term="open-quote" form="short"/>
         <text variable="publisher-place"/>
         <text term="open-inner-quote" form="short"/>
       </group>

From d551fdf19e5ea015761575ad32e699fe0bb1f205 Mon Sep 17 00:00:00 2001
From: Peter Wills <peter@peterwills.ca>
Date: Fri, 14 Apr 2023 15:03:37 -0700
Subject: [PATCH 11/12] Ensure paren opened even when no place

---
 jm-mcgill-v9.csl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index 21b47a0..9f11ebf 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1559,10 +1559,9 @@
     </choose>
   </macro>
   <macro name="publisher-place-year">
-  	<text term="open-quote" form="short"/>									  
+    <text term="open-quote" form="short"/>
     <group delimiter=" ">
       <group>
-        <text term="open-quote" form="short"/>
         <text variable="publisher-place"/>
         <text term="open-inner-quote" form="short"/>
       </group>

From 7c54c3fe94ecc22e62b57b93d5ba494b0655aa00 Mon Sep 17 00:00:00 2001
From: Frank Bennett <biercenator@gmail.com>
Date: Sun, 16 Apr 2023 18:12:44 +0900
Subject: [PATCH 12/12] Tweaks to IB Law Review

to be edited

Merge my edits into v9

Revert "Merge my edits into v9"

This reverts commit 1c54291976803e503a838d0d8210587d493cc9d4.

- fIx blog identifier
- handle conference papers
- handle preprints
- Don't show short title if author will be shown instead
- Handle chapters without editors
---
 jm-mcgill-v9.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index 9f11ebf..dc14c49 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -1559,7 +1559,7 @@
     </choose>
   </macro>
   <macro name="publisher-place-year">
-    <text term="open-quote" form="short"/>
+  	<text term="open-quote" form="short"/>									  
     <group delimiter=" ">
       <group>
         <text variable="publisher-place"/>