Implémentation et validation

REB/REB.csl

@@ -97,11 +97,13 @@
         <text macro="sourceReference"/>
         <choose>
           <if type="webpage post-weblog" match="none">
-            <group delimiter=" ">
-              <text macro="publicationReference"/>
-              <text macro="digitalReference" prefix="(" suffix=")"/>
+            <group delimiter=", ici ">
+              <group delimiter=" ">
+                <text macro="publicationReference"/>
+                <text macro="digitalReference" prefix="(" suffix=")"/>
+              </group>
+              <text macro="thisCitationLocator"/>
             </group>
-            <text macro="publicationLocators"/>
           </if>
           <else>
             <text macro="publicationReference"/>
@@ -145,6 +147,7 @@
         <text macro="publicationPublisher"/>
         <text macro="publicationDateWithReedition"/>
       </group>
+      <text macro="wholeItemLocator"/>
     </group>
   </macro>
 
@@ -621,13 +624,6 @@
     <text variable="edition" vertical-align="sup"/>
   </macro>
 
-  <macro name="publicationLocators">
-    <group delimiter=", ici ">
-      <text macro="wholeItemLocator"/>
-      <text macro="thisCitationLocator"/>
-    </group>
-  </macro>
-
   <macro name="wholeItemLocator">
     <group delimiter=" ">
       <choose>