MLA: Simplify container 2 conditions

Author: adunning

diffs/modern-language-association-annotated-bibliography.diff

@@ -25,7 +25,7 @@
      <updated>2025-07-15T00:00: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>
-@@ -1219,6 +1220,7 @@
+@@ -1220,6 +1221,7 @@
          <text macro="container2"/>
          <text macro="supplemental-element-end"/>
        </group>

diffs/modern-language-association-no-url.diff

@@ -37,15 +37,15 @@
      </group>
    </macro>
    <macro name="container1-location-event">
-@@ -1206,7 +1202,6 @@
+@@ -1207,7 +1203,6 @@
        <key macro="supplemental-element-after-title"/>
        <key macro="container1"/>
        <key macro="supplemental-element-between"/>
 -      <key macro="container2"/>
        <key macro="supplemental-element-end"/>
      </sort>
      <layout suffix=".">
-@@ -1216,7 +1211,6 @@
+@@ -1217,7 +1212,6 @@
          <text macro="supplemental-element-after-title"/>
          <text macro="container1"/>
          <text macro="supplemental-element-between"/>

diffs/modern-language-association-notes-no-url.diff

@@ -45,7 +45,7 @@
      </group>
    </macro>
    <macro name="container1-location-event">
-@@ -1182,7 +1178,7 @@
+@@ -1183,7 +1179,7 @@
      </group>
    </macro>
    <citation disambiguate-add-givenname="true" disambiguate-add-names="true" et-al-min="3" et-al-use-first="1">
@@ -54,15 +54,15 @@
        <choose>
          <if locator="page line" match="any">
            <group delimiter=" ">
-@@ -1206,7 +1202,6 @@
+@@ -1207,7 +1203,6 @@
        <key macro="supplemental-element-after-title"/>
        <key macro="container1"/>
        <key macro="supplemental-element-between"/>
 -      <key macro="container2"/>
        <key macro="supplemental-element-end"/>
      </sort>
      <layout suffix=".">
-@@ -1216,7 +1211,6 @@
+@@ -1217,7 +1212,6 @@
          <text macro="supplemental-element-after-title"/>
          <text macro="container1"/>
          <text macro="supplemental-element-between"/>

diffs/modern-language-association-notes.diff

@@ -33,7 +33,7 @@
      <updated>2025-07-15T00:00: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>
-@@ -1182,7 +1183,7 @@
+@@ -1183,7 +1184,7 @@
      </group>
    </macro>
    <citation disambiguate-add-givenname="true" disambiguate-add-names="true" et-al-min="3" et-al-use-first="1">

templates/modern-language-association-template.csl

@@ -949,17 +949,14 @@
   <!-- 6. Container 2 (MLA 5.102) -->
   <macro name="container2">
     <group delimiter=", ">
-      <!-- Title of Container -->
       <choose>
-        <if match="any" variable="DOI URL">
+        <if match="none" variable="DOI URL"/>
+        <else-if variable="source">
+          <!-- Title of Container -->
           <text font-style="italic" variable="source"/>
-        </if>
-      </choose>
-      <!-- Location -->
-      <choose>
-        <if variable="source">
+          <!-- Location -->
           <text macro="container1-location-URI"/>
-        </if>
+        </else-if>
       </choose>
     </group>
   </macro>