From f2a315bd4b2a798f6a10c68b0601aed529bd4bdb Mon Sep 17 00:00:00 2001
From: github actions <jabrefmail+webfeedback@gmail.com>
Date: Sat, 18 Jan 2020 11:53:05 +0000
Subject: [PATCH] Squashed 'src/main/resources/csl-styles/' changes from
 9c0f5c6eeb..f0c7374103

f0c7374103 Fix AGLC Subsequents
6a8ec908e6 More Uni Gottingen fixes

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: f0c7374103f185a586519c0dba35d3428766afc1
---
 australian-guide-to-legal-citation.csl | 14 +++++++++++---
 universitatsmedizin-gottingen.csl      | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/australian-guide-to-legal-citation.csl b/australian-guide-to-legal-citation.csl
index f99101ef4e9..ab4d346532e 100644
--- a/australian-guide-to-legal-citation.csl
+++ b/australian-guide-to-legal-citation.csl
@@ -23,6 +23,14 @@
       <term name="editor" form="verb-short">ed.</term>
       <term name="translator" form="verb-short">tr.</term>
       <term name="editortranslator" form="verb-short">ed. and tr.</term>
+      <!--Ordinals' in superscript-->
+      <term name="ordinal">ᵗʰ</term>
+      <term name="ordinal-01">ˢᵗ</term>
+      <term name="ordinal-02">ⁿᵈ</term>
+      <term name="ordinal-03">ʳᵈ</term>
+      <term name="ordinal-11">ᵗʰ</term>
+      <term name="ordinal-12">ᵗʰ</term>
+      <term name="ordinal-13">ᵗʰ</term>
     </terms>
   </locale>
   <!--Authors and Persons-->
@@ -98,7 +106,7 @@
       <else-if type="patent">
         <text macro="patent"/>
       </else-if>
-      <else>
+      <else-if type="bill legal_case legislation" match="none">
         <names variable="author">
           <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with="" form="short"/>
           <substitute>
@@ -107,7 +115,7 @@
             <text macro="title"/>
           </substitute>
         </names>
-      </else>
+      </else-if>
     </choose>
   </macro>
   <macro name="author">
@@ -200,7 +208,7 @@
   <macro name="title-short">
     <choose>
       <if type="book legislation webpage thesis motion_picture manuscript legal_case" match="any">
-        <text variable="title-short" font-style="italic" text-case="title"/>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
       </if>
       <else>
         <text variable="title" quotes="true" text-case="title" form="short"/>
diff --git a/universitatsmedizin-gottingen.csl b/universitatsmedizin-gottingen.csl
index 423bcc4221d..737bffefa39 100644
--- a/universitatsmedizin-gottingen.csl
+++ b/universitatsmedizin-gottingen.csl
@@ -25,7 +25,7 @@
   </locale>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text"/>
+      <name form="short" and="text" sort-separator=" " initialize-with="" name-as-sort-order="all"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -115,7 +115,7 @@
       </else>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-givenname="true">
     <sort>
       <key macro="year" sort="ascending"/>
       <key macro="author"/>
@@ -147,23 +147,29 @@
         <if type="chapter paper-conference" match="any">
           <group prefix=": " delimiter=". ">
             <text variable="title"/>
-            <group delimiter=", ">
               <group delimiter=": ">
                 <text term="in" text-case="capitalize-first" suffix=":"/>
                 <text macro="editor"/>
+                <group delimiter=" ">
                 <text variable="container-title"/>
+                <group prefix="(" suffix=")" delimiter=" ">
+                  <text variable="collection-title"/>
+                  <text variable="collection-number"/>
+                </group>
+              </group>
               </group>
+              <group delimiter="; ">
               <group delimiter=" ">
                 <label variable="volume"/>
                 <text variable="volume"/>
               </group>
               <text macro="edition"/>
-            </group>
             <group delimiter=", ">
               <text macro="publisher"/>
               <text variable="page"/>
             </group>
           </group>
+          </group>
         </if>
         <else-if type="report">
           <group delimiter=". ">
@@ -186,8 +192,8 @@
                 <text variable="volume"/>
               </group>
               <text macro="edition"/>
-            </group>
             <text macro="publisher"/>
+            </group>
           </group>
         </else-if>
         <else-if type="webpage post-weblog" match="any">