diff --git a/american-journal-of-archaeology.csl b/american-journal-of-archaeology.csl
index b7da8ffeca9..588cb148ae6 100644
--- a/american-journal-of-archaeology.csl
+++ b/american-journal-of-archaeology.csl
@@ -15,7 +15,7 @@
     <issn>0002-9114</issn>
     <eissn>1939-828X</eissn>
     <summary>The American Journal of Archaeology style</summary>
-    <updated>2021-11-12T14:22:00+00:00</updated>
+    <updated>2022-02-27T11:00:00+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>
@@ -262,7 +262,7 @@
         <text macro="container-prefix" suffix=" "/>
       </if>
     </choose>
-    <text variable="container-title" font-style="italic"/>
+    <text variable="container-title" text-case="title" font-style="italic"/>
   </macro>
   <macro name="publisher">
     <group>
diff --git a/antiquites-africaines.csl b/antiquites-africaines.csl
index 743bbce5935..624a700db45 100644
--- a/antiquites-africaines.csl
+++ b/antiquites-africaines.csl
@@ -9,27 +9,26 @@
     <link href="https://journals.openedition.org/antafr/340" rel="documentation"/>
     <author>
       <name>Antonio Mendes da Silva</name>
-      <email>mendes@mmsh.univ-aix.fr</email>
+      <email>antonio.mendes@cnrs.fr</email>
     </author>
     <category citation-format="author-date"/>
     <category field="humanities"/>
     <category field="history"/>
     <issn>0066-4871</issn>
     <eissn>2117-539X</eissn>
-    <summary>Style conçu pour la revue Antiquités africaines. Histoire et archéologie de
-            l’Afrique du Nord, de la protohistoire à la conquête arabe &#8211; History and
-            archaeology of North Africa, from protohistory to the Arab conquests. Centre Camille
-            Jullian, CNRS</summary>
-    <updated>2020-05-04T12:23:43+00:00</updated>
+    <summary>Style conçu pour la revue Antiquités africaines. Histoire et archéologie de l’Afrique
+      du Nord, de la protohistoire à la conquête arabe &#8211; History and archaeology of North
+      Africa, from protohistory to the Arab conquests. Centre Camille Jullian, CNRS</summary>
+    <updated>2020-05-10T04:06:15+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">
     <terms>
-      <term name="no date" form="short">[s.d.]</term>
+      <term name="no date" form="short">s.d.</term>
       <term name="et-al">et alii</term>
       <term name="editor" form="short">
-        <single>dir.</single>
-        <multiple>dirs.</multiple>
+        <single>éd.</single>
+        <multiple>éd.</multiple>
       </term>
     </terms>
   </locale>
@@ -105,7 +104,7 @@
         </names>
       </else-if>
       <else-if type="book">
-        <text variable="title-short"/>
+        <text variable="title-short" font-style="italic"/>
       </else-if>
       <else-if type="map">
         <text variable="title-short"/>
@@ -133,6 +132,14 @@
           <label form="short" prefix=" (" suffix=".)"/>
         </names>
       </else-if>
+      <else-if variable="editorial-director">
+        <names variable="editorial-director" suffix=" ">
+          <name name-as-sort-order="all" and="text" initialize-with=". " delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family" font-variant="small-caps"/>
+          </name>
+          <label form="short" prefix=" (" suffix=".)"/>
+        </names>
+      </else-if>
     </choose>
   </macro>
   <macro name="editor">
@@ -274,7 +281,7 @@
           <choose>
             <if variable="issued">
               <text macro="volume" prefix=", "/>
-              <text variable="issue" prefix="&amp;#160;"/>
+              <text variable="issue" prefix="&#160;"/>
             </if>
             <else>
               <text macro="volume" prefix=", "/>
@@ -343,10 +350,9 @@
   <macro name="collection">
     <choose>
       <if type="motion_picture map entry-dictionary entry-encyclopedia book speech paper-conference chapter" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+        <group prefix=" (" suffix=")">
           <text variable="collection-title"/>
-          <text macro="volume"/>
-          <text variable="collection-number"/>
+          <text variable="collection-number" prefix=" "/>
         </group>
       </if>
       <else-if type="article-journal">
@@ -361,6 +367,7 @@
     <group suffix=", " prefix=" ">
       <choose>
         <if variable="issued">
+          <text macro="originally-published" suffix=" "/>
           <date variable="issued">
             <date-part name="year" form="long"/>
           </date>
@@ -383,6 +390,15 @@
       </else>
     </choose>
   </macro>
+  <macro name="originally-published">
+    <group delimiter=", " prefix=" [" suffix="]">
+      <date variable="original-date">
+        <date-part name="day" suffix=" "/>
+        <date-part name="month" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
   <macro name="page-bib">
     <choose>
       <if type="book" match="any"/>
@@ -444,7 +460,6 @@
     <group suffix=", ">
       <choose>
         <if is-numeric="volume">
-          <text term="volume" form="short" suffix=". "/>
           <text variable="volume"/>
           <text variable="number-of-volumes" prefix="/"/>
         </if>
@@ -465,19 +480,28 @@
       </names>
     </group>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&amp;#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
+  <macro name="archive">
+    <group suffix="." prefix=". ">
+      <group delimiter=", ">
+        <text variable="archive"/>
+        <text variable="archive_location"/>
+        <text variable="call-number"/>
+      </group>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
     <sort>
       <key variable="issued" sort="descending"/>
       <key macro="author-citation"/>
       <key macro="title"/>
     </sort>
-    <layout delimiter="&amp;#160;; ">
-      <group delimiter=",&amp;#160;">
+    <layout delimiter="&#160;; ">
+      <group delimiter=",&#160;">
         <group delimiter=" ">
           <text macro="author-citation"/>
           <text macro="year-date-short"/>
         </group>
-        <group delimiter="&amp;#160;">
+        <group delimiter="&#160;">
           <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
@@ -501,6 +525,7 @@
         <text macro="place"/>
         <text macro="collection"/>
         <text macro="page-bib"/>
+        <text macro="archive"/>
       </group>
       <text variable="URL"/>
     </layout>
diff --git a/australian-road-research-board.csl b/australian-road-research-board.csl
new file mode 100644
index 00000000000..820d749d86e
--- /dev/null
+++ b/australian-road-research-board.csl
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB" page-range-format="minimal">
+  <info>
+    <title>Australian Road Research Board</title>
+    <id>http://www.zotero.org/styles/australian-road-research-board</id>
+    <link href="http://www.zotero.org/styles/australian-road-research-board" rel="self"/>
+    <link href="http://www.zotero.org/styles/style-manual-australian-government" rel="template"/>
+    <link href="https://www.railknowledgebank.com/Presto/pl/NmQ5ZmY0YWQtNTc4NS00YzZiLTk3MTItNjEzYWQxZTgyMTRlLjcxNjg=" rel="documentation"/>
+    <author>
+      <name>TMason</name>
+      <email>tony.mason@arrb.com.au</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>Australian Road Research Board Style based on the Australian Style Manual author-date 6th edition</summary>
+    <updated>2017-10-12T00:16:23+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="en">
+    <terms>
+      <term name="edition" form="short">edn</term>
+      <term name="editor" form="short">
+        <single>ed</single>
+        <multiple>eds</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="symbol" initialize-with=""/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text value="viewed"/>
+            <date variable="accessed">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+          <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+        </group>
+      </if>
+	  <else>
+        <text variable="DOI" prefix="doi: "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " prefix=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author"/>
+      <text macro="year-date" prefix=" "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture song" match="any">
+          <group delimiter=", ">
+            <text macro="title" prefix=", "/>
+            <text macro="edition"/>
+            <text macro="editor"/>
+			<text variable="version" prefix=" "/>
+          </group>
+          <text macro="publisher"/>
+        </if>
+		<else-if type="report" match="any">
+          <group delimiter=", ">
+            <text macro="title" prefix=", "/>
+            <text macro="edition"/>
+            <text macro="editor"/>
+			<text variable="number"/>
+          </group>
+          <text macro="publisher"/>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <group prefix=", ">
+            <text macro="title"/>
+            <text macro="editor" prefix=", in "/>
+            <text variable="container-title" font-style="italic" prefix=", "/>
+            <text variable="collection-title" prefix=", "/>
+            <group>
+              <text macro="publisher"/>
+            </group>
+            <group prefix=", ">
+              <label variable="page" form="short"/>
+              <text variable="page" prefix=" "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group prefix=", ">
+            <text variable="title" quotes="true"/>
+            <text variable="genre" prefix=", "/>
+            <text macro="publisher"/>
+          </group>
+        </else-if>
+		<else-if type="article-newspaper">
+          <group prefix=", ">
+            <text variable="title" quotes="true"/>
+            <text variable="container-title" font-style="italic" prefix=", "/>
+			<text variable="section" prefix=", "/>
+            <text variable="edition" prefix=", "/>
+          </group>
+        </else-if>
+        <else>
+          <group prefix=", ">
+            <text macro="title"/>
+			<text variable="note" prefix=", "/>
+			<text macro="publisher"/>
+          </group>
+          <group prefix=", ">
+            <text variable="container-title" font-style="italic"/>
+            <group prefix=", ">
+              <text variable="volume" prefix="vol. "/>
+              <text variable="issue" prefix=", no. "/>
+            </group>
+            <group prefix=", ">
+              <label variable="page" form="short"/>
+              <text variable="page" prefix=". "/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text prefix=", " macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/boletin-de-la-sociedad-geologica-mexicana.csl b/boletin-de-la-sociedad-geologica-mexicana.csl
new file mode 100644
index 00000000000..e50b3bd6229
--- /dev/null
+++ b/boletin-de-la-sociedad-geologica-mexicana.csl
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="es-MX">
+  <info>
+    <title>Boletín de la Sociedad Geológica Mexicana (Español - Mexico)</title>
+    <id>http://www.zotero.org/styles/boletin-de-la-sociedad-geologica-mexicana</id>
+    <link href="http://www.zotero.org/styles/boletin-de-la-sociedad-geologica-mexicana" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-structural-geology" rel="template"/>
+    <link href="http://boletinsgm.igeolcu.unam.mx/bsgm/index.php/instrucciones-instructions" rel="documentation"/>
+    <author>
+      <name>Mario Schädel</name>
+      <email>mario.schaedel@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="geology"/>
+    <updated>2022-01-13T11:18:02+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="container-chapter-journal">
+    <choose>
+      <if type="chapter paper-conference article-journal" match="any">
+        <group delimiter=", ">
+          <group>
+            <text term="in" text-case="lowercase" suffix=" "/>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")"/>
+            </names>
+          </group>
+          <text variable="container-title" text-case="title"/>
+          <text variable="collection-title" text-case="title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-other">
+    <choose>
+      <if type="chapter paper-conference article-journal" match="none">
+        <group delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title" form="short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if type="webpage post post-weblog">
+        <group delimiter=" ">
+          <text term="available at"/>
+          <group delimiter=", ">
+            <text variable="URL" prefix="&lt;" suffix=">"/>
+            <text term="accessed" suffix=" "/>
+          </group>
+          <date form="text" variable="accessed"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <group delimiter=". ">
+          <text variable="title"/>
+          <group delimiter=" ">
+            <text variable="number" prefix="No. "/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
+        <text variable="title"/>
+        <text macro="edition" prefix=", "/>
+      </else-if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=" ">
+          <text variable="title"/>
+          <text term="online" prefix="(" suffix=")"/>
+        </group>
+      </else-if>
+      <else>
+        <text variable="title" suffix=":"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+      <text variable="genre"/>
+    </group>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" text-case="capitalize-first" suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <number variable="edition" form="ordinal"/>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+      <text term="edition" form="short" strip-periods="true"/>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group prefix=" " delimiter=", ">
+          <group>
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+        <group delimiter=", " prefix=": ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <group delimiter=" ">
+            <text variable="number-of-pages"/>
+            <label plural="never" variable="number-of-pages" form="short"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", " prefix=", ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <text variable="number" prefix=". "/>
+      </else-if>
+      <else-if type="map">
+        <group delimiter=", " prefix=", ">
+          <group delimiter=" ">
+            <text term="scale"/>
+            <text variable="scale"/>
+          </group>
+          <text macro="publisher"/>
+          <text macro="edition"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
+    <sort>
+      <key macro="issued" sort="ascending"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued"/>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout>
+      <group delimiter=", " suffix=".">
+        <group delimiter=", ">
+          <text macro="author"/>
+          <text macro="issued"/>
+        </group>
+        <group>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="container-chapter-journal"/>
+            </group>
+            <text macro="container-other"/>
+          </group>
+          <text macro="locators"/>
+        </group>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/china-national-standard-gb-t-7714-2015-author-date.csl b/china-national-standard-gb-t-7714-2015-author-date.csl
index 14f8754b377..3a05577a7c7 100644
--- a/china-national-standard-gb-t-7714-2015-author-date.csl
+++ b/china-national-standard-gb-t-7714-2015-author-date.csl
@@ -1,263 +1,465 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" delimiter-precedes-last="always" demote-non-dropping-particle="never" name-delimiter=", " initialize-with=" " names-delimiter=". " name-as-sort-order="all" sort-separator=" " default-locale="zh-CN">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2015 (author-date, 中文)</title>
-    <title-short>GB/T 7714-2015 (author-date)</title-short>
     <id>http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-author-date</id>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-author-date" rel="self"/>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="template"/>
-    <link href="http://www.std.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
+    <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>牛耕田</name>
       <email>buffalo_d@163.com</email>
     </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>The Chinese GB/T7714-2015 author-date style</summary>
-    <updated>2021-11-25T18:00:00+08:00</updated>
+    <summary>The Chinese GB/T 7714-2015 author-date style</summary>
+    <updated>2022-01-20T00:00:00+08: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="zh-CN">
+    <date form="text">
+      <date-part name="year" suffix="年" range-delimiter="&#8212;"/>
+      <date-part name="month" form="numeric" suffix="月" range-delimiter="&#8212;"/>
+      <date-part name="day" suffix="日" range-delimiter="&#8212;"/>
+    </date>
     <terms>
-      <term name="anonymous">佚名</term>
-      <term name="edition">版</term>
-      <term name="page" form="short">
-        <single>p.</single>
-        <multiple>pp.</multiple>
-      </term>
+      <term name="anonymous" form="short">佚名</term>
+      <term name="edition" form="short">版</term>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="open-inner-quote">‘</term>
+      <term name="close-inner-quote">’</term>
     </terms>
   </locale>
-  <macro name="accessed-date">
-    <date variable="accessed" delimiter="&#8211;" prefix="[" suffix="]">
-      <date-part name="year"/>
-      <date-part name="month" form="numeric-leading-zeros"/>
-      <date-part name="day" form="numeric-leading-zeros"/>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
     </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
   </macro>
-  <macro name="author">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name>
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given"/>
-          </name>
-        </names>
-      </if>
-      <else>
-        <text term="anonymous"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author-intext">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name form="short">
-            <name-part name="family" text-case="uppercase"/>
-          </name>
-        </names>
-      </if>
-      <else>
-        <text term="anonymous"/>
-      </else>
-    </choose>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
   </macro>
-  <macro name="container-author">
-    <names variable="container-author">
+  <!-- 主要责任者 -->
+  <macro name="author">
+    <names variable="author">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+        <text macro="anon"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="edition">
+  <!-- 参考文献表的著者姓名与出版年 -->
+  <macro name="author-date">
+    <group delimiter=", ">
+      <text macro="author"/>
+      <text macro="issued-year"/>
+    </group>
+  </macro>
+  <!-- 正文引用的著者姓名 -->
+  <macro name="author-intext">
+    <names variable="author">
+      <!-- 国标 10.2.2 节要求姓氏与“et al.”“等”之间留适当空隙 -->
+      <name form="short" delimiter="&#160;" delimiter-precedes-et-al="always">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
     <choose>
-      <if variable="edition">
-        <group delimiter=" ">
-          <text variable="edition"/>
-          <text term="edition"/>
-        </group>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
-  <macro name="editor">
-    <names variable="editor translator">
+  <!-- 专著主要责任者 -->
+  <macro name="container-author">
+    <names variable="editor">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
-      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="issued-date">
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 版本项 -->
+  <macro name="edition">
     <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter="&#8211;">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros"/>
-          <date-part name="day" form="numeric-leading-zeros"/>
-        </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="issue-date-year">
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
+  </macro>
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if variable="issued">
-        <date variable="issued" date-parts="year" form="numeric"/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
   </macro>
+  <!-- 专著的出版项 -->
   <macro name="publishing">
-    <choose>
-      <if variable="publisher">
+    <group delimiter=": ">
+      <group delimiter=", ">
         <group delimiter=": ">
           <text variable="publisher-place"/>
-          <group delimiter=", ">
-            <text variable="publisher"/>
-          </group>
+          <text variable="publisher"/>
         </group>
-        <text variable="page" prefix=": "/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="serial-information">
-    <group delimiter=", ">
-      <text variable="volume"/>
+      </group>
+      <text variable="page"/>
     </group>
-    <text variable="issue" prefix="(" suffix=")"/>
-    <text variable="page" prefix=": "/>
-  </macro>
-  <macro name="type-code">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text value="J"/>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
       </if>
-      <else-if type="article-newspaper">
-        <text value="N"/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text value="S"/>
-      </else-if>
-      <else-if type="book">
-        <text value="M"/>
-      </else-if>
-      <else-if type="chapter">
-        <text value="M"/>
-      </else-if>
-      <else-if type="dataset">
-        <text value="DS"/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text value="C"/>
-      </else-if>
-      <else-if type="patent">
-        <text value="P"/>
-      </else-if>
-      <else-if type="post-weblog webpage" match="any">
-        <text value="EB"/>
-      </else-if>
-      <else-if type="report">
-        <text value="R"/>
-      </else-if>
-      <else-if type="thesis">
-        <text value="D"/>
-      </else-if>
-      <else>
-        <text value="Z"/>
-      </else>
     </choose>
+    <text macro="accessed-date"/>
+  </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
   </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text variable="page"/>
+      </group>
+      <text macro="accessed-date"/>
+    </group>
+  </macro>
+  <!-- 题名 -->
   <macro name="title">
-    <text variable="title" text-case="title"/>
-    <choose>
-        <if type="bill broadcast legal_case legislation patent report song" match="any">
-          <text variable="number" prefix=": "/>
-        </if>
-    </choose>
-    <group delimiter="/" prefix="[" suffix="]">
-      <text macro="type-code"/>
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="bill legal_case legislation patent regulation report standard" match="any">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </group>
       <choose>
-        <if variable="URL">
-          <text value="OL"/>
+        <if variable="container-title" type="paper-conference" match="none">
+          <choose>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
+            </if>
+          </choose>
         </if>
       </choose>
     </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
   </macro>
-  <citation et-al-min="2" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
-    <sort>
-      <key macro="author-intext"/>
-      <key macro="issue-date-year" sort="ascending"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <text macro="author-intext"/>
-        <text macro="issue-date-year"/>
-        <group>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" line-spacing="1" hanging-indent="true">
-    <sort>
-      <key macro="author-intext"/>
-      <key macro="issue-date-year" sort="ascending"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="author" suffix=", "/>
-      <text macro="issue-date-year" suffix=". "/>
-      <text macro="title"/>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
       <choose>
-        <if type="book bill chapter legislation paper-conference report thesis" match="any">
-          <text macro="editor" prefix=". "/>
+        <if type="article">
           <choose>
-            <if variable="container-title">
-              <text value="//"/>
-              <text macro="container-author" suffix=". "/>
-              <text variable="container-title" suffix=". " text-case="title"/>
+            <if variable="archive">
+              <text value="A"/>
             </if>
             <else>
-              <text value=". "/>
+              <text value="M"/>
             </else>
           </choose>
-          <text macro="edition" suffix=". "/>
-          <text macro="publishing"/>
         </if>
-        <else-if type="article-journal article-magazine article-newspaper" match="any">
-          <group prefix=". ">
-            <choose>
-              <if variable="container-title">
-                <text variable="container-title" text-case="title"/>
-                <text macro="serial-information" prefix=", "/>
-              </if>
-              <else>
-                <text macro="serial-information" suffix=". "/>
-                <text macro="publishing"/>
-              </else>
-            </choose>
-          </group>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="bill collection legal_case legislation regulation" match="any">
+          <text value="A"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DS"/>
+        </else-if>
+        <else-if type="map">
+          <text value="CM"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
         </else-if>
         <else-if type="patent">
-          <text macro="issued-date" prefix=". "/>
+          <text value="P"/>
+        </else-if>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
         </else-if>
         <else>
-          <text macro="publishing" prefix=". "/>
-          <text macro="issued-date" prefix="(" suffix=")"/>
+          <text value="Z"/>
         </else>
       </choose>
-      <text macro="accessed-date"/>
-      <group delimiter=". " prefix=". ">
-        <text variable="URL"/>
-        <text variable="DOI" prefix="DOI:"/>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
+    <group delimiter=". ">
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
+      </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <group delimiter=", ">
+        <text macro="author-intext"/>
+        <text macro="issued-year"/>
       </group>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
+      </if>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
+      </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="2" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name-with-initials" collapse="year">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout prefix="(" suffix=")" delimiter="; " locale="en"><text macro="citation-layout"/></layout> -->
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <text macro="citation-layout"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-year"/>
+      <key variable="title"/>
+    </sort>
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text macro="entry-layout"/></layout> -->
+    <layout>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/china-national-standard-gb-t-7714-2015-note.csl b/china-national-standard-gb-t-7714-2015-note.csl
index f8588580778..7689e73fd1b 100644
--- a/china-national-standard-gb-t-7714-2015-note.csl
+++ b/china-national-standard-gb-t-7714-2015-note.csl
@@ -1,302 +1,471 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" delimiter-precedes-last="always" demote-non-dropping-particle="never" initialize-with=" " name-delimiter=", " names-delimiter=". " name-as-sort-order="all" sort-separator=" " default-locale="zh-CN">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2015 (note, 中文)</title>
-    <title-short>GB/T 7714-2015 (note)</title-short>
     <id>http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-note</id>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-note" rel="self"/>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="template"/>
-    <link href="http://www.std.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
+    <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>牛耕田</name>
       <email>buffalo_d@163.com</email>
     </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="note"/>
     <category field="generic-base"/>
-    <summary>The Chinese GB/T7714-2015 with notes and bibliography</summary>
-    <updated>2020-03-07T05:07:26+00:00</updated>
+    <summary>The Chinese GB/T 7714-2015 with notes and bibliography</summary>
+    <updated>2022-01-20T00:00:00+08: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="zh-CN">
+    <date form="text">
+      <date-part name="year" suffix="年" range-delimiter="&#8212;"/>
+      <date-part name="month" form="numeric" suffix="月" range-delimiter="&#8212;"/>
+      <date-part name="day" suffix="日" range-delimiter="&#8212;"/>
+    </date>
     <terms>
-      <term name="anonymous">佚名</term>
-      <term name="edition">版</term>
-      <term name="page" form="short">
-        <single>p.</single>
-        <multiple>pp.</multiple>
-      </term>
-      <!-- <term name="container-author" form="verb-short">著</term> -->
+      <term name="edition" form="short">版</term>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="open-inner-quote">‘</term>
+      <term name="close-inner-quote">’</term>
+      <term name="page" form="short"/>
     </terms>
   </locale>
-  <macro name="accessed-date">
-    <date variable="accessed" delimiter="&#8211;" prefix="[" suffix="]">
-      <date-part name="year"/>
-      <date-part name="month" form="numeric-leading-zeros"/>
-      <date-part name="day" form="numeric-leading-zeros"/>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
     </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
   </macro>
+  <!-- 主要责任者 -->
   <macro name="author">
+    <names variable="author">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
     <choose>
-      <if variable="author">
-        <names variable="author">
-          <name>
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given"/>
-          </name>
-        </names>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
       </if>
-      <else>
-        <text term="anonymous"/>
-      </else>
     </choose>
   </macro>
+  <!-- 专著主要责任者 -->
   <macro name="container-author">
-    <names variable="container-author reviewed-author">
+    <names variable="editor">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
-      <!-- <label form="verb-short" prefix=", "/> -->
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 版本项 -->
   <macro name="edition">
     <choose>
-      <if variable="edition">
+      <if is-numeric="edition">
         <group delimiter=" ">
-          <text variable="edition"/>
-          <text term="edition"/>
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
+      <else>
+        <text variable="edition"/>
+      </else>
     </choose>
   </macro>
-  <macro name="editor">
-    <names variable="editor translator">
-      <name>
-        <name-part name="family" text-case="uppercase"/>
-        <name-part name="given"/>
-      </name>
-      <label form="verb-short" prefix=", "/>
-    </names>
-  </macro>
+  <!-- 电子资源的更新或修改日期 -->
   <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
+  </macro>
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter="&#8211;">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros"/>
-          <date-part name="day" form="numeric-leading-zeros"/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
         </date>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
   </macro>
-  <macro name="issue-date-year">
+  <!-- 引文页码 -->
+  <macro name="page">
     <choose>
-      <if variable="issued">
-        <date variable="issued" date-parts="year" form="numeric"/>
+      <if variable="locator">
+        <text variable="locator"/>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <text variable="page"/>
       </else>
     </choose>
   </macro>
+  <!-- 专著的出版项 -->
   <macro name="publishing">
-    <choose>
-      <if variable="publisher">
+    <group delimiter=": ">
+      <group delimiter=", ">
         <group delimiter=": ">
           <text variable="publisher-place"/>
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text macro="issue-date-year"/>
-          </group>
+          <text variable="publisher"/>
         </group>
+        <!-- 非电子资源显示“出版年” -->
         <choose>
-          <if variable="locator">
-            <text variable="locator" prefix=": "/>
+          <if variable="publisher page" type="book chapter paper-conference thesis" match="any">
+            <text macro="issued-year"/>
           </if>
-          <else>
-            <text variable="page" prefix=": "/>
-          </else>
+          <else-if variable="URL DOI" match="none">
+            <text macro="issued-year"/>
+          </else-if>
         </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="serial-information">
-    <group delimiter=", ">
-      <text macro="issue-date-year"/>
-      <text variable="volume"/>
+      </group>
+      <text macro="page"/>
     </group>
-    <text variable="issue" prefix="(" suffix=")"/>
-    <text variable="page" prefix=": "/>
-  </macro>
-  <macro name="type-code">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text value="J"/>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
       </if>
-      <else-if type="article-newspaper">
-        <text value="N"/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text value="S"/>
-      </else-if>
-      <else-if type="book">
-        <text value="M"/>
-      </else-if>
-      <else-if type="chapter">
-        <text value="M"/>
-      </else-if>
-      <else-if type="dataset">
-        <text value="DS"/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text value="C"/>
-      </else-if>
-      <else-if type="patent">
-        <text value="P"/>
-      </else-if>
-      <else-if type="post-weblog webpage" match="any">
-        <text value="EB"/>
-      </else-if>
-      <else-if type="report">
-        <text value="R"/>
-      </else-if>
-      <else-if type="thesis">
-        <text value="D"/>
-      </else-if>
-      <else>
-        <text value="Z"/>
-      </else>
     </choose>
+    <text macro="accessed-date"/>
   </macro>
-  <macro name="title">
-    <text variable="title" text-case="title"/>
-    <text variable="number" prefix=": "/>
-    <group delimiter="/" prefix="[" suffix="]">
-      <text macro="type-code"/>
-      <choose>
-        <if variable="URL">
-          <text value="OL"/>
-        </if>
-      </choose>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+              <else>
+                <text macro="issued-year"/>
+              </else>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text macro="page"/>
+      </group>
+      <text macro="accessed-date"/>
     </group>
   </macro>
-  <citation et-al-min="4" et-al-use-first="3" disambiguate-add-names="true">
-    <layout suffix="." delimiter="; ">
+  <!-- 题名 -->
+  <macro name="title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="bill legal_case legislation patent regulation report standard" match="any">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </group>
       <choose>
-        <if position="ibid-with-locator">
-          <text term="ibid"/>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </if>
-        <else-if position="ibid">
-          <text term="ibid"/>
-        </else-if>
-        <else-if position="subsequent">
-          <text variable="first-reference-note-number" prefix="同【" suffix="】"/>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </else-if>
-        <else>
-          <text macro="author" suffix=". "/>
-          <text macro="title"/>
+        <if variable="container-title" type="paper-conference" match="none">
           <choose>
-            <if type="book bill chapter legislation paper-conference report thesis" match="any">
-              <text macro="editor" prefix=". "/>
-              <choose>
-                <if variable="container-title">
-                  <text value="//"/>
-                  <text macro="container-author" suffix=". "/>
-                  <text variable="container-title" suffix=". " text-case="title"/>
-                </if>
-                <else>
-                  <text value=". "/>
-                </else>
-              </choose>
-              <text macro="edition" suffix=". "/>
-              <text macro="publishing"/>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
             </if>
-            <else-if type="article-journal article-magazine article-newspaper" match="any">
-              <group prefix=". ">
-                <choose>
-                  <if variable="container-title">
-                    <text variable="container-title" text-case="title"/>
-                    <text macro="serial-information" prefix=", "/>
-                  </if>
-                  <else>
-                    <text macro="serial-information" suffix=". "/>
-                    <text macro="publishing"/>
-                  </else>
-                </choose>
-              </group>
-            </else-if>
-            <else-if type="patent">
-              <text macro="issued-date" prefix=". "/>
-            </else-if>
-            <else>
-              <text macro="publishing" prefix=". "/>
-              <text macro="issued-date" prefix="(" suffix=")"/>
-            </else>
           </choose>
-          <text macro="accessed-date"/>
-          <group delimiter=". " prefix=". ">
-            <text variable="URL"/>
-            <text variable="DOI" prefix="DOI:"/>
-          </group>
-        </else>
+        </if>
       </choose>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" line-spacing="1" second-field-align="flush">
-    <layout suffix=".">
-      <text variable="citation-number" prefix="[" suffix="]"/>
-      <text macro="author" suffix=". "/>
-      <text macro="title"/>
+    </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
       <choose>
-        <if type="book bill chapter legislation paper-conference report thesis" match="any">
-          <text macro="editor" prefix=". "/>
+        <if type="article">
           <choose>
-            <if variable="container-title">
-              <text value="//"/>
-              <text macro="container-author" suffix=". "/>
-              <text variable="container-title" suffix=". " text-case="title"/>
+            <if variable="archive">
+              <text value="A"/>
             </if>
             <else>
-              <text value=". "/>
+              <text value="M"/>
             </else>
           </choose>
-          <text macro="edition" suffix=". "/>
-          <text macro="publishing"/>
         </if>
-        <else-if type="article-journal article-magazine article-newspaper" match="any">
-          <group prefix=". ">
-            <choose>
-              <if variable="container-title">
-                <text variable="container-title" text-case="title"/>
-                <text macro="serial-information" prefix=", "/>
-              </if>
-              <else>
-                <text macro="serial-information" suffix=". "/>
-                <text macro="publishing"/>
-              </else>
-            </choose>
-          </group>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="bill collection legal_case legislation regulation" match="any">
+          <text value="A"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DS"/>
+        </else-if>
+        <else-if type="map">
+          <text value="CM"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
         </else-if>
         <else-if type="patent">
-          <text macro="issued-date" prefix=". "/>
+          <text value="P"/>
+        </else-if>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
         </else-if>
         <else>
-          <text macro="publishing" prefix=". "/>
-          <text macro="issued-date" prefix="(" suffix=")"/>
+          <text value="Z"/>
         </else>
       </choose>
-      <text macro="accessed-date"/>
-      <group delimiter=". " prefix=". ">
-        <text variable="URL"/>
-        <text variable="DOI" prefix="DOI:"/>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
+    <group delimiter=". ">
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
       </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <choose>
+      <if position="ibid-with-locator">
+        <text term="ibid"/>
+        <label variable="locator" form="short"/>
+        <text variable="locator"/>
+      </if>
+      <else-if position="ibid">
+        <text term="ibid"/>
+      </else-if>
+      <else-if position="subsequent">
+        <!-- 国标要求提供的示例中脚注编号是用圈码，在 CSL 中无法实现 -->
+        <!-- 这里改为用冒号隔开编号和页码 -->
+        <group delimiter=": ">
+          <text variable="first-reference-note-number" prefix="同"/>
+          <group delimiter=" ">
+            <label variable="locator" form="short"/>
+            <text variable="locator"/>
+          </group>
+        </group>
+      </else-if>
+      <else>
+        <text macro="entry-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
+      </if>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
+      </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="3" disambiguate-add-names="true">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout delimiter="; " locale="en"><text macro="citation-layout"/></layout> -->
+    <layout suffix="." delimiter="; ">
+      <text macro="citation-layout"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" second-field-align="flush">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text variable="citation-number" prefix="[" suffix="]"/><text macro="entry-layout"/></layout> -->
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/china-national-standard-gb-t-7714-2015-numeric.csl b/china-national-standard-gb-t-7714-2015-numeric.csl
index 7e9009a7cdd..d6a72def496 100644
--- a/china-national-standard-gb-t-7714-2015-numeric.csl
+++ b/china-national-standard-gb-t-7714-2015-numeric.csl
@@ -1,242 +1,435 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="zh-CN" delimiter-precedes-last="always" demote-non-dropping-particle="never" initialize-with=" " name-delimiter=", " names-delimiter=". " name-as-sort-order="all" sort-separator=" ">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2015 (numeric, 中文)</title>
-    <title-short>GB/T 7714-2015</title-short>
     <id>http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric</id>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="self"/>
-    <link href="http://www.std.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
+    <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>牛耕田</name>
       <email>buffalo_d@163.com</email>
     </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="generic-base"/>
-    <summary>The Chinese GB/T7714-2015 numeric style</summary>
-    <updated>2021-11-25T18:00:00+08:00</updated>
+    <summary>The Chinese GB/T 7714-2015 numeric style</summary>
+    <updated>2022-01-20T00:00:00+08: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="zh-CN">
+    <date form="text">
+      <date-part name="year" suffix="年" range-delimiter="&#8212;"/>
+      <date-part name="month" form="numeric" suffix="月" range-delimiter="&#8212;"/>
+      <date-part name="day" suffix="日" range-delimiter="&#8212;"/>
+    </date>
     <terms>
-      <term name="anonymous">佚名</term>
-      <term name="edition">版</term>
-      <term name="page" form="short">
-        <single>p.</single>
-        <multiple>pp.</multiple>
-      </term>
+      <term name="edition" form="short">版</term>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="open-inner-quote">‘</term>
+      <term name="close-inner-quote">’</term>
     </terms>
   </locale>
-  <macro name="accessed-date">
-    <date variable="accessed" delimiter="&#8211;" prefix="[" suffix="]">
-      <date-part name="year"/>
-      <date-part name="month" form="numeric-leading-zeros"/>
-      <date-part name="day" form="numeric-leading-zeros"/>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
     </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
   </macro>
+  <!-- 主要责任者 -->
   <macro name="author">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name>
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given"/>
-          </name>
-        </names>
-      </if>
-      <else>
-        <text term="anonymous"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="container-author">
-    <names variable="container-author">
+    <names variable="author">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+      </substitute>
     </names>
   </macro>
-  <macro name="edition">
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
     <choose>
-      <if variable="edition">
-        <group delimiter=" ">
-          <text variable="edition"/>
-          <text term="edition"/>
-        </group>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
-  <macro name="editor">
-    <names variable="editor translator">
+  <!-- 专著主要责任者 -->
+  <macro name="container-author">
+    <names variable="editor">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
-      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="issued-date">
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 版本项 -->
+  <macro name="edition">
     <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter="&#8211;">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros"/>
-          <date-part name="day" form="numeric-leading-zeros"/>
-        </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="issue-date-year">
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
+  </macro>
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if variable="issued">
-        <date variable="issued" date-parts="year" form="numeric"/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
   </macro>
+  <!-- 专著的出版项 -->
   <macro name="publishing">
-    <choose>
-      <if variable="publisher">
+    <group delimiter=": ">
+      <group delimiter=", ">
         <group delimiter=": ">
           <text variable="publisher-place"/>
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text macro="issue-date-year"/>
-          </group>
+          <text variable="publisher"/>
         </group>
-        <text variable="page" prefix=": "/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="serial-information">
-    <group delimiter=", ">
-      <text macro="issue-date-year"/>
-      <text variable="volume"/>
+        <!-- 非电子资源显示“出版年” -->
+        <choose>
+          <if variable="publisher page" type="book chapter paper-conference thesis" match="any">
+            <text macro="issued-year"/>
+          </if>
+          <else-if variable="URL DOI" match="none">
+            <text macro="issued-year"/>
+          </else-if>
+        </choose>
+      </group>
+      <text variable="page"/>
     </group>
-    <text variable="issue" prefix="(" suffix=")"/>
-    <text variable="page" prefix=": "/>
-  </macro>
-  <macro name="type-code">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text value="J"/>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
       </if>
-      <else-if type="article-newspaper">
-        <text value="N"/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text value="S"/>
-      </else-if>
-      <else-if type="book">
-        <text value="M"/>
-      </else-if>
-      <else-if type="chapter">
-        <text value="M"/>
-      </else-if>
-      <else-if type="dataset">
-        <text value="DS"/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text value="C"/>
-      </else-if>
-      <else-if type="patent">
-        <text value="P"/>
-      </else-if>
-      <else-if type="post-weblog webpage" match="any">
-        <text value="EB"/>
-      </else-if>
-      <else-if type="report">
-        <text value="R"/>
-      </else-if>
-      <else-if type="thesis">
-        <text value="D"/>
-      </else-if>
-      <else>
-        <text value="Z"/>
-      </else>
     </choose>
+    <text macro="accessed-date"/>
   </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+              <else>
+                <text macro="issued-year"/>
+              </else>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text variable="page"/>
+      </group>
+      <text macro="accessed-date"/>
+    </group>
+  </macro>
+  <!-- 题名 -->
   <macro name="title">
-    <text variable="title" text-case="title"/>
-    <choose>
-        <if type="bill broadcast legal_case legislation patent report song" match="any">
-          <text variable="number" prefix=": "/>
-        </if>
-    </choose>
-    <group delimiter="/" prefix="[" suffix="]">
-      <text macro="type-code"/>
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="bill legal_case legislation patent regulation report standard" match="any">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </group>
       <choose>
-        <if variable="URL">
-          <text value="OL"/>
+        <if variable="container-title" type="paper-conference" match="none">
+          <choose>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
+            </if>
+          </choose>
         </if>
       </choose>
     </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
   </macro>
-  <citation collapse="citation-number" after-collapse-delimiter=",">
-    <sort>
-      <key variable="citation-number" sort="ascending"/>
-    </sort>
-    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
-      <text variable="citation-number"/>
-      <group prefix="(" suffix=")">
-        <label variable="locator" suffix=". " form="short" strip-periods="true"/>
-        <text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" line-spacing="1" second-field-align="flush">
-    <layout suffix=".">
-      <text variable="citation-number" prefix="[" suffix="]"/>
-      <text macro="author" suffix=". "/>
-      <text macro="title"/>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
       <choose>
-        <if type="book bill chapter legislation paper-conference report thesis" match="any">
-          <text macro="editor" prefix=". "/>
+        <if type="article">
           <choose>
-            <if variable="container-title">
-              <text value="//"/>
-              <text macro="container-author" suffix=". "/>
-              <text variable="container-title" suffix=". " text-case="title"/>
+            <if variable="archive">
+              <text value="A"/>
             </if>
             <else>
-              <text value=". "/>
+              <text value="M"/>
             </else>
           </choose>
-          <text macro="edition" suffix=". "/>
-          <text macro="publishing"/>
         </if>
-        <else-if type="article-journal article-magazine article-newspaper" match="any">
-          <group prefix=". ">
-            <choose>
-              <if variable="container-title">
-                <text variable="container-title" text-case="title"/>
-                <text macro="serial-information" prefix=", "/>
-              </if>
-              <else>
-                <text macro="serial-information" suffix=". "/>
-                <text macro="publishing"/>
-              </else>
-            </choose>
-          </group>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="bill collection legal_case legislation regulation" match="any">
+          <text value="A"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DS"/>
+        </else-if>
+        <else-if type="map">
+          <text value="CM"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
         </else-if>
         <else-if type="patent">
-          <text macro="issued-date" prefix=". "/>
+          <text value="P"/>
+        </else-if>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
         </else-if>
         <else>
-          <text macro="publishing" prefix=". "/>
-          <text macro="issued-date" prefix="(" suffix=")"/>
+          <text value="Z"/>
         </else>
       </choose>
-      <text macro="accessed-date"/>
-      <group delimiter=". " prefix=". ">
-        <text variable="URL"/>
-        <text variable="DOI" prefix="DOI:"/>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
+    <group delimiter=". ">
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
       </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <text variable="citation-number"/>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
+      </if>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
+      </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number" after-collapse-delimiter=",">
+    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
+      <text macro="citation-layout"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" second-field-align="flush">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text variable="citation-number" prefix="[" suffix="]"/><text macro="entry-layout"/></layout> -->
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/chinese-gb7714-2005-author-date.csl b/chinese-gb7714-2005-author-date.csl
index cad4f12f213..34706cf034e 100644
--- a/chinese-gb7714-2005-author-date.csl
+++ b/chinese-gb7714-2005-author-date.csl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="zh-CN">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2005 (author-date, 中文)</title>
     <id>http://www.zotero.org/styles/chinese-gb7714-2005-author-date</id>
     <link href="http://www.zotero.org/styles/chinese-gb7714-2005-author-date" rel="self"/>
-    <link href="http://www.zotero.org/styles/chinese-gb7714-2005-numeric" rel="template"/>
-    <link href="http://gradschool.ustc.edu.cn/ylb/material/xw/wdxz/19.pdf" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-author-date" rel="template"/>
+    <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D78562D3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>heromyth</name>
       <email>zxpmyth@yahoo.com.cn</email>
@@ -14,203 +14,471 @@
       <name>Kristene Collins</name>
       <uri>http://www.mendeley.com/profiles/kristene-collins1/</uri>
     </contributor>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>This style just partly implemented what the Chinese GB/T 7714-2005 requires.</summary>
-    <updated>2014-02-27T02:27:29+00:00</updated>
+    <summary>The Chinese GB/T 7714-2005 author-date style</summary>
+    <updated>2022-01-20T00:00:00+08: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="zh-CN">
+    <date form="text">
+      <date-part name="year" suffix="年" range-delimiter="&#8212;"/>
+      <date-part name="month" form="numeric" suffix="月" range-delimiter="&#8212;"/>
+      <date-part name="day" suffix="日" range-delimiter="&#8212;"/>
+    </date>
+    <terms>
+      <term name="anonymous" form="short">佚名</term>
+      <term name="edition" form="short">版</term>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="open-inner-quote">‘</term>
+      <term name="close-inner-quote">’</term>
+    </terms>
+  </locale>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+    </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+  </macro>
+  <!-- 主要责任者 -->
   <macro name="author">
-    <names variable="author" suffix="，">
-      <name initialize-with=" " name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
+    <names variable="author">
+      <name>
         <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
       </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+        <text macro="anon"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="recipient">
-    <names variable="recipient">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
+  <!-- 参考文献表的著者姓名与出版年 -->
+  <macro name="author-date">
+    <group delimiter=". ">
+      <text macro="author"/>
+      <text macro="issued-year"/>
+    </group>
   </macro>
-  <macro name="interviewer">
-    <names variable="interviewer">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
+  <!-- 正文引用的著者姓名 -->
+  <macro name="author-intext">
+    <names variable="author">
+      <!-- 国标 10.2.2 节要求姓氏与“et al.”“等”之间留适当空隙 -->
+      <name form="short" delimiter="&#160;" delimiter-precedes-et-al="always">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+        <text macro="anon"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="composer">
-    <names variable="composer">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
   </macro>
-  <macro name="original-author">
-    <names variable="original-author">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
+  <!-- 专著主要责任者 -->
+  <macro name="container-author">
+    <names variable="editor">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="title">
-    <text variable="title"/>
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
   </macro>
-  <macro name="titleField">
+  <!-- 版本项 -->
+  <macro name="edition">
     <choose>
-      <if type="report">
-        <text macro="title" suffix="[R]. "/>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
-      <else-if type="thesis">
-        <text macro="title" suffix="[D]. "/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text variable="number" suffix=", "/>
-        <text macro="title" suffix="[S]"/>
-      </else-if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text macro="title" suffix="[M]. "/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text macro="title" suffix="[C]//"/>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <text macro="title" suffix="[G]//"/>
-      </else-if>
-      <else-if type="webpage">
-        <text macro="title" suffix="[EB/OL]. "/>
-      </else-if>
-      <else-if type="patent">
-        <text macro="title"/>
-        <text variable="number" prefix=": 中国, " suffix="[P].  "/>
-      </else-if>
       <else>
-        <text macro="title" suffix="[J]. "/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="secondaryAuthor">
-    <names variable="editor">
-      <name initialize-with=" " name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
-        <name-part name="family" text-case="uppercase"/>
-      </name>
-    </names>
-    <names variable="translator">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always" suffix=", 译"/>
-    </names>
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
   </macro>
-  <macro name="publisher">
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if type="chapter paper-conference" match="any">
-        <text variable="container-title" suffix=". "/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
-      <else-if type="report">
-        <text variable="collection-title" suffix=", "/>
-        <text variable="number" suffix=", "/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text variable="container-title" prefix=". "/>
-      </else-if>
       <else>
-        <text variable="container-title" suffix=", "/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
-    <text variable="publisher-place" suffix=": "/>
+  </macro>
+  <!-- 专著的出版项 -->
+  <macro name="publishing">
+    <group delimiter=": ">
+      <group delimiter=", ">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </group>
+      <text variable="page"/>
+    </group>
+    <choose>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+    <text macro="accessed-date"/>
+  </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text variable="page"/>
+      </group>
+      <text macro="accessed-date"/>
+    </group>
+  </macro>
+  <!-- 题名 -->
+  <macro name="title">
     <group delimiter=", ">
-      <text variable="publisher"/>
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="patent">
+              <group delimiter=", ">
+                <choose>
+                  <!-- 专利的国别应使用 `jurisdiction`，但 Zotero 没有对应的域，所以 `publisher-place` 作为备选 -->
+                  <if variable="jurisdiction">
+                    <text variable="jurisdiction"/>
+                  </if>
+                  <else>
+                    <text variable="publisher-place"/>
+                  </else>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </if>
+            <else-if type="bill legal_case legislation regulation report standard" match="any">
+              <text variable="number"/>
+            </else-if>
+          </choose>
+        </group>
+      </group>
+      <choose>
+        <if variable="container-title" type="paper-conference" match="none">
+          <choose>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
       <choose>
-        <if type="webpage" variable="container-title" match="all">
-          <date variable="issued" suffix=". ">
-            <date-part name="year"/>
-            <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-            <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-          </date>
+        <if type="article">
+          <choose>
+            <if variable="archive">
+              <text value="A"/>
+            </if>
+            <else>
+              <text value="M"/>
+            </else>
+          </choose>
         </if>
-        <else-if type="webpage"/>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DB"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
+        </else-if>
         <else-if type="patent">
-          <date variable="issued">
-            <date-part name="year"/>
-            <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-            <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-          </date>
+          <text value="P"/>
+        </else-if>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
         </else-if>
-        <else-if variable="publisher">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+        <else-if variable="URL">
+          <text value="EB"/>
         </else-if>
-        <else-if type="bill legislation" match="any"/>
         <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text value="M"/>
         </else>
       </choose>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
     </group>
-    <text variable="volume" prefix=", "/>
-    <text variable="issue" prefix="(" suffix=")"/>
-  </macro>
-  <macro name="pageField">
-    <text variable="page"/>
   </macro>
-  <macro name="referenceDate">
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
     <choose>
-      <if type="webpage">
-        <date variable="issued" prefix="(" suffix=")">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-          <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-        </date>
-        <date variable="accessed" prefix="[" suffix="]">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-          <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-        </date>
+      <if variable="URL">
+        <text variable="URL"/>
       </if>
+      <else>
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else>
     </choose>
   </macro>
-  <macro name="access">
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
+      </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <group delimiter=", ">
+        <text macro="author-intext"/>
+        <text macro="issued-year"/>
+      </group>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
     <choose>
-      <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
       </if>
-      <else-if variable="URL">
-        <text variable="URL"/>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
       </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
     </choose>
   </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-label"/>
-    </sort>
-    <layout vertical-align="baseline" delimiter="；" prefix="（" suffix="）">
-      <choose>
-        <if match="all" variable="author">
-          <text macro="author"/>
-        </if>
-        <else-if match="all" variable="title">
-          <text macro="title" suffix="，"/>
-        </else-if>
-      </choose>
-      <date date-parts="year" form="numeric" variable="issued"/>
+  <citation et-al-min="2" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name-with-initials" collapse="year">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout prefix="(" suffix=")" delimiter="; " locale="en"><text macro="citation-layout"/></layout> -->
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <text macro="citation-layout"/>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
-    <layout suffix=".">
-      <text macro="author" suffix=". "/>
-      <text macro="titleField"/>
-      <text macro="secondaryAuthor" suffix=". "/>
-      <text variable="edition" prefix="第" suffix="版. "/>
-      <text macro="publisher"/>
-      <text macro="pageField" prefix=": "/>
-      <text macro="referenceDate"/>
-      <choose>
-        <if type="webpage" match="any">
-          <text macro="access" prefix=". "/>
-        </if>
-      </choose>
-      <text macro="recipient"/>
-      <text macro="interviewer"/>
-      <text macro="composer"/>
-      <text macro="original-author"/>
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-year"/>
+      <key variable="title"/>
+    </sort>
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text macro="entry-layout"/></layout> -->
+    <layout>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/chinese-gb7714-2005-numeric.csl b/chinese-gb7714-2005-numeric.csl
index 77d2368717a..eb9642d426b 100644
--- a/chinese-gb7714-2005-numeric.csl
+++ b/chinese-gb7714-2005-numeric.csl
@@ -1,215 +1,451 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="zh-CN">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2005 (numeric, 中文)</title>
     <id>http://www.zotero.org/styles/chinese-gb7714-2005-numeric</id>
     <link href="http://www.zotero.org/styles/chinese-gb7714-2005-numeric" rel="self"/>
+    <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="template"/>
     <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D78562D3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>heromyth</name>
       <email>zxpmyth@yahoo.com.cn</email>
     </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="numeric"/>
-    <category field="engineering"/>
     <category field="generic-base"/>
-    <category field="science"/>
-    <summary>This style just partly implemented what the Chinese GB/T 7714-2005 requires.</summary>
-    <updated>2021-11-21T09:38:41+00:00</updated>
+    <summary>The Chinese GB/T 7714-2005 numeric style</summary>
+    <updated>2022-01-20T00:00:00+08: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="zh-CN">
+    <date form="text">
+      <date-part name="year" suffix="年" range-delimiter="&#8212;"/>
+      <date-part name="month" form="numeric" suffix="月" range-delimiter="&#8212;"/>
+      <date-part name="day" suffix="日" range-delimiter="&#8212;"/>
+    </date>
+    <terms>
+      <term name="edition" form="short">版</term>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="open-inner-quote">‘</term>
+      <term name="close-inner-quote">’</term>
+    </terms>
+  </locale>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+    </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 主要责任者 -->
   <macro name="author">
     <names variable="author">
-      <name initialize-with=" " name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
+      <name>
         <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
       </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+      </substitute>
     </names>
   </macro>
-  <macro name="recipient">
-    <names variable="recipient">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
-  </macro>
-  <macro name="interviewer">
-    <names variable="interviewer">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
-  </macro>
-  <macro name="composer">
-    <names variable="composer">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
   </macro>
-  <macro name="original-author">
-    <names variable="original-author">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
+  <!-- 专著主要责任者 -->
+  <macro name="container-author">
+    <names variable="editor">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="title">
-    <text variable="title"/>
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
   </macro>
-  <macro name="titleField">
+  <!-- 版本项 -->
+  <macro name="edition">
     <choose>
-      <if type="report">
-        <text macro="title" suffix="[R]. "/>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
-      <else-if type="thesis">
-        <text macro="title" suffix="[D]. "/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text variable="number" suffix=", "/>
-        <text macro="title" suffix="[S]"/>
-      </else-if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text macro="title" suffix="[M]. "/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text macro="title" suffix="[C]//"/>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <text macro="title" suffix="[G]//"/>
-      </else-if>
-      <else-if type="webpage">
-        <text macro="title" suffix="[EB/OL]. "/>
-      </else-if>
-      <else-if type="patent">
-        <text macro="title"/>
-        <text variable="number" prefix=": 中国, " suffix="[P].  "/>
-      </else-if>
       <else>
-        <text macro="title" suffix="[J]. "/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="secondaryAuthor">
-    <names variable="editor">
-      <name initialize-with=" " name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
-        <name-part name="family" text-case="uppercase"/>
-      </name>
-    </names>
-    <names variable="translator">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always" suffix=", 译"/>
-    </names>
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
   </macro>
-  <macro name="publisher">
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if type="chapter paper-conference" match="any">
-        <text variable="container-title" suffix=". "/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
-      <else-if type="report">
-        <text variable="collection-title" suffix=", "/>
-        <text variable="number" suffix=", "/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text variable="container-title" prefix=". "/>
-      </else-if>
       <else>
-        <text variable="container-title" suffix=", "/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
-    <!--
-
-<text variable="event" suffix="event "/>
-<text variable="event-place" suffix="event-place "/>
-<text variable="original-title" suffix="original-title"/>
-
- -->
-    <text variable="publisher-place" suffix=": "/>
-    <group delimiter=", ">
-       <choose>
-          <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-            <text variable="publisher"/>
+  </macro>
+  <!-- 专著的出版项 -->
+  <macro name="publishing">
+    <group delimiter=": ">
+      <group delimiter=", ">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+        <!-- 非电子资源显示“出版年” -->
+        <choose>
+          <if variable="publisher page" type="book chapter paper-conference thesis" match="any">
+            <text macro="issued-year"/>
+          </if>
+          <else-if variable="URL DOI" match="none">
+            <text macro="issued-year"/>
+          </else-if>
+        </choose>
+      </group>
+      <text variable="page"/>
+    </group>
+    <choose>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
           </if>
-        <else-if type="webpage" variable="container-title" match="all">
-          <date variable="issued" suffix=". ">
-            <date-part name="year"/>
-            <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-            <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-          </date>
+        </choose>
+      </if>
+    </choose>
+    <text macro="accessed-date"/>
+  </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+              <else>
+                <text macro="issued-year"/>
+              </else>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text variable="page"/>
+      </group>
+      <text macro="accessed-date"/>
+    </group>
+  </macro>
+  <!-- 题名 -->
+  <macro name="title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="patent">
+              <group delimiter=", ">
+                <choose>
+                  <!-- 专利的国别应使用 `jurisdiction`，但 Zotero 没有对应的域，所以 `publisher-place` 作为备选 -->
+                  <if variable="jurisdiction">
+                    <text variable="jurisdiction"/>
+                  </if>
+                  <else>
+                    <text variable="publisher-place"/>
+                  </else>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </if>
+            <else-if type="bill legal_case legislation regulation report standard" match="any">
+              <text variable="number"/>
+            </else-if>
+          </choose>
+        </group>
+      </group>
+      <choose>
+        <if variable="container-title" type="paper-conference" match="none">
+          <choose>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
+      <choose>
+        <if type="article">
+          <choose>
+            <if variable="archive">
+              <text value="A"/>
+            </if>
+            <else>
+              <text value="M"/>
+            </else>
+          </choose>
+        </if>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DB"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
         </else-if>
-        <else-if type="webpage"/>
         <else-if type="patent">
-          <date variable="issued">
-            <date-part name="year"/>
-            <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-            <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-          </date>
+          <text value="P"/>
         </else-if>
-        <else-if variable="publisher">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
+        </else-if>
+        <else-if variable="URL">
+          <text value="EB"/>
         </else-if>
-        <else-if type="bill legislation" match="any"/>
         <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text value="M"/>
         </else>
       </choose>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
     </group>
-    <text variable="volume" prefix=", "/>
-    <text variable="issue" prefix="(" suffix=")"/>
-  </macro>
-  <macro name="pageField">
-    <text variable="page"/>
   </macro>
-  <macro name="referenceDate">
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
     <choose>
-      <if type="webpage">
-        <date variable="issued" prefix="(" suffix=")">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-          <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-        </date>
-        <date variable="accessed" prefix="[" suffix="]">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-          <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-        </date>
+      <if variable="URL">
+        <text variable="URL"/>
       </if>
+      <else>
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else>
     </choose>
   </macro>
-  <macro name="access">
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
+      </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <text variable="citation-number"/>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
     <choose>
-      <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
       </if>
-      <else-if variable="URL">
-        <text variable="URL"/>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
       </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
     </choose>
   </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number" sort="ascending"/>
-    </sort>
-    <layout vertical-align="sup" prefix="[" suffix="]" delimiter=",">
-      <text variable="citation-number"/>
+  <citation collapse="citation-number" after-collapse-delimiter=",">
+    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
+      <text macro="citation-layout"/>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
-    <layout suffix=".">
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" second-field-align="flush">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text variable="citation-number" prefix="[" suffix="]"/><text macro="entry-layout"/></layout> -->
+    <layout>
       <text variable="citation-number" prefix="[" suffix="]"/>
-      <text macro="author" suffix=". "/>
-      <text macro="titleField"/>
-      <text macro="secondaryAuthor" suffix=". "/>
-      <text variable="edition" prefix="第" suffix="版. "/>
-      <text macro="publisher"/>
-      <text macro="pageField" prefix=": "/>
-      <text macro="referenceDate"/>
-      <choose>
-        <if type="webpage" match="any">
-          <text macro="access" prefix=". "/>
-        </if>
-      </choose>
-      <text macro="recipient"/>
-      <text macro="interviewer"/>
-      <text macro="composer"/>
-      <text macro="original-author"/>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/dependent/organization-studies.csl b/dependent/organization-studies.csl
deleted file mode 100644
index dc8ee18f8e1..00000000000
--- a/dependent/organization-studies.csl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <info>
-    <title>Organization Studies</title>
-    <id>http://www.zotero.org/styles/organization-studies</id>
-    <link href="http://www.zotero.org/styles/organization-studies" rel="self"/>
-    <link href="http://www.zotero.org/styles/apa-no-initials" rel="independent-parent"/>
-    <link href="https://journals.sagepub.com/author-instructions/OSS" rel="documentation"/>
-    <link href="https://journals.sagepub.com/pb-assets/cmscontent/OSS/OS%20Style%20and%20Reference%20Guide_October%202021-1632991647.pdf" rel="documentation"/>
-    <category citation-format="author-date"/>
-    <category field="social_science"/>
-    <issn>0170-8406</issn>
-    <eissn>1741-3044</eissn>
-    <updated>2021-12-13T09:00:13+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>
-</style>
diff --git a/digital-humanities-im-deutschsprachigen-raum.csl b/digital-humanities-im-deutschsprachigen-raum.csl
new file mode 100644
index 00000000000..a3b11d51aa6
--- /dev/null
+++ b/digital-humanities-im-deutschsprachigen-raum.csl
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="de-DE">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Digital Humanities im deutschsprachigen Raum (Deutsch)</title>
+    <title-short>DHd (Deutsch)</title-short>
+    <id>http://www.zotero.org/styles/digital-humanities-im-deutschsprachigen-raum</id>
+    <link href="http://www.zotero.org/styles/digital-humanities-im-deutschsprachigen-raum" rel="self"/>
+    <link href="http://www.zotero.org/styles/deutsche-sprache" rel="template"/>
+    <link xml:lang="de" href="https://www.dhd2022.de/wp-content/uploads/2021/07/Zitationsguidelines.pdf" rel="documentation"/>
+    <author>
+      <name>Simon Meier-Vieracker</name>
+      <uri>https://tu-dresden.de/gsw/slk/germanistik/al</uri>
+      <email>simon.meier-vieracker@tu-dresden.de</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="humanities"/>
+    <summary>Zitierstil entsprechend den Vorgaben der Guidelines Digital Humanities im deutschsprachigen Raum</summary>
+    <updated>2022-02-22T13:40:08+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="de">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="creator-year-long">
+    <group delimiter=" ">
+      <names variable="author" font-weight="normal">
+        <name font-weight="bold" delimiter=" / " name-as-sort-order="all"/>
+        <label form="short" prefix=" (" suffix=")"/>
+        <substitute>
+          <names variable="editor"/>
+          <text term="anonymous" form="short"/>
+        </substitute>
+      </names>
+      <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="editor-container-title">
+    <group delimiter=" " suffix=".">
+      <text term="in" suffix=": "/>
+      <group delimiter=" ">
+        <names variable="editor" suffix=":">
+          <name delimiter=" / " name-as-sort-order="all"/>
+          <label form="short" prefix=" (" suffix=")"/>
+        </names>
+        <text variable="container-title" font-style="italic"/>
+        <text macro="collection-title-number"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="publication-place-publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="creator-year-short">
+    <group delimiter=" ">
+      <text macro="creator-short"/>
+      <date date-parts="year" form="text" variable="issued"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if match="any" is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="collection-title-number">
+    <group delimiter=" " prefix="(= " suffix=")">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="page-range">
+    <group delimiter=" " suffix=".">
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="online-url">
+    <group delimiter=" ">
+      <text variable="URL"/>
+      <date form="text" variable="accessed" prefix="[letzter Zugriff " suffix="]"/>
+    </group>
+  </macro>
+  <macro name="container-title-volume">
+    <group delimiter=" " suffix=":">
+      <text variable="container-title" font-style="italic"/>
+      <text variable="volume"/>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="creator-short">
+    <names variable="author">
+      <name form="short" delimiter=" / "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix">
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=": ">
+        <text macro="creator-year-short"/>
+        <group delimiter=" ">
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="9" et-al-use-first="1" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="creator-short"/>
+      <key macro="creator-year-short"/>
+    </sort>
+    <layout>
+      <group delimiter=" " suffix=".">
+        <group delimiter=" ">
+          <text macro="creator-year-long" suffix=":"/>
+        </group>
+        <choose>
+          <if type="book" match="any">
+            <group delimiter=" ">
+              <text variable="title" font-style="italic" suffix="."/>
+              <text macro="collection-title-number"/>
+              <text macro="edition"/>
+              <text macro="publication-place-publisher"/>
+            </group>
+          </if>
+          <else-if type="article-journal article-magazine article-newspaper" match="any">
+            <text variable="title" prefix="&quot;" suffix="&quot;, "/>
+            <group delimiter=" ">
+              <group delimiter=": ">
+                <text term="in"/>
+                <text macro="container-title-volume"/>
+              </group>
+              <text macro="page-range"/>
+              <text variable="DOI" strip-periods="false"/>
+            </group>
+          </else-if>
+          <else-if type="chapter" match="any">
+            <group delimiter=" ">
+              <text variable="title" prefix="&quot;" suffix="&quot;"/>
+              <text macro="editor-container-title"/>
+              <text macro="edition"/>
+              <text macro="publication-place-publisher"/>
+              <text macro="page-range"/>
+              <text variable="DOI"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text variable="title" font-style="italic"/>
+              <choose>
+                <if match="any" variable="container-title">
+                  <text macro="editor-container-title"/>
+                </if>
+              </choose>
+              <text macro="publication-place-publisher"/>
+              <text macro="page-range"/>
+              <text macro="collection-title-number"/>
+              <text macro="online-url"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/hemijska-industrija.csl b/hemijska-industrija.csl
new file mode 100644
index 00000000000..6987ceb3682
--- /dev/null
+++ b/hemijska-industrija.csl
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Hemijska industrija</title>
+    <title-short>HemInd</title-short>
+    <id>http://www.zotero.org/styles/hemijska-industrija</id>
+    <link href="http://www.zotero.org/styles/hemijska-industrija" rel="self"/>
+    <link href="https://www.ache-pub.org.rs/index.php/HemInd/Instructions" rel="documentation"/>
+    <author>
+      <name>Aleksandar Dekanski</name>
+      <email>aleksandar@dekanski.com</email>
+      <uri>www.dekanski.com</uri>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="chemistry"/>
+    <issn>0367-598X</issn>
+    <eissn>2217-7426</eissn>
+    <updated>2022-02-02T10:05:37+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=", " suffix="."/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher-place" suffix=": " text-case="title"/>
+    <text variable="publisher" suffix="; "/>
+    <text macro="year-date"/>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <choose>
+          <if variable="URL">
+            <text variable="URL"/>
+            <group prefix=" (" suffix=")" delimiter=" ">
+              <text term="accessed"/>
+              <date variable="accessed" form="text"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+      <key variable="author"/>
+    </sort>
+    <layout delimiter=",">
+      <text variable="citation-number" prefix="[" suffix="]"/>
+    </layout>
+  </citation>
+  <bibliography second-field-align="flush" entry-spacing="0">
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" suffix=". "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=". ">
+            <text variable="title"/>
+            <text variable="volume" prefix="vol. "/>
+            <text macro="edition"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group>
+            <group>
+              <text variable="title" suffix=". "/>
+              <group>
+                <text term="in" text-case="sentence" suffix=": "/>
+                <text macro="editor" suffix=". "/>
+              </group>
+              <group delimiter=", " suffix=". ">
+                <text variable="container-title" form="short"/>
+                <text variable="volume" prefix="vol. "/>
+              </group>
+              <text macro="edition"/>
+            </group>
+            <text macro="publisher" suffix=";"/>
+            <text variable="page"/>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <text variable="number"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=". ">
+            <text variable="title"/>
+            <text variable="genre"/>
+            <group delimiter=", ">
+              <text variable="publisher"/>
+              <text macro="year-date"/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=":">
+            <group delimiter=" ">
+              <group delimiter=". ">
+                <text variable="title"/>
+                <text variable="container-title" form="short" text-case="title" strip-periods="true" font-style="italic"/>
+              </group>
+              <group delimiter=";">
+                <text macro="year-date"/>
+                <group>
+                  <text variable="volume"/>
+                  <text variable="issue" prefix="(" suffix=")"/>
+                </group>
+              </group>
+            </group>
+            <text variable="page" form="short"/>
+          </group>
+        </else>
+      </choose>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/hospital-a-domicilio.csl b/hospital-a-domicilio.csl
new file mode 100644
index 00000000000..98ccd48df1a
--- /dev/null
+++ b/hospital-a-domicilio.csl
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only">
+  <!-- Polyglot; journal publishes in English, and Spanish -->
+  <info>
+    <title>Hospital a Domicilio</title>
+    <title-short>HAD</title-short>
+    <id>http://www.zotero.org/styles/hospital-a-domicilio</id>
+    <link href="http://www.zotero.org/styles/hospital-a-domicilio" rel="self"/>
+    <link href="http://www.zotero.org/styles/bibliotheque-universitaire-de-medecine-vancouver" rel="template"/>
+    <link href="https://www.revistahad.eu/index.php/revistahad/about/submissions" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2530-5115</issn>
+    <updated>2022-02-23T16:10:00+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="es">
+    <terms>
+      <term name="accessed">consultado</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <choose>
+          <if type="chapter" match="none">
+            <names variable="editor collection-editor">
+              <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=", "/>
+            </names>
+          </if>
+        </choose>
+      </substitute>
+    </names>
+    <choose>
+      <if type="patent">
+        <text term="original-author" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor collection-editor" suffix=".">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <names variable="container-author" suffix=".">
+          <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+          <label form="long" prefix=", "/>
+        </names>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="entry-encyclopedia" match="all"/>
+      <else-if type="chapter" match="all">
+        <choose>
+          <if match="none" variable="issued">
+            <group delimiter=": " suffix=".">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </if>
+          <else-if match="all" variable="issued">
+            <group delimiter=": " suffix=";">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if match="none" variable="issued">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else-if>
+      <else-if match="all" variable="issued">
+        <group delimiter=": " suffix=";">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal" match="all" variable="DOI">
+        <text variable="DOI" prefix="DOI: "/>
+      </if>
+      <else-if type="article-journal" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="book" match="all" variable="DOI">
+        <text variable="DOI" prefix="DOI: "/>
+      </else-if>
+      <else-if type="book" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="chapter" match="all" variable="DOI">
+        <text variable="DOI" prefix="DOI: "/>
+      </else-if>
+      <else-if type="chapter" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="entry-encyclopedia" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="article-newspaper" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="report" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="motion_picture" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="song" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="thesis" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if match="any" variable="DOI" type="entry-encyclopedia"/>
+      <else-if match="any" variable="URL">
+        <group prefix="[" suffix="]">
+          <text term="cited" suffix=" "/>
+          <date form="text" variable="accessed"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal article-magazine paper-conference article-newspaper review review-book entry-dictionary entry-encyclopedia" match="any">
+        <group suffix=".">
+          <choose>
+            <if type="article-journal review review-book" match="any">
+              <text variable="container-title" form="short" strip-periods="true"/>
+            </if>
+            <else>
+              <text variable="container-title" strip-periods="true"/>
+            </else>
+          </choose>
+          <text macro="edition" prefix=". "/>
+          <choose>
+            <if match="all" variable="DOI"/>
+            <else-if match="any" variable="URL">
+              <text term="internet" text-case="capitalize-first" prefix=" [" suffix="]."/>
+              <choose>
+                <if type="entry-encyclopedia" match="all">
+                  <group delimiter=" : " prefix=" " suffix=".">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                  <date form="text" variable="issued" prefix=" "/>
+                  <text term="cited" prefix=" ["/>
+                  <date form="text" variable="accessed" prefix=" " suffix="]."/>
+                </if>
+              </choose>
+            </else-if>
+          </choose>
+        </group>
+      </if>
+      <else-if type="chapter" match="all">
+        <text variable="container-title" suffix=". "/>
+        <choose>
+          <if match="all" variable="DOI">
+            <choose>
+              <if match="none" variable="edition"/>
+              <else>
+                <number variable="edition" form="ordinal"/>
+                <text term="edition" form="short" suffix="."/>
+              </else>
+            </choose>
+          </if>
+          <else-if match="all" variable="URL">
+            <choose>
+              <if match="none" variable="edition">
+                <text term="internet" text-case="capitalize-first" prefix="[" suffix="]."/>
+              </if>
+              <else>
+                <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                <number suffix=" " variable="edition" form="ordinal"/>
+                <text term="edition" form="short"/>
+              </else>
+            </choose>
+          </else-if>
+          <else-if match="none" variable="URL DOI">
+            <group>
+              <number suffix=" " variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text variable="container-title"/>
+            <group delimiter=" ">
+              <text term="section" form="short" text-case="capitalize-first"/>
+              <text variable="section"/>
+            </group>
+          </group>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=", " suffix=" ">
+          <choose>
+            <if variable="collection-title" match="none">
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <text variable="volume"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="container-title"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report" match="all" variable="URL">
+        <text variable="title"/>
+      </if>
+      <else-if type="motion_picture" match="all">
+        <text variable="title"/>
+        <text variable="medium" prefix=" [" suffix="]"/>
+      </else-if>
+      <else-if type="song" match="all">
+        <text variable="title"/>
+      </else-if>
+      <else-if type="thesis" match="all">
+        <text variable="title"/>
+      </else-if>
+      <else-if type="book" match="all">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" suffix="."/>
+      </else>
+    </choose>
+    <choose>
+      <if type="thesis">
+        <choose>
+          <if variable="URL">
+            <group prefix=" [" suffix="]" delimiter=" ">
+              <text variable="genre"/>
+              <text term="internet"/>
+            </group>
+          </if>
+          <else>
+            <text variable="genre" prefix=" [" suffix="]"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="graphic">
+        <choose>
+          <if variable="URL">
+            <group prefix=" [" suffix="]" delimiter=" ">
+              <text variable="medium"/>
+              <text term="internet"/>
+            </group>
+          </if>
+          <else>
+            <text variable="medium" prefix=" [" suffix="]"/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper thesis graphic review review-book entry-dictionary entry-encyclopedia" match="none">
+        <choose>
+          <if match="all" variable="DOI"/>
+          <else-if variable="URL">
+            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+        <text macro="edition" prefix=". "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-journal article-magazine webpage review review-book" match="any">
+        <group suffix=";" delimiter=" ">
+          <date date-parts="year" form="text" variable="issued"/>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <date variable="issued" form="text"/>
+        </group>
+      </else-if>
+      <else-if type="report">
+        <choose>
+          <if match="all" variable="URL">
+            <group>
+              <date form="text" variable="issued"/>
+              <text term="cited" prefix=" ["/>
+              <date form="text" variable="accessed" prefix=" " suffix="]"/>
+            </group>
+          </if>
+          <else>
+            <group>
+              <date form="text" date-parts="year-month-day" variable="issued"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="patent">
+        <group suffix=".">
+          <group delimiter=", ">
+            <text variable="number"/>
+            <date variable="issued" form="text"/>
+          </group>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else-if>
+      <else-if type="book" match="all" variable="DOI">
+        <date form="text" date-parts="year-month-day" variable="issued"/>
+      </else-if>
+      <else-if type="book" match="all" variable="URL">
+        <group delimiter=" ">
+          <date date-parts="year" form="text" variable="issued"/>
+          <text term="cited" prefix="["/>
+          <date form="text" variable="accessed" suffix="]"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper" match="all">
+        <choose>
+          <if match="all" variable="URL">
+            <group>
+              <date form="text" variable="issued"/>
+              <group prefix=" [" suffix="]" delimiter=" ">
+                <text term="cited"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <date form="text" date-parts="year-month-day" variable="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="entry-encyclopedia" match="all"/>
+      <else>
+        <group suffix=".">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="page" prefix=":"/>
+      </if>
+      <else-if type="chapter" match="all" variable="DOI"/>
+      <else-if type="chapter" match="all" variable="URL"/>
+      <else>
+        <group prefix=" " delimiter=" ">
+          <label variable="page" form="short" plural="never"/>
+          <text variable="page"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine review review-book" match="any">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-details">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="none">
+        <choose>
+          <if variable="collection-title">
+            <group delimiter=" " prefix="(" suffix=")">
+              <names variable="collection-editor" suffix=".">
+                <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+                <label form="long" prefix=", "/>
+              </names>
+              <group delimiter="; ">
+                <text variable="collection-title"/>
+                <group delimiter=" ">
+                  <label variable="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <text variable="number" prefix="Rapport no "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="media-details">
+    <choose>
+      <if type="motion_picture"/>
+      <else-if variable="dimensions">
+        <text variable="dimensions" prefix="Podcast audio: " suffix=" min."/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout vertical-align="sup" delimiter="," prefix="(" suffix=")">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <choose>
+        <if type="webpage post post-weblog" match="any">
+          <text macro="author" suffix=". "/>
+          <text macro="container-title"/>
+          <choose>
+            <if match="none" variable="title">
+              <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+              <text variable="title" suffix="; "/>
+              <date date-parts="year" form="text" variable="issued" suffix=" "/>
+              <group prefix="[" suffix="]. " delimiter=" ">
+                <text term="cited"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </if>
+            <else-if type="webpage" match="all" variable="note title">
+              <choose>
+                <if match="all" variable="issued">
+                  <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                  <date form="text" variable="issued" suffix=". "/>
+                  <text variable="title" suffix=" "/>
+                  <group prefix="[" suffix="]. " delimiter=" ">
+                    <text term="cited"/>
+                    <date form="text" variable="accessed"/>
+                  </group>
+                </if>
+                <else-if match="none" variable="issued">
+                  <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                  <text variable="title" suffix=" "/>
+                  <group prefix="[" suffix="]. " delimiter=" ">
+                    <text term="cited"/>
+                    <date form="text" variable="accessed"/>
+                  </group>
+                </else-if>
+              </choose>
+            </else-if>
+            <else-if type="webpage" match="all" variable="title">
+              <choose>
+                <if match="all" variable="issued">
+                  <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                  <date form="text" variable="issued" suffix=". "/>
+                  <text variable="title"/>
+                </if>
+                <else-if match="none" variable="issued">
+                  <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                  <text variable="title"/>
+                </else-if>
+              </choose>
+              <group prefix=" [" suffix="]. " delimiter=" ">
+                <text term="accessed"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </else-if>
+            <else-if match="all" variable="title">
+              <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+              <date form="text" variable="issued" suffix=". "/>
+              <text variable="title" suffix="; "/>
+              <text variable="note" suffix=" "/>
+              <group prefix="[" suffix="]. " delimiter=" ">
+                <text term="cited"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </else-if>
+          </choose>
+          <group>
+            <text term="available at" text-case="capitalize-first" suffix=": "/>
+            <text variable="URL"/>
+          </group>
+        </if>
+        <else>
+          <group delimiter=". " suffix=". ">
+            <text macro="author"/>
+            <text macro="title"/>
+          </group>
+          <group delimiter=" " suffix=". ">
+            <choose>
+              <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+                <text term="in" text-case="capitalize-first" suffix=": "/>
+              </if>
+            </choose>
+            <text macro="editor"/>
+            <text macro="container-title"/>
+            <text macro="publisher"/>
+            <group>
+              <text macro="date"/>
+              <text macro="journal-location"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+          <text macro="collection-details" suffix=". "/>
+          <text macro="report-details" suffix=". "/>
+          <text macro="media-details" suffix=". "/>
+          <choose>
+            <if type="motion_picture" match="all" variable="URL">
+              <text variable="dimensions" prefix="Vidéo: " suffix=" min."/>
+            </if>
+          </choose>
+        </else>
+      </choose>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/international-journal-of-cosmetic-science.csl b/international-journal-of-cosmetic-science.csl
new file mode 100644
index 00000000000..3db494448c5
--- /dev/null
+++ b/international-journal-of-cosmetic-science.csl
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>International Journal of Cosmetic Science</title>
+    <id>http://www.zotero.org/styles/international-journal-of-cosmetic-science</id>
+    <link href="http://www.zotero.org/styles/international-journal-of-cosmetic-science" rel="self"/>
+    <link href="http://www.zotero.org/styles/institute-of-mathematical-statistics" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/14682494/homepage/forauthors.html" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+      <email>obrienpat86@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0142-5463</issn>
+    <eissn>1468-2494</eissn>
+    <updated>2022-02-24T14:20:31+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="en">
+    <terms>
+      <term name="et-al">et al</term>
+      <term name="editor" form="short">ed</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="text" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label strip-periods="false" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <et-al font-style="italic"/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher"/>
+        <text variable="publisher-place"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date date-parts="year" form="text" variable="issued"/>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal" match="any">
+        <choose>
+          <if match="none" variable="page volume">
+            <text variable="DOI" prefix="doi:"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter=", " prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="11" et-al-use-first="10" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix="."/>
+      <group delimiter=". " prefix=" " suffix=".">
+        <text macro="author"/>
+        <text macro="title"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=" " prefix=" ">
+              <group delimiter=", ">
+                <text macro="volume"/>
+                <text macro="editor"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first" prefix=" "/>
+                <text macro="editor"/>
+              </group>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic"/>
+                <text variable="collection-title"/>
+                <text variable="event"/>
+                <text macro="volume"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post-weblog post" match="any">
+            <group delimiter=". ">
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <text term="available at" text-case="capitalize-first"/>
+                <text variable="URL"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+              <group delimiter=";">
+                <text macro="year-date"/>
+                <group delimiter=":">
+                  <group>
+                    <text variable="volume" font-weight="normal"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text variable="page"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/journal-de-la-societe-des-oceanistes.csl b/journal-de-la-societe-des-oceanistes.csl
index 441046c9277..709dbd73ac9 100644
--- a/journal-de-la-societe-des-oceanistes.csl
+++ b/journal-de-la-societe-des-oceanistes.csl
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
+  <!-- Polyglot; journal publishes in English, and French -->
   <info>
     <title>Journal de la Société des Océanistes</title>
     <title-short>JSO</title-short>
@@ -314,8 +315,8 @@
       <key macro="issued"/>
       <key macro="author"/>
     </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=": ">
+    <layout prefix="(" suffix=")" delimiter="&#160;; ">
+      <group delimiter="&#160;: ">
         <group delimiter=", ">
           <text macro="author-short"/>
           <text macro="issued"/>
diff --git a/jurisprudence.csl b/jurisprudence.csl
new file mode 100644
index 00000000000..a7a532307bd
--- /dev/null
+++ b/jurisprudence.csl
@@ -0,0 +1,529 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="sort-only" default-locale="cs-CZ">
+  <info>
+    <title>Jurisprudence (Čeština)</title>
+    <id>http://www.zotero.org/styles/jurisprudence</id>
+    <link href="http://www.zotero.org/styles/jurisprudence" rel="self"/>
+    <link href="http://www.zotero.org/styles/pravnik" rel="template"/>
+    <link href="https://www.jurisprudence.cz/cz/vzory-citaci.c-18.html" rel="documentation"/>
+    <author>
+      <name>Oldrich Tristan Florian</name>
+      <email>oldrich.florian@gmail.com</email>
+      <uri>http://otristan.com</uri>
+    </author>
+    <category citation-format="note"/>
+    <category field="law"/>
+    <issn>1802-3843</issn>
+    <summary>Suitable for Jurisprudence - a journal published by Charles University, Faculty of Law.</summary>
+    <updated>2022-01-17T10:00:00+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="cs">
+    <terms>
+      <term name="accessed" form="short">cit.</term>
+      <term name="ibid">ibidem</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="page" form="short">
+        <single>str.</single>
+        <multiple>str.</multiple>
+      </term>
+      <term name="available at">dostupné na</term>
+    </terms>
+  </locale>
+  <macro name="page-range">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="locator-or-period">
+    <choose>
+      <if variable="locator" match="none">
+        <text value="."/>
+      </if>
+      <else>
+        <text prefix=", " macro="citation-locator" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="contributors-full">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="contributors-long">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="contributors-short">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". " form="short">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". " form="short">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if variable="container-author">
+        <names variable="container-author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if type="chapter paper-conference" match="any">
+            <names variable="editor">
+              <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+                <name-part name="family" text-case="uppercase"/>
+              </name>
+              <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+            </names>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-contributors-full">
+    <choose>
+      <if variable="container-author">
+        <names variable="container-author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if type="chapter paper-conference" match="any">
+            <names variable="editor">
+              <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+                <name-part name="family" text-case="uppercase"/>
+              </name>
+              <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+            </names>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-long">
+    <text variable="title"/>
+  </macro>
+  <macro name="title-short">
+    <text variable="title" form="short"/>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
+        <text term="in" text-case="capitalize-first" suffix=":&#160;"/>
+        <text macro="container-contributors" suffix=". "/>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+            <text prefix=" " macro="medium"/>
+          </if>
+          <else-if variable="volume">
+            <text prefix=", " term="volume" form="short" suffix=". "/>
+            <text variable="volume"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="container-title" font-style="italic"/>
+        <text prefix=" " macro="medium"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-full">
+    <choose>
+      <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
+        <text term="in" text-case="capitalize-first" suffix=": "/>
+        <text macro="container-contributors-full" suffix=". "/>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+            <text prefix=" " macro="medium"/>
+          </if>
+          <else-if variable="volume">
+            <text prefix=", " term="volume" form="short" suffix=". "/>
+            <text variable="volume"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="container-title" font-style="italic"/>
+        <text prefix=" " macro="medium"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if variable="edition">
+        <text variable="edition" suffix="."/>
+        <text prefix=" " term="edition" form="short"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher-place">
+    <text variable="publisher-place"/>
+  </macro>
+  <macro name="publisher">
+    <text macro="publisher-place"/>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter=", ">
+          <date variable="issued">
+            <date-part name="year" range-delimiter="&#160;&#8211;&#160;"/>
+          </date>
+          <group delimiter="&#160;">
+            <text term="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+          <group delimiter="&#160;">
+            <text term="issue" form="short"/>
+            <text variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="webpage" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=".&#160;"/>
+          <date-part name="month" suffix=".&#160;" form="numeric"/>
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else-if type="entry entry-dictionary entry-encyclopedia thesis" match="any">
+        <date variable="issued">
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
+      </else-if>
+      <else>
+        <text prefix=" " macro="publisher" suffix=" "/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <label variable="locator" form="short" suffix="&#160;"/>
+    <text variable="locator"/>
+  </macro>
+  <macro name="collection">
+    <text variable="collection-title"/>
+    <text prefix=" " variable="collection-number"/>
+    <choose>
+      <if variable="collection-editor">
+        <text prefix=", " term="editor" form="verb-short" text-case="uppercase" suffix=" "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="ISBN">
+    <choose>
+      <if variable="ISBN">
+        <text variable="ISBN" prefix="ISBN&#160;"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="identifier">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="DOI:&#160;"/>
+      </if>
+      <else>
+        <text term="available at" text-case="capitalize-first" suffix="&#160;"/>
+        <text variable="URL" prefix="&lt;" suffix=">."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="medium">
+    <choose>
+      <if variable="URL" match="any">
+        <choose>
+          <if variable="DOI" match="none">
+            <text term="online" prefix="[" suffix="]"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
+    <layout delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid"/>
+            <text macro="citation-locator" suffix="."/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" suffix="."/>
+        </else-if>
+        <else-if position="subsequent">
+          <text macro="contributors-short" suffix=", "/>
+          <text macro="title-short" font-style="italic"/>
+          <text macro="locator-or-period"/>
+        </else-if>
+        <else>
+          <choose>
+            <if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" suffix=". "/>
+              <text macro="container"/>
+              <text prefix=". " variable="volume" text-case="capitalize-first"/>
+              <choose>
+                <if variable="URL" match="any">
+                  <text prefix=". " macro="issued"/>
+                  <text prefix=", " macro="citation-locator"/>
+                  <!--<text prefix=" " macro="quoted"/>-->
+                  <text prefix=". " macro="identifier"/>
+                </if>
+                <else-if variable="issued" match="none">
+                  <choose>
+                    <if variable="publisher publisher-place" match="any">
+                      <text prefix=". " macro="publisher"/>
+                    </if>
+                  </choose>
+                  <text macro="locator-or-period"/>
+                </else-if>
+                <else>
+                  <text prefix=". " macro="issued"/>
+                  <text macro="locator-or-period"/>
+                </else>
+              </choose>
+            </if>
+            <else-if type="article-magazine article-newspaper webpage" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" suffix=". "/>
+              <text macro="container"/>
+              <choose>
+                <if variable="URL" match="any">
+                  <text prefix=". " macro="issued"/>
+                  <text prefix=", " macro="citation-locator"/>
+                  <!--<text prefix=" " macro="quoted"/>-->
+                  <text prefix=". " macro="identifier"/>
+                </if>
+                <else>
+                  <text prefix=". " macro="issued"/>
+                  <text macro="locator-or-period"/>
+                </else>
+              </choose>
+            </else-if>
+            <else-if type="article-journal" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" suffix=". "/>
+              <text macro="container"/>
+              <text prefix=", " macro="issued"/>
+              <choose>
+                <if variable="URL" match="any">
+                  <text prefix=", " macro="citation-locator"/>
+                  <!--<text prefix=" " macro="quoted"/>-->
+                  <text prefix=". " macro="identifier"/>
+                </if>
+                <else>
+                  <text macro="locator-or-period"/>
+                </else>
+              </choose>
+            </else-if>
+            <else-if type="thesis" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" font-style="italic"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " variable="genre"/>
+              <text prefix=", " variable="publisher"/>
+              <text macro="locator-or-period"/>
+            </else-if>
+            <else>
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" font-style="italic"/>
+              <choose>
+                <if variable="URL" match="any">
+                  <text prefix=" " macro="medium"/>
+                  <text prefix=". " macro="issued"/>
+                  <text prefix=", " macro="citation-locator"/>
+                  <!--<text prefix=" " macro="quoted"/>-->
+                  <text prefix=". " macro="identifier"/>
+                </if>
+                <else-if variable="issued" match="none">
+                  <text prefix=" " macro="medium"/>
+                  <choose>
+                    <if variable="publisher publisher-place" match="any">
+                      <text prefix=". " macro="publisher"/>
+                    </if>
+                  </choose>
+                  <choose>
+                    <if variable="locator" match="none">
+                      <text value="."/>
+                    </if>
+                    <else>
+                      <text prefix=", " macro="citation-locator" suffix="."/>
+                    </else>
+                  </choose>
+                </else-if>
+                <else>
+                  <text prefix=" " macro="medium"/>
+                  <text prefix=". " macro="issued"/>
+                  <choose>
+                    <if variable="locator" match="none">
+                      <text value="."/>
+                    </if>
+                    <else>
+                      <text prefix=", " macro="citation-locator" suffix="."/>
+                    </else>
+                  </choose>
+                </else>
+              </choose>
+            </else>
+          </choose>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="1">
+    <sort>
+      <key macro="contributors-full" names-min="3" names-use-first="3"/>
+      <key macro="title-long"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" suffix=". "/>
+          <text macro="container-full"/>
+          <text prefix=". " variable="volume" text-case="capitalize-first"/>
+          <choose>
+            <if variable="URL" match="any">
+              <text prefix=". " macro="edition"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " macro="page-range"/>
+              <!--<text prefix=" " macro="quoted"/>-->
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+              <text prefix=". " macro="identifier"/>
+            </if>
+            <else-if variable="issued" match="none">
+              <text prefix=". " macro="edition" suffix="."/>
+              <choose>
+                <if variable="publisher publisher-place" match="any">
+                  <text prefix=". " macro="publisher"/>
+                </if>
+              </choose>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=", " macro="page-range"/>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+            </else-if>
+            <else>
+              <text prefix=". " macro="edition"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " macro="page-range" suffix="."/>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+            </else>
+          </choose>
+        </if>
+        <else-if type="article-magazine article-newspaper webpage article-journal" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" suffix=". "/>
+          <text macro="container-full"/>
+          <text prefix=", " macro="issued"/>
+          <choose>
+            <if variable="URL" match="any">
+              <text prefix=", " macro="page-range"/>
+              <!--<text prefix=" " macro="quoted"/>-->
+              <text prefix=". " macro="identifier"/>
+            </if>
+            <else>
+              <text prefix=", " macro="page-range" suffix="."/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="thesis" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" font-style="italic"/>
+          <text prefix=". " macro="issued"/>
+          <text prefix=", " variable="genre"/>
+          <text prefix=", " variable="publisher" suffix="."/>
+        </else-if>
+        <else-if type="bill legal_case legislation" match="none">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" font-style="italic"/>
+          <choose>
+            <if variable="URL" match="any">
+              <text prefix=" " macro="medium"/>
+              <text prefix=". " macro="edition" suffix="."/>
+              <text prefix=". " macro="issued"/>
+              <!--<text prefix=" " macro="quoted" suffix="."/>-->
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+              <text prefix=". " macro="identifier"/>
+            </if>
+            <else-if variable="issued" match="none">
+              <text prefix=" " macro="medium" suffix="."/>
+              <choose>
+                <if variable="publisher publisher-place" match="any">
+                  <text prefix=". " macro="publisher" suffix="."/>
+                </if>
+              </choose>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+            </else-if>
+            <else>
+              <text prefix=" " macro="medium" suffix="."/>
+              <text prefix=". " macro="edition" suffix="."/>
+              <text prefix=". " macro="issued" suffix="."/>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+            </else>
+          </choose>
+        </else-if>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl b/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
index 32b5b6cbdcf..335fa944a16 100644
--- a/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
+++ b/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
@@ -260,8 +260,15 @@
             <text macro="nor-legislation"/>
           </else-if>
           <else-if type="report">
-            <text macro="author-short"/>
-            <text macro="issued"/>
+            <choose>
+              <if variable="author" match="none">
+                <text variable="title"/>
+              </if>
+              <else>
+                <text macro="author-short"/>
+                <text macro="issued"/>
+              </else>
+            </choose>
           </else-if>
           <else>
             <text variable="title"/>
diff --git a/organization-studies.csl b/organization-studies.csl
new file mode 100644
index 00000000000..fe8e18bab0f
--- /dev/null
+++ b/organization-studies.csl
@@ -0,0 +1,1515 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
+  <info>
+    <title>Organization Studies</title>
+    <title-short>OSS</title-short>
+    <id>http://www.zotero.org/styles/organization-studies</id>
+    <link href="http://www.zotero.org/styles/organization-studies" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://journals.sagepub.com/author-instructions/OSS" rel="documentation"/>
+    <link href="https://journals.sagepub.com/pb-assets/cmscontent/OSS/OS%20Style%20and%20Reference%20Guide_October%202021-1632991647.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <issn>0170-8406</issn>
+    <eissn>1741-3044</eissn>
+    <updated>2022-02-17T09:51:30+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="en">
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="circa" form="short">ca.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="container-title">
+            <choose>
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                <choose>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text macro="title-and-descriptions"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="title">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="parenthetical"/>
+            </group>
+          </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-intext">
+    <choose>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text macro="title-intext"/>
+      </if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text macro="title-intext"/>
+                </substitute>
+              </names>
+              <text term="letter"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <text macro="title-intext"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="author"/>
+            <names variable="illustrator"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <text macro="title-intext"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
+      <choose>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
+        </if>
+      </choose>
+      <group>
+        <choose>
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
+            <choose>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
+              </if>
+              <else-if type="paper-conference">
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+            </choose>
+          </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
+          <else>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
+    <choose>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
+      </else-if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-sort-date">
+    <choose>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <date variable="issued" form="numeric"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication" match="any">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-and-descriptions">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="post webpage" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <choose>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else-if type="paper-conference">
+            <choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
+            </choose>
+          </else-if>
+          <else>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short" text-case="title"/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="legislation treaty" match="any">
+        <text variable="title" form="short" text-case="title"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <text variable="title" form="short" quotes="true" text-case="title"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="parenthetical">
+    <group prefix="(" suffix=")">
+      <choose>
+        <if type="patent">
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage" match="any">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else-if>
+        <else-if variable="container-title">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <text macro="number"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <choose>
+            <if variable="title">
+              <text macro="format"/>
+            </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
+            <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication">
+          <choose>
+            <if variable="recipient">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if variable="composer" type="song" match="all">
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else-if variable="container-title" match="none">
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <choose>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
+          </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <text macro="reviewed-title-intext" prefix="Review of "/>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
+        </else-if>
+        <else-if type="personal_communication">
+          <choose>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="symbol" delimiter=", "/>
+                </names>
+              </group>
+            </if>
+            <else>
+              <text macro="format-intext"/>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <text macro="format-intext"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-container">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if type="paper-conference speech" match="any">
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="book" variable="version" match="all">
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <text macro="format"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <text macro="secondary-contributors-periodical"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <choose>
+        <if type="post webpage" match="none">
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
+              </group>
+            </if>
+          </choose>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="database-location">
+    <choose>
+      <if variable="archive-place" match="none">
+        <text variable="archive_location"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="number">
+    <choose>
+      <if variable="number">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
+          </group>
+          <choose>
+            <if type="thesis">
+              <choose>
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <choose>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
+        </group>
+      </if>
+      <else>
+        <text variable="version"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="reviewed-title">
+    <choose>
+      <if variable="reviewed-title">
+        <text variable="reviewed-title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="reviewed-title-intext">
+    <choose>
+      <if variable="reviewed-title">
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="format">
+    <choose>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="format-intext">
+    <choose>
+      <if variable="genre" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
+      </if>
+      <else-if variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="container-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <text macro="container-periodical"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="post webpage" match="none">
+        <text macro="container-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
+      </group>
+      <choose>
+        <if variable="issued">
+          <choose>
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <names variable="editor translator" delimiter=", &amp; ">
+              <name and="symbol"/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="post webpage" match="any">
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference">
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <group delimiter=", ">
+              <text variable="event"/>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publication-history">
+    <choose>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
+                <choose>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
+                  </if>
+                </choose>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else-if type="bill">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number container-title" match="none">
+                <text variable="title" font-style="italic"/>
+              </if>
+              <else>
+                <text variable="title"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="date-legal">
+    <choose>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-legal">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name-with-initials">
+    <sort>
+      <key macro="author-bib" names-min="3" names-use-first="1"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-intext"/>
+        <text macro="date-intext"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author-bib"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <choose>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
+            </if>
+            <else>
+              <text macro="legal-cites" suffix="."/>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/sodertorns-hogskola-harvard-ibid.csl b/sodertorns-hogskola-harvard-ibid.csl
index 947c9bd82f2..dae23b6ccd6 100644
--- a/sodertorns-hogskola-harvard-ibid.csl
+++ b/sodertorns-hogskola-harvard-ibid.csl
@@ -118,7 +118,7 @@
               <date variable="accessed" delimiter="-">
                 <date-part name="year"/>
                 <date-part name="month" form="numeric-leading-zeros" strip-periods="true"/>
-                <date-part name="day"/>
+                <date-part name="day" form="numeric-leading-zeros"/>
               </date>
             </group>
           </if>
diff --git a/sodertorns-hogskola-harvard.csl b/sodertorns-hogskola-harvard.csl
index 40edd364228..13320a55d71 100644
--- a/sodertorns-hogskola-harvard.csl
+++ b/sodertorns-hogskola-harvard.csl
@@ -118,7 +118,7 @@
               <date variable="accessed" delimiter="-">
                 <date-part name="year"/>
                 <date-part name="month" form="numeric-leading-zeros" strip-periods="true"/>
-                <date-part name="day"/>
+                <date-part name="day" form="numeric-leading-zeros"/>
               </date>
             </group>
           </if>
diff --git a/sodertorns-hogskola-oxford.csl b/sodertorns-hogskola-oxford.csl
index 2937f83bc43..1b4abc6019d 100644
--- a/sodertorns-hogskola-oxford.csl
+++ b/sodertorns-hogskola-oxford.csl
@@ -15,7 +15,7 @@
     <category field="humanities"/>
     <category field="social_science"/>
     <summary>Södertörn University Oxford style without ibid</summary>
-    <updated>2021-02-18T14:14:20+00:00</updated>
+    <updated>2022-01-05T13:45:04+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="sv">
@@ -27,16 +27,6 @@
     <label variable="page" form="short" suffix=" "/>
     <text variable="page"/>
   </macro>
-  <macro name="locator-or-period">
-    <choose>
-      <if variable="locator" match="none">
-        <text value="."/>
-      </if>
-      <else>
-        <text prefix=", " macro="citation-locator" suffix="."/>
-      </else>
-    </choose>
-  </macro>
   <macro name="contributors-full">
     <choose>
       <if variable="author">
@@ -51,7 +41,7 @@
           <name name-as-sort-order="all" sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
             <name-part name="family"/>
           </name>
-          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+          <label prefix=" (" form="short" plural="contextual" suffix=")"/>
         </names>
       </else-if>
       <else-if variable="composer">
@@ -77,7 +67,7 @@
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
             <name-part name="family"/>
           </name>
-          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+          <label prefix=" (" form="short" plural="contextual" suffix=")"/>
         </names>
       </else-if>
       <else-if variable="composer">
@@ -103,7 +93,7 @@
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
             <name-part name="family"/>
           </name>
-          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+          <label prefix=" (" form="short" plural="contextual" suffix=")"/>
         </names>
       </else-if>
       <else-if variable="composer">
@@ -255,9 +245,11 @@
   <macro name="publisher">
     <choose>
       <if type="book report chapter entry entry-dictionary entry-encyclopedia paper-conference thesis map figure graphic" match="any">
-        <text prefix="(" macro="publisher-place" suffix=": "/>
-        <text macro="printers" suffix=", "/>
-        <text macro="issued-year" suffix=")"/>
+        <group prefix="(" suffix=")">
+          <text macro="publisher-place" suffix=": "/>
+          <text macro="printers" suffix=", "/>
+          <text macro="issued-year"/>
+        </group>
       </if>
       <else>
         <text macro="printers"/>
@@ -327,8 +319,8 @@
       <else-if type="post post-weblog broadcast personal_communication interview manuscript" match="any">
         <date variable="issued">
           <date-part name="day" suffix="/"/>
-          <date-part name="month" suffix=" " form="numeric"/>
-          <date-part name="year"/>
+          <date-part name="month" form="numeric"/>
+          <date-part prefix=" " name="year"/>
         </date>
       </else-if>
       <else>
@@ -339,7 +331,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
-    <label variable="locator" form="short" suffix="&#160;"/>
+    <label prefix=", " variable="locator" form="short" suffix="&#160;"/>
     <text variable="locator"/>
   </macro>
   <macro name="collection">
@@ -403,13 +395,13 @@
       <text term="accessed" form="short" suffix="&#160;"/>
       <date variable="accessed">
         <date-part name="year" suffix="-"/>
-        <date-part name="month" suffix="-" form="numeric"/>
-        <date-part name="day"/>
+        <date-part name="month" suffix="-" form="numeric-leading-zeros"/>
+        <date-part name="day" form="numeric-leading-zeros"/>
       </date>
     </group>
   </macro>
   <citation et-al-min="20" et-al-use-first="1" disambiguate-add-names="true">
-    <layout delimiter="; ">
+    <layout delimiter="; " suffix=".">
       <choose>
         <if position="subsequent">
           <choose>
@@ -435,7 +427,7 @@
               <text prefix=" " macro="issued-year"/>
             </else>
           </choose>
-          <text macro="locator-or-period"/>
+          <text macro="citation-locator"/>
         </if>
         <else>
           <choose>
@@ -445,7 +437,7 @@
               <text macro="container"/>
               <text prefix=", " variable="volume" text-case="capitalize-first"/>
               <text prefix=" " macro="publisher"/>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </if>
             <else-if type="book" match="any">
               <text macro="contributors-long" suffix=", "/>
@@ -457,7 +449,7 @@
                 </if>
               </choose>
               <text prefix=" " macro="publisher"/>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="webpage post post-weblog" match="any">
               <choose>
@@ -475,10 +467,10 @@
                 <if variable="URL" match="any">
                   <text prefix=", " macro="page-range"/>
                   <text prefix=", " macro="identifier"/>
-                  <text prefix=" " macro="quoted" suffix="."/>
+                  <text prefix=" " macro="quoted"/>
                 </if>
                 <else>
-                  <text prefix=", " macro="page-range" suffix="."/>
+                  <text prefix=", " macro="page-range"/>
                 </else>
               </choose>
             </else-if>
@@ -491,10 +483,10 @@
                 <if variable="URL" match="any">
                   <text prefix=", " macro="page-range"/>
                   <text prefix=", " macro="identifier"/>
-                  <text prefix=" " macro="quoted" suffix="."/>
+                  <text prefix=" " macro="quoted"/>
                 </if>
                 <else>
-                  <text prefix=", " macro="page-range" suffix="."/>
+                  <text prefix=", " macro="page-range"/>
                 </else>
               </choose>
             </else-if>
@@ -504,7 +496,7 @@
               <text macro="container"/>
               <text prefix=" " macro="issued"/>
               <text prefix=", doi:" variable="DOI"/>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="paper-conference speech" match="any">
               <text macro="contributors-long" suffix=", "/>
@@ -518,14 +510,14 @@
                   <text prefix=", doi:" variable="DOI"/>
                 </if>
               </choose>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="thesis" match="any">
               <text macro="contributors-long" suffix=", "/>
               <text macro="title-long" font-style="italic"/>
               <text prefix=", " macro="genre"/>
               <text prefix=" " macro="publisher"/>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="report" match="any">
               <text macro="contributors-full" suffix=", "/>
@@ -543,7 +535,7 @@
                   <text prefix=" " macro="quoted"/>
                 </if>
               </choose>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="map figure graphic" match="any">
               <text macro="contributors-full" suffix=", "/>
@@ -564,11 +556,8 @@
               <choose>
                 <if variable="URL" match="any">
                   <text prefix=", " macro="identifier"/>
-                  <text prefix=" " macro="quoted" suffix="."/>
+                  <text prefix=" " macro="quoted"/>
                 </if>
-                <else>
-                  <text value="."/>
-                </else>
               </choose>
             </else-if>
             <else>
@@ -580,9 +569,9 @@
                 <if variable="URL" match="any">
                   <text prefix=", " macro="issued"/>
                   <text prefix=", " macro="publisher"/>
-                  <text prefix=", " macro="citation-locator"/>
+                  <text macro="citation-locator"/>
                   <text prefix=", " macro="identifier"/>
-                  <text prefix=" " macro="quoted" suffix="."/>
+                  <text prefix=" " macro="quoted"/>
                 </if>
                 <else-if variable="issued" match="none">
                   <choose>
@@ -591,12 +580,9 @@
                     </if>
                   </choose>
                   <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
+                    <if variable="locator" match="any">
+                      <text macro="citation-locator"/>
                     </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
                   </choose>
                 </else-if>
                 <else>
@@ -604,12 +590,9 @@
                   <text prefix=", " macro="issued"/>
                   <text prefix=", " macro="archive"/>
                   <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
+                    <if variable="locator" match="any">
+                      <text macro="citation-locator"/>
                     </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
                   </choose>
                 </else>
               </choose>
@@ -624,7 +607,7 @@
       <key macro="sort-bibliography" names-min="3" names-use-first="3"/>
       <key macro="title-long"/>
     </sort>
-    <layout>
+    <layout suffix=".">
       <choose>
         <if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -634,7 +617,6 @@
           <text prefix=" " macro="publisher"/>
           <text prefix=", " macro="collection"/>
           <text prefix=", " macro="page-range"/>
-          <text value="."/>
         </if>
         <else-if type="book" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -645,7 +627,7 @@
               <text prefix=" " term="edition" form="short"/>
             </if>
           </choose>
-          <text prefix=" " macro="publisher" suffix="."/>
+          <text prefix=" " macro="publisher"/>
         </else-if>
         <else-if type="webpage post post-weblog" match="any">
           <choose>
@@ -663,10 +645,10 @@
             <if variable="URL" match="any">
               <text prefix=", " macro="page-range"/>
               <text prefix=", " macro="identifier"/>
-              <text prefix=" " macro="quoted" suffix="."/>
+              <text prefix=" " macro="quoted"/>
             </if>
             <else>
-              <text prefix=", " macro="page-range" suffix="."/>
+              <text prefix=", " macro="page-range"/>
             </else>
           </choose>
         </else-if>
@@ -679,10 +661,10 @@
             <if variable="URL" match="any">
               <text prefix=", " macro="page-range"/>
               <text prefix=", " macro="identifier"/>
-              <text prefix=" " macro="quoted" suffix="."/>
+              <text prefix=" " macro="quoted"/>
             </if>
             <else>
-              <text prefix=", " macro="page-range" suffix="."/>
+              <text prefix=", " macro="page-range"/>
             </else>
           </choose>
         </else-if>
@@ -693,7 +675,6 @@
           <text prefix=" " macro="issued"/>
           <text prefix=", " macro="page-range"/>
           <text prefix=", doi:" variable="DOI"/>
-          <text value="."/>
         </else-if>
         <else-if type="paper-conference speech" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -705,11 +686,10 @@
           <choose>
             <if variable="DOI" match="any">
               <text prefix=", " macro="page-range"/>
-              <text prefix=", doi:" variable="DOI" suffix="."/>
+              <text prefix=", doi:" variable="DOI"/>
             </if>
             <else>
               <text prefix=", " macro="page-range"/>
-              <text value="."/>
             </else>
           </choose>
         </else-if>
@@ -717,7 +697,7 @@
           <text macro="contributors-full" suffix=", "/>
           <text macro="title-long" font-style="italic"/>
           <text prefix=", " macro="genre"/>
-          <text prefix=" " macro="publisher" suffix="."/>
+          <text prefix=" " macro="publisher"/>
         </else-if>
         <else-if type="report" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -735,7 +715,6 @@
               <text prefix=" " macro="quoted"/>
             </if>
           </choose>
-          <text value="."/>
         </else-if>
         <else-if type="map figure graphic" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -756,11 +735,8 @@
           <choose>
             <if variable="URL" match="any">
               <text prefix=", " macro="identifier"/>
-              <text prefix=" " macro="quoted" suffix="."/>
+              <text prefix=" " macro="quoted"/>
             </if>
-            <else>
-              <text value="."/>
-            </else>
           </choose>
         </else-if>
         <else-if type="bill legal_case legislation personal_communication" match="none">
@@ -773,7 +749,7 @@
               <text prefix=", " macro="issued"/>
               <text prefix=", " macro="publisher"/>
               <text prefix=", " macro="identifier"/>
-              <text prefix=" " macro="quoted" suffix="."/>
+              <text prefix=" " macro="quoted"/>
             </if>
             <else-if variable="issued" match="none">
               <choose>
@@ -782,13 +758,11 @@
                 </if>
               </choose>
               <text prefix=", " macro="collection"/>
-              <text value="."/>
             </else-if>
             <else>
               <text prefix=", " macro="publisher"/>
               <text prefix=", " macro="issued"/>
               <text prefix=", " macro="archive"/>
-              <text value="."/>
             </else>
           </choose>
         </else-if>
diff --git a/springer-basic-brackets-no-et-al.csl b/springer-basic-brackets-no-et-al.csl
index c3325c7253f..b66533c3b60 100644
--- a/springer-basic-brackets-no-et-al.csl
+++ b/springer-basic-brackets-no-et-al.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-US" version="1.0" demote-non-dropping-particle="sort-only">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
     <title>Springer - Basic (numeric, brackets, no "et al.")</title>
     <id>http://www.zotero.org/styles/springer-basic-brackets-no-et-al</id>
@@ -121,8 +121,8 @@
                     <text variable="volume" suffix=":"/>
                     <text variable="page"/>
                   </group>
-                  <text prefix=". https://doi.org/" variable="DOI"/>
                 </group>
+                <text prefix=". https://doi.org/" variable="DOI"/>
               </group>
             </if>
             <else>
diff --git a/steel-research-international.csl b/steel-research-international.csl
index a7fcc1d6a89..2cb5aa05621 100644
--- a/steel-research-international.csl
+++ b/steel-research-international.csl
@@ -5,8 +5,8 @@
     <title-short>Steel Res. Int.</title-short>
     <id>http://www.zotero.org/styles/steel-research-international</id>
     <link href="http://www.zotero.org/styles/steel-research-international" rel="self"/>
-    <link href="https://onlinelibrary.wiley.com/page/journal/1869344x/homepage/author-guidelines" rel="documentation"/>
     <link href="http://www.zotero.org/styles/taylor-and-francis-national-library-of-medicine" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/1869344x/homepage/author-guidelines" rel="documentation"/>
     <author>
       <name>Christian Schubert</name>
     </author>
@@ -20,31 +20,34 @@
     <issnl>1611-3683</issnl>
     <summary>Citation style for the Steel research international
     
-    There are some difficulties i.e. with patents, preprint  specifications and the variables that the CSL offers (nor preprint type or company variable availably), which probably cannot be fixed right now (perfectly) and need manual correction.
-    Also there is no way to automatically use or define journal or conference abbrevitation in the csl file right now?</summary>
-    <updated>2021-11-10T16:22:30+01:00</updated>
+    Known issues:
+
+    - Patents should have the following form:
+      [2] H.-S. Seo, D.-C. Kim (Samsung Electronics Co., Ltd.), Ger. 2016122271, 2016
+
+      Issue: There is no specific field for patent owner/assignee in CSL (1.0.x) right now. It may come with CSL 1.1.
+      The current idea is to call this variable `assignee`. This is implemented (commented out) in line 53, 
+      which may work with CSL 1.1.
+
+      Journal Abbreviation (for journal titles) are handeled by citation software, experience may therefore vary.</summary>
+    <updated>2022-02-22T10:00:30+01: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="en-US">
     <date form="text" delimiter=" ">
+      <date-part name="day" suffix=" " range-delimiter="-" form="numeric-leading-zeros"/>
       <date-part name="month" form="short" strip-periods="true" suffix=" "/>
       <date-part name="year" font-weight="bold"/>
     </date>
     <terms>
       <term name="chapter" form="short">Ch.</term>
-      <term name="editor" form="short">eds</term>
     </terms>
   </locale>
   <macro name="author">
     <names variable="author">
       <name sort-separator=" " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-      <substitute>
-        <names variable="editor">
-            <name/>
-            <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
-        </names>
-      </substitute>
     </names>
+    <!--     <choose><if type="patent"><text variable="assignee" prefix=" (" suffix=")"/></if></choose> -->
   </macro>
   <macro name="title">
     <choose>
@@ -67,7 +70,7 @@
         <text variable="genre" font-style="italic"/>
       </else-if>
       <else-if type="article-journal" match="any">
-        <text variable="container-title" font-style="italic"/>
+        <text variable="container-title" font-style="italic" form="short"/>
       </else-if>
       <else-if type="article-magazine article-newspaper" match="any">
         <text variable="container-title" font-style="italic"/>
@@ -75,6 +78,19 @@
       <else-if type="webpage" match="any">
         <text variable="title"/>
       </else-if>
+      <else-if type="article" match="any">
+        <text value="(Preprint)"/>
+        <text variable="number" prefix=" "/>
+        <text variable="version" prefix=", "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="book-chapter-volume">
+    <choose>
+      <if type="book chapter" match="any">
+        <label variable="volume" form="short" prefix=", "/>
+        <text variable="volume"/>
+      </if>
     </choose>
   </macro>
   <macro name="editor">
@@ -138,6 +154,14 @@
       <if type="speech" match="any">
         <date variable="issued" prefix=", " form="text"/>
       </if>
+      <else-if type="paper-conference" match="any">
+        <group>
+          <date variable="issued" form="text" date-parts="year-month" prefix=", "/>
+        </group>
+      </else-if>
+      <else-if type="article" match="any">
+        <date variable="issued" prefix=", submitted: " form="text" date-parts="year-month"/>
+      </else-if>
       <else-if type="webpage" match="none">
         <group font-weight="bold">
           <date variable="issued" form="text" date-parts="year" prefix=" "/>
@@ -155,14 +179,27 @@
               <text variable="chapter-number"/>
             </group>
           </if>
-          <else>
+          <else-if variable="page">
             <group delimiter=" ">
-              <text term="page" form="short" prefix=", "/>
-              <text variable="page"/>
+              <text variable="page" prefix=", "/>
             </group>
-          </else>
+          </else-if>
         </choose>
       </if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <choose>
+          <if variable="page-first">
+            <group delimiter=" ">
+              <text variable="page-first" prefix=", "/>
+            </group>
+          </if>
+          <else-if variable="page">
+            <group delimiter=" ">
+              <text variable="page" prefix=", "/>
+            </group>
+          </else-if>
+        </choose>
+      </else-if>
     </choose>
   </macro>
   <macro name="journal-volume">
@@ -193,7 +230,7 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout prefix="[" suffix="]" delimiter=",">
+    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
       <group delimiter=",">
         <text variable="citation-number"/>
         <group>
@@ -210,6 +247,7 @@
         <text macro="author"/>
         <text macro="title"/>
       </group>
+      <text macro="book-chapter-volume"/>
       <text macro="editor"/>
       <text macro="publisher"/>
       <text macro="report-patent-numbers"/>