More Uni Gottingen fixes

Author: adam3smith

Diff for: 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">