Add "match" attribute in ambiguous cases

citation-style-language · Sep 21, 2014 · d83fc4ed20c03c2fe4501f87f2e153aa5d9887cb · d83fc4e
1 parent c4906dc
commit d83fc4ed20c03c2fe4501f87f2e153aa5d9887cb
diff --git a/acs-nano.csl b/acs-nano.csl
@@ -37,7 +37,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="bill book graphic legal_case legislation motion_picture report song">
+  
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
        <text variable="title" text-case="title" font-style="italic"/>
      </if>
      <else>

diff --git a/american-chemical-society-author-date.csl b/american-chemical-society-author-date.csl
@@ -61,7 +61,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="bill book graphic legal_case legislation motion_picture report song">
+  
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
        <text variable="title" text-case="title" font-style="italic"/>
      </if>
      <else>

diff --git a/american-chemical-society-with-titles-no-et-al.csl b/american-chemical-society-with-titles-no-et-al.csl
@@ -43,7 +43,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="bill book graphic legal_case legislation motion_picture report song">
+  
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
        <text variable="title" text-case="title" font-style="italic"/>
      </if>
      <else>

diff --git a/american-chemical-society-with-titles-page-first.csl b/american-chemical-society-with-titles-page-first.csl
@@ -44,7 +44,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="bill book graphic legal_case legislation motion_picture report song">
+  
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
        <text variable="title" text-case="title" font-style="italic"/>
      </if>
      <else>

diff --git a/american-chemical-society-with-titles-sentence-case-doi.csl b/american-chemical-society-with-titles-sentence-case-doi.csl
@@ -44,7 +44,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="bill book graphic legal_case legislation motion_picture report song">
+  
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
        <text variable="title" font-style="italic"/>
      </if>
      <else>

diff --git a/american-chemical-society-with-titles-sentence-case.csl b/american-chemical-society-with-titles-sentence-case.csl
@@ -44,7 +44,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="bill book graphic legal_case legislation motion_picture report song">
+  
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
        <text variable="title" font-style="italic"/>
      </if>
      <else>

diff --git a/american-chemical-society-with-titles.csl b/american-chemical-society-with-titles.csl
@@ -43,7 +43,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="bill book graphic legal_case legislation motion_picture report song">
+  
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
        <text variable="title" text-case="title" font-style="italic"/>
      </if>
      <else>

diff --git a/american-mineralogist.csl b/american-mineralogist.csl
@@ -257,7 +257,7 @@
          <date variable="issued" form="text"/>
        </group>
      </else-if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <date variable="issued" prefix=" (" suffix=")">
          <date-part name="year"/>
        </date>

diff --git a/annals-of-biomedical-engineering.csl b/annals-of-biomedical-engineering.csl
@@ -32,7 +32,7 @@
  <macro name="access">
    <choose>
      <if variable="volume"/>
-  
-      <else-if variable="number" type="patent"/>
+  
+      <else-if variable="number" type="patent" match="any"/>
      <else-if variable="DOI">
        <text variable="DOI" prefix="doi:"/>
      </else-if>

diff --git a/apa-fr-provost.csl b/apa-fr-provost.csl
@@ -293,7 +293,7 @@
      <if type="manuscript">
        <text value="Manuscrit soumis pour publication"/>
      </if>
-  
-      <else-if type="book chapter thesis">
+  
+      <else-if type="book chapter thesis" match="any">
        <text variable="note" prefix="(" suffix=")"/>
      </else-if>
    </choose>

diff --git a/applied-spectroscopy.csl b/applied-spectroscopy.csl
@@ -43,7 +43,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="article-journal chapter article-magazine speech webpage">
+  
+      <if type="article-journal chapter article-magazine speech webpage" match="any">
        <text variable="title" quotes="true"/>
      </if>
      <else-if type="thesis patent" match="any">

diff --git a/associacao-brasileira-de-normas-tecnicas-ufjf.csl b/associacao-brasileira-de-normas-tecnicas-ufjf.csl
@@ -143,7 +143,7 @@
          </substitute>
        </names>
      </else-if>
-  
-      <else-if type=" entry-encyclopedia">
+  
+      <else-if type=" entry-encyclopedia" match="any">
        <names variable="author">
          <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" prefix=" In: ">
            <name-part name="family" text-case="uppercase"/>
@@ -159,7 +159,7 @@
          </substitute>
        </names>
      </else-if>
-  
-      <else-if type="entry-dictionary ">
+  
+      <else-if type="entry-dictionary " match="any">
        <names variable="author">
          <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always">
            <name-part name="family" text-case="uppercase"/>
@@ -658,7 +658,7 @@
          <text variable="page" suffix=" p."/>
          <text macro="access" prefix=" " suffix="."/>
        </else-if>
-  
-        <else-if type="entry-dictionary ">
+  
+        <else-if type="entry-dictionary " match="any">
          <text macro="title" suffix=". "/>
          <text macro="author" suffix=". "/>
          <text macro="container-contributors"/>

diff --git a/australian-veterinary-journal.csl b/australian-veterinary-journal.csl
@@ -71,7 +71,7 @@
  </macro>
  <macro name="accessed-date">
    <choose>
-  
-      <if variable="URL" type="webpage">
+  
+      <if variable="URL" type="webpage" match="any">
        <group delimiter=" ">
          <text term="retrieved" text-case="capitalize-first"/>
          <date variable="accessed" delimiter=" ">

diff --git a/canadian-public-policy.csl b/canadian-public-policy.csl
@@ -369,7 +369,7 @@
  <macro name="issue">
    <choose>
      <if type="article-journal"/>
-  
-      <else-if type="legal_case article">
+  
+      <else-if type="legal_case article" match="any">
        <text variable="authority" prefix=". "/>
      </else-if>
      <else-if type="speech">

diff --git a/current-proteomics.csl b/current-proteomics.csl
@@ -37,7 +37,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="bill book graphic legal_case legislation motion_picture report song">
+  
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
        <text variable="title" text-case="title" font-style="italic"/>
      </if>
      <else>

diff --git a/die-bachelorarbeit-samac-et-al-in-text.csl b/die-bachelorarbeit-samac-et-al-in-text.csl
@@ -343,7 +343,7 @@
      <if type="bill legal_case legislation webpage" match="none">
        <text variable="container-title" font-style="italic"/>
      </if>
-  
-      <else-if type="bill legal_case legislation">
+  
+      <else-if type="bill legal_case legislation" match="any">
        <group delimiter=" " prefix=", ">
          <choose>
            <if variable="container-title">

diff --git a/die-bachelorarbeit-samac-et-al-note.csl b/die-bachelorarbeit-samac-et-al-note.csl
@@ -343,7 +343,7 @@
      <if type="bill legal_case legislation webpage" match="none">
        <text variable="container-title" font-style="italic"/>
      </if>
-  
-      <else-if type="bill legal_case legislation">
+  
+      <else-if type="bill legal_case legislation" match="any">
        <group delimiter=" " prefix=", ">
          <choose>
            <if variable="container-title">

diff --git a/european-journal-of-political-research.csl b/european-journal-of-political-research.csl
@@ -311,7 +311,7 @@
          <date variable="issued" form="text"/>
        </group>
      </else-if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <date variable="issued" prefix=" (" suffix=")">
          <date-part name="year"/>
        </date>

diff --git a/evolutionary-anthropology.csl b/evolutionary-anthropology.csl
@@ -50,7 +50,7 @@
  <macro name="editor">
    <group delimiter=": ">
      <choose>
-  
-        <if type="chapter paper-conference">
+  
+        <if type="chapter paper-conference" match="any">
          <text term="in" text-case="capitalize-first"/>
        </if>
      </choose>
@@ -82,7 +82,7 @@
        <text macro="edition" prefix=" "/>
      </if>
      <!--add event-name and event-place once they become available-->
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <group delimiter=", ">
          <group delimiter=". ">
            <text variable="container-title" form="short"/>
@@ -139,7 +139,7 @@
          </date>
        </group>
      </if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <group delimiter=", ">
          <date variable="issued" delimiter=" ">
            <date-part name="month" form="short" strip-periods="true"/>

diff --git a/fachhochschule-vorarlberg.csl b/fachhochschule-vorarlberg.csl
@@ -57,7 +57,7 @@
  </macro>
  <macro name="title">
    <choose>
-  
-      <if type="book thesis">
+  
+      <if type="book thesis" match="any">
        <text variable="title" font-style="normal" suffix=".&#160;"/>
      </if>
      <else-if type="chapter">

diff --git a/forensic-science-review.csl b/forensic-science-review.csl
@@ -30,7 +30,7 @@
  <macro name="editor">
    <group delimiter=" ">
      <choose>
-  
-        <if type="chapter paper-conference">
+  
+        <if type="chapter paper-conference" match="any">
          <text term="in" text-case="capitalize-first"/>
        </if>
      </choose>
@@ -88,7 +88,7 @@
          <text macro="edition"/>
        </group>
      </else-if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <group delimiter=", ">
          <group delimiter=".">
            <text variable="container-title" form="short"/>
@@ -141,7 +141,7 @@
          <text macro="accessed-date"/>
        </group>
      </if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <group delimiter=", ">
          <date variable="issued" delimiter=" ">
            <date-part name="month" form="short" strip-periods="true"/>

diff --git a/geoarchaeology.csl b/geoarchaeology.csl
@@ -270,7 +270,7 @@
          <date variable="issued" form="text"/>
        </group>
      </else-if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <date variable="issued" prefix=" (" suffix=")">
          <date-part name="year"/>
        </date>

diff --git a/grasas-y-aceites.csl b/grasas-y-aceites.csl
@@ -49,7 +49,7 @@
  </macro>
  <macro name="access">
    <choose>
-  
-      <if variable="URL" type="webpage">
+  
+      <if variable="URL" type="webpage" match="any">
        <text value="Available at:" suffix=" "/>
        <text variable="URL"/>
        <group prefix=" [" suffix="]">

diff --git a/harvard-cranfield-university.csl b/harvard-cranfield-university.csl
@@ -42,7 +42,7 @@
      <if type="article-newspaper">
        <text variable="container-title"/>
      </if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <text variable="title"/>
      </else-if>
    </choose>
@@ -178,7 +178,7 @@
    </sort>
    <layout prefix="(" suffix=")" delimiter="; ">
      <choose>
-  
-        <if type="bill legislation">
+  
+        <if type="bill legislation" match="any">
          <group delimiter=", ">
            <text macro="title"/>
            <group>
@@ -209,7 +209,7 @@
    </sort>
    <layout>
      <choose>
-  
-        <if type="bill legislation">
+  
+        <if type="bill legislation" match="any">
          <text macro="author" suffix=". "/>
        </if>
        <else>
@@ -218,7 +218,7 @@
        </else>
      </choose>
      <choose>
-  
-        <if type="bill legislation">
+  
+        <if type="bill legislation" match="any">
          <group prefix="" delimiter=". " suffix=".">
            <group font-style="italic" delimiter=". ">
              <group delimiter=": ">

diff --git a/interdisziplinare-zeitschrift-fur-technologie-und-lernen.csl b/interdisziplinare-zeitschrift-fur-technologie-und-lernen.csl
@@ -134,7 +134,7 @@
            </if>
          </choose>
        </if>
-  
-        <else-if type="webpage post">
+  
+        <else-if type="webpage post" match="any">
          <date delimiter=" " variable="issued">
            <date-part name="day" suffix="."/>
            <date-part name="month"/>
@@ -376,7 +376,7 @@
  </macro>
  <macro name="issue">
    <choose>
-  
-      <if type="article-journal post">
+  
+      <if type="article-journal post" match="any">
        <text macro="day-month" prefix=" "/>
      </if>
      <else-if type="legal_case">

diff --git a/international-journal-of-occupational-medicine-and-environmental-health.csl b/international-journal-of-occupational-medicine-and-environmental-health.csl
@@ -34,7 +34,7 @@
  <macro name="editor">
    <group delimiter=": ">
      <choose>
-  
-        <if type="chapter paper-conference">
+  
+        <if type="chapter paper-conference" match="any">
          <text term="in" text-case="capitalize-first"/>
        </if>
      </choose>
@@ -105,7 +105,7 @@
        <text macro="edition" prefix=" "/>
      </if>
      <!--add event-name and event-place once they become available-->
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <group delimiter=", ">
          <group delimiter=". ">
            <text variable="container-title" form="short"/>
@@ -165,7 +165,7 @@
          <text macro="accessed-date"/>
        </group>
      </if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <group delimiter=", ">
          <date variable="issued" delimiter=" ">
            <date-part name="month" form="short" strip-periods="true"/>

diff --git a/iso690-author-date-en.csl b/iso690-author-date-en.csl
@@ -315,7 +315,7 @@
  <macro name="archive">
    <text variable="archive"/>
    <choose>
-  
-      <if variable="archive_location call-number">
+  
+      <if variable="archive_location call-number" match="any">
        <text value=":&#160;"/>
      </if>
    </choose>

diff --git a/iso690-author-date-fr.csl b/iso690-author-date-fr.csl
@@ -321,7 +321,7 @@
  <macro name="archive">
    <text variable="archive"/>
    <choose>
-  
-      <if variable="archive_location call-number">
+  
+      <if variable="archive_location call-number" match="any">
        <text value="&#160;:&#160;"/>
      </if>
    </choose>

diff --git a/iso690-numeric-en.csl b/iso690-numeric-en.csl
@@ -278,7 +278,7 @@
  <macro name="archive">
    <text variable="archive"/>
    <choose>
-  
-      <if variable="archive_location call-number">
+  
+      <if variable="archive_location call-number" match="any">
        <text value=":&#160;"/>
      </if>
    </choose>

diff --git a/iso690-numeric-fr.csl b/iso690-numeric-fr.csl
@@ -275,7 +275,7 @@
  <macro name="archive">
    <text variable="archive"/>
    <choose>
-  
-      <if variable="archive_location call-number">
+  
+      <if variable="archive_location call-number" match="any">
        <text value="&#160;:&#160;"/>
      </if>
    </choose>

diff --git a/journal-of-biomedical-materials-research-part-a.csl b/journal-of-biomedical-materials-research-part-a.csl
@@ -42,7 +42,7 @@
  <macro name="editor">
    <group delimiter=": ">
      <choose>
-  
-        <if type="chapter paper-conference">
+  
+        <if type="chapter paper-conference" match="any">
          <text term="in" text-case="capitalize-first"/>
        </if>
      </choose>
@@ -101,7 +101,7 @@
        </group>
        <text macro="edition" prefix=" "/>
      </if>
-  
-      <else-if type="bill legislation">
+  
+      <else-if type="bill legislation" match="any">
        <group delimiter=", ">
          <group delimiter=". ">
            <text variable="container-title" form="short"/>