Fix for conditions with multiple type values without match="any" (#3407)

Fixes #3405
citation-style-language · Mar 28, 2018 · 149a664d26b80c572a26aaf9184088eea2f65454 · 149a664
1 parent 2a9a8a3
commit 149a664d26b80c572a26aaf9184088eea2f65454
diff --git a/anabases.csl b/anabases.csl
@@ -123,7 +123,7 @@
  </macro>
  <macro name="year-date">
    <choose>
-  
-      <if type="webpage post-weblog">
+  
+      <if type="webpage post-weblog" match="any">
        <text term="online" suffix=" "/>
        <date variable="issued" form="text"/>
      </if>

diff --git a/annals-of-joint.csl b/annals-of-joint.csl
@@ -68,7 +68,7 @@
  </macro>
  <macro name="access">
    <choose>
-  
-      <if type="webpage post-weblog">
+  
+      <if type="webpage post-weblog" match="any">
        <choose>
          <if variable="URL">
            <text variable="URL"/>

diff --git a/associacao-brasileira-de-normas-tecnicas-unirio-eipp.csl b/associacao-brasileira-de-normas-tecnicas-unirio-eipp.csl
@@ -215,7 +215,7 @@
  </macro>
  <macro name="genre">
    <choose>
-  
-      <if type="paper-conference thesis report">
+  
+      <if type="paper-conference thesis report" match="any">
        <text variable="genre"/>
      </if>
    </choose>

diff --git a/cambridge-university-press-numeric.csl b/cambridge-university-press-numeric.csl
@@ -68,7 +68,7 @@
  </macro>
  <macro name="access">
    <choose>
-  
-      <if type="webpage post-weblog">
+  
+      <if type="webpage post-weblog" match="any">
        <text variable="URL"/>
        <group prefix=" (" suffix=")" delimiter=" ">
          <text term="accessed"/>

diff --git a/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale.csl b/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale.csl
@@ -341,7 +341,7 @@
          </else>
        </choose>
      </if>
-  
-      <else-if type="article-journal article-magazine">
+  
+      <else-if type="article-journal article-magazine" match="any">
        <group delimiter="" font-style="normal">
          <group delimiter="/">
            <group delimiter=" ">

diff --git a/chimia.csl b/chimia.csl
@@ -85,7 +85,7 @@
  <!-- pages -->
  <macro name="pages">
    <choose>
-  
-      <if type="chapter paper-conference">
+  
+      <if type="chapter paper-conference" match="any">
        <label variable="page" form="short" suffix=" "/>
        <text variable="page-first"/>
      </if>
@@ -144,7 +144,7 @@
  <macro name="volume">
    <group delimiter=" ">
      <choose>
-  
-        <if type="chapter paper-conference">
+  
+        <if type="chapter paper-conference" match="any">
          <text term="volume" form="short" text-case="capitalize-first"/>
        </if>
      </choose>

diff --git a/college-montmorency.csl b/college-montmorency.csl
@@ -184,7 +184,7 @@
      <else-if type="bill">
        <text variable="locator" prefix="art.&#160;"/>
      </else-if>
-  
-      <else-if type="broadcast interview motion_picture song speech">
+  
+      <else-if type="broadcast interview motion_picture song speech" match="any">
        <text variable="locator"/>
      </else-if>
      <else>

diff --git a/cultivos-tropicales.csl b/cultivos-tropicales.csl
@@ -320,7 +320,7 @@
            <text macro="isbn"/>
          </group>
        </if>
-  
-        <else-if type="article-journal article-magazine article-newspaper">
+  
+        <else-if type="article-journal article-magazine article-newspaper" match="any">
          <group suffix=", ">
            <text macro="responsability"/>
            <text macro="title"/>
@@ -401,7 +401,7 @@
            <text macro="page"/>
          </group>
        </else-if>
-  
-        <else-if type="legislation legal_case">
+  
+        <else-if type="legislation legal_case" match="any">
          <group suffix=", ">
            <text macro="responsability"/>
            <text macro="title"/>

diff --git a/current-gene-therapy.csl b/current-gene-therapy.csl
@@ -54,7 +54,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="entry-dictionary entry-encyclopedia">
+  
+      <if type="entry-dictionary entry-encyclopedia" match="any">
        <choose>
          <if variable="author">
            <text variable="title"/>

diff --git a/de-buck.csl b/de-buck.csl
@@ -130,7 +130,7 @@
        <text variable="title" font-style="italic"/>
      </if>
      <else-if type="manuscript"/>
-  
-      <else-if type="thesis speech article">
+  
+      <else-if type="thesis speech article" match="any">
        <text variable="title"/>
      </else-if>
      <else>
@@ -470,7 +470,7 @@
          <text variable="archive_location"/>
        </group>
      </else-if>
-  
-      <else-if type="thesis speech article">
+  
+      <else-if type="thesis speech article" match="any">
        <text variable="title" form="short"/>
      </else-if>
      <else>

diff --git a/documents-d-archeologie-francaise.csl b/documents-d-archeologie-francaise.csl
@@ -218,7 +218,7 @@
        <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">
+  
+      <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"/>

diff --git a/edward-elgar-business-and-social-sciences.csl b/edward-elgar-business-and-social-sciences.csl
@@ -23,7 +23,7 @@
  <!-- Note: Patents and legal citations not currently supported -->
  <macro name="conditionalusetitle">
    <choose>
-  
-      <if type="article-newspaper article-magazine">
+  
+      <if type="article-newspaper article-magazine" match="any">
        <text variable="container-title"/>
      </if>
      <else>

diff --git a/elementa.csl b/elementa.csl
@@ -175,7 +175,7 @@
      <if type="chapter">
        <text variable="container-title" font-style="italic" text-case="title"/>
      </if>
-  
-      <else-if type="article-magazine article-newspaper">
+  
+      <else-if type="article-magazine article-newspaper" match="any">
        <text variable="container-title" font-style="italic"/>
      </else-if>
      <else-if type="article-journal">
@@ -241,7 +241,7 @@
      <choose>
        <if variable="volume issue page" match="none">
          <choose>
-  
-            <if type="article-journal review review-book">
+  
+            <if type="article-journal review review-book" match="any">
              <text term="in press" prefix=", "/>
            </if>
          </choose>

diff --git a/ens-de-lyon-centre-d-ingenierie-documentaire.csl b/ens-de-lyon-centre-d-ingenierie-documentaire.csl
@@ -518,7 +518,7 @@
      </choose>
      <!-- type/genre -->
      <choose>
-  
-        <if type="thesis manuscript personal_communication speech motion_picture">
+  
+        <if type="thesis manuscript personal_communication speech motion_picture" match="any">
          <text variable="genre"/>
        </if>
      </choose>

diff --git a/escuela-nacional-de-antropologia-e-historia-author-date.csl b/escuela-nacional-de-antropologia-e-historia-author-date.csl
@@ -314,7 +314,7 @@
  <!-- Título del contenedor -->
  <macro name="container-title">
    <choose>
-  
-      <if type="chapter paper-conference">
+  
+      <if type="chapter paper-conference" match="any">
        <text term="in" text-case="lowercase" prefix=", " suffix=" "/>
      </if>
    </choose>
@@ -453,7 +453,7 @@
      <else-if type="legal_case">
        <text variable="authority" prefix=". "/>
      </else-if>
-  
-      <else-if type="speech paper-conference">
+  
+      <else-if type="speech paper-conference" match="any">
        <group prefix=", " delimiter=". ">
          <text macro="event"/>
          <text macro="day-month"/>

diff --git a/escuela-nacional-de-antropologia-e-historia-full-note.csl b/escuela-nacional-de-antropologia-e-historia-full-note.csl
@@ -308,7 +308,7 @@
  <!-- Título del contenedor -->
  <macro name="container-title">
    <choose>
-  
-      <if type="chapter paper-conference">
+  
+      <if type="chapter paper-conference" match="any">
        <text term="in" text-case="lowercase" prefix=", " suffix=" "/>
      </if>
    </choose>

diff --git a/escuela-nacional-de-antropologia-e-historia-short-note.csl b/escuela-nacional-de-antropologia-e-historia-short-note.csl
@@ -310,7 +310,7 @@
  <!-- Título del contenedor -->
  <macro name="container-title">
    <choose>
-  
-      <if type="chapter paper-conference">
+  
+      <if type="chapter paper-conference" match="any">
        <text term="in" text-case="lowercase" prefix=", " suffix=" "/>
      </if>
    </choose>

diff --git a/european-journal-of-microbiology-and-immunology.csl b/european-journal-of-microbiology-and-immunology.csl
@@ -131,7 +131,7 @@
            </choose>
          </group>
        </else-if>
-  
-        <else-if type="webpage post-weblog">
+  
+        <else-if type="webpage post-weblog" match="any">
          <group delimiter=", " prefix=": ">
            <text macro="title"/>
            <text variable="URL"/>

diff --git a/european-journal-of-ultrasound.csl b/european-journal-of-ultrasound.csl
@@ -55,7 +55,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="entry-dictionary entry-encyclopedia">
+  
+      <if type="entry-dictionary entry-encyclopedia" match="any">
        <choose>
          <if variable="author">
            <text variable="title"/>
@@ -94,7 +94,7 @@
          </else>
        </choose>
      </if>
-  
-      <else-if type="entry-encyclopedia" variable="author">
+  
+      <else-if type="entry-encyclopedia" variable="author" match="any">
        <text macro="editor-container"/>
      </else-if>
      <else-if type="chapter">
@@ -116,7 +116,7 @@
      <if type="report">
        <text macro="online" prefix=" [" suffix="]"/>
      </if>
-  
-      <else-if type="thesis" variable="genre">
+  
+      <else-if type="thesis" variable="genre" match="any">
        <group delimiter=", ">
          <text variable="genre" prefix="[" suffix="]"/>
          <text macro="online" prefix="[" suffix="]"/>

diff --git a/fachhochschule-vorarlberg-author-date.csl b/fachhochschule-vorarlberg-author-date.csl
@@ -415,7 +415,7 @@
        </else>
      </choose>
      <choose>
-  
-        <if type="post-weblog webpage">
+  
+        <if type="post-weblog webpage" match="any">
          <text macro="container-title"/>
        </if>
        <else>
@@ -424,7 +424,7 @@
      </choose>
      <text macro="container-prefix"/>
      <choose>
-  
-        <if type="post-weblog webpage">
+  
+        <if type="post-weblog webpage" match="any">
          <text macro="title"/>
        </if>
        <else>

diff --git a/fachhochschule-vorarlberg-note.csl b/fachhochschule-vorarlberg-note.csl
@@ -414,7 +414,7 @@
        </else>
      </choose>
      <choose>
-  
-        <if type="post-weblog webpage">
+  
+        <if type="post-weblog webpage" match="any">
          <text macro="container-title"/>
        </if>
        <else>
@@ -423,7 +423,7 @@
      </choose>
      <text macro="container-prefix"/>
      <choose>
-  
-        <if type="post-weblog webpage">
+  
+        <if type="post-weblog webpage" match="any">
          <text macro="title"/>
        </if>
        <else>

diff --git a/harvard-university-for-the-creative-arts.csl b/harvard-university-for-the-creative-arts.csl
@@ -262,7 +262,7 @@
      <else-if type="patent">
        <text variable="number" suffix="."/>
      </else-if>
-  
-      <else-if type="broadcast motion_picture">
+  
+      <else-if type="broadcast motion_picture" match="any">
        <choose>
          <if match="any" variable="collection-title container-title">
            <text term="in" text-case="capitalize-first" suffix=": "/>

diff --git a/infoclio-de.csl b/infoclio-de.csl
@@ -396,7 +396,7 @@
  </macro>
  <macro name="url-web-documents-only">
    <choose>
-  
-      <if type="webpage post post-weblog">
+  
+      <if type="webpage post post-weblog" match="any">
        <text macro="url"/>
      </if>
    </choose>

diff --git a/infoclio-fr-nocaps.csl b/infoclio-fr-nocaps.csl
@@ -478,7 +478,7 @@
  </macro>
  <macro name="url-web-documents-only">
    <choose>
-  
-      <if type="webpage post post-weblog">
+  
+      <if type="webpage post post-weblog" match="any">
        <text macro="url"/>
      </if>
    </choose>

diff --git a/infoclio-fr-smallcaps.csl b/infoclio-fr-smallcaps.csl
@@ -483,7 +483,7 @@
  </macro>
  <macro name="url-web-documents-only">
    <choose>
-  
-      <if type="webpage post post-weblog">
+  
+      <if type="webpage post post-weblog" match="any">
        <text macro="url"/>
      </if>
    </choose>

diff --git a/international-journal-of-osteoarchaeology.csl b/international-journal-of-osteoarchaeology.csl
@@ -69,7 +69,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="book thesis">
+  
+      <if type="book thesis" match="any">
        <text variable="title" font-style="italic"/>
      </if>
      <else>

diff --git a/journal-fur-kunstgeschichte.csl b/journal-fur-kunstgeschichte.csl
@@ -533,7 +533,7 @@
  </macro>
  <macro name="url-web-documents-only">
    <choose>
-  
-      <if type="webpage post post-weblog">
+  
+      <if type="webpage post post-weblog" match="any">
        <text macro="url"/>
      </if>
    </choose>

diff --git a/journal-of-environmental-science-and-health-part-b.csl b/journal-of-environmental-science-and-health-part-b.csl
@@ -116,7 +116,7 @@
            <date date-parts="year" form="text" variable="issued"/>
          </group>
        </else-if>
-  
-        <else-if type="webpage post-weblog">
+  
+        <else-if type="webpage post-weblog" match="any">
          <text variable="title" suffix=". "/>
          <text variable="URL" suffix=" "/>
          <group delimiter=" " prefix="(" suffix=")">

diff --git a/journal-of-management-studies.csl b/journal-of-management-studies.csl
@@ -101,7 +101,7 @@
  </macro>
  <macro name="publisher">
    <choose>
-  
-      <if type="book chapter">
+  
+      <if type="book chapter" match="any">
        <group delimiter=": " prefix=", ">
          <text variable="publisher-place"/>
          <text variable="publisher"/>

diff --git a/journal-of-molecular-recognition.csl b/journal-of-molecular-recognition.csl
@@ -49,7 +49,7 @@
          </if>
          <else-if variable="URL">
            <choose>
-  
-              <if type="webpage post-weblog article-journal">
+  
+              <if type="webpage post-weblog article-journal" match="any">
                <group delimiter=". ">
                  <text variable="URL"/>
                  <group>

diff --git a/journal-of-political-philosophy.csl b/journal-of-political-philosophy.csl
@@ -279,7 +279,7 @@
      </choose>
    </group>
    <choose>
-  
-      <if type="webpage post-weblog">
+  
+      <if type="webpage post-weblog" match="any">
        <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
        <group prefix=" [" suffix="]">
          <text term="accessed"/>

diff --git a/jurnal-pangan-dan-agroindustri.csl b/jurnal-pangan-dan-agroindustri.csl
@@ -74,7 +74,7 @@
  </macro>
  <macro name="access">
    <choose>
-  
-      <if type="webpage post-weblog">
+  
+      <if type="webpage post-weblog" match="any">
        <text variable="URL"/>
      </if>
    </choose>
@@ -92,7 +92,7 @@
        <text variable="title"/>
        <text macro="edition" prefix=", "/>
      </else-if>
-  
-      <else-if type="webpage post-weblog">
+  
+      <else-if type="webpage post-weblog" match="any">
        <text variable="title"/>
      </else-if>
      <else>

diff --git a/microbial-cell.csl b/microbial-cell.csl
@@ -84,7 +84,7 @@
        <text macro="title"/>
      </group>
      <choose>
-  
-        <if type="chapter paper-conference">
+  
+        <if type="chapter paper-conference" match="any">
          <group delimiter=" " suffix=". ">
            <text term="in" text-case="capitalize-first" suffix=":"/>
            <names variable="editor">

diff --git a/mis-quarterly.csl b/mis-quarterly.csl
@@ -256,7 +256,7 @@
      <else>
        <text variable="URL"/>
        <choose>
-  
-          <if type="post post-weblog webpage manuscript dataset">
+  
+          <if type="post post-weblog webpage manuscript dataset" match="any">
            <group prefix=", " delimiter=" ">
              <text term="accessed"/>
              <date variable="accessed">