From a1573a6c39c559ed8951e4e8c0c9ea24980a40bc Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bastien.dumont@posteo.net>
Date: Wed, 23 Dec 2020 17:41:32 +0100
Subject: [PATCH] =?UTF-8?q?Traitement=20des=20volumes=20rendu=20plus=20con?=
 =?UTF-8?q?forme=20aux=20instructions=20de=20la=20REB=20et=20cr=C3=A9ation?=
 =?UTF-8?q?=20du=20test=20associ=C3=A9=20manquant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 REB/REB.csl                      | 14 +++++++++++---
 Tests-Data/BIBLIO_CSL-Tests.json | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/REB/REB.csl b/REB/REB.csl
index 40b4a85..9923392 100644
--- a/REB/REB.csl
+++ b/REB/REB.csl
@@ -178,6 +178,7 @@ interview  ;  Interview
             <group delimiter=", ">
               <text macro="publicationAuthors"/>
               <text macro="publicationTitle"/>
+              <text macro="publicationVolumes"/>
               <text macro="publicationContainer"/>
             </group>
             <text macro="publicationCollection"/>
@@ -335,9 +336,9 @@ interview  ;  Interview
   </macro>
 
   <macro name="bookWithVolume">
-    <group>
+    <group delimiter=", ">
       <text variable="title" font-style="italic"/>
-      <text macro="bookVolume" prefix=". "/>
+      <text macro="bookVolume"/>
     </group>
   </macro>
 
@@ -498,7 +499,7 @@ interview  ;  Interview
     <choose>
       <if type="article-journal book paper-conference thesis chapter entry-dictionary entry-encyclopedia" match="any">
         <date variable="issued">
-          <date-part name="year"/>
+          <date-part name="year" range-delimiter="-"/>
         </date>
       </if>
       <else-if type="article-newspaper article-magazine" match="any">
@@ -617,10 +618,17 @@ interview  ;  Interview
   </macro>
 
   <macro name="bookVolume">
+    <choose>
+      <if variable="volume">
     <group delimiter="-">
       <number variable="volume" form="roman" text-case="uppercase"/> 
       <number variable="issue"/>
     </group>
+      </if>
+      <else>
+        <number variable="number-of-volumes" prefix="I-" form="roman" text-case="uppercase"/> 
+      </else>
+    </choose>
   </macro>
 
   <macro name="journalVolume">
diff --git a/Tests-Data/BIBLIO_CSL-Tests.json b/Tests-Data/BIBLIO_CSL-Tests.json
index 83d211a..59dff89 100644
--- a/Tests-Data/BIBLIO_CSL-Tests.json
+++ b/Tests-Data/BIBLIO_CSL-Tests.json
@@ -1464,5 +1464,29 @@
 				]
 			]
 		}
+	},
+	{
+		"type": "book",
+		"event-place": "Lieu de publication",
+                "id": "VolumeAnonymeDansMultivolume",
+		"number-of-volumes": "4",
+		"publisher": "Maison d'édition",
+		"publisher-place": "Lieu de publication",
+		"title": "Volume non nommé d'un livre en plusieurs volumes",
+		"title-short": "Titre abrégé",
+		"volume": "2",
+		"author": [
+			{
+				"family": "Auteur",
+				"given": "Nom"
+			}
+		],
+		"issued": {
+			"date-parts": [
+				[
+					"2000"
+				]
+			]
+		}
 	}
 ]