From 6a20be4a08c6a5044c827b34e21093faeb630fe8 Mon Sep 17 00:00:00 2001
From: loup-brun <louis@loupbrun.ca>
Date: Wed, 9 Oct 2024 10:13:17 -0400
Subject: [PATCH 1/2] Update etudes-francaises.csl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fall 2024 update

Minor revisions from prof. Benoit Melançon (long time director for the ETFRA journal, now retired)

* Add post-weblog support

* Lastname, Firstname order in bibliography only

* Display directors for motion_picture

* Updated last-modified date
---
 etudes-francaises.csl | 74 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/etudes-francaises.csl b/etudes-francaises.csl
index 254f84cff0..e4e2c508cf 100644
--- a/etudes-francaises.csl
+++ b/etudes-francaises.csl
@@ -18,7 +18,7 @@
     <issn>0014-2085</issn>
     <issn>1492-1405</issn>
     <summary>Références pour le style Études françaises. Aussi utilisé par les Presses de l’Université de Montréal (PUM).</summary>
-    <updated>2023-10-23T16:35:00-04:00</updated>
+    <updated>2024-10-09T13:56:00+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">
@@ -129,15 +129,49 @@
     </choose>
   </macro>
   <macro name="author">
-    <names variable="author" delimiter=", ">
-      <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never"/>
-      <substitute>
-        <names variable="editor">
-          <name font-variant="normal" sort-separator=" " and="text"/>
+    <choose>
+      <if type="motion_picture">
+        <group delimiter=", ">
+          <!-- Motion picture should display `director` -->
+          <names variable="director" delimiter=", ">
+            <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never" />
+          </names>
+        </group>
+      </if>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never" />
+          <substitute>
+            <names variable="editor" delimiter=", ">
+              <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never"/>
+              <label form="short" text-case="lowercase" font-variant="normal" prefix=" (" suffix=")"/>
+            </names>
+          </substitute>
         </names>
-        <text macro="title"/>
-      </substitute>
-    </names>
+      </else>
+    </choose>
+  </macro>
+  <!-- List authors as Lastname, Firstname in bibliography -->
+  <macro name="author-bibliography">
+    <choose>
+      <if type="motion_picture">
+        <names variable="director" delimiter=", ">
+          <name font-variant="normal" sort-separator=", " and="text" delimiter-precedes-last="never" name-as-sort-order="all" />
+        </names>
+      </if>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name font-variant="normal" sort-separator=", " and="text" delimiter-precedes-last="never" name-as-sort-order="all" />
+          <substitute>
+            <names variable="editor">
+              <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never" />
+              <label form="short" text-case="lowercase" font-variant="normal" prefix=" (" suffix=")"/>
+            </names>
+            <text macro="title"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="editor-translator">
     <names variable="translator" delimiter=", ">
@@ -236,16 +270,9 @@
     <label plural="never" suffix="&#160;" variable="locator" form="short"/>
     <text variable="locator" form="short"/>
   </macro>
+  <!-- The full-note macro does not include the author part, because of the difference between citation and bibliography -->
   <macro name="full-note">
     <group>
-      <choose>
-        <if match="any" variable="author">
-          <text macro="author" suffix=", "/>
-        </if>
-        <else-if match="none" variable="author">
-          <text macro="editor" suffix=", "/>
-        </else-if>
-      </choose>
       <choose>
         <if match="any" type="thesis report">
           <group delimiter=", ">
@@ -274,7 +301,7 @@
             </group>
           </group>
         </else-if>
-        <else-if type="webpage article-journal article-magazine article-newspaper broadcast personal_communication article" match="any">
+        <else-if type="webpage article-journal article-magazine article-newspaper broadcast personal_communication article post-weblog" match="any">
           <group delimiter=", ">
             <text macro="title" quotes="true"/>
             <text variable="container-title" font-style="italic" text-case="title"/>
@@ -349,6 +376,15 @@
             <text macro="number-of-pages"/>
           </group>
         </else-if>
+        <else-if type="motion_picture">
+          <group delimiter=", ">
+            <text macro="title" font-style="italic"/>
+            <text macro="volume"/>
+            <text macro="publisher"/>
+            <text macro="year-date"/>
+            <text variable="dimensions"/>
+          </group>
+        </else-if>
         <else>
           <group delimiter=", ">
             <text macro="title" font-style="italic"/>
@@ -390,6 +426,7 @@
         </else-if>
         <else>
           <group delimiter=", ">
+            <text macro="author" />
             <text macro="full-note"/>
             <choose>
               <if variable="locator">
@@ -409,6 +446,7 @@
       <key variable="title"/>
     </sort>
     <layout suffix=".">
+      <text macro="author-bibliography" suffix=", "/>
       <text macro="full-note"/>
     </layout>
   </bibliography>

From 71bde0b1d0a18ea50832ec658786708f97e07893 Mon Sep 17 00:00:00 2001
From: loup-brun <loup-brun@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:17:19 +0000
Subject: [PATCH 2/2] Re-indent CSL styles

---
 etudes-francaises.csl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/etudes-francaises.csl b/etudes-francaises.csl
index e4e2c508cf..52e1357149 100644
--- a/etudes-francaises.csl
+++ b/etudes-francaises.csl
@@ -134,13 +134,13 @@
         <group delimiter=", ">
           <!-- Motion picture should display `director` -->
           <names variable="director" delimiter=", ">
-            <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never" />
+            <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never"/>
           </names>
         </group>
       </if>
       <else>
         <names variable="author" delimiter=", ">
-          <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never" />
+          <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never"/>
           <substitute>
             <names variable="editor" delimiter=", ">
               <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never"/>
@@ -156,15 +156,15 @@
     <choose>
       <if type="motion_picture">
         <names variable="director" delimiter=", ">
-          <name font-variant="normal" sort-separator=", " and="text" delimiter-precedes-last="never" name-as-sort-order="all" />
+          <name font-variant="normal" sort-separator=", " and="text" delimiter-precedes-last="never" name-as-sort-order="all"/>
         </names>
       </if>
       <else>
         <names variable="author" delimiter=", ">
-          <name font-variant="normal" sort-separator=", " and="text" delimiter-precedes-last="never" name-as-sort-order="all" />
+          <name font-variant="normal" sort-separator=", " and="text" delimiter-precedes-last="never" name-as-sort-order="all"/>
           <substitute>
             <names variable="editor">
-              <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never" />
+              <name font-variant="normal" sort-separator=" " and="text" delimiter-precedes-last="never"/>
               <label form="short" text-case="lowercase" font-variant="normal" prefix=" (" suffix=")"/>
             </names>
             <text macro="title"/>
@@ -426,7 +426,7 @@
         </else-if>
         <else>
           <group delimiter=", ">
-            <text macro="author" />
+            <text macro="author"/>
             <text macro="full-note"/>
             <choose>
               <if variable="locator">