csl-styles 1.0.1.9 → 1.0.1.10

data/vendor/styles/chicago-author-date-fr.csl

@@ -1,212 +1,233 @@
 <?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="chicago" default-locale="fr-FR">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago" default-locale="fr-FR">
   <info>
-    <title>Chicago Manual of Style 16th edition (author-date, French)</title>
+    <title>Chicago Manual of Style 17th edition (author-date), French</title>
     <id>http://www.zotero.org/styles/chicago-author-date-fr</id>
     <link href="http://www.zotero.org/styles/chicago-author-date-fr" rel="self"/>
-    <link href="http://www.zotero.org/styles/chicago-author-date" rel="template"/>
     <link href="http://guides.bib.umontreal.ca/disciplines/483-Citer-selon-le-style-Chicago?tab=2189" rel="documentation"/>
     <author>
-      <name>Florian Martin-Bariteau</name>
-      <email>f.martin-bariteau@umontreal.ca</email>
+      <name>Anne Le-Huu Pineault</name>
+      <email>anne-gabrielle.le-huu.pineault@umontreal.ca</email>
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>Adaptation en français de la norme "Chicago" (méthode auteur-date), basée sur le guide des Bibliothèques de l'Université de Montréal.</summary>
-    <updated>2018-05-22T00:59:23+00:00</updated>
+    <summary>Adaptation française du style "Chicago" (méthode auteur-date), 17e édition</summary>
+    <updated>2019-10-02T00:48:01+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>
+  <locale xml:lang="fr">
     <terms>
-      <term name="ibid">ibid</term>
       <term name="in">dans</term>
-      <term name="editor" form="short">dir.</term>
-      <term name="editor" form="verb">sous la direction de</term>
-      <term name="editor" form="verb-short">dir.</term>
-      <term name="issue" form="short">no</term>
-      <term name="editortranslator" form="verb-short">
-        <single>dir. et trad.</single>
-        <multiple>dir. and trad.</multiple>
+      <term name="editor" form="short">
+        <single>dir.</single>
+        <multiple>dir.</multiple>
       </term>
-      <term name="editortranslator" form="verb">Sous la direction et traduit par</term>
+      <term name="editor" form="verb">Sous la direction de</term>
+      <term name="editor" form="verb-short">Sous la dir. de</term>
+      <term name="editor" form="short">dir.</term>
+      <term name="container-author" form="verb">par</term>
       <term name="translator" form="verb-short">trad.</term>
+      <term name="editortranslator" form="verb">Sous la direction et traduit par</term>
       <term name="translator" form="short">trad.</term>
-      <term name="translator" form="verb">traduit par</term>
     </terms>
   </locale>
   <macro name="secondary-contributors">
     <choose>
-      <if type="entry-encyclopedia entry-dictionary" match="any">
-        <names variable="editor translator" delimiter=". ">
-          <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-          <label form="short" prefix=", "/>
-        </names>
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
+        <group delimiter=". ">
+          <names variable="editor translator" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+            <et-al/>
+          </names>
+          <names variable="director" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+            <et-al/>
+          </names>
+        </group>
       </if>
-      <else-if type="chapter paper-conference" match="none">
-        <names variable="editor translator" delimiter=". ">
-          <label form="verb" text-case="capitalize-first" suffix=" "/>
-          <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-        </names>
-      </else-if>
     </choose>
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=", ">
-          <choose>
-            <if variable="author">
-              <choose>
-                <if variable="container-author" match="any">
-                  <names variable="container-author">
-                    <label form="verb" text-case="capitalize-first" suffix=" "/>
-                    <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-                  </names>
-                </if>
-              </choose>
-              <!--This includes page numers after the container author, e.g. for Introductions -->
-              <choose>
-                <if variable="container-author author" match="all">
-                  <group delimiter=". ">
-                    <text variable="page"/>
-                    <names variable="editor translator" delimiter=", ">
-                      <label form="verb" text-case="capitalize-first" suffix=" "/>
-                      <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-                    </names>
-                  </group>
-                </if>
-                <else>
-                  <names variable="editor translator" delimiter=", ">
-                    <label form="verb" text-case="capitalize-first" suffix=" "/>
-                    <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-                  </names>
-                </else>
-              </choose>
-            </if>
-          </choose>
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter=", "/>
+            <et-al/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter=", "/>
+            <et-al/>
+          </names>
         </group>
       </if>
     </choose>
   </macro>
-  <macro name="recipient-note">
+  <macro name="recipient">
+    <choose>
+      <if type="personal_communication">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text term="letter" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
     <names variable="recipient" delimiter=", ">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-    </names>
-  </macro>
-  <macro name="contributors-note">
-    <group delimiter=" ">
-      <names variable="author">
-        <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-        <label form="short" prefix=", "/>
-        <substitute>
-          <names variable="editor"/>
-          <names variable="translator"/>
-        </substitute>
-      </names>
-      <text macro="recipient-note"/>
-    </group>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-      <label form="short" prefix=", "/>
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+      <et-al/>
     </names>
   </macro>
-  <macro name="translator">
-    <names variable="translator">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-      <label form="verb-short" prefix=", "/>
-    </names>
-  </macro>
-  <macro name="recipient">
-    <group delimiter=" ">
-      <choose>
-        <if type="personal_communication">
-          <choose>
-            <if variable="genre">
-              <text variable="genre" text-case="capitalize-first"/>
-            </if>
-            <else>
-              <text term="letter" text-case="capitalize-first"/>
-            </else>
-          </choose>
-        </if>
-      </choose>
-      <text macro="recipient-note"/>
-    </group>
+  <macro name="substitute-title">
+    <choose>
+      <if type="article-magazine article-newspaper review review-book" match="any">
+        <text macro="container-title"/>
+      </if>
+    </choose>
   </macro>
   <macro name="contributors">
-    <group delimiter=". ">
-      <names variable="author">
-        <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-        <substitute>
-          <text macro="editor"/>
-          <text macro="translator"/>
-        </substitute>
-      </names>
-      <text macro="recipient"/>
-    </group>
-  </macro>
-  <macro name="recipient-short">
-    <names variable="recipient">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-    </names>
+    <choose>
+      <if type="book">
+        <group delimiter=". ">
+          <names variable="author">
+            <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+            <et-al/>
+            <label form="short" prefix=", "/>
+            <substitute>
+              <names variable="editor"/>
+              <names variable="translator"/>
+              <names variable="director"/>
+              <text macro="substitute-title"/>
+              <text macro="title"/>
+            </substitute>
+          </names>
+          <text macro="recipient"/>
+        </group>
+      </if>
+      <else-if type="book" match="none">
+        <group delimiter=". ">
+          <names variable="author">
+            <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+            <et-al/>
+            <label form="short" prefix=", "/>
+            <substitute>
+              <names variable="editor"/>
+              <names variable="translator"/>
+              <names variable="director"/>
+              <text macro="substitute-title"/>
+              <text macro="title"/>
+            </substitute>
+          </names>
+          <text macro="recipient"/>
+        </group>
+      </else-if>
+    </choose>
   </macro>
-  <macro name="contributors-short">
-    <group delimiter=" ">
+  <macro name="contributors-long">
+    <group delimiter=". ">
       <names variable="author">
-        <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
         <substitute>
           <names variable="editor"/>
           <names variable="translator"/>
+          <names variable="director"/>
+          <text macro="substitute-title"/>
+          <text macro="title"/>
         </substitute>
       </names>
-      <text macro="recipient-short"/>
+      <text macro="recipient"/>
     </group>
   </macro>
-  <macro name="contributors-sort">
+  <macro name="contributors-short">
     <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
+        <names variable="director"/>
+        <text macro="substitute-title"/>
         <text macro="title"/>
       </substitute>
     </names>
   </macro>
   <macro name="interviewer">
     <names variable="interviewer" delimiter=", ">
-      <label form="verb" text-case="capitalize-first" suffix=" "/>
-      <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+      <et-al/>
     </names>
   </macro>
-  <macro name="title-note">
-    <choose>
-      <if variable="title" match="none">
-        <text variable="genre"/>
-      </if>
-      <else-if type="bill book graphic legislation motion_picture song" match="any">
-        <text variable="title" text-case="title" font-style="italic"/>
-        <group delimiter=" " prefix=", ">
-          <text term="version"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
-      <else-if type="legal_case interview" match="any">
-        <text variable="title"/>
-      </else-if>
-      <else-if variable="reviewed-author">
-        <text variable="title" font-style="italic" prefix="review of "/>
-      </else-if>
-      <else-if type="thesis">
-        <text variable="title" text-case="title" quotes="true"/>
-      </else-if>
-      <else>
-        <text variable="title" text-case="title" quotes="true"/>
-      </else>
-    </choose>
+  <macro name="archive">
+    <group delimiter=". ">
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if type="webpage">
+          <date variable="issued" form="text"/>
+        </if>
+        <else-if type="post-weblog">
+          <date variable="issued">
+            <date-part name="day" form="numeric"/>
+            <date-part name="month" form="long" prefix=" "/>
+          </date>
+        </else-if>
+        <else-if type="entry-encyclopedia" variable="DOI" match="all">
+          <date variable="issued" form="text" prefix="Consulté le "/>
+        </else-if>
+        <else-if type="entry-encyclopedia" variable="URL" match="all">
+          <date variable="issued" form="text" prefix="Consulté le "/>
+        </else-if>
+        <else-if type="entry-dictionary" variable="DOI" match="all">
+          <date variable="issued" form="text" prefix="Consulté le "/>
+        </else-if>
+        <else-if type="entry-dictionary" variable="URL" match="all">
+          <date variable="issued" form="text" prefix="Consulté le "/>
+        </else-if>
+        <else-if type="report" variable="URL" match="all">
+          <date variable="accessed" form="text" prefix="Consulté le "/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="https://doi.org/"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
   </macro>
   <macro name="title">
     <choose>
@@ -218,640 +239,521 @@
         </choose>
       </if>
       <else-if type="bill book graphic legislation motion_picture song" match="any">
-        <text variable="title" text-case="title" font-style="italic"/>
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
         <group prefix=" (" suffix=")" delimiter=" ">
           <text term="version"/>
           <text variable="version"/>
         </group>
       </else-if>
       <else-if variable="reviewed-author">
-        <group delimiter=", ">
-          <text variable="title" font-style="italic" prefix="Review of "/>
-          <names variable="reviewed-author">
-            <label form="verb-short" text-case="lowercase" suffix=" "/>
-            <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-          </names>
-        </group>
+        <choose>
+          <if variable="reviewed-title">
+            <group delimiter=". ">
+              <text variable="title" text-case="capitalize-first" quotes="true"/>
+              <group delimiter=", ">
+                <text variable="reviewed-title" text-case="capitalize-first" font-style="italic" prefix="Review of "/>
+                <names variable="reviewed-author">
+                  <label form="verb-short" text-case="lowercase" suffix=" "/>
+                  <name and="text" delimiter=", "/>
+                  <et-al/>
+                </names>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="title" text-case="capitalize-first" font-style="italic" prefix="Review of "/>
+              <names variable="reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name and="text" delimiter=", "/>
+                <et-al/>
+              </names>
+            </group>
+          </else>
+        </choose>
       </else-if>
-      <else-if type="legal_case interview" match="any">
+      <else-if type="legal_case interview patent" match="any">
         <text variable="title"/>
       </else-if>
       <else>
-        <text variable="title" text-case="title" quotes="true"/>
+        <text variable="title" text-case="capitalize-first" quotes="true"/>
       </else>
     </choose>
   </macro>
-  <macro name="description">
-    <group delimiter=", ">
-      <group delimiter=". ">
-        <text macro="interviewer"/>
-        <text variable="medium" text-case="capitalize-first"/>
-      </group>
-      <choose>
-        <if variable="title" match="none"/>
-        <else-if type="thesis speech" match="any"/>
-        <else>
-          <text variable="genre" text-case="capitalize-first"/>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="container-title">
-    <group delimiter=" ">
-      <choose>
-        <if type="chapter paper-conference" match="any">
-          <text term="in" text-case="capitalize-first"/>
-        </if>
-      </choose>
-      <choose>
-        <if type="legal_case" match="none">
-          <text variable="container-title" text-case="title" font-style="italic"/>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="collection-title">
+  <macro name="edition">
     <choose>
-      <if match="none" type="article-journal">
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <choose>
-          <if match="none" is-numeric="collection-number">
-            <group delimiter=", ">
-              <text variable="collection-title" text-case="title"/>
-              <text variable="collection-number"/>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=". ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" strip-periods="true"/>
             </group>
           </if>
           <else>
-            <group delimiter=" ">
-              <text variable="collection-title" text-case="title"/>
-              <text variable="collection-number"/>
-            </group>
+            <text variable="edition" text-case="capitalize-first" prefix=". "/>
           </else>
         </choose>
       </if>
-    </choose>
-  </macro>
-  <macro name="collection-title-journal">
-    <choose>
-      <if type="article-journal">
-        <group delimiter=" ">
-          <text variable="collection-title"/>
-          <text variable="collection-number"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <else-if type="chapter paper-conference" match="any">
         <choose>
           <if is-numeric="edition">
-            <group delimiter=" ">
+            <group delimiter=" " prefix=", ">
               <number variable="edition" form="ordinal"/>
               <text term="edition" form="short"/>
             </group>
           </if>
           <else>
-            <text variable="edition" text-case="capitalize-first" suffix="."/>
+            <text variable="edition" prefix=", "/>
           </else>
         </choose>
-      </if>
+      </else-if>
     </choose>
   </macro>
-  <macro name="locators-join-with-space">
+  <macro name="locators">
     <choose>
-      <if type="article-journal" variable="volume" match="all">
+      <if type="article-journal">
         <choose>
-          <if match="none" variable="collection-title">
-            <text macro="locators"/>
+          <if variable="volume">
+            <text variable="volume" prefix=" "/>
+            <group prefix=" (" suffix=")">
+              <choose>
+                <if variable="issue">
+                  <text variable="issue"/>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="month"/>
+                  </date>
+                </else>
+              </choose>
+            </group>
           </if>
+          <else-if variable="issue">
+            <group delimiter=" " prefix=", ">
+              <text term="issue" form="short"/>
+              <text variable="issue"/>
+              <date variable="issued" prefix="(" suffix=")">
+                <date-part name="month"/>
+              </date>
+            </group>
+          </else-if>
+          <else>
+            <date variable="issued" prefix=", ">
+              <date-part name="month"/>
+            </date>
+          </else>
         </choose>
       </if>
-    </choose>
-  </macro>
-  <macro name="locators-join-with-comma">
-    <choose>
-      <if type="legal_case chapter paper-conference" match="any">
-        <text macro="locators"/>
-      </if>
-      <else-if type="article-journal">
+      <else-if type="legal_case">
+        <text variable="volume" prefix=", "/>
+        <text variable="container-title" prefix=" "/>
+        <text variable="page" prefix=" "/>
+      </else-if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=". " delimiter=". ">
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <choose>
-          <if variable="volume" match="none">
-            <text macro="locators"/>
+          <if variable="page" match="none">
+            <group prefix=". ">
+              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+              <number variable="volume" form="numeric"/>
+            </group>
           </if>
-          <else-if match="any" variable="collection-title">
-            <text macro="locators"/>
-          </else-if>
         </choose>
       </else-if>
     </choose>
   </macro>
-  <macro name="locators-join-with-period">
+  <macro name="locators-chapter">
     <choose>
-      <if type="legal_case article-journal chapter paper-conference" match="none">
-        <text macro="locators"/>
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+        <choose>
+          <if variable="page">
+            <group prefix=", ">
+              <text variable="volume" suffix="&#160;: "/>
+              <text variable="page"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
-  <macro name="locators">
+  <macro name="locators-article">
     <choose>
-      <if type="article-journal">
-        <group delimiter=", ">
-          <text macro="collection-title-journal"/>
-          <number variable="volume"/>
+      <if type="article-newspaper">
+        <group prefix=", " delimiter=", ">
           <group delimiter=" ">
-            <text term="issue" form="short"/>
-            <number variable="issue"/>
+            <text variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=" "/>
+            <text variable="section"/>
           </group>
         </group>
       </if>
-      <else-if type="legal_case">
-        <group delimiter=" ">
-          <number variable="volume"/>
-          <text variable="container-title"/>
-          <text variable="page"/>
-        </group>
-      </else-if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group delimiter=". ">
-          <text macro="edition"/>
-          <group delimiter=" ">
-            <text term="volume" form="short" text-case="capitalize-first"/>
-            <number variable="volume" form="numeric"/>
-          </group>
-          <group delimiter=" ">
-            <number variable="number-of-volumes" form="numeric"/>
-            <text term="volume" form="short" plural="true"/>
-          </group>
-        </group>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <group delimiter=". ">
-          <text macro="edition"/>
-          <choose>
-            <if variable="page" match="none">
-              <group delimiter=" ">
-                <text term="volume" form="short" text-case="capitalize-first"/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </if>
-          </choose>
-        </group>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text variable="page" prefix="&#160;: "/>
+          </if>
+          <else>
+            <text variable="page" prefix=", "/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
-  <macro name="locators-newspaper">
+  <macro name="point-locators">
     <choose>
-      <if type="article-newspaper">
-        <group delimiter=", ">
-          <group delimiter=" ">
-            <number variable="edition"/>
-            <text term="edition"/>
-          </group>
-          <group delimiter=" ">
-            <text term="section"/>
-            <text variable="section"/>
-          </group>
-          <choose>
-            <if variable="locator" match="none">
-              <text variable="page"/>
-            </if>
-            <else>
-              <group delimiter=" ">
+      <if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <choose>
+              <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
                 <choose>
-                  <if locator="page" match="none">
-                    <label variable="locator" form="short" suffix=" "/>
+                  <if variable="volume">
+                    <group>
+                      <text term="volume" form="short" suffix=" "/>
+                      <number variable="volume" form="numeric"/>
+                      <label variable="locator" form="short" prefix=", " suffix=" "/>
+                    </group>
                   </if>
+                  <else>
+                    <label variable="locator" form="short" suffix=" "/>
+                  </else>
                 </choose>
-                <text variable="locator"/>
-              </group>
-            </else>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="event">
-    <group delimiter=" ">
-      <text term="presented at"/>
-      <text variable="event"/>
-    </group>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="thesis">
-        <text variable="publisher"/>
-      </if>
-      <else-if type="speech">
-        <text variable="event-place"/>
-      </else-if>
-      <else>
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if variable="issued">
-        <choose>
-          <if type="graphic report" match="any">
-            <date variable="issued" form="text"/>
+              </if>
+              <else>
+                <label variable="locator" form="short" suffix=" "/>
+              </else>
+            </choose>
           </if>
-          <else-if type="legal_case">
-            <group delimiter=" ">
-              <text variable="authority"/>
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
-            </group>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <number variable="volume" form="numeric" suffix="&#160;: "/>
           </else-if>
-          <else-if type="bill book chapter graphic legal_case legislation paper-conference motion_picture report song thesis" match="any">
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-          </else-if>
-          <else>
-            <date variable="issued" form="text"/>
-          </else>
         </choose>
+        <text variable="locator"/>
       </if>
-      <else-if variable="accessed URL" match="all"/>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
     </choose>
   </macro>
-  <macro name="point-locators">
+  <macro name="container-title">
     <choose>
-      <if variable="locator" match="none">
-        <choose>
-          <if type="article-journal article-magazine chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-            <text variable="page"/>
-          </if>
-        </choose>
+      <if type="chapter paper-conference entry-dictionary" match="any">
+        <text term="in" text-case="capitalize-first" suffix=" "/>
+        <text variable="container-title" text-case="capitalize-first" font-style="italic" suffix=". "/>
       </if>
-      <else-if type="article-journal article-magazine" match="any">
-        <group delimiter=" ">
-          <choose>
-            <if locator="page" match="none">
-              <label variable="locator" form="short" suffix=" "/>
-            </if>
-          </choose>
-          <text variable="locator"/>
-        </group>
-      </else-if>
-      <else-if type="legal_case"/>
-      <else>
-        <group delimiter=" ">
-          <choose>
-            <if locator="page" match="none">
-              <label variable="locator" form="short"/>
-            </if>
-          </choose>
-          <text variable="locator"/>
-        </group>
-      </else>
     </choose>
-  </macro>
-  <macro name="locators-chapter">
     <choose>
-      <if type="chapter paper-conference" match="any">
-        <choose>
-          <if variable="author container-author" match="all"/>
-          <else>
-            <choose>
-              <if variable="page">
-                <number variable="volume" suffix=":"/>
-                <text variable="page"/>
-              </if>
-            </choose>
-          </else>
-        </choose>
+      <if type="entry-encyclopedia" match="any">
+        <text term="in" text-case="capitalize-first" suffix=" "/>
       </if>
     </choose>
-  </macro>
-  <macro name="locators-journal-join-with-colon">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <choose>
-          <if variable="volume issue" match="any">
-            <text variable="page"/>
-          </if>
-        </choose>
+      <if type="webpage">
+        <text variable="container-title" text-case="capitalize-first"/>
       </if>
+      <else-if type="legal_case chapter paper-conference entry-dictionary" match="none">
+        <group delimiter=" ">
+          <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
+        </group>
+      </else-if>
     </choose>
   </macro>
-  <macro name="locators-journal-join-with-comma">
-    <choose>
-      <if type="article-journal article-magazine" match="any">
-        <choose>
-          <if variable="volume issue" match="none">
-            <text variable="page"/>
-          </if>
-        </choose>
-      </if>
-    </choose>
+  <macro name="publisher">
+    <group delimiter="&#160;: ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
   </macro>
-  <macro name="archive-note">
+  <macro name="date">
     <choose>
-      <if type="thesis">
+      <if variable="issued">
         <group delimiter=" ">
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
+          <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
         </group>
       </if>
+      <else-if variable="status">
+        <text variable="status" text-case="capitalize-first"/>
+      </else-if>
       <else>
-        <group delimiter=", ">
-          <text variable="archive_location"/>
-          <text variable="archive"/>
-          <text variable="archive-place"/>
-        </group>
+        <text term="no date" form="short"/>
       </else>
     </choose>
   </macro>
-  <macro name="archive">
+  <macro name="date-in-text">
     <choose>
-      <if type="thesis">
+      <if variable="issued">
         <group delimiter=" ">
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
+          <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
         </group>
       </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
       <else>
-        <group delimiter=". ">
-          <text variable="archive_location" text-case="capitalize-first"/>
-          <text variable="archive"/>
-          <text variable="archive-place"/>
-        </group>
+        <text term="no date" form="short"/>
       </else>
     </choose>
   </macro>
-  <macro name="issue-join-with-space">
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="collection-title">
     <choose>
-      <if type="article-journal legal_case" match="any">
+      <if match="none" type="article-journal">
         <choose>
-          <if variable="issue volume" match="any">
-            <text macro="issue"/>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
           </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="collection-title" text-case="capitalize-first"/>
+              <text variable="collection-number"/>
+            </group>
+          </else>
         </choose>
       </if>
     </choose>
   </macro>
-  <macro name="issue-join-with-period">
+  <macro name="collection-title-journal">
     <choose>
-      <if type="article-journal legal_case" match="none">
-        <choose>
-          <if type="speech" variable="publisher publisher-place" match="any">
-            <text macro="issue"/>
-          </if>
-        </choose>
+      <if type="article-journal">
+        <group delimiter=" ">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </group>
       </if>
     </choose>
   </macro>
-  <macro name="issue-join-with-comma">
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
     <choose>
-      <if type="article-journal legal_case" match="none">
-        <choose>
-          <if type="speech" variable="publisher publisher-place" match="none">
-            <text macro="issue"/>
-          </if>
-        </choose>
+      <if type="interview">
+        <group delimiter=". ">
+          <text macro="interviewer"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
       </if>
-      <else-if variable="volume issue" match="none">
-        <text macro="issue"/>
+      <else-if type="patent">
+        <group delimiter=" " prefix=". ">
+          <text variable="authority"/>
+          <text variable="number"/>
+        </group>
       </else-if>
+      <else>
+        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+      </else>
+    </choose>
+    <choose>
+      <if variable="title" match="none"/>
+      <else-if type="thesis personal_communication speech" match="any"/>
+      <else>
+        <group delimiter=" " prefix=". ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <choose>
+            <if type="report">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </else>
     </choose>
   </macro>
   <macro name="issue">
     <choose>
-      <if type="legal_case" match="any">
-        <text macro="issued" prefix="(" suffix=")"/>
+      <if type="legal_case">
+        <text variable="authority" prefix=". "/>
       </if>
-      <else-if type="article-journal">
-        <choose>
-          <if variable="issue volume" match="any">
-            <text macro="issued" prefix="(" suffix=")"/>
-          </if>
-          <else>
-            <text macro="issued"/>
-          </else>
-        </choose>
-      </else-if>
       <else-if type="speech">
-        <group delimiter=", ">
+        <group prefix=". " delimiter=", ">
           <group delimiter=" ">
-            <choose>
-              <if variable="title" match="none"/>
-              <else>
-                <text variable="genre" text-case="capitalize-first"/>
-              </else>
-            </choose>
+            <text variable="genre" text-case="capitalize-first"/>
             <text macro="event"/>
           </group>
           <text variable="event-place"/>
-          <text macro="issued"/>
+          <text macro="day-month"/>
         </group>
       </else-if>
-      <!--Chicago doesn't use publisher/place for Newspapers -->
-      <else-if type="article-newspaper">
-        <text macro="issued"/>
+      <else-if type="article-newspaper article-magazine personal_communication" match="any">
+        <date variable="issued" form="text" prefix=", "/>
       </else-if>
-      <else-if variable="publisher-place publisher" match="any">
-        <group delimiter=", ">
+      <else-if type="patent">
+        <group delimiter=", " prefix=", ">
+          <group delimiter=" ">
+            <!--Needs Localization-->
+            <text value="filed"/>
+            <date variable="submitted" form="text"/>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if variable="issued submitted" match="all">
+                <text term="and"/>
+              </if>
+            </choose>
+            <!--Needs Localization-->
+            <text value="issued"/>
+            <date variable="issued" form="text"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal" match="any"/>
+      <else>
+        <group prefix=". " delimiter=", ">
           <choose>
             <if type="thesis">
               <text variable="genre" text-case="capitalize-first"/>
             </if>
           </choose>
           <text macro="publisher"/>
-          <text macro="issued"/>
         </group>
-      </else-if>
-      <else>
-        <text macro="issued"/>
       </else>
     </choose>
   </macro>
-  <macro name="access-note">
-    <group delimiter=", ">
-      <choose>
-        <if type="graphic report" match="any">
-          <text macro="archive-note"/>
-        </if>
-        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
-          <text macro="archive-note"/>
-        </else-if>
-      </choose>
-      <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="doi:"/>
-        </if>
-        <else-if type="entry-encyclopedia entry-dictionary" match="any">
-          <choose>
-            <if variable="issued" match="none">
-              <group delimiter=", ">
-                <group delimiter=" ">
-                  <text term="accessed"/>
-                  <date variable="accessed" form="text"/>
-                </group>
-                <text variable="URL"/>
-              </group>
-            </if>
-          </choose>
-        </else-if>
-        <else>
-          <group delimiter=", ">
-            <text variable="URL"/>
-          </group>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="access">
-    <group delimiter=". ">
-      <choose>
-        <if type="graphic report" match="any">
-          <text macro="archive"/>
-        </if>
-        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
-          <text macro="archive"/>
-        </else-if>
-      </choose>
-      <choose>
-        <if type="legal_case" match="none">
-          <choose>
-            <if variable="DOI">
-              <text variable="DOI" prefix="doi:"/>
-            </if>
-            <else-if type="entry-encyclopedia entry-dictionary" match="any">
-              <choose>
-                <if variable="issued" match="none">
-                  <group delimiter=", ">
-                    <group delimiter=" ">
-                      <text term="accessed" text-case="capitalize-first"/>
-                      <date variable="accessed" form="text"/>
-                    </group>
-                    <text variable="URL"/>
-                  </group>
-                </if>
-              </choose>
-            </else-if>
-            <else>
-              <text variable="URL"/>
-            </else>
-          </choose>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="motionpicture-details">
-    <group delimiter=". ">
-      <text macro="issued"/>
-      <group delimiter=", ">
-        <text macro="publisher"/>
-        <text variable="dimensions"/>
-        <text variable="genre"/>
-        <date variable="accessed" form="text"/>
-      </group>
-      <text macro="access-note"/>
-    </group>
-  </macro>
-  <macro name="date">
-    <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else-if variable="accessed">
-        <date variable="accessed">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </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" givenname-disambiguation-rule="primary-name">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-        <group delimiter=" ">
-          <text macro="contributors-short"/>
-          <text macro="date"/>
-        </group>
+        <choose>
+          <if variable="issued accessed" match="any">
+            <group delimiter=" ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text"/>
+            </group>
+          </if>
+          <!---comma before forthcoming and n.d.-->
+          <else>
+            <group delimiter=", ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text"/>
+            </group>
+          </else>
+        </choose>
         <text macro="point-locators"/>
       </group>
     </layout>
   </citation>
   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
     <sort>
-      <key macro="contributors-sort"/>
-      <key variable="issued" sort="descending"/>
-      <key variable="genre"/>
+      <key macro="contributors"/>
+      <key variable="issued"/>
       <key variable="title"/>
     </sort>
     <layout suffix=".">
       <choose>
-        <if type="motion_picture">
-          <group delimiter=". ">
-            <text macro="contributors-note"/>
-            <text macro="title-note"/>
-            <text macro="motionpicture-details"/>
+        <if type="entry-encyclopedia">
+          <group delimiter=" ">
+            <choose>
+              <if variable="author" match="none">
+                <group delimiter=", ">
+                  <text variable="container-title" font-style="italic" suffix="."/>
+                  <group delimiter=". ">
+                    <text macro="container-contributors"/>
+                    <group delimiter=", ">
+                      <text macro="publisher"/>
+                      <text macro="date"/>
+                    </group>
+                  </group>
+                  <text variable="title" prefix=" s.v. " quotes="true"/>
+                </group>
+              </if>
+              <else-if variable="author">
+                <group delimiter=". ">
+                  <text macro="contributors" suffix="."/>
+                  <text macro="date"/>
+                  <text variable="title" quotes="true"/>
+                  <text macro="container-title"/>
+                  <text macro="container-contributors" text-case="capitalize-first"/>
+                  <text macro="publisher"/>
+                  <text macro="access"/>
+                </group>
+              </else-if>
+            </choose>
           </group>
         </if>
-        <else>
+        <else-if type="motion_picture">
           <group delimiter=". ">
-            <group delimiter=": ">
-              <group delimiter=", ">
-                <group delimiter=" ">
-                  <group delimiter=". ">
-                    <group delimiter=" ">
-                      <group delimiter=", ">
-                        <group delimiter=". ">
-                          <group delimiter=". ">
-                            <text macro="contributors"/>
-                            <choose>
-                              <if type="entry-encyclopedia entry-dictionary" match="none">
-                                <text macro="title"/>
-                              </if>
-                            </choose>
-                          </group>
-                          <text macro="description"/>
-                          <text macro="secondary-contributors"/>
-                          <group delimiter=". ">
-                            <text macro="container-title"/>
-                            <text macro="container-contributors"/>
-                          </group>
-                          <text macro="locators-join-with-period"/>
-                        </group>
-                        <text macro="locators-join-with-comma"/>
-                        <text macro="locators-chapter"/>
-                      </group>
-                      <text macro="locators-join-with-space"/>
-                    </group>
-                    <text macro="collection-title"/>
-                    <text macro="issue-join-with-period"/>
-                    <choose>
-                      <if type="entry-encyclopedia entry-dictionary" match="any">
-                        <choose>
-                          <if variable="URL" match="any">
-                            <text macro="title" prefix="s.v. "/>
-                          </if>
-                        </choose>
-                      </if>
-                    </choose>
+            <group delimiter=". ">
+              <group delimiter=" ">
+                <group delimiter=". ">
+                  <group delimiter=", ">
+                    <text variable="title" font-style="italic"/>
+                    <text variable="medium"/>
+                  </group>
+                  <text macro="contributors-long" prefix="Réalisé par "/>
+                  <group delimiter=", ">
+                    <text macro="publisher"/>
+                    <text macro="date"/>
                   </group>
-                  <text macro="issue-join-with-space"/>
                 </group>
-                <text macro="issue-join-with-comma"/>
-                <text macro="locators-journal-join-with-comma"/>
-                <text macro="locators-newspaper"/>
-                <text macro="locators-journal-join-with-colon"/>
               </group>
             </group>
-            <text macro="access"/>
-            <text variable="note"/>
           </group>
+        </else-if>
+        <else-if type="legislation">
+          <text macro="contributors" suffix=". "/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <group prefix="(" suffix=")" delimiter=", ">
+              <text variable="section" prefix="chapitre "/>
+              <text variable="volume" prefix="r. "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="bill">
+          <text macro="contributors" suffix=". "/>
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <group prefix="(RLRQ, " suffix=")" delimiter=", ">
+              <text variable="section" prefix="chapitre "/>
+              <text variable="number" prefix="r. "/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=". ">
+            <text macro="contributors"/>
+            <text macro="date"/>
+            <text macro="title"/>
+          </group>
+          <text macro="description"/>
+          <text macro="secondary-contributors" prefix=". "/>
+          <text macro="container-title" prefix=". "/>
+          <text macro="container-contributors"/>
+          <text macro="edition"/>
+          <text macro="locators-chapter"/>
+          <text macro="collection-title-journal" prefix=", " suffix=", "/>
+          <text macro="locators"/>
+          <text macro="collection-title" prefix=". "/>
+          <text macro="issue"/>
+          <text macro="locators-article"/>
+          <text macro="access" prefix=". "/>
         </else>
       </choose>
     </layout>