From d4d59cac839b6a0d19724d0572530e32a880a925 Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:02:18 +0000
Subject: [PATCH 1/3] Add volume-title support to MHRA

See <https://www.mhra.org.uk/style/chapter7.html#section_7_3>, example xi.
---
 ...ities-research-association-3rd-edition.csl | 19 +++++++++++--------
 ...ities-research-association-author-date.csl | 18 ++++++++++++------
 modern-humanities-research-association.csl    | 19 +++++++++++--------
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/modern-humanities-research-association-3rd-edition.csl b/modern-humanities-research-association-3rd-edition.csl
index 384c874225..ef3b01eff3 100644
--- a/modern-humanities-research-association-3rd-edition.csl
+++ b/modern-humanities-research-association-3rd-edition.csl
@@ -247,14 +247,17 @@
   <macro name="locators-specific-note">
     <choose>
       <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <choose>
-          <if is-numeric="volume">
-            <number variable="volume" form="roman" font-variant="small-caps"/>
-          </if>
-          <else>
-            <text variable="volume" font-variant="small-caps"/>
-          </else>
-        </choose>
+        <group delimiter=", ">
+          <choose>
+            <if is-numeric="volume">
+              <number variable="volume" form="roman" font-variant="small-caps"/>
+            </if>
+            <else>
+              <text variable="volume" font-variant="small-caps"/>
+            </else>
+          </choose>
+          <text variable="volume-title" text-case="title" font-style="italic"/>
+        </group>
       </if>
     </choose>
   </macro>
diff --git a/modern-humanities-research-association-author-date.csl b/modern-humanities-research-association-author-date.csl
index cf1bbfb118..a4ed607613 100644
--- a/modern-humanities-research-association-author-date.csl
+++ b/modern-humanities-research-association-author-date.csl
@@ -130,12 +130,18 @@
   </macro>
   <macro name="locators-specific-note">
     <choose>
-      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-        <choose>
-          <if is-numeric="volume">
-            <number variable="volume" form="roman" font-variant="small-caps"/>
-          </if>
-        </choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if is-numeric="volume">
+              <number variable="volume" form="roman" font-variant="small-caps"/>
+            </if>
+            <else>
+              <text variable="volume" font-variant="small-caps"/>
+            </else>
+          </choose>
+          <text variable="volume-title" text-case="title" font-style="italic"/>
+        </group>
       </if>
     </choose>
   </macro>
diff --git a/modern-humanities-research-association.csl b/modern-humanities-research-association.csl
index bedc635c97..2d99f1cdfa 100644
--- a/modern-humanities-research-association.csl
+++ b/modern-humanities-research-association.csl
@@ -246,14 +246,17 @@
   <macro name="locators-specific-note">
     <choose>
       <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <choose>
-          <if is-numeric="volume">
-            <number variable="volume" form="roman" font-variant="small-caps"/>
-          </if>
-          <else>
-            <text variable="volume" font-variant="small-caps"/>
-          </else>
-        </choose>
+        <group delimiter=", ">
+          <choose>
+            <if is-numeric="volume">
+              <number variable="volume" form="roman" font-variant="small-caps"/>
+            </if>
+            <else>
+              <text variable="volume" font-variant="small-caps"/>
+            </else>
+          </choose>
+          <text variable="volume-title" text-case="title" font-style="italic"/>
+        </group>
       </if>
     </choose>
   </macro>

From 26d2cff6836255e637881e6d6d01f6563f6a33fa Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Tue, 10 Dec 2024 11:14:48 +0000
Subject: [PATCH 2/3] Remove volume title from subsequent citations

---
 modern-humanities-research-association-3rd-edition.csl | 2 +-
 modern-humanities-research-association.csl             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modern-humanities-research-association-3rd-edition.csl b/modern-humanities-research-association-3rd-edition.csl
index ef3b01eff3..9b4a470340 100644
--- a/modern-humanities-research-association-3rd-edition.csl
+++ b/modern-humanities-research-association-3rd-edition.csl
@@ -256,7 +256,6 @@
               <text variable="volume" font-variant="small-caps"/>
             </else>
           </choose>
-          <text variable="volume-title" text-case="title" font-style="italic"/>
         </group>
       </if>
     </choose>
@@ -379,6 +378,7 @@
     </choose>
   </macro>
   <macro name="point-locators">
+    <text variable="volume-title" text-case="title" font-style="italic" prefix=", "/>
     <text macro="pages"/>
     <choose>
       <if variable="page">
diff --git a/modern-humanities-research-association.csl b/modern-humanities-research-association.csl
index 2d99f1cdfa..10673b1148 100644
--- a/modern-humanities-research-association.csl
+++ b/modern-humanities-research-association.csl
@@ -255,7 +255,6 @@
               <text variable="volume" font-variant="small-caps"/>
             </else>
           </choose>
-          <text variable="volume-title" text-case="title" font-style="italic"/>
         </group>
       </if>
     </choose>
@@ -378,6 +377,7 @@
     </choose>
   </macro>
   <macro name="point-locators">
+    <text variable="volume-title" text-case="title" font-style="italic" prefix=", "/>
     <text macro="pages"/>
     <choose>
       <if variable="page">

From a35357ff1763290095bf43ea2d20e77f68138fe6 Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Sun, 15 Dec 2024 12:57:23 +0000
Subject: [PATCH 3/3] Support reference works

---
 ...manities-research-association-3rd-edition.csl | 16 ++++++++--------
 ...manities-research-association-author-date.csl | 12 ++++++------
 modern-humanities-research-association.csl       | 16 ++++++++--------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modern-humanities-research-association-3rd-edition.csl b/modern-humanities-research-association-3rd-edition.csl
index 9b4a470340..3025459d47 100644
--- a/modern-humanities-research-association-3rd-edition.csl
+++ b/modern-humanities-research-association-3rd-edition.csl
@@ -148,14 +148,14 @@
   </macro>
   <macro name="secondary-contributors-note">
     <choose>
-      <if type="chapter paper-conference" match="none">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
         <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
   <macro name="container-contributors-note">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <text macro="editor-translator"/>
       </if>
     </choose>
@@ -182,7 +182,7 @@
           <text variable="issue"/>
         </group>
       </if>
-      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <else-if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <text macro="edition-note"/>
           <group>
@@ -201,7 +201,7 @@
           <text variable="issue"/>
         </group>
       </if>
-      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <else-if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <text macro="edition-note"/>
           <group>
@@ -246,7 +246,7 @@
   </macro>
   <macro name="locators-specific-note">
     <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <choose>
             <if is-numeric="volume">
@@ -262,7 +262,7 @@
   </macro>
   <macro name="container-title-note">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <text term="in" suffix=" "/>
       </if>
     </choose>
@@ -270,7 +270,7 @@
   </macro>
   <macro name="edition-note">
     <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
@@ -407,7 +407,7 @@
   <macro name="access-note">
     <group delimiter=", ">
       <choose>
-        <if type="article-journal bill chapter legal_case legislation paper-conference" match="none">
+        <if type="article-journal bill chapter entry-dictionary entry-encyclopedia legal_case legislation paper-conference" match="none">
           <text macro="archive-note" prefix=", "/>
         </if>
       </choose>
diff --git a/modern-humanities-research-association-author-date.csl b/modern-humanities-research-association-author-date.csl
index a4ed607613..d7a35f47d0 100644
--- a/modern-humanities-research-association-author-date.csl
+++ b/modern-humanities-research-association-author-date.csl
@@ -99,7 +99,7 @@
           </if>
         </choose>
       </if>
-      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+      <else-if type="bill book graphic legal_case motion_picture report song chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <group delimiter=", ">
           <text macro="edition-note"/>
           <group>
@@ -130,7 +130,7 @@
   </macro>
   <macro name="locators-specific-note">
     <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <choose>
             <if is-numeric="volume">
@@ -147,7 +147,7 @@
   </macro>
   <macro name="container-title-note">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <text term="in" suffix=" "/>
       </if>
     </choose>
@@ -155,7 +155,7 @@
   </macro>
   <macro name="edition-note">
     <choose>
-      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+      <if type="bill book graphic legal_case motion_picture report song chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
@@ -207,7 +207,7 @@
           <date-part name="year"/>
         </date>
       </if>
-      <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
+      <else-if type="bill book graphic legal_case motion_picture report song thesis chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <date variable="issued">
           <date-part name="year"/>
         </date>
@@ -259,7 +259,7 @@
         <if type="graphic report" match="any">
           <text macro="archive-note" prefix=", "/>
         </if>
-        <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
+        <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
           <text macro="archive-note" prefix=", "/>
         </else-if>
       </choose>
diff --git a/modern-humanities-research-association.csl b/modern-humanities-research-association.csl
index 10673b1148..9c71ab4817 100644
--- a/modern-humanities-research-association.csl
+++ b/modern-humanities-research-association.csl
@@ -147,14 +147,14 @@
   </macro>
   <macro name="secondary-contributors-note">
     <choose>
-      <if type="chapter paper-conference" match="none">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
         <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
   <macro name="container-contributors-note">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <text macro="editor-translator"/>
       </if>
     </choose>
@@ -181,7 +181,7 @@
           <text variable="issue"/>
         </group>
       </if>
-      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <else-if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <text macro="edition-note"/>
           <group>
@@ -200,7 +200,7 @@
           <text variable="issue"/>
         </group>
       </if>
-      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <else-if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <text macro="edition-note"/>
           <group>
@@ -245,7 +245,7 @@
   </macro>
   <macro name="locators-specific-note">
     <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <choose>
             <if is-numeric="volume">
@@ -261,7 +261,7 @@
   </macro>
   <macro name="container-title-note">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <text term="in" suffix=" "/>
       </if>
     </choose>
@@ -269,7 +269,7 @@
   </macro>
   <macro name="edition-note">
     <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
@@ -406,7 +406,7 @@
   <macro name="access-note">
     <group delimiter=", ">
       <choose>
-        <if type="article-journal bill chapter legal_case legislation paper-conference" match="none">
+        <if type="article-journal bill chapter entry-dictionary entry-encyclopedia legal_case legislation paper-conference" match="none">
           <text macro="archive-note" prefix=", "/>
         </if>
       </choose>