Skip to content
Please note that GitHub no longer supports your web browser.

We recommend upgrading to the latest Google Chrome or Firefox.

Learn more
Permalink
Browse files

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

Fixes #3405
  • Loading branch information
customcommander authored and adam3smith committed Mar 28, 2018
1 parent 2a9a8a3 commit 149a664d26b80c572a26aaf9184088eea2f65454
Showing with 77 additions and 77 deletions.
  1. +1 −1 anabases.csl
  2. +1 −1 annals-of-joint.csl
  3. +1 −1 associacao-brasileira-de-normas-tecnicas-unirio-eipp.csl
  4. +1 −1 cambridge-university-press-numeric.csl
  5. +1 −1 centre-de-recherche-sur-les-civilisations-de-l-asie-orientale.csl
  6. +2 −2 chimia.csl
  7. +1 −1 college-montmorency.csl
  8. +2 −2 cultivos-tropicales.csl
  9. +1 −1 current-gene-therapy.csl
  10. +2 −2 de-buck.csl
  11. +1 −1 documents-d-archeologie-francaise.csl
  12. +1 −1 edward-elgar-business-and-social-sciences.csl
  13. +2 −2 elementa.csl
  14. +1 −1 ens-de-lyon-centre-d-ingenierie-documentaire.csl
  15. +2 −2 escuela-nacional-de-antropologia-e-historia-author-date.csl
  16. +1 −1 escuela-nacional-de-antropologia-e-historia-full-note.csl
  17. +1 −1 escuela-nacional-de-antropologia-e-historia-short-note.csl
  18. +1 −1 european-journal-of-microbiology-and-immunology.csl
  19. +3 −3 european-journal-of-ultrasound.csl
  20. +2 −2 fachhochschule-vorarlberg-author-date.csl
  21. +2 −2 fachhochschule-vorarlberg-note.csl
  22. +1 −1 harvard-university-for-the-creative-arts.csl
  23. +1 −1 infoclio-de.csl
  24. +1 −1 infoclio-fr-nocaps.csl
  25. +1 −1 infoclio-fr-smallcaps.csl
  26. +1 −1 international-journal-of-osteoarchaeology.csl
  27. +1 −1 journal-fur-kunstgeschichte.csl
  28. +1 −1 journal-of-environmental-science-and-health-part-b.csl
  29. +1 −1 journal-of-management-studies.csl
  30. +1 −1 journal-of-molecular-recognition.csl
  31. +1 −1 journal-of-political-philosophy.csl
  32. +2 −2 jurnal-pangan-dan-agroindustri.csl
  33. +1 −1 microbial-cell.csl
  34. +1 −1 mis-quarterly.csl
  35. +1 −1 mondes-en-developpement.csl
  36. +1 −1 nehet.csl
  37. +4 −4 padagogische-hochschule-fachhochschule-nordwestschweiz.csl
  38. +2 −2 pest-management-science.csl
  39. +4 −4 plos.csl
  40. +1 −1 prehospital-emergency-care.csl
  41. +4 −4 revista-latinoamericana-de-recursos-naturales.csl
  42. +3 −3 society-of-biblical-literature-fullnote-bibliography.csl
  43. +1 −1 the-institution-of-engineering-and-technology.csl
  44. +2 −2 triangle.csl
  45. +1 −1 uludag-universitesi-sosyal-bilimler-enstitusu-author-date.csl
  46. +1 −1 universidad-autonoma-cidudad-juarez-estilo-latino-humanistico.csl
  47. +2 −2 universite-de-liege-droit.csl
  48. +1 −1 universite-de-sherbrooke-departement-de-geomatique.csl
  49. +1 −1 university-college-lillebaelt-apa.csl
  50. +1 −1 university-college-lillebaelt-vancouver.csl
  51. +1 −1 university-of-gothenburg-apa-swedish-legislations.csl
  52. +1 −1 worlds-poultry-science-journal.csl
  53. +1 −1 zeitschrift-fur-ostmitteleuropa-forschung.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>
@@ -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"/>
@@ -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>
@@ -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"/>
@@ -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=" ">
@@ -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>
@@ -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>
@@ -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"/>
@@ -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"/>
@@ -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>
@@ -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"/>
@@ -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>
@@ -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>
@@ -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>
@@ -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"/>
@@ -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>
@@ -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>
@@ -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"/>
@@ -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="]"/>
@@ -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>
@@ -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>
@@ -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=": "/>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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=")">
@@ -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"/>
@@ -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>
@@ -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"/>
@@ -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>
@@ -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">
@@ -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">

0 comments on commit 149a664

Please sign in to comment.
You can’t perform that action at this time.