diff --git a/pour-reussir-note.csl b/pour-reussir-note.csl
index 884c78ffe94..4cc02a54b98 100644
--- a/pour-reussir-note.csl
+++ b/pour-reussir-note.csl
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-CA" version="1.0" page-range-format="expanded">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="expanded" default-locale="fr-CA">
   <info>
-    <title>Pour réussir (note, Français - Canada)</title>
+    <title>Pour Réussir de Dionne 6ème édition (note, Français - Canada)</title>
+    <title-short>Dionne</title-short>
     <id>http://www.zotero.org/styles/pour-reussir-note</id>
     <link href="http://www.zotero.org/styles/pour-reussir-note" rel="self"/>
-    <link href="http://www.zotero.org/styles/le-tapuscrit-note" rel="template"/>
+    <link href="http://www.zotero.org/styles/pour-reussir-note" rel="template"/>
     <link href="http://www.cheneliere.ca/7901-livre-pour-reussir-6e-edition.html" rel="documentation"/>
+    <link href="https://bibliotheque.uqac.ca/rediger-bibliographie/dionne-zotero" rel="documentation"/>
     <author>
-      <name>Dany Thibault</name>
+      <name>Lino Tremblay (cette version)</name>
+      <email>lino_tremblay@uqac.ca</email>
+    </author>
+    <author>
+      <name>Dany Thibault (version précédente)</name>
       <email>dany.thibault@cmontmorency.qc.ca</email>
     </author>
     <category citation-format="note"/>
     <category field="social_science"/>
     <category field="generic-base"/>
-    <updated>2015-03-12T20:54:41+00:00</updated>
+    <updated>2021-02-12T04:50:30+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="fr">
@@ -29,7 +35,7 @@
   </locale>
   <macro name="author">
     <names variable="interviewer">
-      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
         <name-part name="family" text-case="uppercase"/>
       </name>
       <substitute>
@@ -45,7 +51,7 @@
       </name>
       <substitute>
         <names variable="author"/>
-        <text macro="editor"/>
+        <text macro="editor-bib"/>
       </substitute>
     </names>
   </macro>
@@ -60,31 +66,172 @@
       </substitute>
     </names>
   </macro>
+  <macro name="composer">
+    <names variable="composer">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+    </names>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal">
+        <choose>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", " prefix=" (Coll. « " suffix=" »)">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter="" prefix=" (" suffix=")">
+              <group delimiter=" " prefix="Coll. « " suffix=" »">
+                <text variable="collection-title" text-case="title"/>
+              </group>
+              <group delimiter="" prefix=", nº ">
+                <text variable="collection-number"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="composer-bib">
+    <names variable="composer">
+      <name name-as-sort-order="first" form="long" and="text" delimiter-precedes-last="after-inverted-name" delimiter-precedes-et-al="always" sort-separator=", " font-style="normal">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+    </names>
+  </macro>
+  <macro name="date_aaaa">
+    <choose>
+      <if variable="issued" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text value="[s.d.]"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date_aaaa-mm-jj">
+    <choose>
+      <if variable="issued" match="any">
+        <date variable="issued">
+          <date-part name="day" prefix="" suffix="&#160;"/>
+          <date-part name="month" suffix=" "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text value="[s.d.]"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" suffix="."/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="article-journal article-magazine" match="any">
+        <group delimiter="" font-style="normal">
+          <choose>
+            <if variable="issued">
+              <text macro="volume"/>
+              <date variable="issued" prefix=", ">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" suffix=" "/>
+                <date-part name="year"/>
+              </date>
+            </if>
+            <else>
+              <text macro="volume" text-case="capitalize-first"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+    <text macro="issue" prefix=", "/>
+  </macro>
   <macro name="editor">
     <names variable="editor">
-      <name name-as-sort-order="first" form="long" and="text" delimiter-precedes-last="never" sort-separator=", " font-style="normal">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
         <name-part name="family" text-case="uppercase"/>
       </name>
       <label form="short" prefix=",&#160;" suffix="."/>
     </names>
   </macro>
-  <macro name="translator">
-    <names variable="translator">
-      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal" prefix=" traduit par ">
+  <macro name="editor-bib">
+    <names variable="editor">
+      <name name-as-sort-order="first" form="long" and="text" delimiter-precedes-last="after-inverted-name" delimiter-precedes-et-al="always" sort-separator=", " font-style="normal">
+        <name-part name="family" text-case="uppercase"/>
       </name>
+      <label form="short" prefix=",&#160;" suffix="."/>
     </names>
   </macro>
+  <macro name="issue">
+    <choose>
+      <if is-numeric="issue">
+        <text term="issue" form="short" suffix="&#160;"/>
+        <text variable="issue"/>
+      </if>
+      <else>
+        <text variable="issue"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pub-place">
+    <choose>
+      <if type="book chapter entry-dictionary entry-encyclopedia thesis legal_case manuscript paper-conference report song motion_picture broadcast" match="any">
+        <choose>
+          <if variable="publisher-place" match="any">
+            <text variable="publisher-place"/>
+          </if>
+          <else>
+            <text value="[s.l.]"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher"/>
+  </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic interview legal_case motion_picture report song" match="any">
+      <if type="bill book graphic interview legal_case motion_picture report" match="any">
         <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
-      <else-if type="article-journal article-newspaper article-magazine" match="any">
+      <else-if type="article-journal article-newspaper article-magazine song" match="any">
         <group delimiter=", ">
           <text variable="title" text-case="capitalize-first" quotes="true"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
+      <else-if type="broadcast" match="any">
+        <group delimiter="">
+          <choose>
+            <if variable="container-title" match="any">
+              <text variable="title" text-case="capitalize-first" quotes="true" suffix=", "/>
+            </if>
+            <else-if variable="container-title" match="none">
+              <text variable="title" text-case="capitalize-first" font-style="italic"/>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
       <else-if type="thesis" match="any">
         <group delimiter="">
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
@@ -100,12 +247,12 @@
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
           <text variable="title" text-case="capitalize-first" quotes="true"/>
-          <text value="dans" suffix=" " prefix=" "/>
-          <text macro="editor" suffix=" "/>
+          <text value="dans" suffix=" " prefix=", "/>
+          <text macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
         </group>
       </else-if>
-      <else-if type="webpage post-weblog" match="any">
+      <else>
         <group delimiter="">
           <choose>
             <if variable="container-title" match="any">
@@ -116,36 +263,50 @@
             </else-if>
           </choose>
         </group>
-      </else-if>
-      <else>
-        <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="pub-place">
+  <macro name="translator">
+    <names variable="translator">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal" prefix=" traduit par "/>
+    </names>
+  </macro>
+  <macro name="url">
+    <group>
+      <choose>
+        <if variable="DOI">
+          <text variable="DOI" prefix="https://doi.org/"/>
+        </if>
+        <else>
+          <text variable="URL"/>
+        </else>
+      </choose>
+    </group>
+    <group delimiter=" " prefix=" (" suffix=")">
+      <text value="Page consultée le" suffix=" " prefix=""/>
+      <date variable="accessed" form="text">
+        <date-part name="day"/>
+        <date-part name="month"/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="volume">
     <choose>
-      <if type="book chapter entry-dictionary entry-encyclopedia thesis graphic legal_case manuscript paper-conference report song" match="any">
-        <choose>
-          <if variable="publisher-place" match="any">
-            <text variable="publisher-place"/>
-          </if>
-          <else>
-            <text value="s.l."/>
-          </else>
-        </choose>
+      <if is-numeric="volume">
+        <text term="volume" form="short" suffix=".&#160;"/>
+        <text variable="volume"/>
       </if>
+      <else>
+        <text variable="volume"/>
+      </else>
     </choose>
   </macro>
-  <macro name="publisher">
-    <text variable="publisher"/>
-  </macro>
   <macro name="yearpage">
     <choose>
-      <if type="bill book graphic legal_case motion_picture paper-conference manuscript report song thesis" match="any">
+      <if type="bill book graphic legal_case paper-conference manuscript report thesis" match="any">
         <group delimiter=", " font-style="normal">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text macro="date_aaaa"/>
           <choose>
             <if variable="locator" match="any">
               <group delimiter="&#8239;">
@@ -154,32 +315,67 @@
               </group>
             </if>
             <else-if variable="locator" match="none">
-              <text variable="number-of-pages" suffix="&#160;p"/>
+              <text variable="number-of-pages" suffix="&#160;p."/>
             </else-if>
           </choose>
         </group>
       </if>
+      <else-if type="broadcast" match="any">
+        <group>
+          <text macro="date_aaaa"/>
+          <choose>
+            <if variable="locator" match="any">
+              <group delimiter="&#8239;" prefix=", ">
+                <text variable="locator"/>
+              </group>
+            </if>
+            <else-if variable="locator" match="none">
+              <text variable="page" prefix=", "/>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=" " font-style="normal">
+        <group>
           <date variable="issued">
-            <date-part name="year" suffix=", "/>
+            <date-part name="year"/>
           </date>
           <choose>
             <if variable="locator" match="any">
-              <group delimiter="&#8239;">
+              <group delimiter="&#8239;" prefix=", ">
                 <label variable="locator" form="short"/>
                 <text variable="locator"/>
               </group>
             </if>
             <else-if variable="locator" match="none">
-              <label variable="page" form="short"/>
-              <text variable="page"/>
+              <group>
+                <text variable="volume" prefix=", tome "/>
+                <text variable="page" prefix=", p. "/>
+              </group>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song motion_picture" match="any">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <choose>
+            <if variable="locator" match="any">
+              <group delimiter="&#8239;" prefix=", ">
+                <text variable="locator"/>
+              </group>
+            </if>
+            <else-if variable="locator" match="none">
+              <text variable="page" prefix=", "/>
             </else-if>
           </choose>
         </group>
       </else-if>
       <else-if type="article-journal" match="any">
-        <group delimiter=" " font-style="normal">
+        <text macro="date_aaaa-mm-jj"/>
+        <group delimiter=" " font-style="normal" prefix=", ">
           <choose>
             <if variable="locator" match="any">
               <group delimiter="&#8239;">
@@ -194,7 +390,7 @@
           </choose>
         </group>
       </else-if>
-      <else-if type="article-newspaper article-magazine" match="any">
+      <else-if type="article-newspaper article-magazine webpage post-weblog" match="any">
         <group delimiter=" " font-style="normal">
           <choose>
             <if variable="locator" match="any">
@@ -210,31 +406,11 @@
           </choose>
         </group>
       </else-if>
-      <else-if type="webpage post-weblog" match="any">
-        <group delimiter=" " prefix="(" suffix=")">
-          <text value="Page consultée le" suffix=" " prefix=""/>
-          <date variable="accessed" form="text">
-            <date-part name="day"/>
-            <date-part name="month"/>
-            <date-part name="year"/>
-          </date>
-        </group>
-      </else-if>
       <else>
         <group delimiter="" font-style="normal">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text macro="date_aaaa-mm-jj"/>
           <text variable="number-of-pages" suffix="&#160;p"/>
-          <text variable="URL" prefix=", "/>
-          <group delimiter=" " prefix=" (" suffix=")">
-            <text value="Page consultée le" suffix=" " prefix=""/>
-            <date variable="accessed" form="text">
-              <date-part name="day"/>
-              <date-part name="month"/>
-              <date-part name="year"/>
-            </date>
-          </group>
+          <text macro="url" prefix=", "/>
           <group>
             <label variable="locator" form="short"/>
             <text variable="locator"/>
@@ -245,13 +421,11 @@
   </macro>
   <macro name="yearpage-bib">
     <choose>
-      <if type="bill book graphic legal_case motion_picture paper-conference report song thesis" match="any">
+      <if type="bill book graphic legal_case paper-conference report thesis" match="any">
         <group delimiter=", ">
           <group delimiter=", " font-style="normal">
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-            <text variable="number-of-pages" suffix="&#160;p"/>
+            <text macro="date_aaaa"/>
+            <text variable="number-of-pages" suffix="&#160;p."/>
           </group>
           <group>
             <label variable="locator" form="short"/>
@@ -265,31 +439,44 @@
             <date-part name="year"/>
           </date>
           <group>
+            <text variable="volume" prefix="tome " suffix=", "/>
             <label variable="page" form="short"/>
             <text variable="page" prefix="&#160;"/>
           </group>
         </group>
       </else-if>
-      <else-if type="article-journal chapter article-newspaper article-magazine" match="any">
+      <else-if type="article-journal" match="any">
         <group delimiter=" " font-style="normal">
+          <choose>
+            <if variable="locator" match="any">
+              <group delimiter="&#8239;">
+                <label variable="locator" form="short"/>
+                <text variable="locator"/>
+              </group>
+            </if>
+            <else-if variable="locator" match="none">
+              <label variable="page" form="short"/>
+              <text variable="page"/>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text macro="date_aaaa-mm-jj"/>
+        <group delimiter=" " font-style="normal" prefix=", ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
       <else-if type="manuscript">
-        <group delimiter="" font-style="normal">
-          <choose>
-            <if variable="issued">
-              <date variable="issued">
-                <date-part name="day" suffix=" "/>
-                <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
-              </date>
-            </if>
-            <else>
-              <text value="s. d."/>
-            </else>
-          </choose>
+        <text macro="date_aaaa-mm-jj"/>
+      </else-if>
+      <else-if type="song motion_picture" match="any">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text variable="page" prefix=", "/>
         </group>
       </else-if>
       <else-if type="webpage post-weblog" match="any">
@@ -304,19 +491,9 @@
       </else-if>
       <else>
         <group delimiter="" font-style="normal">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text macro="date_aaaa-mm-jj"/>
           <text variable="number-of-pages" suffix="&#160;p"/>
-          <text variable="URL" prefix=", "/>
-          <group delimiter=" " prefix=" (" suffix=")">
-            <text value="Page consultée le" suffix=" " prefix=""/>
-            <date variable="accessed" form="text">
-              <date-part name="day"/>
-              <date-part name="month"/>
-              <date-part name="year"/>
-            </date>
-          </group>
+          <text macro="url" prefix=", "/>
           <group>
             <label variable="locator" form="short"/>
             <text variable="locator"/>
@@ -325,63 +502,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="edition">
-    <choose>
-      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short"/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" text-case="capitalize-first" suffix="."/>
-          </else>
-        </choose>
-      </if>
-      <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
-          <choose>
-            <if variable="issued">
-              <text macro="volume"/>
-              <date variable="issued" prefix=", ">
-                <date-part name="day" suffix=" "/>
-                <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
-              </date>
-            </if>
-            <else>
-              <text macro="volume" text-case="capitalize-first"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-    </choose>
-    <text macro="issue" prefix=", "/>
-  </macro>
-  <macro name="volume">
-    <choose>
-      <if is-numeric="volume">
-        <text term="volume" form="short" suffix=".&#160;"/>
-        <text variable="volume"/>
-      </if>
-      <else>
-        <text variable="volume"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="issue">
-    <choose>
-      <if is-numeric="issue">
-        <text term="issue" form="short" suffix="&#160;"/>
-        <text variable="issue"/>
-      </if>
-      <else>
-        <text variable="issue"/>
-      </else>
-    </choose>
-  </macro>
   <citation et-al-min="4" et-al-use-first="1">
     <layout delimiter="&#160;; ">
       <choose>
@@ -427,31 +547,41 @@
                 <text macro="yearpage-bib"/>
               </group>
             </if>
-            <else-if type="webpage post-weblog" match="any">
-              <group delimiter=" ">
-                <text macro="author" suffix=","/>
-                <text macro="title" suffix=","/>
-                <text macro="translator" suffix=","/>
-                <group prefix="">
+            <else-if type="article-newspaper" match="any">
+              <group delimiter="" suffix=".">
+                <text macro="author" suffix=", "/>
+                <text macro="title"/>
+                <group>
+                  <text term="volume" form="short" suffix=".&#160;"/>
+                  <text variable="number-of-volumes" prefix=". " suffix="/"/>
+                </group>
+                <group>
+                  <text term="volume" form="short" suffix=".&#160;"/>
+                  <text variable="volume" form="short"/>
+                </group>
+                <text macro="issue" prefix=", "/>
+                <group prefix=" (" suffix=")">
                   <date variable="issued">
-                    <date-part name="day" suffix=" "/>
+                    <date-part name="day" prefix="" suffix="&#160;"/>
                     <date-part name="month" suffix=" "/>
-                    <date-part name="year" suffix=","/>
+                    <date-part name="year"/>
                   </date>
                 </group>
-                <choose>
-                  <if variable="container-title" match="any">
-                    <text value="dans" suffix=" " prefix=" "/>
-                  </if>
-                  <else-if variable="container-title" match="none">
+                <text macro="url" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+              </group>
             </else-if>
-                </choose>
-                <text variable="container-title" font-style="italic" suffix=","/>
-                <text macro="edition"/>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text variable="URL"/>
-                <text macro="yearpage"/>
+            <else-if type="article-journal article-magazine" match="any">
+              <group delimiter="" suffix=".">
+                <text macro="author" suffix=", "/>
+                <text macro="title"/>
+                <group>
+                  <text term="volume" form="short" prefix=", " suffix=".&#160;"/>
+                  <text variable="volume" form="short"/>
+                </group>
+                <text macro="issue" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
             <else-if type="bill" match="any">
@@ -464,34 +594,79 @@
                 <text macro="pub-place"/>
                 <text macro="publisher"/>
                 <text macro="yearpage"/>
-                <text variable="URL" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
-            <else-if type="article-newspaper" match="any">
-              <group delimiter="" suffix=".">
-                <text macro="author" suffix=". "/>
+            <else-if type="book" match="any">
+              <group suffix=".">
+                <text macro="author" suffix=", "/>
                 <text macro="title"/>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="number-of-volumes" prefix=". " suffix="/"/>
-                </group>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="volume" form="short"/>
-                </group>
-                <text macro="issue" prefix=", "/>
-                <group prefix=" (" suffix=")">
-                  <date variable="issued">
-                    <date-part name="day" prefix="" suffix="&#160;"/>
-                    <date-part name="month" suffix=" "/>
-                    <date-part name="year"/>
-                  </date>
+                <text variable="volume" prefix=", tome "/>
+                <text macro="translator"/>
+                <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+                <text macro="edition" prefix=", "/>
+                <text macro="pub-place" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text macro="collection-title"/>
+                <text macro="url" prefix=", "/>
+              </group>
+            </else-if>
+            <else-if type="broadcast" match="any">
+              <group suffix=".">
+                <text macro="author" suffix=" (réal.), "/>
+                <text macro="title"/>
+                <text variable="container-title" font-style="italic"/>
+                <text macro="pub-place" prefix=", "/>
+                <text variable="archive" prefix=", "/>
+                <text variable="medium" prefix=", "/>
+                <text macro="date_aaaa-mm-jj" prefix=", "/>
+                <text variable="dimensions" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="collection-title"/>
+                <text macro="url" prefix=", "/>
+              </group>
+            </else-if>
+            <else-if type="entry-dictionary entry-encyclopedia chapter interview book legal_case report thesis" match="any">
+              <group suffix=".">
+                <text macro="author" suffix=", "/>
+                <text macro="title"/>
+                <text macro="translator" prefix=", "/>
+                <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+                <text macro="edition" prefix=", "/>
+                <text macro="pub-place" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text macro="collection-title" prefix=", "/>
+                <text macro="url" prefix=", "/>
+              </group>
+            </else-if>
+            <else-if type="graphic" match="any">
+              <group suffix=".">
+                <group suffix=", ">
+                  <text macro="author"/>
+                  <text variable="archive" prefix=" (" suffix=")"/>
                 </group>
+                <choose>
+                  <if variable="title" match="none">
+                    <text variable="abstract" prefix="[" suffix="]"/>
+                  </if>
+                  <else>
+                    <text macro="title"/>
+                  </else>
+                </choose>
+                <text variable="medium" prefix=", "/>
+                <text variable="dimensions" prefix=", "/>
+                <text macro="edition" prefix=", "/>
                 <text macro="yearpage" prefix=", "/>
+                <text variable="publisher-place" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="collection-title" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
             <else-if type="interview" match="any">
-              <group delimiter="" suffix=".">
+              <group suffix=".">
                 <text macro="author" suffix=". "/>
                 <text macro="title" suffix=","/>
                 <group>
@@ -513,75 +688,121 @@
                 <text macro="yearpage" prefix=", "/>
               </group>
             </else-if>
-            <else-if type="article-journal article-magazine" match="any">
-              <group delimiter="" suffix=".">
+            <else-if type="motion_picture" match="any">
+              <group suffix=".">
                 <text macro="author" suffix=", "/>
-                <text macro="title" suffix=", "/>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="volume" form="short" suffix=". "/>
-                </group>
-                <text macro="issue" prefix=""/>
-                <group prefix=" (" suffix="), ">
-                  <date variable="issued">
-                    <date-part name="day" prefix="" suffix="&#160;"/>
-                    <date-part name="month" suffix=" "/>
-                    <date-part name="year"/>
-                  </date>
+                <text macro="title"/>
+                <text macro="edition" prefix=", "/>
+                <text variable="publisher-place" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text variable="dimensions" prefix=", "/>
+                <text variable="medium" prefix=", "/>
+                <group prefix=", dans " delimiter=", ">
+                  <text variable="publisher"/>
+                  <text variable="collection-title" font-style="italic"/>
                 </group>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text macro="yearpage"/>
+                <text variable="archive" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
-            <else-if type="book" match="any">
-              <group delimiter="" suffix=".">
-                <text macro="author" suffix=", "/>
-                <text macro="title" suffix=", "/>
+            <else-if type="paper-conference" match="any">
+              <group suffix=".">
+                <text macro="author"/>
+                <text macro="title" prefix=", "/>
+                <text variable="genre" prefix=", "/>
+                <text macro="translator" prefix=", "/>
+                <text variable="volume" prefix=", tome "/>
+                <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+                <text macro="edition" prefix=", "/>
+                <text macro="pub-place" prefix=", "/>
+                <text variable="event" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="date_aaaa-mm-jj" prefix=", "/>
+                <text macro="collection-title" prefix=", "/>
+                <text macro="url" prefix=", "/>
+              </group>
+            </else-if>
+            <else-if type="personal_communication" match="any">
+              <text macro="author"/>
+              <text macro="title" prefix=", "/>
+              <date variable="issued" prefix=" (" suffix=")">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" suffix=" "/>
+                <date-part name="year"/>
+              </date>
+              <group prefix=", " suffix=".">
+                <text variable="genre"/>
+                <names variable="recipient" prefix=" à ">
+                  <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" "/>
+                </names>
+              </group>
+            </else-if>
+            <else-if type="song" match="any">
+              <group suffix=".">
                 <choose>
-                  <if variable="volume" match="any">
-                    <text value="Tome" suffix=" " prefix=" "/>
+                  <if variable="composer">
+                    <text macro="composer"/>
                   </if>
-                  <else-if variable="volume" match="none">
-                    </else-if>
+                  <else>
+                    <text macro="author"/>
+                  </else>
                 </choose>
-                <text variable="volume" suffix=", "/>
-                <text macro="translator"/>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="number-of-volumes" prefix=". " suffix="/"/>
-                </group>
-                <text macro="edition" suffix=", "/>
-                <text macro="pub-place" suffix=", "/>
-                <text macro="publisher" suffix=", "/>
-                <text macro="yearpage"/>
+                <text macro="title" prefix=", "/>
+                <choose>
+                  <if variable="composer">
+                    <text macro="author" prefix=", interprété par "/>
+                  </if>
+                </choose>
+                <text macro="translator" prefix=", "/>
+                <text macro="edition" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text variable="volume" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
-            <else-if type="entry-encyclopedia chapter interview book graphic legal_case motion_picture paper-conference report song thesis" match="any">
-              <group delimiter=", " suffix=".">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="translator"/>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="number-of-volumes" prefix=". " suffix="/"/>
+            <else-if type="webpage post-weblog" match="any">
+              <group delimiter=" " suffix=".">
+                <text macro="author" suffix=","/>
+                <text macro="title" suffix=","/>
+                <text macro="translator" suffix=","/>
+                <choose>
+                  <if variable="container-title" match="any">
+                    <text value="dans" suffix=" " prefix=" "/>
+                    <text macro="editor" suffix=", "/>
+                  </if>
+                  <else-if variable="container-title" match="none"/>
+                </choose>
+                <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+                <group prefix="">
+                  <date variable="issued">
+                    <date-part name="day" suffix=" "/>
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="year" suffix=","/>
+                  </date>
                 </group>
                 <text macro="edition"/>
                 <text macro="pub-place"/>
                 <text macro="publisher"/>
+                <text macro="url"/>
                 <text macro="yearpage"/>
               </group>
             </else-if>
             <else>
               <group delimiter="" suffix=".">
                 <text macro="author" suffix=", "/>
-                <text macro="title" suffix=", "/>
+                <text macro="title"/>
+                <choose>
+                  <if variable="container-title" match="any"/>
+                  <else-if variable="container-title" match="none"/>
+                </choose>
+                <text variable="container-title" font-style="italic" prefix=", "/>
+                <text variable="medium" prefix=" [" suffix="]"/>
                 <choose>
                   <if variable="volume" match="any">
-                    <text value="Tome" suffix=" " prefix=" "/>
+                    <text value="tome" suffix=" " prefix=" "/>
                   </if>
-                  <else-if variable="volume" match="none">
-                    </else-if>
+                  <else-if variable="volume" match="none"/>
                 </choose>
                 <text variable="volume" suffix=", "/>
                 <text macro="translator"/>
@@ -590,9 +811,10 @@
                   <text variable="number-of-volumes" prefix=". " suffix="/"/>
                 </group>
                 <text macro="edition" suffix=", "/>
-                <text macro="pub-place" suffix=", "/>
-                <text macro="publisher" suffix=", "/>
-                <text macro="yearpage"/>
+                <text variable="publisher-place" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text variable="dimensions" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
               </group>
             </else>
           </choose>
@@ -616,31 +838,28 @@
             <text macro="yearpage-bib"/>
           </group>
         </if>
-        <else-if type="webpage post-weblog" match="any">
-          <group delimiter=" ">
-            <text macro="author-bib" suffix="."/>
-            <text macro="title" suffix=","/>
-            <text macro="translator" suffix=","/>
-            <group prefix="">
+        <else-if type="article-newspaper" match="any">
+          <group delimiter="" suffix=".">
+            <text macro="author-bib" suffix=". "/>
+            <text macro="title"/>
+            <group>
+              <text term="volume" form="short" suffix=".&#160;"/>
+              <text variable="number-of-volumes" prefix=". " suffix="/"/>
+            </group>
+            <group>
+              <text term="volume" form="short" suffix=".&#160;"/>
+              <text variable="volume" form="short"/>
+            </group>
+            <text macro="issue" prefix=", "/>
+            <group prefix=" (" suffix=")">
               <date variable="issued">
-                <date-part name="day" suffix=" "/>
+                <date-part name="day" prefix="" suffix="&#160;"/>
                 <date-part name="month" suffix=" "/>
-                <date-part name="year" suffix=","/>
+                <date-part name="year"/>
               </date>
             </group>
-            <choose>
-              <if variable="container-title" match="any">
-                <text value="dans" suffix=" " prefix=" "/>
-              </if>
-              <else-if variable="container-title" match="none">
-            </else-if>
-            </choose>
-            <text variable="container-title" font-style="italic" suffix=","/>
-            <text macro="edition"/>
-            <text macro="pub-place"/>
-            <text macro="publisher"/>
-            <text variable="URL"/>
-            <text macro="yearpage"/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
         <else-if type="bill" match="any">
@@ -653,71 +872,103 @@
             <text macro="pub-place"/>
             <text macro="publisher"/>
             <text macro="yearpage"/>
-            <text variable="URL" prefix=", "/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
         <else-if type="book" match="any">
-          <group delimiter=" " suffix=".">
+          <group suffix=".">
             <text macro="author-bib" suffix="."/>
-            <text macro="title" suffix=","/>
-            <choose>
-              <if variable="volume" match="any">
-                <text value="Tome" suffix=" " prefix=" "/>
-              </if>
-              <else-if variable="volume" match="none">
-            </else-if>
-            </choose>
-            <text variable="volume" suffix=","/>
+            <text macro="title" prefix=" "/>
+            <text variable="volume" prefix=", tome "/>
+            <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
             <text macro="translator"/>
-            <text macro="edition" suffix=","/>
-            <text macro="pub-place" suffix=","/>
-            <group delimiter=" ">
-              <text macro="publisher" suffix=","/>
-            </group>
-            <text macro="yearpage-bib"/>
+            <text macro="edition" prefix=", "/>
+            <text macro="pub-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="collection-title"/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
-        <else-if type="entry-encyclopedia chapter book graphic legal_case motion_picture paper-conference report song thesis" match="any">
-          <group delimiter=" " suffix=".">
-            <text macro="author-bib" suffix="."/>
-            <text macro="title" suffix=","/>
-            <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="volume" suffix=","/>
-            </group>
-            <text macro="translator"/>
-            <text macro="edition" suffix=","/>
-            <text macro="pub-place" suffix=","/>
-            <group delimiter=" ">
-              <text macro="publisher" suffix=","/>
-            </group>
-            <text macro="yearpage-bib"/>
+        <else-if type="broadcast" match="any">
+          <group delimiter="" suffix=".">
+            <text macro="author" suffix=" (réal.). "/>
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="pub-place" prefix=", "/>
+            <text variable="archive" prefix=", "/>
+            <text variable="medium" prefix=", "/>
+            <text macro="date_aaaa-mm-jj" prefix=", "/>
+            <text variable="dimensions" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="collection-title"/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
-        <else-if type="article-newspaper" match="any">
+        <else-if type="article-journal article-magazine" match="any">
           <group delimiter="" suffix=".">
             <text macro="author-bib" suffix=". "/>
             <text macro="title"/>
             <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="number-of-volumes" prefix=". " suffix="/"/>
-            </group>
-            <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
+              <text term="volume" form="short" prefix=", " suffix=".&#160;"/>
               <text variable="volume" form="short"/>
             </group>
             <text macro="issue" prefix=", "/>
-            <group prefix=" (" suffix=")">
-              <date variable="issued">
-                <date-part name="day" prefix="" suffix="&#160;"/>
-                <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
-              </date>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="chapter" match="any">
+          <group delimiter="" suffix=".">
+            <text macro="author-bib" suffix=". "/>
+            <text macro="title"/>
+            <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+            <text macro="edition" prefix=", "/>
+            <text macro="pub-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="entry-dictionary entry-encyclopedia chapter legal_case report thesis" match="any">
+          <group suffix=".">
+            <text macro="author-bib" suffix="."/>
+            <text macro="title" prefix=" "/>
+            <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+            <text macro="edition" prefix=", "/>
+            <text macro="translator" prefix=", "/>
+            <text macro="pub-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="collection-title" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="graphic" match="any">
+          <group suffix=".">
+            <group suffix=". ">
+              <text macro="author-bib"/>
+              <text variable="archive" prefix=" (" suffix=")"/>
             </group>
+            <choose>
+              <if variable="title" match="none">
+                <text variable="abstract" prefix="[" suffix="]"/>
+              </if>
+              <else>
+                <text macro="title"/>
+              </else>
+            </choose>
+            <text variable="medium" prefix=", "/>
+            <text variable="dimensions" prefix=", "/>
+            <text macro="edition" prefix=", "/>
             <text macro="yearpage-bib" prefix=", "/>
+            <text variable="publisher-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="collection-title" prefix=", "/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
-        <else-if type="chapter article-journal article-magazine" match="any">
+        <else-if type="interview" match="any">
           <group delimiter="" suffix=".">
             <text macro="author-bib" suffix=". "/>
             <text macro="title" suffix=", "/>
@@ -730,7 +981,7 @@
               <text variable="volume" form="short" suffix=", "/>
             </group>
             <text macro="issue" prefix=""/>
-            <group prefix=" (" suffix=")">
+            <group prefix="">
               <date variable="issued">
                 <date-part name="day" prefix="" suffix="&#160;"/>
                 <date-part name="month" suffix=" "/>
@@ -740,44 +991,135 @@
             <text macro="yearpage-bib" prefix=", "/>
           </group>
         </else-if>
-        <else-if type="interview" match="any">
-          <group delimiter="" suffix=".">
+        <else-if type="motion_picture" match="any">
+          <group suffix=".">
             <text macro="author-bib" suffix=". "/>
-            <text macro="title" suffix=", "/>
-            <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="number-of-volumes" prefix=". " suffix="/"/>
+            <text macro="title"/>
+            <text macro="edition" prefix=", "/>
+            <text variable="publisher-place" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text variable="dimensions" prefix=", "/>
+            <text variable="medium" prefix=", "/>
+            <group prefix=", dans " delimiter=", ">
+              <text variable="publisher"/>
+              <text variable="collection-title" font-style="italic"/>
             </group>
-            <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="volume" form="short" suffix=", "/>
+            <text variable="archive" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference" match="any">
+          <group suffix=".">
+            <text macro="author-bib" suffix="."/>
+            <text macro="title" prefix=" "/>
+            <text variable="genre" prefix=", "/>
+            <text variable="volume" prefix=", tome "/>
+            <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+            <text macro="edition" prefix=", "/>
+            <text macro="translator" prefix=", "/>
+            <text macro="pub-place" prefix=", "/>
+            <text variable="event" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="date_aaaa-mm-jj" prefix=", "/>
+            <text macro="collection-title" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="personal_communication" match="any">
+          <group suffix=".">
+            <text macro="author-bib"/>
+            <text macro="title" prefix=". "/>
+            <date variable="issued" prefix=" (" suffix=")">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+            <group prefix=", ">
+              <text variable="genre"/>
+              <names variable="recipient" prefix=" à ">
+                <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" "/>
+              </names>
             </group>
-            <text macro="issue" prefix=""/>
+          </group>
+        </else-if>
+        <else-if type="song" match="any">
+          <group suffix=".">
+            <choose>
+              <if variable="composer">
+                <text macro="composer-bib"/>
+              </if>
+              <else>
+                <text macro="author-bib"/>
+              </else>
+            </choose>
+            <text macro="title" prefix=". "/>
+            <choose>
+              <if variable="composer">
+                <text macro="author" prefix=", interprété par "/>
+              </if>
+            </choose>
+            <text macro="translator" prefix=", "/>
+            <text macro="edition" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text variable="volume" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="webpage post-weblog" match="any">
+          <group delimiter=" " suffix=".">
+            <text macro="author-bib" suffix="."/>
+            <text macro="title" suffix=","/>
+            <text macro="translator" suffix=","/>
+            <choose>
+              <if variable="container-title" match="any">
+                <text value="dans" suffix=" " prefix=" "/>
+                <text macro="editor" suffix=", "/>
+              </if>
+              <else-if variable="container-title" match="none"/>
+            </choose>
+            <text variable="container-title" font-style="italic" suffix=","/>
             <group prefix="">
               <date variable="issued">
-                <date-part name="day" prefix="" suffix="&#160;"/>
+                <date-part name="day" suffix=" "/>
                 <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
+                <date-part name="year" suffix=","/>
               </date>
             </group>
-            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="edition"/>
+            <text macro="pub-place"/>
+            <text macro="publisher"/>
+            <text macro="url"/>
+            <text macro="yearpage"/>
           </group>
         </else-if>
         <else>
-          <group delimiter=" " suffix=".">
-            <text macro="author-bib" suffix="."/>
-            <text macro="title" suffix=","/>
+          <group delimiter="" suffix=".">
+            <text macro="author-bib" suffix=". "/>
+            <text macro="title"/>
+            <choose>
+              <if variable="container-title" match="any"/>
+              <else-if variable="container-title" match="none"/>
+            </choose>
+            <text variable="container-title" font-style="italic" prefix=", "/>
+            <text variable="medium" prefix=" [" suffix="]"/>
+            <choose>
+              <if variable="volume" match="any">
+                <text value="tome" suffix=" " prefix=" "/>
+              </if>
+              <else-if variable="volume" match="none"/>
+            </choose>
+            <text variable="volume" suffix=", "/>
+            <text macro="translator"/>
             <group>
               <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="volume" suffix=","/>
-            </group>
-            <text macro="translator"/>
-            <text macro="edition" suffix=","/>
-            <text macro="pub-place" suffix=","/>
-            <group delimiter=" ">
-              <text macro="publisher" suffix=","/>
+              <text variable="number-of-volumes" prefix=". " suffix="/"/>
             </group>
-            <text macro="yearpage-bib"/>
+            <text macro="edition" suffix=", "/>
+            <text variable="publisher-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text variable="dimensions" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
           </group>
         </else>
       </choose>