csl-styles 2.0.2 → 2.1.0

data/vendor/styles/universite-du-quebec-a-montreal-departement-dhistoire.csl

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="expanded" default-locale="fr-CA">
   <info>
-    <title>Université du Québec à Montréal - Département d’histoire (Français - Canada)</title>
+    <title>Université du Québec à Montréal - Département d'histoire (Français - Canada)</title>
     <title-short>UQAM - histoire</title-short>
     <id>http://www.zotero.org/styles/universite-du-quebec-a-montreal-departement-dhistoire</id>
     <link href="http://www.zotero.org/styles/universite-du-quebec-a-montreal-departement-dhistoire" rel="self"/>
-    <link href="https://histoire.uqam.ca/wp-content/uploads/sites/21/Nouveau_Guide_Premier_Cycle_decembre_2014.pdf" rel="documentation"/>
+    <link href="https://uqam-histoire.github.io/guideuqamhistoire/" rel="documentation"/>
     <author>
-      <name>Patrice Fiset</name>
-      <email>fiset.patrice@courrier.uqam.ca</email>
+      <name>Richard Matthew Pollard</name>
+      <email>pollard.richard_matthew@uqam.ca</email>
     </author>
     <contributor>
-      <name>Lyse Roy</name>
+      <name>Simon Côté-Lapointe</name>
+    </contributor>
+    <contributor>
+      <name>Jean-François Palomino</name>
     </contributor>
     <category citation-format="note"/>
     <category field="history"/>
-    <updated>2024-09-28T16:12:00+00:00</updated>
+    <updated>2026-08-04T00:00:00Z</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">
@@ -24,26 +27,59 @@
       <term name="ordinal-02">e</term>
       <term name="ordinal-03">e</term>
       <term name="ordinal-04">e</term>
-      <term name="cited">op.&#160;cit.</term>
-      <term name="page" form="short">p.</term>
-      <term name="editor" form="short">éd.</term>
+      <!-- Éditeur (édition scientifique) -->
+      <term name="editor" form="short">
+        <single>éd.</single>
+        <multiple>éd.</multiple>
+      </term>
+      <term name="editor" form="verb">édité par</term>
+      <term name="editortranslator" form="verb">édité et traduit par</term>
+      <!-- Directeur d’ouvrage collectif -->
+      <term name="editor" form="verb-short">
+        <single>dir.</single>
+        <multiple>dir.</multiple>
+      </term>
     </terms>
   </locale>
   <macro name="author">
     <choose>
+      <!-- AUTHOR -->
       <if variable="author">
         <names variable="author">
-          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" text-case="capitalize-first" prefix=""/>
+          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="given"/>
           </name>
+          <et-al font-style="italic"/>
         </names>
       </if>
+      <!-- Editor as main contributor for collective volumes -->
       <else-if variable="editor">
         <names variable="editor">
-          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" font-variant="small-caps"/>
+          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family"/>
+            <name-part name="given"/>
           </name>
-          <label form="short" prefix="&#160;(" suffix=".)"/>
+          <et-al font-style="italic"/>
+          <label form="verb-short" prefix=" (" suffix=")"/>
+        </names>
+      </else-if>
+      <else-if variable="host">
+        <names variable="host">
+          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="given"/>
+          </name>
+        </names>
+      </else-if>
+      <!-- Fallback for director -->
+      <else-if variable="director" match="any">
+        <names variable="director">
+          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
         </names>
       </else-if>
     </choose>
@@ -52,17 +88,30 @@
     <choose>
       <if variable="author">
         <names variable="author">
-          <name initialize-with="." and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" text-case="capitalize-first"/>
+          <name form="short" and="text" delimiter-precedes-last="never">
+            <name-part name="family"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
-          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" font-variant="small-caps"/>
+          <name form="short" and="text" delimiter-precedes-last="never">
+            <name-part name="family"/>
+          </name>
+        </names>
+      </else-if>
+      <else-if variable="host">
+        <names variable="host">
+          <name initialize-with="." and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </else-if>
+      <else-if variable="director">
+        <names variable="director">
+          <name initialize-with="." and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+            <name-part name="family" text-case="capitalize-first"/>
           </name>
-          <label form="short" prefix="&#160;(" suffix=".)"/>
         </names>
       </else-if>
     </choose>
@@ -71,202 +120,167 @@
     <choose>
       <if variable="author">
         <names variable="author">
-          <name name-as-sort-order="first" form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" text-case="uppercase" suffix=","/>
+          <name and="text" delimiter-precedes-last="never" name-as-sort-order="first">
+            <name-part name="family" text-case="uppercase"/>
           </name>
           <et-al font-style="italic"/>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
-          <name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" font-variant="small-caps"/>
+          <name and="text" delimiter-precedes-last="never" name-as-sort-order="first">
+            <name-part name="family" text-case="uppercase"/>
           </name>
-          <label form="short" prefix="&#160;(" suffix=".)"/>
+          <et-al font-style="italic"/>
+          <label form="verb-short" prefix=" (" suffix=")"/>
         </names>
       </else-if>
+      <else-if variable="host">
+        <names variable="host">
+          <name and="text" delimiter-precedes-last="never" name-as-sort-order="first">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+          <et-al font-style="italic"/>
+        </names>
+      </else-if>
+      <else-if match="any" variable="director">
+        <names variable="director">
+          <name and="text" delimiter-precedes-last="never" name-as-sort-order="first" sort-separator=" ">
+            <name-part name="family" text-case="uppercase" suffix=","/>
+          </name>
+          <et-al font-style="italic"/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="editor-translator-note">
+    <choose>
+      <if variable="editor translator" match="any">
+        <names variable="editor translator" delimiter="; ">
+          <label form="verb" suffix=" "/>
+          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="given"/>
+            <name-part name="family"/>
+          </name>
+          <et-al font-style="italic"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor-translator-after-title">
+    <choose>
+      <if variable="author">
+        <text macro="editor-translator-note"/>
+      </if>
     </choose>
   </macro>
-  <!--
-  <macro name="editor"><choose><if type="chapter" match="none"></if></choose><names variable="editor"><name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal"><name-part name="family" font-variant="small-caps"/></name><label form="short" prefix="&#160;(" suffix=".)"/></names></macro>
-  -->
   <macro name="translator">
-    <text value="trad. par "/>
     <names variable="translator">
-      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-        <name-part name="family" font-variant="small-caps"/>
+      <label form="verb" suffix=" "/>
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+        <name-part name="family"/>
       </name>
     </names>
   </macro>
-  <!--
-  <macro name="conferenceName"><names variable="event" font-style="italic"><name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal"></name></names></macro>
-  -->
   <macro name="man-archive">
     <choose>
       <if type="manuscript" match="any">
-        <group delimiter=", ">
-          <text variable="archive"/>
-          <text variable="call-number"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="document">
-    <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song article-journal article-magazine chapter entry-dictionary entry-encyclopedia webpage" match="none">
         <group delimiter=", ">
           <text variable="archive"/>
           <text variable="archive_location"/>
           <text variable="call-number"/>
-          <text variable="title"/>
         </group>
       </if>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation report song thesis" match="any">
         <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
-      <else-if type="article-journal article-newspaper article-magazine paper-conference" match="any">
-        <group delimiter=", ">
-          <!--<text variable="title" form="short" text-case="capitalize-first" quotes="false"/>-->
-          <text variable="title" text-case="title" quotes="true"/>
-          <text variable="container-title" font-style="italic"/>
-        </group>
+      <else-if type="article-journal article-newspaper article-magazine" match="any">
+        <text variable="title" text-case="title" quotes="true"/>
       </else-if>
       <else-if type="paper-conference" match="any">
         <group delimiter=", ">
-          <!--<text variable="title" form="short" text-case="capitalize-first" quotes="false"/>-->
           <text variable="title" text-case="capitalize-first" quotes="true"/>
           <text variable="container-title" font-style="italic"/>
-          <text value="dans" font-style="normal" suffix=" " prefix=" "/>
-          <!--<text variable="editor" suffix=" (dir.), "/>-->
-        </group>
-      </else-if>
-      <else-if type="thesis" match="any">
-        <group>
-          <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
-          <text variable="genre" prefix=" "/>
-          <text variable="publisher" prefix=", "/>
+          <text term="in" suffix=" "/>
         </group>
       </else-if>
       <else-if type="map" match="any">
-        <group>
-          <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
-        </group>
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </else-if>
       <else-if type="manuscript" match="any">
-        <group delimiter=",">
-          <text variable="title" text-case="capitalize-first" quotes="false" font-style="italic"/>
-          <!--<text variable="archive" prefix=" "/>-->
-          <!--<text variable="call-number" prefix=" "/>-->
-          <!-- <text variable="genre" prefix=" "/> -->
-        </group>
-      </else-if>
-      <else-if type="chapter" match="any">
-        <group>
-          <group suffix=",">
-            <text variable="title" text-case="capitalize-first" quotes="true"/>
-          </group>
-          <text value="dans" font-style="normal" suffix="" prefix=" "/>
-          <text variable="edition" suffix=" (dir.), "/>
-          <text variable="container-title" text-case="capitalize-first" font-style="italic" prefix="&#160;"/>
-        </group>
-      </else-if>
-      <else-if type="webpage" match="any">
-        <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal" suffix=","/>
-          <text variable="container-title" text-case="capitalize-first" suffix=","/>
-          <date variable="issued" suffix=" ">
-            <date-part name="day" suffix=" "/>
-            <date-part name="month" suffix=" "/>
-            <date-part name="year"/>
-          </date>
-          <text variable="URL"/>
-          <date form="text" variable="accessed" prefix="(" suffix=")"/>
-        </group>
+        <text variable="title" text-case="capitalize-first"/>
       </else-if>
       <else>
         <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>
+  <macro name="title-short-note">
+    <choose>
+      <!-- books etc. = italic -->
+      <if type="book report thesis manuscript" match="any">
+        <text variable="title" form="short" font-style="italic"/>
+      </if>
+      <!-- articles/chapters etc. = quotes -->
+      <else-if type="article-journal article-newspaper article-magazine chapter paper-conference entry-encyclopedia" match="any">
+        <text variable="title" form="short" quotes="true"/>
+      </else-if>
+      <!-- fallback -->
+      <else>
+        <text variable="title" form="short"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="pub-place">
     <choose>
-      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation manuscript motion_picture paper-conference report song thesis" match="any">
+      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation manuscript motion_picture paper-conference report song thesis map" match="any">
         <text variable="publisher-place"/>
       </if>
     </choose>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song article-magazine map" match="any">
+      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song article-magazine map thesis" match="any">
         <text variable="publisher"/>
       </if>
     </choose>
   </macro>
   <macro name="yearpage">
     <choose>
-      <if type="bill book graphic legal_case legislation manuscript motion_picture paper-conference report song thesis" match="any">
-        <group delimiter=", " font-style="normal">
+      <if type="bill graphic legal_case legislation manuscript map motion_picture paper-conference report song thesis book" match="any">
+        <group>
+          <!-- Year of the edition used -->
           <date variable="issued">
             <date-part name="year"/>
           </date>
-          <group>
-            <text term="volume" form="short" suffix="."/>
-            <text variable="number-of-volumes" prefix=". " suffix="/"/>
-            <text variable="volume"/>
-          </group>
-          <choose>
-            <if variable="locator" match="any">
-              <text variable="locator" prefix="p.&#160;"/>
-            </if>
-          </choose>
-        </group>
-      </if>
-      <else-if type="chapter entry-dictionary entry-encyclopedia article-magazine" match="any">
-        <group delimiter=" " font-style="normal">
-          <date variable="issued">
-            <date-part name="year" suffix=", "/>
+          <!-- Original year, if present in the Original date field -->
+          <date variable="original-date">
+            <date-part name="year" prefix=" [" suffix="]"/>
           </date>
-          <group>
-            <text term="volume" form="short" suffix="."/>
-            <!--<text variable="number-of-volumes" prefix=". " suffix="/"/>-->
-            <text variable="volume" suffix=","/>
-          </group>
-          <choose>
-            <if variable="locator" match="any">
-              <text variable="locator" prefix="p.&#160;"/>
-            </if>
-            <else-if variable="locator" match="none">
-              <label variable="page" form="short"/>
-              <text variable="page"/>
-            </else-if>
-          </choose>
         </group>
+      </if>
+      <else-if type="bill graphic legal_case legislation manuscript motion_picture paper-conference report song thesis book" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
       </else-if>
       <else-if type="article-newspaper article-magazine" match="any">
-        <group delimiter=" " font-style="normal">
-          <label variable="page" form="short"/>
-          <text variable="page"/>
-        </group>
-        <group delimiter=" " font-style="normal">
-          <choose>
-            <if variable="locator" match="any">
-              <text variable="locator" prefix="p.&#160;"/>
-            </if>
-            <else-if variable="locator" match="none">
-              <label variable="page" form="short"/>
-            </else-if>
-          </choose>
-        </group>
+        <date form="text" variable="issued"/>
       </else-if>
       <else>
         <date variable="issued">
           <date-part name="day" suffix="&#160;"/>
           <date-part name="month" suffix="&#160;"/>
-          <date-part name="year" suffix=""/>
+          <date-part name="year"/>
         </date>
       </else>
     </choose>
@@ -274,79 +288,27 @@
   <macro name="yearpage-bib">
     <choose>
       <if type="bill book graphic legal_case legislation manuscript motion_picture paper-conference report song thesis chapter entry-dictionary entry-encyclopedia" match="any">
-        <group font-style="normal">
+        <group>
+          <!-- Année de l'édition utilisée -->
           <date variable="issued">
             <date-part name="year"/>
           </date>
-          <!--
-	        <group prefix="&#160;[" suffix="]"><number variable="edition" form="numeric"/></group>
-          -->
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="nbr-page">
-    <choose>
-      <if type="bill book graphic legal_case legislation manuscript motion_picture report song thesis entry-dictionary article-journal" match="any">
-        <group delimiter=", " font-style="normal">
-          <number variable="number-of-pages" suffix="p."/>
-          <text variable="page" prefix="&#160;"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="chapter-nbr-page">
-    <choose>
-      <if type="chapter" match="any">
-        <group delimiter=", " font-style="normal">
-          <text variable="page" prefix="p.&#160;"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="conference-nbr-page">
-    <choose>
-      <if type="paper-conference" match="any">
-        <group delimiter=", " font-style="normal">
-          <text variable="page" suffix="p."/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="entry-encyclopedia-nbr-page">
-    <choose>
-      <if type="entry-encyclopedia" match="any">
-        <group delimiter=", " font-style="normal">
-          <text variable="page" suffix="p."/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="journal-nbr-page">
-    <choose>
-      <if type="article-journal" match="any">
-        <group delimiter=", " font-style="normal">
-          <text variable="page" prefix="p.&#160;"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="page-nbr">
-    <choose>
-      <if type="bill book graphic legal_case legislation manuscript motion_picture paper-conference report song thesis chapter entry-dictionary entry-encyclopedia article-journal article-newspaper article-magazine" match="any">
-        <group delimiter=" " font-style="normal">
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
+          <!-- Année de la première édition, si présente dans le champ Date originale -->
+          <date variable="original-date">
+            <date-part name="year" prefix=" [" suffix="]"/>
+          </date>
         </group>
       </if>
+      <else>
+        <date form="text" date-parts="year-month-day" variable="issued"/>
+      </else>
     </choose>
   </macro>
   <macro name="volume">
     <choose>
-      <if type="bill book graphic legal_case legislation manuscript motion_picture paper-conference report song thesis chapter entry-dictionary entry-encyclopedia" match="any">
-        <group font-style="normal">
-          <text term="volume" form="short" suffix=".&#160;"/>
-          <text variable="number-of-volumes" prefix=".&#160;" suffix="/"/>
+      <if variable="volume">
+        <group delimiter="&#160;">
+          <label variable="volume" form="short"/>
           <text variable="volume"/>
         </group>
       </if>
@@ -357,50 +319,61 @@
       <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <choose>
           <if is-numeric="edition">
-            <group prefix="[" suffix="]">
-              <number variable="edition" form="numeric"/>
+            <group delimiter="&#160;">
+              <number variable="edition" form="ordinal"/>
+              <label variable="edition" form="short"/>
             </group>
           </if>
           <else>
-            <text variable="edition" text-case="capitalize-first" suffix=" (dir.)"/>
+            <text variable="edition" text-case="capitalize-first"/>
           </else>
         </choose>
         <text macro="issue" prefix=", "/>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter=", " font-style="normal">
+        <group delimiter=", ">
           <text macro="voljournal"/>
-          <date variable="issued">
-            <date-part name="day" suffix=" "/>
-            <date-part name="month" suffix=" "/>
-            <date-part name="year"/>
-          </date>
+          <date form="text" variable="issued"/>
           <choose>
             <if is-numeric="page">
-              <group>
+              <group prefix=". " delimiter="&#160;">
                 <label variable="page" form="short"/>
-                <text variable="page" prefix=".&#160;"/>
+                <text variable="page"/>
               </group>
             </if>
-            <else>
-              <text variable="URL" text-decoration="underline"/>
-            </else>
           </choose>
         </group>
+        <text macro="URL-note"/>
       </else-if>
     </choose>
   </macro>
   <macro name="voljournal">
-    <group delimiter=",">
-      <text variable="volume" prefix="vol.&#160;"/>
-      <text variable="issue" prefix="&#160;n°&#160;"/>
+    <group delimiter=", ">
+      <choose>
+        <if variable="volume">
+          <group delimiter="&#160;">
+            <label variable="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if variable="issue">
+          <group delimiter="&#160;">
+            <label variable="issue" form="short" plural="never"/>
+            <text variable="issue"/>
+          </group>
+        </if>
+      </choose>
     </group>
   </macro>
   <macro name="issue">
     <choose>
       <if is-numeric="issue">
-        <text term="issue" form="short" suffix="&#160;"/>
-        <text variable="issue"/>
+        <group delimiter="&#160;">
+          <label variable="issue" form="short" plural="never"/>
+          <text variable="issue"/>
+        </group>
       </if>
       <else>
         <text variable="issue"/>
@@ -408,143 +381,348 @@
     </choose>
   </macro>
   <macro name="encyclopediaTitle">
-    <group delimiter=",">
-      <text variable="container-title" font-style="italic"/>
-    </group>
+    <choose>
+      <if match="any" variable="editor">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text term="in"/>
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="genre">
-    <group delimiter=",">
-      <text variable="genre"/>
-    </group>
-  </macro>
-  <macro name="note">
-    <group delimiter=",">
-      <text variable="note"/>
-    </group>
+    <text variable="genre"/>
   </macro>
   <macro name="collection">
     <choose>
       <if is-numeric="collection-number">
-        <group prefix=" coll.">
-          <text variable="collection-title" quotes="true" suffix="#160;"/>
+        <group prefix=" " delimiter=" ">
+          <text term="collection" form="short"/>
+          <text variable="collection-title" quotes="true"/>
+        </group>
+        <group prefix=", " delimiter="&#160;">
+          <label variable="collection-number" form="short"/>
+          <number variable="collection-number"/>
         </group>
-        <text variable="collection-number" prefix=", n˚&#160;"/>
       </if>
+      <else-if type="broadcast" match="any">
+        <text variable="collection-title" font-style="italic"/>
+      </else-if>
       <else>
-        <group prefix=" coll. ">
+        <group prefix=" " delimiter=" ">
+          <text term="collection" form="short"/>
           <text variable="collection-title" quotes="true"/>
         </group>
       </else>
     </choose>
   </macro>
-  <citation>
-    <layout suffix="." delimiter="&#160;">
+  <macro name="URL">
+    <choose>
+      <if variable="URL DOI" match="all">
+        <text variable="URL" prefix=". "/>
+      </if>
+      <else-if variable="URL">
+        <text variable="URL" prefix=". "/>
+      </else-if>
+      <else-if variable="DOI">
+        <text variable="DOI" prefix=". https://doi.org/"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="URL-note">
+    <choose>
+      <if variable="URL DOI" match="all">
+        <text variable="URL" prefix=". "/>
+      </if>
+      <else-if variable="URL">
+        <text variable="URL" prefix=". "/>
+      </else-if>
+      <else-if variable="DOI">
+        <text variable="DOI" prefix=". https://doi.org/"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="editor_chapter">
+    <choose>
+      <if variable="author" match="any">
+        <group prefix=" " delimiter=" ">
+          <text term="in"/>
+          <names variable="editor">
+            <name and="text" delimiter-precedes-last="never">
+              <name-part name="family"/>
+            </name>
+            <label form="verb-short" prefix=" (" suffix=")"/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor_book">
+    <choose>
+      <if variable="author editor" match="all">
+        <names variable="editor" prefix=" ">
+          <label form="verb" suffix=" "/>
+          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="annee_intervalle-note">
+    <choose>
+      <if type="book chapter manuscript" match="any" is-numeric="note">
+        <text variable="note"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locator-note">
+    <group delimiter="&#160;">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="locator-or-page">
+    <choose>
+      <if variable="locator">
+        <group delimiter="&#160;">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </if>
+      <else>
+        <text macro="page"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="nbr_volumes">
+    <choose>
+      <if variable="number-of-volumes">
+        <group delimiter="&#160;">
+          <number variable="number-of-volumes" form="numeric"/>
+          <label variable="volume" form="short" plural="contextual"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="date_consult">
+    <choose>
+      <if variable="accessed">
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="accessed"/>
+          <date form="text" variable="accessed"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="page">
+    <group delimiter="&#160;">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="nb-pages">
+    <choose>
+      <if variable="number-of-pages">
+        <group delimiter="&#160;">
+          <number variable="number-of-pages" form="numeric"/>
+          <label variable="page" form="short" plural="contextual"/>
+        </group>
+      </if>
+      <else-if variable="page">
+        <group delimiter="&#160;">
+          <text variable="page"/>
+          <label variable="page" form="short"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1">
+    <layout delimiter="; " suffix=".">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
-            <text term="ibid" text-case="capitalize-first" font-style="italic" suffix="."/>
-            <text variable="locator" prefix="p. "/>
+            <text macro="author-opcit"/>
+            <text macro="title-short-note"/>
+            <text macro="locator-note"/>
           </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid" text-case="capitalize-first" font-style="italic"/>
+          <group delimiter=", ">
+            <text macro="author-opcit"/>
+            <text macro="title-short-note"/>
+            <text macro="locator-note"/>
+          </group>
         </else-if>
         <else-if position="subsequent">
           <group delimiter=", ">
             <text macro="author-opcit"/>
-            <text term="cited" font-style="italic" suffix="."/>
-            <text variable="locator" prefix="p.&#160;"/>
+            <text macro="title-short-note"/>
+            <text macro="locator-note"/>
           </group>
         </else-if>
         <else>
+          <group delimiter=", ">
+            <text macro="author"/>
+            <choose>
+              <if type="motion_picture" match="any">
+                <text macro="title" quotes="false"/>
+              </if>
+              <else>
+                <text macro="title"/>
+              </else>
+            </choose>
+            <choose>
+              <if type="manuscript" match="any">
+                <group delimiter=", ">
+                  <text macro="genre"/>
+                  <text macro="pub-place"/>
+                  <text macro="yearpage"/>
+                  <text macro="annee_intervalle-note"/>
+                  <text macro="locator-note"/>
+                </group>
+              </if>
+              <else-if type="article-newspaper article-magazine" match="any">
+                <group delimiter=", ">
+                  <text variable="container-title" font-style="italic"/>
+                  <text macro="yearpage"/>
+                  <text macro="locator-or-page"/>
+                </group>
+              </else-if>
+              <else-if type="article-journal" match="any">
+                <group delimiter=", ">
+                  <text macro="translator"/>
+                  <text variable="container-title" font-style="italic"/>
+                  <text macro="voljournal"/>
+                  <text macro="yearpage"/>
+                  <text macro="locator-or-page"/>
+                </group>
+              </else-if>
+              <else-if type="entry-encyclopedia entry-dictionary" match="any">
+                <group delimiter=", ">
+                  <text macro="editor_chapter"/>
+                  <text macro="translator"/>
+                  <text macro="encyclopediaTitle"/>
+                  <text macro="volume"/>
+                  <text macro="pub-place"/>
+                  <text macro="publisher"/>
+                  <text macro="yearpage-bib"/>
+                  <text macro="locator-or-page"/>
+                </group>
+              </else-if>
+              <else-if type="map" match="any">
+                <group delimiter=", ">
+                  <text macro="genre"/>
+                  <text macro="translator"/>
+                  <text macro="pub-place"/>
+                  <text macro="publisher"/>
+                  <text macro="edition"/>
+                  <date form="text" date-parts="year-month-day" variable="issued"/>
+                </group>
+              </else-if>
+              <else-if type="broadcast" match="any">
+                <group delimiter=", ">
+                  <text variable="medium"/>
+                  <text variable="container-title" font-style="italic"/>
+                  <text macro="collection"/>
+                  <text variable="number"/>
+                  <date form="text" date-parts="year-month-day" variable="issued"/>
+                  <text variable="dimensions"/>
+                </group>
+              </else-if>
+              <else-if type="post-weblog post" match="any">
+                <group delimiter=", ">
+                  <text variable="genre"/>
+                  <text variable="container-title" font-style="italic"/>
+                  <date form="text" date-parts="year-month-day" variable="issued"/>
+                </group>
+              </else-if>
+              <else-if type="chapter" match="any">
+                <group delimiter=", ">
+                  <text macro="editor_chapter"/>
+                  <text macro="translator"/>
+                  <text macro="encyclopediaTitle"/>
+                  <text macro="volume"/>
+                  <text macro="pub-place"/>
+                  <text macro="publisher"/>
+                  <text macro="yearpage"/>
+                  <text macro="locator-or-page"/>
+                </group>
+              </else-if>
+              <else-if type="motion_picture" match="any">
+                <group delimiter=", ">
+                  <text variable="medium"/>
+                  <text variable="publisher"/>
+                  <text macro="yearpage"/>
+                  <text variable="dimensions"/>
+                </group>
+              </else-if>
+              <else-if type="book" match="any">
+                <group delimiter=", ">
+                  <text macro="editor-translator-after-title"/>
+                  <text macro="volume"/>
+                  <text macro="pub-place"/>
+                  <text macro="publisher"/>
+                  <text macro="yearpage"/>
+                  <text macro="annee_intervalle-note"/>
+                  <text macro="nbr_volumes"/>
+                  <text macro="locator-note"/>
+                </group>
+              </else-if>
+              <else-if type="webpage" match="any">
+                <group delimiter=", ">
+                  <text variable="container-title" font-style="italic"/>
+                  <text macro="genre"/>
+                  <text macro="yearpage"/>
+                </group>
+              </else-if>
+              <else-if type="report" match="any">
+                <group delimiter=", ">
+                  <text macro="genre"/>
+                  <text macro="pub-place"/>
+                  <text macro="publisher"/>
+                  <text macro="yearpage"/>
+                  <text macro="locator-note"/>
+                </group>
+              </else-if>
+              <else-if type="thesis" match="any">
+                <group delimiter=", ">
+                  <text macro="genre"/>
+                  <text macro="pub-place"/>
+                  <text macro="publisher"/>
+                  <text macro="yearpage"/>
+                  <text macro="locator-note"/>
+                </group>
+              </else-if>
+              <else>
+                <group delimiter=", ">
+                  <text macro="genre"/>
+                  <text macro="editor_book"/>
+                  <text macro="translator"/>
+                  <text macro="pub-place"/>
+                  <text macro="publisher"/>
+                  <text macro="yearpage"/>
+                  <text macro="volume"/>
+                  <text macro="locator-note"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <choose>
             <if type="manuscript" match="any">
-              <group delimiter=", ">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="translator"/>
-                <text macro="yearpage-bib"/>
-                <text macro="pub-place"/>
-                <text macro="man-archive"/>
-                <text macro="edition"/>
-                <text macro="publisher"/>
-                <text macro="collection"/>
-                <text macro="page-nbr"/>
-              </group>
+              <text macro="man-archive" prefix=". "/>
+            </if>
+          </choose>
+          <text macro="URL-note"/>
+          <choose>
+            <if type="webpage" match="any">
+              <text macro="date_consult"/>
             </if>
-            <else-if type="thesis" match="any">
-              <group delimiter=", ">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="yearpage-bib"/>
-                <text macro="page-nbr"/>
-              </group>
-            </else-if>
-            <else-if type="article-journal" match="any">
-              <group delimiter=", ">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="translator"/>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text macro="voljournal"/>
-                <text macro="yearpage"/>
-                <text macro="page-nbr"/>
-              </group>
-            </else-if>
-            <else-if type="paper-conference" match="any">
-              <group delimiter=", ">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="translator"/>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text macro="yearpage-bib"/>
-                <text macro="volume"/>
-                <text macro="collection"/>
-                <text macro="page-nbr"/>
-              </group>
-            </else-if>
-            <else-if type="entry-encyclopedia" match="any">
-              <group delimiter=", ">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="encyclopediaTitle"/>
-                <text macro="translator"/>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text macro="yearpage-bib"/>
-                <text macro="volume"/>
-                <text macro="collection"/>
-                <text macro="page-nbr"/>
-              </group>
-            </else-if>
-            <else-if type="map" match="any">
-              <group delimiter=", ">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="genre"/>
-                <text macro="translator"/>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text macro="edition"/>
-                <text macro="yearpage-bib"/>
-                <text macro="note"/>
-              </group>
-            </else-if>
-            <else>
-              <group delimiter=", ">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="translator"/>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text macro="collection"/>
-                <text macro="yearpage-bib"/>
-                <text macro="volume"/>
-                <text macro="page-nbr"/>
-              </group>
-            </else>
           </choose>
         </else>
       </choose>
@@ -558,110 +736,189 @@
     <layout suffix=".">
       <choose>
         <if type="manuscript" match="any">
-          <group delimiter=", ">
+          <group delimiter=", " suffix=".">
             <text macro="author-bib"/>
             <text macro="title"/>
-            <text macro="translator"/>
-            <text macro="yearpage-bib"/>
+            <text variable="genre"/>
             <text macro="pub-place"/>
+            <text macro="yearpage-bib"/>
+            <text macro="annee_intervalle-note"/>
+          </group>
+          <group delimiter=", " prefix=" ">
             <text macro="man-archive"/>
-            <text macro="edition"/>
-            <text macro="publisher"/>
-            <text macro="collection"/>
+            <text macro="nb-pages"/>
           </group>
+          <text macro="URL"/>
         </if>
-        <else-if type="thesis" match="any">
+        <else-if type="article-newspaper article-magazine" match="any">
           <group delimiter=", ">
             <text macro="author-bib"/>
             <text macro="title"/>
-            <text macro="yearpage-bib"/>
-            <text macro="nbr-page"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="yearpage"/>
+            <text macro="page"/>
           </group>
+          <text macro="URL"/>
         </else-if>
         <else-if type="article-journal" match="any">
           <group delimiter=", ">
             <text macro="author-bib"/>
             <text macro="title"/>
             <text macro="translator"/>
-            <text macro="pub-place"/>
-            <text macro="publisher"/>
+            <text variable="container-title" font-style="italic"/>
             <text macro="voljournal"/>
             <text macro="yearpage"/>
-            <text macro="journal-nbr-page"/>
+            <text macro="page"/>
           </group>
+          <text macro="URL"/>
         </else-if>
-        <else-if type="chapter" match="any">
+        <else-if type="entry-encyclopedia entry-dictionary" match="any">
           <group delimiter=", ">
             <text macro="author-bib"/>
             <text macro="title"/>
+            <text macro="editor_chapter"/>
             <text macro="translator"/>
+            <text macro="encyclopediaTitle"/>
+            <text macro="volume"/>
             <text macro="pub-place"/>
             <text macro="publisher"/>
-            <text macro="yearpage-bib"/>
-            <text macro="volume"/>
             <text macro="collection"/>
-            <text macro="chapter-nbr-page"/>
+            <text macro="yearpage-bib"/>
+            <text macro="page"/>
           </group>
+          <text macro="URL"/>
         </else-if>
-        <else-if type="paper-conference" match="any">
+        <else-if type="map" match="any">
           <group delimiter=", ">
             <text macro="author-bib"/>
             <text macro="title"/>
+            <text macro="genre"/>
             <text macro="translator"/>
             <text macro="pub-place"/>
             <text macro="publisher"/>
-            <text macro="yearpage-bib"/>
-            <text macro="volume"/>
+            <text macro="edition"/>
+            <date form="text" date-parts="year-month-day" variable="issued"/>
+          </group>
+          <text macro="URL"/>
+        </else-if>
+        <else-if type="broadcast" match="any">
+          <group delimiter=", ">
+            <text macro="author-bib"/>
+            <text macro="title"/>
+            <text variable="medium"/>
+            <text variable="container-title" font-style="italic"/>
             <text macro="collection"/>
-            <text macro="conference-nbr-page"/>
+            <text variable="number"/>
+            <date form="text" date-parts="year-month-day" variable="issued"/>
+            <text variable="dimensions"/>
           </group>
+          <text macro="URL"/>
         </else-if>
-        <else-if type="entry-encyclopedia" match="any">
+        <else-if type="post-weblog post" match="any">
           <group delimiter=", ">
             <text macro="author-bib"/>
             <text macro="title"/>
-            <text macro="encyclopediaTitle"/>
+            <text variable="genre"/>
+            <text variable="container-title" font-style="italic"/>
+            <date form="text" date-parts="year-month-day" variable="issued"/>
+          </group>
+          <text macro="URL"/>
+        </else-if>
+        <else-if type="chapter" match="any">
+          <group delimiter=", ">
+            <text macro="author-bib"/>
+            <text macro="title"/>
+            <text macro="editor_chapter"/>
             <text macro="translator"/>
+            <text macro="encyclopediaTitle"/>
+            <text macro="volume"/>
             <text macro="pub-place"/>
             <text macro="publisher"/>
-            <text macro="yearpage-bib"/>
-            <text macro="volume"/>
             <text macro="collection"/>
-            <text macro="entry-encyclopedia-nbr-page"/>
+            <text macro="yearpage-bib"/>
+            <text macro="annee_intervalle-note"/>
+            <text macro="page"/>
           </group>
+          <text macro="URL"/>
         </else-if>
-        <else-if type="bill book graphic legal_case legislation motion_picture report song article-magazine chapter webpage" match="any">
+        <else-if type="motion_picture" match="any">
           <group delimiter=", ">
             <text macro="author-bib"/>
             <text macro="title"/>
-            <text macro="translator"/>
+            <text variable="medium"/>
+            <text variable="publisher"/>
+            <text macro="yearpage-bib"/>
+            <text variable="dimensions"/>
+          </group>
+          <text macro="URL"/>
+        </else-if>
+        <else-if type="book" match="any">
+          <group delimiter=", ">
+            <text macro="author-bib"/>
+            <text macro="title"/>
+            <text macro="editor-translator-after-title"/>
+            <text macro="volume"/>
             <text macro="pub-place"/>
             <text macro="publisher"/>
             <text macro="collection"/>
             <text macro="yearpage-bib"/>
-            <text macro="volume"/>
-            <text macro="nbr-page"/>
+            <text macro="annee_intervalle-note"/>
+            <text macro="nbr_volumes"/>
+            <text macro="nb-pages"/>
           </group>
+          <text macro="URL"/>
         </else-if>
-        <else-if type="map" match="any">
+        <else-if type="webpage" match="any">
+          <group delimiter=", ">
+            <text macro="author-bib"/>
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="genre"/>
+            <text macro="yearpage-bib"/>
+          </group>
+          <text macro="URL"/>
+          <text macro="date_consult"/>
+        </else-if>
+        <else-if type="report" match="any">
           <group delimiter=", ">
             <text macro="author-bib"/>
             <text macro="title"/>
             <text macro="genre"/>
-            <text macro="translator"/>
             <text macro="pub-place"/>
             <text macro="publisher"/>
-            <text macro="edition"/>
             <text macro="yearpage-bib"/>
-            <text macro="note"/>
+            <text macro="nb-pages"/>
+          </group>
+          <text macro="URL"/>
+        </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=", ">
+            <text macro="author-bib"/>
+            <text macro="title"/>
+            <text macro="genre"/>
+            <text macro="pub-place"/>
+            <text macro="publisher"/>
+            <text macro="yearpage"/>
+            <text macro="nb-pages"/>
           </group>
+          <text macro="URL"/>
         </else-if>
         <else>
           <group delimiter=", ">
             <text macro="author-bib"/>
-            <text macro="document"/>
+            <text macro="title"/>
+            <text macro="genre"/>
+            <text macro="editor_book"/>
+            <text macro="translator"/>
+            <text macro="pub-place"/>
+            <text macro="publisher"/>
+            <text macro="collection"/>
             <text macro="yearpage"/>
+            <text macro="volume"/>
+            <text macro="page"/>
+            <text macro="nb-pages"/>
           </group>
+          <text macro="URL"/>
         </else>
       </choose>
     </layout>