csl-styles 1.0.1.9 → 1.0.1.10

data/vendor/styles/economic-commission-for-latin-america-and-the-caribbean.csl

@@ -13,7 +13,7 @@
     <category citation-format="author-date"/>
     <category field="political_science"/>
     <summary>Bibliography style for use in ECLAC/CEPAL publications, English version.</summary>
-    <updated>2013-08-29T05:27:03+00:00</updated>
+    <updated>2019-01-21T04:02:09+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>
@@ -34,7 +34,7 @@
         <choose>
           <if variable="author editor translator" match="any">
             <names variable="author">
-              <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+              <name name-as-sort-order="all" and="symbol" initialize-with=". " sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
               <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
               <substitute>
                 <names variable="editor"/>
@@ -68,7 +68,7 @@
         <choose>
           <if variable="author editor translator" match="any">
             <names variable="author">
-              <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+              <name name-as-sort-order="all" and="symbol" initialize-with=". " sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
               <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
               <substitute>
                 <names variable="editor"/>

data/vendor/styles/economic-geology.csl

@@ -14,7 +14,7 @@
     <category field="geology"/>
     <issn>0361-0128</issn>
     <eissn>1554-0774</eissn>
-    <updated>2018-03-31T04:01:14+00:00</updated>
+    <updated>2019-01-21T04:02:09+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -25,14 +25,12 @@
   <macro name="editor-translator">
     <names variable="editor translator" prefix="(" suffix=")" delimiter=", ">
       <name and="symbol" initialize-with=". " delimiter=", "/>
-      <et-al term="and others"/>
       <label form="short" prefix=", " text-case="capitalize-first"/>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
       <name and="text" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all"/>
-      <et-al term="and others"/>
       <label form="short" prefix=", "/>
       <substitute>
         <names variable="editor"/>
@@ -41,10 +39,18 @@
       </substitute>
     </names>
   </macro>
+  <macro name="author-count">
+    <names variable="author">
+      <name form="count"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
   <macro name="author-short">
     <names variable="author">
       <name form="short" and="text" delimiter=", " initialize-with="."/>
-      <et-al term="and others"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -78,7 +84,9 @@
   </citation>
   <bibliography hanging-indent="true" et-al-min="15" et-al-use-first="14">
     <sort>
-      <key macro="author-short"/>
+      <key macro="author" names-min="1" names-use-first="1"/>
+      <key macro="author-count" names-min="3" names-use-first="3"/>
+      <key macro="author" names-min="3" names-use-first="1"/>
       <key variable="issued"/>
       <key variable="title"/>
     </sort>
@@ -148,7 +156,6 @@
             <text term="in"/>
             <names variable="editor translator" prefix=" " suffix="," delimiter=", ">
               <name and="text" initialize-with=". " name-as-sort-order="all"/>
-              <et-al term="and others"/>
               <label form="short" prefix=" "/>
             </names>
             <text variable="event" prefix=" " suffix=" &#8211;"/>

data/vendor/styles/elsevier-harvard.csl

@@ -31,7 +31,7 @@
     <category citation-format="author-date"/>
     <category field="biology"/>
     <category field="generic-base"/>
-    <updated>2017-11-07T19:35:38+00:00</updated>
+    <updated>2019-01-22T15:57:12+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="container">
@@ -94,7 +94,7 @@
       <if variable="DOI">
         <text variable="DOI" prefix="https://doi.org/"/>
       </if>
-      <else-if type="webpage">
+      <else-if type="webpage post-weblog" match="any">
         <group delimiter=" ">
           <text value="URL"/>
           <text variable="URL"/>

data/vendor/styles/elsevier-vancouver-author-date.csl

@@ -12,7 +12,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>A style for some Elsevier journals, resembles Vancouver style, but using author-date format</summary>
-    <updated>2017-07-09T22:44:59+00:00</updated>
+    <updated>2019-10-15T15:13:32+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
@@ -75,7 +75,7 @@
   <macro name="access">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
       <else-if type="webpage post-weblog" match="any">
         <choose>

data/vendor/styles/elsevier-vancouver.csl

@@ -13,7 +13,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>A style for some Elsevier journals, resembles Vancouver style</summary>
-    <updated>2017-05-18T15:23:08+00:00</updated>
+    <updated>2019-10-15T15:13:52+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
@@ -65,7 +65,7 @@
   <macro name="access">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
       <else-if type="webpage post-weblog" match="any">
         <choose>

data/vendor/styles/elsevier-with-titles.csl

@@ -18,7 +18,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>A style for many of Elsevier's journals that includes article titles in the reference list</summary>
-    <updated>2016-04-21T15:20:00+00:00</updated>
+    <updated>2019-10-15T15:14:08+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
@@ -138,7 +138,7 @@
       </choose>
       <choose>
         <if variable="DOI">
-          <text variable="DOI" prefix=". doi:"/>
+          <text variable="DOI" prefix=". https://doi.org/"/>
         </if>
         <else>
           <text macro="access" prefix=". "/>

data/vendor/styles/embnet-journal.csl

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" et-al-min="3" et-al-use-first="1" initialize-with="" name-as-sort-order="all" sort-separator="" names-delimiter="," demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>EMBnet.journal</title>
+    <id>http://www.zotero.org/styles/embnet-journal</id>
+    <link href="http://www.zotero.org/styles/embnet-journal" rel="self"/>
+    <link href="http://journal.embnet.org/index.php/embnetjournal/about/submissions#authorGuidelines" rel="documentation"/>
+    <author>
+      <name>Tomas</name>
+      <email>tomas.klingstrom@slu.se</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <eissn>2226-6089</eissn>
+    <summary>The EMBnet.journal style.</summary>
+    <updated>2019-01-21T04:02:09+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="text" initialize-with="" name-as-sort-order="all" sort-separator=""/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+      <et-al suffix="." font-style="italic"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" et-al-min="6" et-al-use-first="5" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=" "/>
+      <et-al suffix="." font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group>
+      <text variable="publisher" form="short" suffix=","/>
+      <text variable="publisher-place" prefix=" " suffix=","/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="6" et-al-use-first="5" sort-separator=" " names-delimiter=" " entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <text macro="author"/>
+      <date variable="issued" prefix=" (" suffix=")">
+        <date-part name="year"/>
+      </date>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=" " prefix=" " suffix=".">
+            <text macro="title"/>
+            <text macro="publisher"/>
+            <text macro="edition"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" prefix=" " suffix="."/>
+          <group prefix=" ">
+            <text term="in" text-case="capitalize-first" suffix=": "/>
+            <text macro="editor" text-case="uppercase" suffix=" "/>
+            <text variable="container-title" font-style="italic" suffix="."/>
+            <text variable="collection-title" prefix=" " suffix="."/>
+          </group>
+          <group>
+            <text macro="publisher" prefix=" " suffix=", "/>
+            <text variable="publisher-place" prefix=" " suffix=","/>
+            <group>
+              <text variable="volume" prefix="Vol" suffix=","/>
+              <label variable="page" suffix=" " form="short"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="webpage post-weblog article-magazine article-newspaper post report" match="any">
+          <text variable="title" prefix=" " suffix="."/>
+          <text variable="publisher" font-style="italic" prefix=" "/>
+          <text variable="issue" font-weight="bold" prefix=" " suffix="."/>
+          <choose>
+            <if match="any" variable="URL">
+              <text variable="URL" prefix=" "/>
+              <date form="text" variable="accessed" prefix=" (accessed " suffix=")."/>
+            </if>
+          </choose>
+        </else-if>
+        <else>
+          <text macro="title" prefix=" " suffix="."/>
+          <group prefix=" ">
+            <text variable="container-title" form="short" font-style="italic"/>
+            <text variable="volume" font-weight="bold" prefix=" "/>
+            <text variable="issue" font-weight="normal" prefix=" (" suffix=")"/>
+            <text variable="page" prefix=", " suffix="."/>
+          </group>
+          <text variable="DOI" strip-periods="false" prefix=" https://doi.org/"/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>

data/vendor/styles/ens-de-lyon-centre-d-ingenierie-documentaire.csl

@@ -5,7 +5,7 @@
     <title-short>CID</title-short>
     <id>http://www.zotero.org/styles/ens-de-lyon-centre-d-ingenierie-documentaire</id>
     <link href="http://www.zotero.org/styles/ens-de-lyon-centre-d-ingenierie-documentaire" rel="self"/>
-    <link href="http://cid.ens-lyon.fr/aide/documents/zotero_style_cid.pdf" rel="documentation"/>
+    <link href="http://cid.ens-lyon.fr/articles/zotero_style_cid.pdf" rel="documentation"/>
     <author>
       <name>Stéphane Marchand</name>
       <email>stephane.marchand@ens-lyon.fr</email>
@@ -18,7 +18,7 @@
     <category field="philosophy"/>
     <category field="humanities"/>
     <category field="political_science"/>
-    <updated>2018-08-13T15:47:21+00:00</updated>
+    <updated>2019-12-12T16:54:53+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">
@@ -26,6 +26,7 @@
       <term name="cited">op.&#160;cit.</term>
       <term name="page" form="short">p.</term>
       <term name="editor" form="short">éd.</term>
+      <term name="editorial-director" form="short">dir.</term>
       <term name="translator" form="short">trad.</term>
       <term name="in">dans</term>
       <term name="et-al">et&#160;al.</term>
@@ -49,12 +50,17 @@
       </if>
       <else-if type="article-journal article-newspaper article-magazine bill chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
         <!-- pour éviter la répétition du champ editor qui sera déjà avant le container-->
-        <names variable="editor">
+        <names variable="editorial-director">
+          <!--la variable CSL "editorial-director" n'existe pas dans Zotero, mais elle peut ainsi se substituer à "editor" pour les ouvrages "dirigés par" un éditeur (cela lève l'ambiguité entre l'éditeur d'un manuscrit (éd.) et le directeur d'un ouvrage collectif (dir.) -->
           <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " initialize-with=". ">
             <name-part name="family" font-variant="small-caps"/>
           </name>
           <et-al font-style="italic"/>
           <label form="short" prefix=" (" suffix=".)"/>
+          <substitute>
+            <names variable="editor"/>
+          </substitute>
+          <!-- en utilisant la fonction "substitute", on présume que "editorial-director" et "editor" ne cohabitent jamais dans une référence - si c'était le cas, ça serait un doublon pour s'assurer que la référence reste correctement lisible par des styles ne prévoyant par le recours au seul "editorial-director"-->
         </names>
       </else-if>
       <else-if type="entry-dictionary entry-encyclopedia interview" match="none">
@@ -71,15 +77,19 @@
             <name-part name="family" font-variant="small-caps"/>
           </name>
           <et-al font-style="italic"/>
+          <label form="short" prefix=" (" suffix=".)"/>
         </names>
       </if>
       <else-if type="article-journal article-newspaper article-magazine bill chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <names variable="editor">
+        <names variable="editorial-director">
           <name form="long" and="text" delimiter-precedes-last="never" name-as-sort-order="first" sort-separator=" ">
             <name-part name="family" font-variant="small-caps"/>
           </name>
           <et-al font-style="italic"/>
           <label form="short" prefix=" (" suffix=".)"/>
+          <substitute>
+            <names variable="editor"/>
+          </substitute>
         </names>
       </else-if>
       <else-if type="entry-dictionary entry-encyclopedia interview" match="none">
@@ -97,10 +107,13 @@
         </names>
       </if>
       <else>
-        <names variable="editor">
-          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " initialize-with=". "/>
+        <names variable="editorial-director">
+          <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" "/>
           <et-al font-style="italic"/>
           <label form="short" prefix=" (" suffix=".)"/>
+          <substitute>
+            <names variable="editor"/>
+          </substitute>
         </names>
       </else>
     </choose>
@@ -115,10 +128,13 @@
         </names>
       </if>
       <else>
-        <names variable="editor">
+        <names variable="editorial-director">
           <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" "/>
           <et-al font-style="italic"/>
           <label form="short" prefix=" (" suffix=".)"/>
+          <substitute>
+            <names variable="editor"/>
+          </substitute>
         </names>
       </else>
     </choose>
@@ -155,10 +171,34 @@
   </macro>
   <!-- MACRO TITLE, PAR TYPE DE DOCUMENT (ndbp et biblio)-->
   <macro name="title">
+    <group delimiter=", ">
+      <choose>
+        <!-- Pour les book legal_case report song motion_picture graphic thesis -->
+        <if type="book legal_case report song motion_picture graphic thesis" match="any">
+          <text variable="title" text-case="capitalize-first" font-style="italic"/>
+        </if>
+        <!-- Pour les personal_communication (lettres) -->
+        <else-if type="personal_communication" match="any">
+          <group delimiter=", ">
+            <names variable="recipient" prefix="lettre à ">
+              <name form="long" and="text" sort-separator=" "/>
+            </names>
+            <!-- <text variable="title" text-case="capitalize-first" quotes="true"/> : le titre, peu utile pour une lettre, reste caché -->
+          </group>
+        </else-if>
+        <!-- Pour tous les autres cas -->
+        <else>
+          <text variable="title" text-case="capitalize-first" quotes="true"/>
+        </else>
+      </choose>
+      <text variable="scale" prefix="échelle "/>
+    </group>
+  </macro>
+  <!-- MACRO TITLE-SHORT-->
+  <macro name="title-short">
     <choose>
-      <!-- Pour les book legal_case report song motion_picture graphic thesis -->
-      <if type="book legal_case report song motion_picture graphic thesis" match="any">
-        <text variable="title" text-case="capitalize-first" font-style="italic"/>
+      <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
+        <text variable="title" form="short" font-style="italic"/>
       </if>
       <!-- Pour les personal_communication (lettres) -->
       <else-if type="personal_communication" match="any">
@@ -169,9 +209,8 @@
           <!-- <text variable="title" text-case="capitalize-first" quotes="true"/> : le titre, peu utile pour une lettre, reste caché -->
         </group>
       </else-if>
-      <!-- Pour tous les autres cas -->
       <else>
-        <text variable="title" text-case="capitalize-first" quotes="true"/>
+        <text variable="title" form="short" text-case="capitalize-first" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -186,7 +225,7 @@
             <choose>
               <if variable="container-author" match="none">
                 <choose>
-                  <if variable="editor">
+                  <if variable="editor editorial-director" match="any">
                     <text macro="editor-ndbp"/>
                   </if>
                 </choose>
@@ -235,7 +274,7 @@
             <choose>
               <if variable="container-author" match="none">
                 <choose>
-                  <if variable="editor">
+                  <if variable="editor editorial-director" match="any">
                     <text macro="editor-bib"/>
                   </if>
                 </choose>
@@ -276,7 +315,7 @@
   <!-- MACRO PUB-PLACE (ndbp)-->
   <macro name="pub-place-ndbp">
     <choose>
-      <if type="book chapter legal_case manuscript paper-conference" match="any">
+      <if type="book chapter legal_case paper-conference" match="any">
         <choose>
           <if variable="publisher-place" match="any">
             <text variable="publisher-place"/>
@@ -286,7 +325,7 @@
           </else>
         </choose>
       </if>
-      <else-if type="thesis graphic motion_picture broadcast report song entry-dictionary entry-encyclopedia" match="any">
+      <else-if type="thesis graphic motion_picture broadcast report manuscript song entry-dictionary entry-encyclopedia" match="any">
         <text variable="publisher-place"/>
       </else-if>
       <else-if type="speech" match="any">
@@ -297,7 +336,7 @@
   <!-- MACRO PUB-PLACE (biblio)-->
   <macro name="pub-place-bib">
     <choose>
-      <if type="book chapter legal_case manuscript paper-conference" match="any">
+      <if type="book chapter legal_case paper-conference" match="any">
         <choose>
           <if variable="publisher-place" match="any">
             <text variable="publisher-place"/>
@@ -307,7 +346,7 @@
           </else>
         </choose>
       </if>
-      <else-if type="thesis graphic motion_picture broadcast report song entry-dictionary entry-encyclopedia" match="any">
+      <else-if type="thesis graphic motion_picture broadcast manuscript report song entry-dictionary entry-encyclopedia" match="any">
         <text variable="publisher-place"/>
       </else-if>
       <else-if type="speech" match="any">
@@ -329,8 +368,8 @@
   <!-- MACRO DATE PAR TYPE DE DOCUMENT (ndbp)-->
   <macro name="date-ndbp">
     <choose>
-      <!-- Pour les article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript -->
-      <if type="article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript" match="any">
+      <!-- Pour les webpage post de forum et post-weblog article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript -->
+      <if type="webpage post post-weblog motion_picture article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript" match="any">
         <choose>
           <if variable="issued" match="any">
             <date variable="issued" form="text">
@@ -344,24 +383,6 @@
           </else>
         </choose>
       </if>
-      <!-- Pour les webpage post de forum et post-weblog (comprend l'URL) -->
-      <else-if type="webpage post post-weblog" match="any">
-        <group delimiter=", ">
-          <text variable="URL"/>
-          <choose>
-            <if variable="issued" match="any">
-              <date variable="issued" form="text">
-                <date-part name="day" form="ordinal"/>
-                <date-part name="month"/>
-                <date-part name="year"/>
-              </date>
-            </if>
-            <else>
-              <text term="no date" form="short"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
       <!-- Pour le reste -->
       <else>
         <choose>
@@ -381,8 +402,8 @@
   <!-- MACRO DATE PAR TYPE DE DOCUMENT (biblio)-->
   <macro name="date-bib">
     <choose>
-      <!-- Pour les article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript entry-dictionary entry-encyclopedia -->
-      <if type="article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript entry-dictionary entry-encyclopedia" match="any">
+      <!-- Pour les webpage post de forum, enregistrement vidéo et post-weblog article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript entry-dictionary entry-encyclopedia -->
+      <if type="webpage post post-weblog motion_picture article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=" ">
           <choose>
             <if variable="issued" match="any">
@@ -398,32 +419,6 @@
           </choose>
         </group>
       </if>
-      <!-- Pour les webpage post de forum et post-weblog (comprend l'URL) -->
-      <else-if type="webpage post post-weblog" match="any">
-        <group delimiter=", ">
-          <text variable="URL"/>
-          <choose>
-            <if variable="issued" match="any">
-              <date variable="issued" form="text">
-                <date-part name="day" form="ordinal"/>
-                <date-part name="month"/>
-                <date-part name="year"/>
-              </date>
-            </if>
-            <else>
-              <text term="no date"/>
-            </else>
-          </choose>
-          <group delimiter=" ">
-            <text term="accessed"/>
-            <date variable="accessed" form="text">
-              <date-part name="day" form="ordinal"/>
-              <date-part name="month"/>
-              <date-part name="year"/>
-            </date>
-          </group>
-        </group>
-      </else-if>
       <!-- Pour le reste -->
       <else>
         <choose>
@@ -440,16 +435,15 @@
     </choose>
   </macro>
   <!-- MACRO URL/DOI (biblio seulement)-->
-  <!-- pour les webpage post et post-weblog, l'URL est dans la macro date -->
   <macro name="url_doi">
     <choose>
-      <if type="article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <if type="webpage post post-weblog motion_picture article-journal article-newspaper article-magazine bill broadcast speech personal_communication interview manuscript entry-dictionary entry-encyclopedia paper-conference" match="any">
         <!-- le "choose" qui suit permet d'éviter l'affichage du DOI pour les ressources imprimées (de même que l'interface de Zotero permet de choisir d'afficher ou non l'URL pour les articles qui contiennent une indication de pages). Pour toujours afficher le DOI quand il est disponible, supprimer <choose><if variable="page" match="none">, les balises fermantes correspondantes, ainsi que l'alternative -->
         <choose>
           <if variable="page" match="none">
             <choose>
               <if variable="DOI" match="any">
-                <group delimiter=", " prefix="(DOI&#160;: " suffix=")">
+                <group delimiter="&#160; " prefix="(DOI&#160;: " suffix=")">
                   <text variable="DOI"/>
                   <date variable="accessed" form="text" prefix="consulté le ">
                     <date-part name="day" form="ordinal"/>
@@ -459,7 +453,7 @@
                 </group>
               </if>
               <else-if variable="URL" match="any">
-                <group delimiter=", " prefix="(en ligne&#160;: " suffix=")">
+                <group delimiter="&#160;; " prefix="(en ligne&#160;: " suffix=")">
                   <text variable="URL"/>
                   <date variable="accessed" form="text" prefix="consulté le ">
                     <date-part name="day" form="ordinal"/>
@@ -474,7 +468,7 @@
             <choose>
               <!-- temporarily, we do not allow DOI to appear when there is a page indication, because it couldn't be chosen by the user in Zotero settings, whether or not to display the information (as is the case for URL and accessed variables) -->
               <if variable="URL" match="any">
-                <group delimiter=", " prefix="(en ligne&#160;: " suffix=")">
+                <group delimiter="&#160;; " prefix="(en ligne&#160;: " suffix=")">
                   <text variable="URL"/>
                   <date variable="accessed" form="text" prefix="consulté le ">
                     <date-part name="day" form="ordinal"/>
@@ -661,6 +655,24 @@
       <text variable="note" text-case="capitalize-first"/>
     </group>
   </macro>
+  <!-- MACRO DISAMBIGUATION -->
+  <macro name="disambiguation">
+    <choose>
+      <if type="book">
+        <choose>
+          <if variable="volume" match="any">
+            <text macro="volume_singlepublication"/>
+          </if>
+          <else>
+            <text macro="date-ndbp"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <text macro="date-ndbp"/>
+      </else>
+    </choose>
+  </macro>
   <!--_-_-_-_-_-SECTION DEFINITION DES NDBP (citation)-_-_-_-_-_-_-->
   <citation et-al-min="4" et-al-use-first="1">
     <layout delimiter="&#160;; ">
@@ -683,18 +695,11 @@
         <else-if position="subsequent">
           <group delimiter=", ">
             <text macro="author-ndbp"/>
-            <choose>
-              <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </if>
-              <else>
-                <text variable="title" form="short" text-case="capitalize-first" quotes="true"/>
-              </else>
-            </choose>
+            <text macro="title-short"/>
             <choose>
               <!-- Lorsque plusieurs références dans un même document ont le même auteur et le même titre, la date apparaît avant op. cit. -->
               <if disambiguate="true">
-                <text macro="date-ndbp"/>
+                <text macro="disambiguation"/>
               </if>
             </choose>
             <text term="cited" font-style="italic"/>
@@ -706,45 +711,48 @@
         </else-if>
         <!-- Pour les premières occurences d'une référence -->
         <else>
-          <group delimiter=", ">
-            <text macro="author-ndbp"/>
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="firstedition-ndbp"/>
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <text macro="author-ndbp"/>
+              <group delimiter=" ">
+                <text macro="title"/>
+                <text macro="firstedition-ndbp"/>
+              </group>
+              <choose>
+                <if variable="container-title event" match="any">
+                  <text macro="translator-ndbp"/>
+                </if>
+              </choose>
+              <text macro="container-ndbp"/>
+              <choose>
+                <if variable="container-author" match="any">
+                  <choose>
+                    <if variable="author" match="any">
+                      <text macro="editor-ndbp"/>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+              <choose>
+                <if variable="container-title event" match="none">
+                  <choose>
+                    <if variable="author" match="any">
+                      <text macro="editor-ndbp"/>
+                    </if>
+                  </choose>
+                  <text macro="translator-ndbp"/>
+                </if>
+              </choose>
+              <text macro="edition"/>
+              <text macro="volume_periodical"/>
+              <text macro="issue_periodical"/>
+              <text macro="pub-place-ndbp"/>
+              <text macro="publisher"/>
+              <text macro="date-ndbp"/>
+              <text macro="volume_singlepublication"/>
+              <text macro="pages"/>
             </group>
-            <choose>
-              <if variable="container-title event" match="any">
-                <text macro="translator-ndbp"/>
-              </if>
-            </choose>
-            <text macro="container-ndbp"/>
-            <choose>
-              <if variable="container-author" match="any">
-                <choose>
-                  <if variable="author" match="any">
-                    <text macro="editor-ndbp"/>
-                  </if>
-                </choose>
-              </if>
-            </choose>
-            <choose>
-              <if variable="container-title event" match="none">
-                <choose>
-                  <if variable="author" match="any">
-                    <text macro="editor-ndbp"/>
-                  </if>
-                </choose>
-                <text macro="translator-ndbp"/>
-              </if>
-            </choose>
-            <text macro="edition"/>
-            <text macro="volume_periodical"/>
-            <text macro="issue_periodical"/>
-            <text macro="pub-place-ndbp"/>
-            <text macro="publisher"/>
-            <text macro="date-ndbp"/>
-            <text macro="volume_singlepublication"/>
-            <text macro="pages"/>
+            <text macro="url_doi"/>
           </group>
         </else>
       </choose>