From 82528082d4fda3604d64d4fddb7e4b573b95c424 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bastien.dumont@posteo.net>
Date: Tue, 22 Dec 2020 22:44:17 +0100
Subject: [PATCH] =?UTF-8?q?Premi=C3=A8re=20r=C3=A9daction=20compl=C3=A8te?=
 =?UTF-8?q?=20moins=20les=20d=C3=A9limiteurs=20et=20les=20liens=20internet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 REB/REB.csl | 958 +++++++++++++++++++++++++---------------------------
 1 file changed, 460 insertions(+), 498 deletions(-)

diff --git a/REB/REB.csl b/REB/REB.csl
index 807ffe0..59b9ce8 100644
--- a/REB/REB.csl
+++ b/REB/REB.csl
@@ -101,7 +101,7 @@ Pour utiliser ce style dans un article rédigé dans une langue autre que le fra
     </terms>
   </locale>
 
-    <citation disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="all-names">
+  <citation disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="all-names">
     <layout suffix=".">
       <choose>
         <if position="ibid-with-locator ibid" match="any">
@@ -138,157 +138,482 @@ Pour utiliser ce style dans un article rédigé dans une langue autre que le fra
   </bibliography>
 
   <macro name="completeReference">
-              <group delimiter=" ">
-            <group delimiter=", ">
-	      <choose>
-	        <if variable="abstract">
-		  <choose>
-		    <if variable="title container-title" match="none">
-		      <group delimiter=" ">
-		        <text macro="source"/>
-		        <text macro="collection"/>
-		      </group>
-		    </if>
-		    <else>
-		      <text macro="source"/>
-		    </else>
-		  </choose>
-	        </if>
-	        <else>
-		  <text macro="author"/>
-	        </else>
-	      </choose>
-	      <choose>
-                <if variable="title container-title" match="any">
-	          <group delimiter=" ">
-		    <text macro="title"/>
-		    <text macro="collection"/>
-	          </group>
-                </if>
-	      </choose>
-	      <text macro="translation"/>
-	      <group delimiter=" ">
-                <text macro="pub-place"/>
-	        <group>
-		  <text macro="year"/>
-		  <text variable="edition" vertical-align="sup"/>
-	        </group>
-	      </group>
-              <text macro="manuscript"/>
-              <choose>
-                <if variable="page chapter-number" type="webpage post-weblog" match="any">
-	          <text macro="page"/>
-	          <text macro="locator" prefix=", ici "/>
-                </if>
-                <else>
-                  <text macro="locator"/> 
-                </else>
-              </choose>
-            </group>
-	    <text macro="accessed"/>
-	  </group>
+    <text macro="sourceReference"/>
+    <text macro="publicationReference"/>
+    <text macro="digitalReference"/>
   </macro>
 
-  <!-- Indique l'auteur, le titre et l'éditeur de la source, plus la cote du manuscrit si le type est "Manuscrit". -->
-  <macro name="source">
-    <group delimiter=", ">
-      <names variable="author">
-        <name>
-          <name-part name="family" font-variant="small-caps"/>
-        </name>
-      </names>
-      <group>
-       	<text variable="abstract" font-style="italic"/>
-	<!-- Utile pour les références aux corpus type CPG ou BHG. 
-             Nécessite un post-traitement pour mettre le nom du répertoire en italiques. -->
-	<text variable="references" prefix=" (" suffix=")"/>
-      </group>
-      <names variable="editor translator" delimiter=", "> 
-        <label form="short" suffix=" "/>
-        <name>
-          <name-part name="family" font-variant="small-caps"/>
-        </name>
-      </names>
-      <names variable="collection-editor">
-	<label form="long" suffix=" "/> 
-	<name>
-          <name-part name="family" font-variant="small-caps"/>
-	</name>
-      </names>
-    </group>
-  </macro>
-
-  <macro name="manuscript">
+  <macro name="sourceReference">
     <choose>
-    <if type="manuscript">
-    <group delimiter=", ">
-      <text variable="publisher-place"/>
-      <text variable="archive"/>
-      <group delimiter=" ">
-        <text variable="archive_location"/>
-        <text variable="call-number"/>
-        <text variable="source" prefix="(" suffix=")"/>
-      </group>
-    </group>
-    </if>
+      <if variable="abstract"> <!-- = primary source title -->
+        <group delimiter=", ">
+          <text macro="sourceAuthor"/>
+          <group delimiter=" ">
+            <text macro="sourceTitle"/>
+            <text macro="sourceIdentifier"/>
+          </group>
+        </group>
+      </if>
     </choose>
   </macro>
 
-  <macro name="author">
-    <group delimiter=", ">
-      <choose>
-        <!-- Ce choix conditionnel sert à faire en sorte que le nom de l'éditeur n'apparaisse que dans le cas d'un ouvrage collectif. Dans le cas d'un article dans un ouvrage, l'éditeur est implémenté par la macro "title" de manière à ce qu'il suive le titre de l'article. -->
-        <if type="book"> 
-	  <names variable="author">
+  <macro name="publicationReference">
+    <text macro="publicationAuthors"/>
+    <text macro="publicationTitle"/>
+    <text macro="publicationContainer"/>
+    <text macro="publicationCollection"/>
+    <text macro="translationNotice"/>
+    <text macro="publicationPublisher"/>
+    <text macro="publicationDate"/>
+    <text macro="publicationEdition"/>
+    <text macro="publicationLocator"/>
+  </macro>
+
+  <macro name="digitalReference">
+    <text macro="digitalLink"/>
+    <text macro="digitalAccessed"/>
+    <text macro="digitalDOI"/>
+  </macro>
+
+  <macro name="sourceAuthor">
+    <names variable="author">
+      <name form="long" initialize="false">
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+    </names>
+  </macro>
+
+  <macro name="sourceTitle">
+    <text variable="abstract" font-style="italic"/>
+  </macro>
+
+  <macro name="sourceIdentifier">
+    <text variable="references" prefix="(" suffix=")"/> <!-- ID of the source in a repertory like CPG or BHG -->
+  </macro>
+
+  <macro name="publicationAuthors">
+    <choose>
+      <if variable="abstract">
+        <text macro="sourcePublicationAuthors"/>
+      </if>
+      <else>
+        <text macro="simplePublicationAuthors"/>
+      </else>
+    </choose>
+  </macro>
+
+  <macro name="sourcePublicationAuthors">
+    <names variable="editor translator" delimiter=", "> 
+      <label form="short" suffix=" "/>
+      <name>
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+    </names>
+    <text macro="collaborator"/>
+  </macro>
+
+  <macro name="collaborator">
+    <names variable="collection-editor">
+      <label form="long" suffix=" "/> 
+      <name>
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+    </names>
+  </macro>
+
+  <macro name="simplePublicationAuthors">
+    <names variable="author">
+      <name>
+	<name-part name="family" font-variant="small-caps"/>
+      </name>
+    </names>
+    <text macro="collectiveBookEditors"/>
+    <names variable="collection-editor" delimiter=", ">
+      <label form="long" suffix=" "/> 
+      <name>
+	<name-part name="family" font-variant="small-caps"/>
+      </name>
+    </names>
+  </macro>
+
+  <macro name="collectiveBookEditors">
+    <choose>
+      <if type="book"> 
+	<group>
+	  <names variable="editor">
 	    <name>
 	      <name-part name="family" font-variant="small-caps"/>
 	    </name>
-          </names>
-	  <group>
-	    <names variable="editor">
+	  </names>
+	  <text term="container-author" form="short" prefix=" (" suffix=")"/> <!-- Here éd., could be dir. -->
+	</group>
+	<choose>
+	  <if variable="original-publisher" match="none"> <!-- original-publisher = lang from which the item was translated  -->
+	    <names variable="translator">
 	      <name>
 		<name-part name="family" font-variant="small-caps"/>
 	      </name>
+	      <label form="short" prefix=" (" suffix=")"/>
 	    </names>
-	    <text term="container-author" form="short" prefix=" (" suffix=")"/>
-	  </group>
-	  <choose>
-	    <if variable="original-publisher" match="none">
-	      <names variable="translator">
-		<name>
-		  <name-part name="family" font-variant="small-caps"/>
-		</name>
-		<label form="short" prefix=" (" suffix=")"/>
-	      </names>
-	    </if>
-	  </choose>
-	  <names variable="collection-editor">
-	    <label form="long" suffix=" "/> 
-	    <name>
-	      <name-part name="family" font-variant="small-caps"/>
-	    </name>
-	  </names>
-        </if>
-        <else-if type="article-journal article-magazine article-newspaper chapter entry-dictionary entry-encyclopedia paper-conference thesis post post-weblog webpage" match="any">
-          <names variable="author">
-	    <name>
-	      <name-part name="family" font-variant="small-caps"/>
-	    </name>
-          </names>
-	  <names variable="collection-editor" delimiter=", ">
-	    <label form="long" suffix=" "/> 
-	    <name>
-	      <name-part name="family" font-variant="small-caps"/>
-	    </name>
-	  </names>
-        </else-if>
-      </choose>
+	  </if>
+	</choose>
+      </if>
+    </choose>
+  </macro>
+
+  <macro name="publicationTitle">
+    <choose>
+      <if type="book">
+        <choose>
+          <if variable="container-title">
+            <text macro="multivolumeNamedBook"/>
+          </if>
+          <else>
+            <text macro="bookWithVolume"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="thesis">
+        <text macro="bookWithVolume"/>
+        <text variable="genre"/>
+        <text variable="publisher"/> <!-- University --> <!-- TODO : reconsidérer l'emplacement -->
+      </else-if>
+      <else>
+       	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+
+  <macro name="multivolumeNamedBook">
+    <group>
+      <text variable="container-title" font-style="italic"/>
+      <text macro="bookVolume" prefix=". "/>
+    </group>
+    <text variable="title" text-case="capitalize-first" font-style="italic"/> 
+  </macro>
+
+  <macro name="bookWithVolume">
+    <group>
+      <text variable="title" font-style="italic"/>
+      <text macro="bookVolume" prefix=". "/>
     </group>
   </macro>
 
+  <macro name="publicationContainer">
+    <text macro="containerIntroduction"/>
+    <text macro="containerAuthors"/>
+    <text macro="containerTitle"/>
+  </macro>
 
-  <!-- Cette macro sert à ne pas indiquer l'éditeur d'une source dans une citation subséquente. -->
-  <macro name="author-subsequent">
+  <macro name="containerIntroduction">
+    <choose>
+      <if variable="title">
+        <choose>
+          <if type="webpage post-weblog" match="any">
+            <text term="at"/>
+          </if>
+          <else>
+            <text term="in"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+
+  <macro name="containerAuthors">
+    <text macro="containerEditor"/>
+    <text macro="collaborator"/>
+  </macro>
+
+  <macro name="containerEditor">
+    <choose>
+      <if variable="abstract">
+        <text macro="containerEditorAsContainerAuthor"/>
+      </if>
+      <else>
+        <text macro="containerEditorAsEditor"/>
+        <text macro="containerEditorAsContainerAuthor"/>
+      </else>
+    </choose>
+  </macro>
+
+  <macro name="containerEditorAsContainerAuthor">
+    <names variable="container-author">
+      <name>
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+
+  <macro name="containerEditorAsEditor">
+    <group>
+      <names variable="editor">
+	<name>
+	  <name-part name="family" font-variant="small-caps"/>
+	</name>
+      </names>
+      <text term="container-author" form="short" prefix=" (" suffix=")"/>
+    </group>
+  </macro>
+
+  <macro name="containerTitle">
+    <choose>
+            <if type="manuscript">
+        <group delimiter=", ">
+          <text variable="publisher-place"/>
+          <text variable="archive"/>
+          <group delimiter=" ">
+            <text variable="archive_location"/>
+            <text variable="call-number"/>
+            <text variable="source" prefix="(" suffix=")"/> <!-- Global identifier (like Diktyon) -->
+          </group>
+        </group>
+      </if>
+      <else-if type="paper-conference">
+       	<group>
+	  <text variable="container-title" font-style="italic"/>
+	  <text variable="event" font-style="italic"/>
+	</group>
+      </else-if>
+      <else-if type="article-journal article-magazine" match="any">
+	<group delimiter=" ">
+          <text variable="container-title" font-style="italic"/>
+          <text macro="journalVolume"/>
+	</group>
+      </else-if>
+      <else>
+        <text variable="container-title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+
+  <macro name="publicationCollection">
+    <group prefix="(" suffix=")" delimiter=" ">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+
+  <macro name="translationNotice">
+    <choose>
+      <if variable="original-publisher">
+	<group delimiter=" ">
+	  <text term="translator" form="verb"/>
+	  <text variable="original-publisher"/>
+	  <text term="by"/>
+	  <names variable="translator">
+	    <name>
+	      <name-part name="family" font-variant="small-caps"/>
+	    </name>			 
+	  </names>
+	</group>
+      </if>
+    </choose>
+  </macro>
+
+  <macro name="publicationPublisher">
+    <choose>
+      <if type="book chapter entry-dictionary entry-encyclopedia" match="any">
+        <text variable="publisher-place"/>
+      </if>
+      <else-if type="paper-conference">
+	<text variable="event-place"/>
+      </else-if>
+    </choose>
+  </macro>
+
+  <macro name="publicationDate">
+    <choose>
+      <if type="article-journal book paper-conference thesis chapter entry-dictionary entry-encyclopedia" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if type="article-newspaper article-magazine" match="any">
+	<date variable="issued" form="numeric"/>
+      </else-if>
+    </choose>
+  </macro>
+
+  <macro name="publicationEdition">
+    	    <text variable="edition" vertical-align="sup"/>
+  </macro>
+
+  <macro name="publicationLocator">
+    <choose>
+      <if variable="page chapter-number" type="webpage post-weblog" match="any">
+	<text macro="wholeItemLocator"/>
+	<text macro="thisCitationLocator" prefix=", ici "/>
+      </if>
+      <else>
+        <text macro="thisCitationLocator"/> 
+      </else>
+    </choose>
+  </macro>
+
+  <macro name="wholeItemLocator">
+    <group delimiter=" ">
+      <choose>
+        <if type="manuscript">
+          <!-- Post-processing required to get the plural form of the term "folio" ("ff.") whenever needed. -->
+          <text term="folio" form="short"/>
+          <text variable="page"/>
+        </if>
+        <else>
+          <label variable="page" form="short"/>
+          <text variable="page" font-variant="small-caps"/>
+        </else>
+      </choose>
+    </group>
+    <group delimiter=" ">
+      <text variable="chapter-number" font-variant="small-caps"/> <!-- = column -->
+    </group>
+  </macro>
+
+  <macro name="thisCitationLocator">
+    <choose>
+      <if locator="column">
+	<text variable="locator" font-variant="small-caps"/>
+      </if>
+      <else>
+	<group delimiter=" ">
+	  <label variable="locator" form="short"/>
+          <choose>
+            <if locator="folio">
+              <text variable="locator"/>
+            </if>
+            <else>
+	      <text variable="locator" font-variant="small-caps"/>
+            </else>
+          </choose>
+	</group>
+      </else>
+    </choose>
+  </macro>
+
+  <macro name="digitalLink">
+
+  </macro>
+
+      <macro name="digitalAccessed">
+        
+      </macro>
+      
+    <macro name="digitalDOI">
+      
+    </macro>
+
+  <macro name="title-short">
+    <choose>
+      <if variable="title-short">
+        <choose>
+	  <if variable="abstract" type="book thesis" match="any">
+	    <text variable="title-short" font-style="italic"/>
+	  </if>
+	  <else>
+	    <text variable="title-short"/>
+	  </else>
+        </choose>
+      </if>
+      <else-if variable="abstract">
+        <text variable="abstract" font-style="italic"/>
+      </else-if>
+      <else-if type="manuscript" variable="container-title-short" match="all">
+        <text variable="container-title-short"/>
+      </else-if>
+    </choose>
+  </macro>
+
+  <macro name="bookVolume">
+    <group delimiter="-">
+      <number variable="volume" form="roman" text-case="uppercase"/> 
+      <number variable="issue"/>
+    </group>
+  </macro>
+
+  <macro name="journalVolume">
+    <group delimiter="-">
+      <number variable="volume"/> 
+      <number variable="issue"/>
+    </group>
+  </macro>
+
+  <macro name="sort-sources">
+    <!-- Cette macro n'est pas destinée à être l'argument d'un "cs:text", mais est utilisée dans la macro "bibliography" pour indiquer en premier les sources, éventuellement elles-mêmes classées selon le critère renseigné dans "Extra" comme valeur de la variable "keyword", puis la littérature secondaire. --> 
+    <choose>
+      <if variable="abstract">
+	<text value="000"/>
+	<!--text variable="keyword"/-->
+	<text macro="source"/>
+      </if>
+    </choose>
+    <text macro="author"/>
+  </macro>
+
+  <macro name="accessed-garbage">
+    <choose>
+      <if type="webpage post-weblog" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+	  <text term="accessed"/>
+	  <date variable="accessed" form="numeric"/>
+	</group>
+      </if>
+      <else>
+	<group prefix="[" suffix="]">
+	  <text term="online" suffix=" : "/>
+	  <text variable="URL"/>
+	  <group>
+	    <text term="accessed" prefix=", " suffix=" "/>
+	    <date variable="accessed" form="numeric"/>
+	  </group>
+	</group>
+      </else>
+    </choose>
+  </macro>
+
+  <macro name="ibidem">
+    <group delimiter=", ">
+      <text term="ibid" text-case="capitalize-first" font-style="italic"/>
+      <text macro="locator"/>
+    </group>
+  </macro>
+
+  <macro name="subsequentCitation">
+    <group delimiter=", ">
+      <text macro="subsequentCitationAuthor"/>
+      <choose>
+	<if variable="title-short abstract container-title-short" match="any">
+	  <text macro="title-short"/>
+	</if>
+	<else>
+	  <choose>
+	    <if type="book thesis" match="any">
+              <text variable="title" font-style="italic"/>
+	    </if>
+	    <else>
+              <choose>
+                <if variable="title">
+                  <text variable="title"/>
+                </if>
+                <else>
+                  <text variable="container-title" font-style="italic"/>
+                </else>
+              </choose>
+	    </else>			  
+	  </choose>		  
+	</else>			 
+      </choose>
+      <group>
+        <text term="cited"/>
+	<text variable="first-reference-note-number"/>
+      </group>
+      <text macro="locator"/>
+    </group>
+  </macro>
+
+    <!-- Cette macro sert à ne pas indiquer l'éditeur d'une source dans une citation subséquente. -->
+  <macro name="subsequentCitationAuthor">
     <choose>
       <if variable="abstract">
         <names variable="author">
@@ -318,369 +643,6 @@ Pour utiliser ce style dans un article rédigé dans une langue autre que le fra
       </else>
     </choose>
   </macro>
-
-  <macro name="title">
-    <group delimiter=", ">
-      <choose>
-	<if type="book">
-          <choose>
-            <if variable="container-title">
-              <group>
-                <text variable="container-title" font-style="italic"/>
-                <text macro="volume-book" prefix=". "/>
-              </group>
-	      <text variable="title" text-case="capitalize-first" font-style="italic"/>
-            </if>
-            <else>
-              <group>
-                <text variable="title" text-case="capitalize-first" font-style="italic"/>
-                <text macro="volume-book" prefix=". "/>
-              </group>
-            </else>
-          </choose>
-	</if>
-	<else-if type="paper-conference">
-	  <choose>
-	    <if variable="title">
-	      <text variable="title"/>
-	      <group delimiter=" ">
-		<text term="in"/>
-		<names variable="editor">
-		  <name>
-		    <name-part name="family" font-variant="small-caps"/>
-		  </name>
-		</names>
-		<text term="container-author" form="short" prefix="(" suffix=")"/>
-	      </group>
-	    </if>
-	    <else>
-	      <group delimiter=" ">
-		<names variable="editor">
-		  <name>
-		    <name-part name="family" font-variant="small-caps"/>
-		  </name>
-		</names>
-		<text term="container-author" form="short" prefix="(" suffix=")"/>
-	      </group>
-	    </else>
-	  </choose>
-	  <group>
-	    <text variable="container-title" font-style="italic"/>
-	    <text variable="event" font-style="italic"/>
-	  </group>
-	</else-if>
- 	<else-if type="article-journal article-magazine" match="any">
-       	  <text variable="title"/>
-	  <group delimiter=" ">
-            <text variable="container-title" font-style="italic"/>
-	    <!-- Ceci ne concerne qu'un numéro de revue. Pour un volume au sein d'une série de livres (p. ex. Das Konzil von Chalkedon. II: Die Entscheidung um Chalkedon), l'ensemble doit être indiqué et mis en forme dans le champ "Titre".) -->
-            <text macro="volume-journal"/>
-	  </group>
-        </else-if>
-        <else-if type="article-newspaper">
-          <text variable="title"/>
-          <text variable="container-title" font-style="italic"/>
-        </else-if>
-        <else-if type="thesis">
-	  <!-- L'instruction <text variable="publisher"/> n'est pas dans la macro "publisher" car le nom de l'université doit apparaître avant le nom de lieu. -->
-          <text variable="title" font-style="italic"/>
-	  <text macro="volume-book"/>
-          <text variable="genre"/>
-          <text variable="publisher"/>
-        </else-if>
-        <else-if type="chapter">	
-	  <text variable="title"/>
-    	  <group>
-	    <text term="in" suffix=" "/>
-            <text macro="editor-of-container"/>
-          </group>
-          <group delimiter=". ">
-	    <text variable="container-title" font-style="italic"/>
-            <text macro="volume-book"/>
-          </group>
-        </else-if>
-        <else-if type="entry-dictionary entry-encyclopedia" match="any">
-	  <text variable="title"/>
-          <group>
-	    <text term="in" suffix=" "/>
-	    <group delimiter=", ">
-	      <group>
-	        <names variable="editor">
-	          <name>
-	            <name-part name="family" font-variant="small-caps"/>
-	          </name>
-	        </names>
-	        <text term="container-author" form="short" prefix=" (" suffix=")"/>
-	      </group>
-	      <names variable="container-author">
-	        <name>
-	          <name-part name="family" font-variant="small-caps"/>
-	        </name>
-	        <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
-	      </names>
-	      <group delimiter=" ">
-	        <text variable="container-title" font-style="italic"/>
-                <text macro="volume-book"/>
-	      </group>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="webpage post-weblog" match="any">
-          <text variable="title"/>
-          <group delimiter=", ">
-            <group delimiter=" ">
-              <choose>
-              <if variable="title">
-                <text term="at"/>
-              </if>
-              </choose>
-              <text macro="editor-of-container"/>
-            </group>
-            <text variable="container-title" font-style="italic"/>
-          </group>
-        </else-if>
-      </choose>
-    </group>
-  </macro>
-
-  <macro name="editor-of-container">
-	    <choose>
-	      <!-- Ce choix conditionnel permet d'éviter que le nom de l'éditeur ou traducteur du texte ne soit repris après le titre de la source (car il est déjà pris en charge par la macro "source"). Seul le nom d'un éventuel directeur d'ouvrage collectif ou éditeur de dictionnaire ou encyclopédie est indiqué après le titre de la source. -->
-	      <if variable="abstract">
-	        <names variable="container-author">			 
-		  <name>
-                    <name-part name="family" font-variant="small-caps"/>
-		  </name>
-		  <label form="short" prefix=" (" suffix=")"/>
-                </names>
-	      </if>
-	      <else>
-	        <group>
-		  <names variable="editor">
-		    <name>
-		      <name-part name="family" font-variant="small-caps"/>
-		    </name>
-		  </names>
-		  <text term="container-author" form="short" prefix=" (" suffix=")"/>
-	        </group>
-	        <names variable="container-author">
-		  <name>
-		    <name-part name="family" font-variant="small-caps"/>
-		  </name>
-		  <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
-	        </names>
-	      </else>
-	    </choose>
-  </macro>
-
-  <macro name="title-short">
-    <choose>
-      <if variable="title-short">
-        <choose>
-	  <if variable="abstract" type="book thesis" match="any">
-	    <text variable="title-short" font-style="italic"/>
-	  </if>
-	  <else>
-	    <text variable="title-short"/>
-	  </else>
-        </choose>
-      </if>
-      <else-if variable="abstract">
-        <text variable="abstract" font-style="italic"/>
-      </else-if>
-      <else-if type="manuscript" variable="container-title-short" match="all">
-        <text variable="container-title-short"/>
-      </else-if>
-    </choose>
-  </macro>
-
-  <macro name="volume-book">
-    <group delimiter="-">
-      <number variable="volume" form="roman" text-case="uppercase"/> 
-      <number variable="issue"/>
-    </group>
-  </macro>
-
-    <macro name="volume-journal">
-    <group delimiter="-">
-      <number variable="volume"/> 
-      <number variable="issue"/>
-    </group>
-  </macro>
-
-  <macro name="translation">
-    <choose>
-      <if variable="original-publisher">
-	<group delimiter=" ">
-	  <text term="translator" form="verb"/>
-	  <text variable="original-publisher"/>
-	  <text term="by"/>
-	  <names variable="translator">
-	    <name>
-	      <name-part name="family" font-variant="small-caps"/>
-	    </name>			 
-	  </names>
-	</group>
-      </if>
-    </choose>
-  </macro>
-
-  <macro name="pub-place">
-    <choose>
-      <if type="book chapter entry-dictionary entry-encyclopedia" match="any">
-        <text variable="publisher-place"/>
-      </if>
-      <else-if type="paper-conference">
-	<text variable="event-place"/>
-      </else-if>
-    </choose>
-  </macro>
-
-  <macro name="publisher">
-    <choose>
-      <if type="book chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-        <text variable="publisher"/>
-      </if>
-    </choose>
-  </macro>
-  
-  <macro name="year">
-    <choose>
-      <if type="article-journal book paper-conference thesis chapter entry-dictionary entry-encyclopedia" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else-if type="article-newspaper article-magazine" match="any">
-	<date variable="issued" form="numeric"/>
-      </else-if>
-    </choose>
-  </macro>
-  
-  <macro name="collection">
-    <group prefix="(" suffix=")" delimiter=" ">
-      <text variable="collection-title"/>
-      <text variable="collection-number"/>
-    </group>
-  </macro>
-
-  <macro name="sort-sources">
-    <!-- Cette macro n'est pas destinée à être l'argument d'un "cs:text", mais est utilisée dans la macro "bibliography" pour indiquer en premier les sources, éventuellement elles-mêmes classées selon le critère renseigné dans "Extra" comme valeur de la variable "keyword", puis la littérature secondaire. --> 
-    <choose>
-      <if variable="abstract">
-	<text value="000"/>
-	<!--text variable="keyword"/-->
-	<text macro="source"/>
-      </if>
-    </choose>
-    <text macro="author"/>
-  </macro>
-
-  <macro name="locator">
-    <choose>
-      <if locator="column">
-	<text variable="locator" font-variant="small-caps"/>
-      </if>
-      <else>
-	<group delimiter=" ">
-	  <label variable="locator" form="short"/>
-          <choose>
-            <if locator="folio">
-              <text variable="locator"/>
-            </if>
-            <else>
-	      <text variable="locator" font-variant="small-caps"/>
-            </else>
-          </choose>
-	</group>
-      </else>
-    </choose>
-  </macro>
-  
-  <macro name="page">
-    <!-- L'ajout de "font-variant="small-caps"" à "text variable="locator/page"" sert à rendre les chiffres romains en petites majuscules. Il ne faut donc pas introduire de mots comme "et" dans le champ "Pages" dans l'éditeur de notes de Zotero ! -->
-    <group delimiter=" ">
-      <choose>
-        <if type="manuscript">
-          <!-- Nécessite un post-traitement pour que le terme "folio" soit mis au pluriel si besoin (p. ex. "ff."). -->
-          <text term="folio" form="short"/>
-          <text variable="page"/>
-        </if>
-        <else-if type="webpage post-weblog" match="any">
-          <text variable="URL"/>
-        </else-if>
-        <else>
-          <label variable="page" form="short"/>
-          <text variable="page" font-variant="small-caps"/>
-        </else>
-      </choose>
-    </group>
-    <group delimiter=" ">
-      <!-- La variable "chapter-number" sert à pallier l'absence d'une variable "column" (existe seulement comme locator). -->
-      <text variable="chapter-number" font-variant="small-caps"/>
-    </group>
-  </macro>
-
-  <macro name="accessed">
-    <choose>
-      <if type="webpage post-weblog" match="any">
-        <group prefix="(" suffix=")" delimiter=" ">
-	    <text term="accessed"/>
-	    <date variable="accessed" form="numeric"/>
-	  </group>
-      </if>
-      <else>
-	<group prefix="[" suffix="]">
-	  <text term="online" suffix=" : "/>
-	  <text variable="URL"/>
-	  <group>
-	    <text term="accessed" prefix=", " suffix=" "/>
-	    <date variable="accessed" form="numeric"/>
-	  </group>
-	</group>
-      </else>
-    </choose>
-  </macro>
-
-  <macro name="ibidem">
-              <group delimiter=", ">
-            <text term="ibid" text-case="capitalize-first" font-style="italic"/>
-	    <text macro="locator"/>
-	  </group>
-  </macro>
-
-  <macro name="subsequentCitation">
-              <group delimiter=", ">
-            <text macro="author-subsequent"/>
-            <choose>
-	      <if variable="title-short abstract container-title-short" match="any">
-		<text macro="title-short"/>
-	      </if>
-	      <else>
-		<choose>
-		  <if type="book thesis" match="any">
-                    <text variable="title" font-style="italic"/>
-		  </if>
-		  <else>
-                    <choose>
-                      <if variable="title">
-                        <text variable="title"/>
-                      </if>
-                      <else>
-                        <text variable="container-title" font-style="italic"/>
-                      </else>
-                    </choose>
-		  </else>			  
-		</choose>		  
-	      </else>			 
-            </choose>
-	    <group>
-              <text term="cited"/>
-	      <text variable="first-reference-note-number"/>
-            </group>
-	    <text macro="locator"/>
-	  </group>
-  </macro>
 </style>