diff --git a/chicago-fullnote-bibliography-fr.csl b/chicago-fullnote-bibliography-fr.csl
index 8cad888e1b..a5c72b0340 100644
--- a/chicago-fullnote-bibliography-fr.csl
+++ b/chicago-fullnote-bibliography-fr.csl
@@ -1,37 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" 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="note" 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 (full note, French)</title>
+    <title>Chicago Manual of Style 17th edition (full note, French)</title>
     <id>http://www.zotero.org/styles/chicago-fullnote-bibliography-fr</id>
     <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography-fr" rel="self"/>
-    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
     <link href="http://guides.bib.umontreal.ca/disciplines/483-Citer-selon-le-style-Chicago?tab=2191" 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="note"/>
     <category field="generic-base"/>
-    <summary>Adaptation en français de la norme "Chicago" (méthode classique), basée sur le guide des Bibliothèques de l'Université de Montréal.</summary>
-    <updated>2014-11-23T22:59:53+00:00</updated>
+    <summary>Adaptation française du style "Chicago" (méthode note de bas de page), 17e édition</summary>
+    <updated>2019-09-23T00:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
-  <locale>
+  <locale xml:lang="fr">
+    <style-options punctuation-in-quote="false"/>
     <terms>
-      <term name="ibid">ibid</term>
       <term name="in">dans</term>
       <term name="editor" form="short">dir.</term>
+      <term name="editor" form="verb-short">sous la dir. de</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>
-      <term name="editortranslator" form="verb">Sous la direction et traduit par</term>
       <term name="translator" form="verb-short">trad.</term>
       <term name="translator" form="short">trad.</term>
-      <term name="translator" form="verb">traduit par</term>
+      <term name="editortranslator" form="verb-short">sous la dir. de et trad. par</term>
+      <term name="editortranslator" form="verb">sous la direction de et traduit par</term>
     </terms>
   </locale>
   <macro name="editor-translator">
@@ -42,59 +36,57 @@
             <group>
               <names variable="container-author reviewed-author">
                 <label form="verb-short" text-case="lowercase" suffix=" "/>
-                <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
+                <name and="text" delimiter=", "/>
+                <et-al/>
               </names>
             </group>
           </if>
         </choose>
       </group>
-      <names variable="editor translator" delimiter=", ">
-        <label form="verb-short" text-case="lowercase" suffix=" "/>
-        <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
-      </names>
+      <choose>
+        <if type="chapter">
+          <names variable="editor translator" delimiter=", ">
+            <label form="short" text-case="lowercase" suffix=" "/>
+            <name and="text" delimiter=", "/>
+            <et-al/>
+          </names>
+        </if>
+        <else>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb-short" text-case="lowercase" suffix=" "/>
+            <name and="text" delimiter=", "/>
+            <et-al/>
+          </names>
+        </else>
+      </choose>
     </group>
   </macro>
-  <macro name="secondary-contributors-note">
-    <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
-        <text macro="editor-translator"/>
-      </if>
-    </choose>
-  </macro>
   <macro name="container-contributors-note">
-    <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-        <text macro="editor-translator"/>
-      </if>
-    </choose>
+    <text macro="editor-translator"/>
   </macro>
   <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>
-      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" 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"/>
+          <name and="text" delimiter=", "/>
+          <et-al/>
         </names>
-      </else-if>
+      </if>
     </choose>
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia 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"/>
+                    <label form="verb-short" suffix=" " text-case="lowercase"/>
+                    <name and="text" delimiter=", "/>
+                    <et-al/>
                   </names>
                 </if>
               </choose>
@@ -104,15 +96,17 @@
                   <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"/>
+                      <label form="verb" suffix=" "/>
+                      <name and="text" delimiter=", "/>
+                      <et-al/>
                     </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"/>
+                    <label form="verb" text-case="lowercase" suffix=" "/>
+                    <name and="text" delimiter=", "/>
+                    <et-al/>
                   </names>
                 </else>
               </choose>
@@ -125,17 +119,18 @@
   <macro name="recipient-note">
     <names variable="recipient" delimiter=", ">
       <label form="verb" text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", " delimiter-precedes-last="never"/>
+      <name and="text" delimiter=", "/>
     </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"/>
+        <name and="text" delimiter=", " form="long"/>
         <label form="short" prefix=", "/>
+        <et-al/>
         <substitute>
-          <names variable="editor"/>
-          <names variable="translator"/>
+          <text macro="editor"/>
+          <text macro="translator"/>
         </substitute>
       </names>
       <text macro="recipient-note"/>
@@ -143,14 +138,16 @@
   </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"/>
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=", "/>
+      <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"/>
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
       <label form="verb-short" prefix=", "/>
+      <et-al/>
     </names>
   </macro>
   <macro name="recipient">
@@ -173,7 +170,8 @@
   <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"/>
+        <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+        <et-al/>
         <substitute>
           <text macro="editor"/>
           <text macro="translator"/>
@@ -185,13 +183,14 @@
   <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"/>
+      <name form="short" and="text" delimiter=", "/>
     </names>
   </macro>
   <macro name="contributors-short">
     <group delimiter=" ">
       <names variable="author">
-        <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
+        <name form="short" and="text" delimiter=", "/>
+        <et-al/>
         <substitute>
           <names variable="editor"/>
           <names variable="translator"/>
@@ -202,7 +201,8 @@
   </macro>
   <macro name="contributors-sort">
     <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
+      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <et-al/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -213,13 +213,13 @@
   <macro name="interviewer-note">
     <names variable="interviewer" delimiter=", ">
       <label form="verb" text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", " delimiter-precedes-last="never" delimiter-precedes-et-al="never"/>
+      <name and="text" delimiter=", "/>
     </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"/>
+      <name and="text" delimiter=", "/>
     </names>
   </macro>
   <macro name="title-note">
@@ -227,24 +227,21 @@
       <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"/>
+      <else-if type="book graphic map motion_picture song" match="any">
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
         <group delimiter=" " prefix=", ">
           <text term="version"/>
           <text variable="version"/>
         </group>
       </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-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"/>
+        <text variable="title" text-case="capitalize-first" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -257,8 +254,8 @@
           </if>
         </choose>
       </if>
-      <else-if type="bill book graphic legislation motion_picture song" match="any">
-        <text variable="title" text-case="title" font-style="italic"/>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
         <group prefix=" (" suffix=")" delimiter=" ">
           <text term="version"/>
           <text variable="version"/>
@@ -269,15 +266,15 @@
           <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"/>
+            <name and="text" delimiter=", "/>
           </names>
         </group>
       </else-if>
-      <else-if type="legal_case interview" match="any">
+      <else-if type="bill legislation 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>
@@ -296,14 +293,20 @@
           </else-if>
         </choose>
       </if>
-      <else-if type="bill book graphic legislation motion_picture song" match="any">
-        <text variable="title" text-case="title" form="short" font-style="italic"/>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="capitalize-first" form="short" font-style="italic"/>
       </else-if>
-      <else-if type="legal_case interview" match="any">
+      <else-if type="legal_case" variable="title-short" match="all">
+        <text variable="title" font-style="italic" form="short"/>
+      </else-if>
+      <else-if type="patent interview" match="any">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="legal_case bill legislation" match="any">
         <text variable="title"/>
       </else-if>
       <else>
-        <text variable="title" text-case="title" form="short" quotes="true"/>
+        <text variable="title" text-case="capitalize-first" form="short" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -320,11 +323,25 @@
       <text variable="medium"/>
       <choose>
         <if variable="title" match="none"/>
-        <else-if type="thesis speech" match="any"/>
+        <else-if type="manuscript thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
         <else>
           <text variable="genre"/>
         </else>
       </choose>
+      <choose>
+        <if type="map">
+          <text variable="scale"/>
+        </if>
+        <else-if type="graphic">
+          <text variable="dimensions"/>
+        </else-if>
+      </choose>
     </group>
   </macro>
   <macro name="description">
@@ -336,37 +353,63 @@
       <choose>
         <if variable="title" match="none"/>
         <else-if type="thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
         <else>
           <text variable="genre" text-case="capitalize-first"/>
         </else>
       </choose>
+      <choose>
+        <if type="map">
+          <text variable="scale"/>
+        </if>
+        <else-if type="graphic">
+          <text variable="dimensions"/>
+        </else-if>
+      </choose>
     </group>
   </macro>
   <macro name="container-title-note">
     <group delimiter=" ">
       <choose>
-        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-          <text term="in"/>
+        <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+          <text term="in" text-case="lowercase"/>
         </if>
       </choose>
       <choose>
-        <if type="legal_case" match="none">
-          <text variable="container-title" text-case="title" font-style="italic"/>
+        <if type="webpage">
+          <text variable="container-title"/>
         </if>
+        <else-if type="post-weblog">
+          <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
+        </else-if>
+        <else-if type="bill legislation legal_case" match="none">
+          <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
+        </else-if>
       </choose>
     </group>
   </macro>
   <macro name="container-title">
     <group delimiter=" ">
       <choose>
-        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <if type="chapter paper-conference entry-dictionary entry-encyclopedia" 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 type="webpage">
+          <text variable="container-title"/>
         </if>
+        <else-if type="post-weblog">
+          <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
+        </else-if>
+        <else-if type="bill legislation legal_case" match="none">
+          <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
+        </else-if>
       </choose>
     </group>
   </macro>
@@ -402,7 +445,7 @@
   </macro>
   <macro name="edition-note">
     <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
@@ -419,7 +462,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
@@ -474,17 +517,10 @@
           </group>
         </group>
       </if>
-      <else-if type="legal_case">
-        <group delimiter=", ">
-          <group delimiter=" ">
-            <number variable="volume"/>
-            <text variable="container-title"/>
-            <text variable="page"/>
-          </group>
-          <text variable="locator"/>
-        </group>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
       </else-if>
-      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <else-if type="book chapter graphic motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <text macro="edition-note"/>
           <group delimiter=" ">
@@ -503,6 +539,58 @@
       </else-if>
     </choose>
   </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case" match="any">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <text variable="page"/>
+            </if>
+            <else>
+              <text variable="number" prefix="No. "/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if variable="number">
+              <!--There's a public law number-->
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
   <macro name="locators-join-with-space">
     <choose>
       <if type="article-journal" variable="volume" match="all">
@@ -516,7 +604,7 @@
   </macro>
   <macro name="locators-join-with-comma">
     <choose>
-      <if type="legal_case chapter paper-conference" match="any">
+      <if type="bill chapter legislation legal_case paper-conference" match="any">
         <text macro="locators"/>
       </if>
       <else-if type="article-journal">
@@ -533,7 +621,7 @@
   </macro>
   <macro name="locators-join-with-period">
     <choose>
-      <if type="legal_case article-journal chapter paper-conference" match="none">
+      <if type="bill legislation legal_case article-journal chapter paper-conference" match="none">
         <text macro="locators"/>
       </if>
     </choose>
@@ -550,14 +638,10 @@
           </group>
         </group>
       </if>
-      <else-if type="legal_case">
-        <group delimiter=" ">
-          <number variable="volume"/>
-          <text variable="container-title"/>
-          <text variable="page"/>
-        </group>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
       </else-if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <else-if type="book graphic motion_picture report song" match="any">
         <group delimiter=". ">
           <text macro="edition"/>
           <group delimiter=" ">
@@ -570,7 +654,7 @@
           </group>
         </group>
       </else-if>
-      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=". ">
           <text macro="edition"/>
           <choose>
@@ -594,34 +678,62 @@
             <text term="edition"/>
           </group>
           <group delimiter=" ">
-            <text term="section"/>
+            <text term="section" form="short"/>
             <text variable="section"/>
           </group>
-          <choose>
-            <if variable="locator" match="none">
-              <text variable="page"/>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <choose>
-                  <if locator="page" match="none">
-                    <label variable="locator" form="short" suffix=" "/>
-                  </if>
-                </choose>
-                <text variable="locator"/>
-              </group>
-            </else>
-          </choose>
         </group>
       </if>
     </choose>
   </macro>
+  <macro name="event-note">
+    <text variable="event"/>
+  </macro>
   <macro name="event">
-    <group delimiter=" ">
-      <text term="presented at"/>
-      <text variable="event"/>
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text term="presented at"/>
+          <text variable="event"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text term="presented at" text-case="capitalize-first"/>
+          <text variable="event"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="originally-published">
+    <group delimiter=", ">
+      <group delimiter="&#160;: ">
+        <text variable="original-publisher-place"/>
+        <text variable="original-publisher"/>
+      </group>
+      <date variable="original-date" form="text" date-parts="year"/>
     </group>
   </macro>
+  <macro name="reprint-note">
+    <!--needs localization-->
+    <choose>
+      <if variable="original-date issued" match="all">
+        <choose>
+          <!--for whatever reason in notes, when we have both original and new publishers, reprint doesn't appear-->
+          <if variable="original-publisher original-publisher-place" match="none">
+            <text value="repr."/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="reprint">
+    <!--needs localization-->
+    <choose>
+      <if variable="original-date issued" match="all">
+        <text value="reprint" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
   <macro name="publisher">
     <choose>
       <if type="thesis">
@@ -631,7 +743,7 @@
         <text variable="event-place"/>
       </else-if>
       <else>
-        <group delimiter=": ">
+        <group delimiter="&#160;: ">
           <text variable="publisher-place"/>
           <text variable="publisher"/>
         </group>
@@ -642,27 +754,76 @@
     <choose>
       <if variable="issued">
         <choose>
-          <if type="graphic report" match="any">
-            <date variable="issued" form="text"/>
+          <if type="entry-encyclopedia" variable="DOI" match="all">
+            <date variable="issued" form="numeric" date-parts="year"/>
           </if>
+          <else-if type="entry-encyclopedia" variable="URL" match="all">
+            <date variable="issued" form="numeric" date-parts="year"/>
+          </else-if>
+          <else-if type="entry-dictionary" variable="DOI" match="all">
+            <date variable="issued" form="numeric" date-parts="year"/>
+          </else-if>
+          <else-if type="entry-dictionary" variable="URL" match="all">
+            <date variable="issued" form="numeric" date-parts="year"/>
+          </else-if>
           <else-if type="legal_case">
             <group delimiter=" ">
               <text variable="authority"/>
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
+              <choose>
+                <if variable="container-title" match="any">
+                  <!--Only print year for cases published in reporters-->
+                  <date variable="issued" form="numeric" date-parts="year"/>
+                </if>
+                <else>
+                  <date variable="issued" form="text"/>
+                </else>
+              </choose>
             </group>
           </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 type="book bill chapter legislation motion_picture paper-conference song thesis" match="any">
+            <choose>
+              <if is-uncertain-date="issued">
+                <date variable="issued" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
+              </if>
+              <else>
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </else>
+            </choose>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=", ">
+              <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>
-            <date variable="issued" form="text"/>
+            <choose>
+              <if is-uncertain-date="issued">
+                <date variable="issued" form="text" prefix="[" suffix="?]"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
           </else>
         </choose>
       </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
       <else-if variable="accessed URL" match="all"/>
       <else>
         <text term="no date" form="short"/>
@@ -671,12 +832,28 @@
   </macro>
   <macro name="point-locators-subsequent">
     <choose>
-      <if variable="locator">
+      <if type="legal_case" variable="locator" match="all">
+        <choose>
+          <if locator="page">
+            <group delimiter="&#160;: ">
+              <number variable="volume"/>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <label variable="locator" form="short"/>
+              <text variable="locator"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="locator">
         <choose>
           <if locator="page" match="none">
             <group delimiter=" ">
               <choose>
-                <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+                <if type="book graphic motion_picture report song" match="any">
                   <choose>
                     <if variable="volume">
                       <group delimiter=", ">
@@ -699,8 +876,8 @@
               <text variable="locator"/>
             </group>
           </if>
-          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-            <group delimiter=":">
+          <else-if type="book graphic motion_picture report song" match="any">
+            <group delimiter="&#160;: ">
               <number variable="volume" form="numeric"/>
               <text variable="locator"/>
             </group>
@@ -709,7 +886,7 @@
             <text variable="locator"/>
           </else>
         </choose>
-      </if>
+      </else-if>
     </choose>
   </macro>
   <macro name="point-locators-join-with-colon">
@@ -741,12 +918,12 @@
     <choose>
       <if variable="locator" match="none">
         <choose>
-          <if type="article-journal article-magazine chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
+          <if type="article-journal chapter paper-conference" match="any">
             <text variable="page"/>
           </if>
         </choose>
       </if>
-      <else-if type="article-journal article-magazine" match="any">
+      <else-if type="article-journal">
         <group delimiter=" ">
           <choose>
             <if locator="page" match="none">
@@ -771,13 +948,13 @@
   </macro>
   <macro name="locators-chapter">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <choose>
           <if variable="author container-author" match="all"/>
           <else>
             <choose>
               <if variable="page">
-                <number variable="volume" suffix=":"/>
+                <number variable="volume" suffix="&#160;: "/>
                 <text variable="page"/>
               </if>
             </choose>
@@ -788,7 +965,7 @@
   </macro>
   <macro name="locators-journal-join-with-colon">
     <choose>
-      <if type="article-journal article-magazine" match="any">
+      <if type="article-journal">
         <choose>
           <if variable="volume issue" match="any">
             <text variable="page"/>
@@ -799,7 +976,7 @@
   </macro>
   <macro name="locators-journal-join-with-comma">
     <choose>
-      <if type="article-journal article-magazine" match="any">
+      <if type="article-journal">
         <choose>
           <if variable="volume issue" match="none">
             <text variable="page"/>
@@ -844,7 +1021,7 @@
   </macro>
   <macro name="issue-note-join-with-space">
     <choose>
-      <if type="article-journal legal_case" variable="publisher-place publisher" match="any">
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
         <!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
         <choose>
           <if type="article-newspaper" match="none">
@@ -863,7 +1040,7 @@
   </macro>
   <macro name="issue-note-join-with-comma">
     <choose>
-      <if type="article-journal legal_case" variable="publisher-place publisher" match="none">
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
         <text macro="issue-note"/>
       </if>
       <else-if type="article-newspaper">
@@ -878,9 +1055,21 @@
       </else-if>
     </choose>
   </macro>
+  <macro name="issue-map-graphic">
+    <!--See CMoS 17th ed. 14.235 and 14.237-->
+    <choose>
+      <if type="graphic map" match="any">
+        <choose>
+          <if variable="publisher publisher-place" match="none">
+            <text macro="issued"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
   <macro name="issue-note">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="bill legislation legal_case" match="any">
         <text macro="issued" prefix="(" suffix=")"/>
       </if>
       <else-if type="article-journal">
@@ -896,18 +1085,27 @@
       <else-if type="article-newspaper">
         <text macro="issued"/>
       </else-if>
-      <else-if variable="publisher-place event-place publisher genre" match="any">
+      <else-if type="manuscript thesis speech" match="any">
+        <group delimiter=", " prefix="(" suffix=")">
+          <choose>
+            <if variable="title" match="any">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <text variable="publisher"/>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else-if variable="publisher-place event-place publisher" match="any">
         <group prefix="(" suffix=")" delimiter=", ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="title" match="none"/>
-              <else-if type="thesis speech" match="any">
-                <text variable="genre"/>
-              </else-if>
-            </choose>
-            <text macro="event"/>
+          <text macro="event-note"/>
+          <group delimiter="; ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint-note"/>
+              <text macro="publisher"/>
+            </group>
           </group>
-          <text macro="publisher"/>
           <text macro="issued"/>
         </group>
       </else-if>
@@ -918,18 +1116,21 @@
   </macro>
   <macro name="issue-join-with-space">
     <choose>
-      <if type="article-journal legal_case" match="any">
+      <if type="article-journal" match="any">
         <choose>
           <if variable="issue volume" match="any">
             <text macro="issue"/>
           </if>
         </choose>
       </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="issue"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="issue-join-with-period">
     <choose>
-      <if type="article-journal legal_case" match="none">
+      <if type="article-journal bill legislation legal_case" match="none">
         <choose>
           <if type="speech" variable="publisher publisher-place" match="any">
             <text macro="issue"/>
@@ -940,21 +1141,25 @@
   </macro>
   <macro name="issue-join-with-comma">
     <choose>
-      <if type="article-journal legal_case" match="none">
+      <if type="bill legislation legal_case" match="none">
         <choose>
-          <if type="speech" variable="publisher publisher-place" match="none">
-            <text macro="issue"/>
+          <if type="article-journal" match="none">
+            <choose>
+              <if type="speech" variable="publisher publisher-place" match="none">
+                <text macro="issue"/>
+              </if>
+            </choose>
           </if>
+          <else-if variable="volume issue" match="none">
+            <text macro="issue"/>
+          </else-if>
         </choose>
       </if>
-      <else-if variable="volume issue" match="none">
-        <text macro="issue"/>
-      </else-if>
     </choose>
   </macro>
   <macro name="issue">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="bill legislation legal_case" match="any">
         <text macro="issued" prefix="(" suffix=")"/>
       </if>
       <else-if type="article-journal">
@@ -993,79 +1198,114 @@
               <text variable="genre" text-case="capitalize-first"/>
             </if>
           </choose>
-          <text macro="publisher"/>
+          <group delimiter=". ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
           <text macro="issued"/>
         </group>
       </else-if>
-      <else>
+      <!--location for data for maps and artwork is different-->
+      <else-if type="graphic map" match="none">
         <text macro="issued"/>
-      </else>
+      </else-if>
     </choose>
   </macro>
   <macro name="access-note">
-    <group delimiter=", ">
+    <group>
+      <choose>
+        <if type="entry-encyclopedia" variable="DOI" match="all">
+          <date variable="accessed" form="text" prefix="consulté le "/>
+        </if>
+        <else-if type="entry-encyclopedia" variable="URL" match="all">
+          <date variable="accessed" form="text" prefix="consulté le "/>
+        </else-if>
+        <else-if type="entry-dictionary" variable="DOI" match="all">
+          <date variable="accessed" form="text" prefix="consulté le "/>
+        </else-if>
+        <else-if type="entry-dictionary" variable="URL" match="all">
+          <date variable="accessed" 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 type="graphic report" match="any">
+        <if type="graphic" match="any">
           <text macro="archive-note"/>
         </if>
-        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference report" match="none">
           <text macro="archive-note"/>
         </else-if>
       </choose>
       <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="doi:"/>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed"/>
+            <date variable="accessed" form="text"/>
+          </group>
         </if>
-        <else-if type="entry-encyclopedia entry-dictionary" match="any">
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
           <choose>
-            <if variable="issued" match="none">
-              <group delimiter=", ">
-                <group delimiter=" ">
-                  <text term="accessed"/>
-                  <date variable="accessed" form="text"/>
-                </group>
-                <text variable="URL"/>
-              </group>
+            <if variable="DOI">
+              <text variable="DOI" prefix=". https://doi.org/"/>
             </if>
+            <else>
+              <text variable="URL" prefix=". "/>
+            </else>
           </choose>
-        </else-if>
-        <else>
-          <group delimiter=", ">
-            <text variable="URL"/>
-          </group>
-        </else>
+        </if>
       </choose>
     </group>
   </macro>
+  <macro name="access-note-online-reference">
+    <choose>
+      <if type="entry-encyclopedia" variable="DOI" match="all">
+        <date variable="accessed" form="text" prefix="Consulté le "/>
+      </if>
+      <else-if type="entry-encyclopedia" variable="URL" match="all">
+        <date variable="accessed" form="text" prefix="Consulté le "/>
+      </else-if>
+      <else-if type="entry-dictionary" variable="DOI" match="all">
+        <date variable="accessed" form="text" prefix="Consulté le "/>
+      </else-if>
+      <else-if type="entry-dictionary" variable="URL" match="all">
+        <date variable="accessed" 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>
+  </macro>
   <macro name="access">
     <group delimiter=". ">
       <choose>
-        <if type="graphic report" match="any">
+        <if type="graphic" 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 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="doi:"/>
+              <text variable="DOI" prefix="https://doi.org/"/>
             </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>
@@ -1077,107 +1317,208 @@
   <macro name="case-locator-subsequent">
     <choose>
       <if type="legal_case">
-        <text macro="locators-note"/>
+        <group delimiter=" ">
+          <text variable="volume"/>
+          <text variable="container-title"/>
+        </group>
       </if>
     </choose>
   </macro>
-  <macro name="case-issue-subsequent">
+  <macro name="case-pinpoint-subsequent">
     <choose>
       <if type="legal_case">
-        <text macro="issue"/>
+        <group delimiter=" ">
+          <choose>
+            <if locator="page">
+              <text term="at"/>
+              <text variable="locator"/>
+            </if>
+            <else>
+              <label variable="locator"/>
+              <text variable="locator"/>
+            </else>
+          </choose>
+        </group>
       </if>
     </choose>
   </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>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
     <layout suffix="." delimiter="; ">
       <choose>
-        <if position="ibid-with-locator">
-          <group delimiter="., ">
-            <text term="ibid"/>
-            <text macro="point-locators-subsequent"/>
+        <if position="ibid ibid-with-locator" match="any">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <choose>
+                  <if variable="author editor translator" match="none">
+                    <text macro="title-short"/>
+                  </if>
+                </choose>
+                <text macro="case-locator-subsequent"/>
+              </group>
+              <text macro="case-pinpoint-subsequent"/>
+            </group>
+            <choose>
+              <if match="none" type="legal_case">
+                <text macro="point-locators-subsequent"/>
+              </if>
+            </choose>
           </group>
         </if>
-        <else-if position="ibid">
-          <text term="ibid"/>
+        <else-if type="motion_picture">
+          <group delimiter=". ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <group delimiter=", ">
+                  <text variable="title" font-style="italic"/>
+                  <text variable="medium"/>
+                  <text macro="contributors-note" prefix="réalisé par "/>
+                  <group prefix="(" suffix=")" delimiter=", ">
+                    <text macro="publisher"/>
+                    <text macro="issued"/>
+                  </group>
+                </group>
+              </group>
+            </group>
+          </group>
         </else-if>
-        <else-if position="subsequent">
+        <else-if type="legislation">
+          <group delimiter=" ">
+            <text variable="title"/>
+            <group prefix="(" suffix=")" delimiter=", ">
+              <text variable="section" prefix="chapitre "/>
+              <text variable="volume" prefix="r. "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="bill">
+          <group delimiter=" ">
+            <text variable="title"/>
+            <group prefix="(RLRQ, " suffix=")" delimiter=", ">
+              <text variable="section" prefix="chapitre "/>
+              <text variable="number" prefix="r. "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="entry-encyclopedia">
           <group delimiter=", ">
-            <text macro="contributors-short"/>
             <group delimiter=" ">
               <group delimiter=", ">
                 <choose>
-                  <if type="book">
-                    <text value="op. cit." font-style="italic" text-case="capitalize-first"/>
+                  <if variable="author" match="none">
+                    <text variable="container-title" font-style="italic"/>
+                    <group delimiter=" ">
+                      <text macro="container-contributors-note"/>
+                      <group prefix="(" suffix=")" delimiter=", ">
+                        <text macro="publisher"/>
+                        <text macro="issued"/>
+                      </group>
+                    </group>
+                    <text variable="title" prefix="s.v. " quotes="true"/>
                   </if>
-                  <else-if type="article-journal">
-                    <text value="loc. cit." font-style="italic" text-case="capitalize-first"/>
+                  <else-if variable="author">
+                    <group delimiter=", ">
+                      <text macro="contributors-note" suffix=","/>
+                      <text variable="title" quotes="true"/>
+                      <text macro="container-contributors" text-case="capitalize-first"/>
+                      <text macro="container-title-note"/>
+                      <group prefix="(" suffix=")" delimiter=", ">
+                        <text macro="publisher"/>
+                        <text macro="issued"/>
+                      </group>
+                      <text macro="access-note"/>
+                    </group>
                   </else-if>
+                </choose>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="entry-dictionary">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <choose>
+                  <if variable="editor" match="none">
+                    <text macro="contributors-note"/>
+                    <group delimiter=" ">
+                      <text variable="container-title" font-style="italic"/>
+                      <text macro="container-contributors-note"/>
+                      <group prefix="(" suffix=")" delimiter=", ">
+                        <text macro="publisher"/>
+                        <text macro="issued"/>
+                      </group>
+                    </group>
+                    <text variable="title" prefix="s.v. " quotes="true"/>
+                  </if>
                   <else>
-                    <text macro="title-short"/>
+                    <group delimiter=", ">
+                      <text macro="contributors" suffix=","/>
+                      <text variable="title" quotes="true"/>
+                      <text macro="container-contributors" text-case="capitalize-first"/>
+                      <text macro="container-title-note"/>
+                      <group prefix="(" suffix=")" delimiter=", ">
+                        <text macro="publisher"/>
+                        <text macro="issued"/>
+                      </group>
+                      <text macro="access-note"/>
+                    </group>
                   </else>
                 </choose>
-                <!--if title & author are the same: -->
-                <text macro="date-disambiguate"/>
-                <text macro="case-locator-subsequent"/>
               </group>
-              <text macro="case-issue-subsequent"/>
             </group>
-            <text macro="point-locators-subsequent"/>
           </group>
         </else-if>
-        <else-if type="motion_picture">
-          <group delimiter=". ">
-            <group delimiter=", ">
-              <text macro="contributors-note"/>
-              <text macro="title-note"/>
+        <else-if position="subsequent">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <text macro="title-short"/>
+                <!--if title & author are the same: -->
+                <text macro="date-disambiguate"/>
+                <text macro="case-locator-subsequent"/>
+              </group>
+              <text macro="case-pinpoint-subsequent"/>
             </group>
-            <text macro="motionpicture-details"/>
+            <choose>
+              <if match="none" type="legal_case">
+                <text macro="point-locators-subsequent"/>
+              </if>
+            </choose>
           </group>
         </else-if>
         <else>
           <group delimiter=", ">
-            <group delimiter=": ">
+            <group delimiter="&#160;: ">
               <group delimiter=", ">
                 <group delimiter=" ">
                   <group delimiter=", ">
                     <group delimiter=" ">
                       <group delimiter=", ">
-                        <group delimiter=", ">
-                          <choose>
-                            <if type="entry-encyclopedia entry-dictionary" match="none">
-                              <text macro="contributors-note"/>
-                              <text macro="title-note"/>
-                              <text macro="description-note"/>
-                              <text macro="secondary-contributors-note"/>
-                            </if>
-                            <else>
-                              <choose>
-                                <if variable="author" match="any">
-                                  <text macro="contributors-note"/>
-                                </if>
-                              </choose>
-                            </else>
-                          </choose>
-                        </group>
-                        <text macro="container-title-note"/>
-                        <text macro="container-contributors-note"/>
                         <choose>
-                          <if type="entry-encyclopedia entry-dictionary" match="any">
-                            <text macro="secondary-contributors-note"/>
+                          <if type="book">
+                            <text macro="contributors-note" suffix=","/>
+                            <group delimiter=", ">
+                              <text macro="title-note"/>
+                              <text macro="issue-map-graphic"/>
+                              <text macro="container-title-note"/>
+                            </group>
                           </if>
+                          <else>
+                            <group delimiter=". ">
+                              <text macro="contributors-note"/>
+                              <group delimiter=", ">
+                                <text macro="title-note"/>
+                                <text macro="issue-map-graphic"/>
+                                <text macro="container-title-note"/>
+                              </group>
+                            </group>
+                          </else>
                         </choose>
+                        <text macro="description-note"/>
+                        <text macro="container-contributors-note"/>
                       </group>
                       <text macro="locators-note-join-with-space"/>
                     </group>
@@ -1187,32 +1528,13 @@
                   </group>
                   <text macro="issue-note-join-with-space"/>
                 </group>
-                <choose>
-                  <if type="entry-encyclopedia entry-dictionary" match="any">
-                    <text macro="title-note" prefix="s. v. "/>
-                  </if>
-                </choose>
-                <choose>
-                  <if type="article-newspaper" match="any">
-                    <text macro="locators-newspaper"/>
-                  </if>
-                  <else>
-                    <text macro="point-locators-join-with-comma"/>
-                  </else>
-                </choose>
+                <text macro="locators-newspaper"/>
+                <text macro="point-locators-join-with-comma"/>
               </group>
               <text macro="point-locators-join-with-colon"/>
             </group>
           </group>
-          <choose>
-            <if type="webpage entry-encyclopedia" match="any">
-              <text macro="access-note" prefix=". "/>
-            </if>
-            <else>
-              <text macro="access-note" prefix=", "/>
-            </else>
-          </choose>
-          <text variable="note" prefix=", "/>
+          <text macro="access-note"/>
         </else>
       </choose>
     </layout>
@@ -1220,22 +1542,86 @@
   <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 variable="title"/>
+      <key variable="genre"/>
+      <key variable="issued"/>
     </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=", ">
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <choose>
+                  <if variable="author" match="none">
+                    <text variable="container-title" font-style="italic" suffix="."/>
+                    <group delimiter=". ">
+                      <text macro="container-contributors-note"/>
+                      <group prefix="(" suffix=")" delimiter=", ">
+                        <text macro="publisher"/>
+                        <text macro="issued"/>
+                      </group>
+                    </group>
+                    <text variable="title" prefix="s.v. " quotes="true"/>
+                  </if>
+                  <else-if variable="author">
+                    <group delimiter=". ">
+                      <text macro="contributors" suffix="."/>
+                      <text variable="title" quotes="true" suffix="."/>
+                      <group delimiter=", ">
+                        <text macro="container-title"/>
+                        <text macro="container-contributors" text-case="capitalize-first"/>
+                      </group>
+                      <text macro="publisher"/>
+                      <text macro="access-note-online-reference"/>
+                      <text macro="access"/>
+                    </group>
+                  </else-if>
+                </choose>
+              </group>
+            </group>
           </group>
         </if>
+        <else-if type="motion_picture">
+          <group delimiter=". ">
+            <group delimiter=". ">
+              <group delimiter=" ">
+                <group delimiter=". ">
+                  <group delimiter=", ">
+                    <text variable="title" font-style="italic"/>
+                    <text variable="medium"/>
+                  </group>
+                  <text macro="contributors-note" prefix="Réalisé par "/>
+                  <group delimiter=", ">
+                    <text macro="publisher"/>
+                    <text macro="issued"/>
+                  </group>
+                </group>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="legislation">
+          <group delimiter=" ">
+            <text variable="title"/>
+            <group prefix="(" suffix=")" delimiter=", ">
+              <text variable="section" prefix="chapitre "/>
+              <text variable="volume" prefix="r. "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="bill">
+          <group delimiter=" ">
+            <text variable="title"/>
+            <group prefix="(RLRQ, " suffix=")" delimiter=", ">
+              <text variable="section" prefix="chapitre "/>
+              <text variable="number" prefix="r. "/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <group delimiter=". ">
-            <group delimiter=": ">
+            <group delimiter="&#160;: ">
               <group delimiter=", ">
                 <group delimiter=" ">
                   <group delimiter=". ">
@@ -1244,15 +1630,12 @@
                         <group delimiter=". ">
                           <group delimiter=". ">
                             <text macro="contributors"/>
-                            <choose>
-                              <if type="entry-encyclopedia entry-dictionary" match="none">
-                                <text macro="title"/>
-                              </if>
-                            </choose>
+                            <text macro="title"/>
+                            <text macro="issue-map-graphic"/>
                           </group>
                           <text macro="description"/>
                           <text macro="secondary-contributors"/>
-                          <group delimiter=". ">
+                          <group delimiter=", ">
                             <text macro="container-title"/>
                             <text macro="container-contributors"/>
                           </group>
@@ -1265,26 +1648,17 @@
                     </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>
                   <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>
+              <text macro="locators-journal-join-with-colon"/>
             </group>
+            <text macro="access-note-online-reference"/>
             <text macro="access"/>
-            <text variable="note"/>
           </group>
         </else>
       </choose>