diff --git a/archeologie-medievale.csl b/archeologie-medievale.csl
index 1ac70696e78..938be428550 100644
--- a/archeologie-medievale.csl
+++ b/archeologie-medievale.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="display-and-sort" default-locale="fr-FR" page-range-format="expanded">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="display-and-sort" page-range-format="expanded" default-locale="fr-FR">
   <info>
     <title>Archéologie médiévale (French)</title>
     <id>http://www.zotero.org/styles/archeologie-medievale</id>
@@ -9,17 +9,24 @@
       <name>Nicolas Monteix</name>
       <email>nicolas.monteix@univ-rouen.fr</email>
     </author>
+    <contributor>
+      <name>Francois Capron</name>
+      <email>f.capron37@gmail.com</email>
+    </contributor>
     <category citation-format="note"/>
     <category field="history"/>
     <category field="anthropology"/>
     <issn>0153-9337</issn>
     <summary>Style auteur-date en note pour Archéologie médiévale. NB: les sources éditées doivent être considérées comme des livres ayant un auteur (médiéval) et un éditeur (contemporain). Pour les sources éditées ne disposant pas d'auteur (médiéval), il est nécessaire de transformer le (dir.) en (éd.). Pour les archives (type=manuscrit), le "lieu" correspond au dépôt d'archives, l' "archive" au fonds, la "loc. dans l'archive" à la cote.</summary>
-    <updated>2014-08-17T23:30:36+00:00</updated>
+    <updated>2020-06-26T00:59:23+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">
     <terms>
       <term name="editor" form="short">dir.</term>
+      <term name="container-author" form="short">dir.</term>
+      <term name="collection-editor" form="short">dir.</term>
+      <term name="translator" form="short">trad.</term>
       <term name="in">dans</term>
       <term name="anonymous">anonyme</term>
       <term name="anonymous" form="short">anon.</term>
@@ -29,12 +36,26 @@
     </terms>
   </locale>
   <macro name="author">
-    <names variable="author" delimiter=" ">
-      <name name-as-sort-order="all" font-variant="small-caps" sort-separator=" " initialize-with="." delimiter-precedes-last="never" and="text" delimiter=", "/>
-      <substitute>
+    <choose>
+      <if variable="author">
+        <names variable="author" delimiter=" ">
+          <name name-as-sort-order="all" font-variant="small-caps" sort-separator=" " initialize-with="." delimiter-precedes-last="never" and="text" delimiter=", "/>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name name-as-sort-order="all" font-variant="small-caps" sort-separator=" " initialize-with="." delimiter-precedes-last="never" and="text" delimiter=", "/>
+        </names>
+      </else-if>
+      <else-if variable="collection-editor">
+        <names variable="collection-editor" suffix=" (dir.)">
+          <name name-as-sort-order="all" font-variant="small-caps" sort-separator=" " initialize-with="." delimiter-precedes-last="never" and="text" delimiter=", "/>
+        </names>
+      </else-if>
+      <else-if variable="editor">
         <text macro="editor"/>
-      </substitute>
-    </names>
+      </else-if>
+    </choose>
   </macro>
   <macro name="editor">
     <names variable="editor">
@@ -48,19 +69,36 @@
     </group>
   </macro>
   <macro name="author-short">
-    <names variable="author">
-      <name form="short" delimiter-precedes-last="never" and="text" delimiter=", "/>
-      <et-al font-variant="normal" font-style="italic"/>
-      <substitute>
-        <text macro="editor-short"/>
-      </substitute>
-    </names>
+    <choose>
+      <if variable="author">
+        <names variable="author" font-variant="small-caps">
+          <name form="short" delimiter-precedes-last="never" and="text" delimiter=", "/>
+          <et-al font-variant="normal" font-style="italic"/>
+        </names>
+      </if>
+      <else-if variable="collection-editor">
+        <names variable="collection-editor" font-variant="small-caps" suffix=" (dir.),">
+          <name form="short" et-al-min="3" et-al-use-first="1"/>
+          <et-al font-weight="bold"/>
+        </names>
+      </else-if>
+      <else-if variable="editor">
+        <names variable="editor"/>
+      </else-if>
+      <else-if type="book">
+        <text variable="title-short"/>
+      </else-if>
+      <else-if type="article-journal">
+        <text macro="journal-no-author"/>
+      </else-if>
+    </choose>
   </macro>
-  <macro name="editor-short">
-    <names variable="editor">
-      <name form="short" delimiter-precedes-last="never" and="text" delimiter=", "/>
-      <et-al font-variant="normal" font-style="italic"/>
-    </names>
+  <macro name="journal-no-author">
+    <group suffix=",">
+      <text variable="container-title" form="short" font-style="italic"/>
+      <text variable="volume" prefix=", " form="short"/>
+      <text variable="issue" prefix=", " form="short"/>
+    </group>
   </macro>
   <macro name="URLaccess">
     <group prefix="(" suffix=")">
@@ -97,19 +135,44 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="book" match="any">
+      <if type="book thesis map motion_picture song manuscript" match="any">
         <text variable="title" font-style="italic"/>
       </if>
-      <else-if type="webpage" match="any">
-        <text variable="title"/>
+      <else-if type="chapter paper-conference broadcast entry-dictionary entry-encyclopedia" match="any">
+        <group delimiter=" ">
+          <text variable="title" quotes="true" suffix=","/>
+          <choose>
+            <if variable="container-author editor translator collection-editor" match="any">
+              <group delimiter=" ">
+                <text term="in"/>
+                <text macro="container-responsability" suffix=","/>
+              </group>
+            </if>
+            <else>
+              <text term="in"/>
+            </else>
+          </choose>
+        </group>
       </else-if>
-      <else-if variable="container-title" match="none">
+      <else-if type="report">
         <text variable="title" font-style="italic"/>
+        <text variable="number" prefix=", "/>
+      </else-if>
+      <else-if type="article-journal speech article-magazine article-newspaper post-weblog post" match="any">
+        <group delimiter=", ">
+          <text variable="title" quotes="true"/>
+          <text variable="container-title" form="short" font-style="italic"/>
+        </group>
       </else-if>
       <else>
-        <text variable="title"/>
+        <text variable="title" font-style="italic"/>
       </else>
     </choose>
+    <choose>
+      <if variable="URL">
+        <text term="online" prefix=" [" suffix="]"/>
+      </if>
+    </choose>
   </macro>
   <macro name="publisher">
     <group delimiter=", ">
@@ -128,16 +191,6 @@
         <text term="no date" form="short"/>
       </else>
     </choose>
-    <choose>
-      <if is-numeric="edition">
-        <group vertical-align="sup">
-          <number variable="edition"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition"/>
-      </else>
-    </choose>
   </macro>
   <macro name="type-sorting">
     <choose>
@@ -168,6 +221,41 @@
       </else>
     </choose>
   </macro>
+  <macro name="container-responsability">
+    <choose>
+      <if variable="container-author editor translator collection-editor" match="any">
+        <choose>
+          <if variable="container-author">
+            <text macro="container-author"/>
+            <text term="container-author" form="short" prefix=" (" suffix=")"/>
+          </if>
+          <else-if variable="editor">
+            <text macro="editor"/>
+          </else-if>
+          <else-if variable="collection-editor">
+            <text macro="collection-editor"/>
+            <text term="container-author" form="short" prefix=" (" suffix=")"/>
+          </else-if>
+          <else>
+            <names variable="translator"/>
+            <text term="translator" form="short" prefix=" (" suffix=")"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-author">
+    <names variable="container-author">
+      <name name-as-sort-order="all" font-variant="small-caps" sort-separator=" " initialize-with="." delimiter-precedes-last="never" and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="collection-editor">
+    <group>
+      <names variable="collection-editor">
+        <name name-as-sort-order="all" font-variant="small-caps" sort-separator=" " initialize-with="." delimiter-precedes-last="never" and="text" delimiter=", "/>
+      </names>
+    </group>
+  </macro>
   <citation et-al-min="4" et-al-use-first="3" delimiter-precedes-et-al="never" disambiguate-add-year-suffix="true">
     <sort>
       <key variable="issued"/>
@@ -199,7 +287,7 @@
           </group>
         </else-if>
         <else>
-          <text macro="author-short" suffix="&#160;" font-variant="small-caps"/>
+          <text macro="author-short" suffix="&#160;"/>
           <text macro="year-date"/>
           <text macro="locator"/>
         </else>
@@ -236,54 +324,62 @@
         </else-if>
         <else>
           <group display="block">
-            <text macro="author" suffix="&#9;"/>
-          </group>
-          <group display="left-margin">
-            <text macro="year-date" suffix=", "/>
-            <choose>
-              <if type="thesis">
-                <group delimiter=", " suffix=".">
-                  <text macro="title" font-style="italic"/>
-                  <text variable="genre"/>
-                  <text variable="publisher"/>
-                  <text variable="publisher-place"/>
-                </group>
-              </if>
-              <else-if type="webpage">
-                <group delimiter=" ">
-                  <text macro="title" font-style="italic"/>
-                  <text macro="URLaccess"/>
-                </group>
-              </else-if>
-              <else-if type="article-journal article-magazine article-newspaper broadcast personal_communication thesis entry-dictionary entry-encyclopedia" match="any">
-                <group delimiter=", " suffix=".">
-                  <text macro="title" quotes="true"/>
-                  <text variable="container-title" font-style="italic"/>
-                  <text variable="volume"/>
-                  <text variable="issue"/>
-                  <text macro="pages"/>
-                </group>
-              </else-if>
-              <else-if type="book graphic" match="any">
-                <group suffix=".">
-                  <text macro="title" suffix=", "/>
-                  <text macro="publisher"/>
-                </group>
-              </else-if>
-              <else-if type="chapter paper-conference" match="any">
-                <text macro="title" quotes="true" suffix=", "/>
-                <group delimiter=", ">
-                  <group delimiter=" ">
-                    <text term="in"/>
-                    <text macro="editor"/>
-                  </group>
-                  <text variable="container-title" font-style="italic"/>
-                  <text macro="publisher"/>
-                  <text macro="pages"/>
-                </group>
-              </else-if>
-            </choose>
+            <text macro="author"/>
           </group>
+          <text macro="year-date" suffix=", "/>
+          <choose>
+            <if type="thesis">
+              <group delimiter=", " suffix=".">
+                <text macro="title" font-style="italic"/>
+                <text variable="genre"/>
+                <text variable="publisher"/>
+                <text variable="publisher-place"/>
+              </group>
+            </if>
+            <else-if type="report">
+              <group suffix=".">
+                <text macro="title" suffix=", "/>
+                <text variable="genre" suffix=", "/>
+                <text variable="archive" prefix="déposé à la "/>
+              </group>
+            </else-if>
+            <else-if type="webpage">
+              <group delimiter=" ">
+                <text macro="title" font-style="italic"/>
+                <text macro="URLaccess"/>
+              </group>
+            </else-if>
+            <else-if type="article-journal article-magazine article-newspaper broadcast personal_communication thesis entry-dictionary entry-encyclopedia" match="any">
+              <group delimiter=", " suffix=".">
+                <text macro="title"/>
+                <text variable="volume"/>
+                <text variable="issue"/>
+                <text macro="pages"/>
+              </group>
+            </else-if>
+            <else-if type="book graphic" match="any">
+              <group suffix=".">
+                <text macro="title" suffix=", "/>
+                <text variable="edition" suffix=", "/>
+                <text macro="publisher"/>
+              </group>
+            </else-if>
+            <else-if type="chapter paper-conference" match="any">
+              <text macro="title" suffix=" "/>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic"/>
+                <text macro="publisher"/>
+                <text macro="pages"/>
+              </group>
+            </else-if>
+            <else>
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text variable="edition" suffix=", "/>
+                <text macro="publisher"/>
+              </group>
+            </else>
+          </choose>
         </else>
       </choose>
     </layout>