citeproc 1.0.3 → 1.0.4

data/features/bugreports/SortSecondaryKeyBibliography.feature

@@ -0,0 +1,235 @@
+Feature: bugreports
+  As a CSL cite processor hacker
+  I want the test bugreports_SortSecondaryKeyBibliography to pass
+
+  @bibliography @bugreports @citations
+  Scenario: Sort Secondary Key Bibliography
+    Given the following style:
+    """
+    <?xml version="1.0" encoding="utf-8"?>
+    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+       <info>
+          <title>Copernicus general format (dev)</title>
+          <id>http://www.zotero.org/styles/copernicus</id>
+          <link href="http://www.zotero.org/styles/copernicus" rel="self"/>
+          <author>
+             <name>Julian Onions</name>
+             <email>julian.onions@gmail.com</email>
+          </author>
+          <contributor>
+             <name> Didier Voisin </name>
+          </contributor>
+          <category citation-format="author-date"/>
+          <category field="science"/>
+          <updated>2010-07-26T02:21:30+00:00</updated>
+          <summary>The Copernicus (EGU) generic style</summary>
+          <link href="http://publications.copernicus.org/Copernicus_Publications_Reference_Types.pdf" rel="documentation"/>
+          <rights>
+    This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
+    </rights>
+       </info>
+       <macro name="editor">
+          <names variable="editor" delimiter=", ">
+             <label form="verb" text-case="lowercase" suffix=" "/>
+             <name and="text" initialize-with=". " delimiter=", "/>
+          </names>
+       </macro>
+       <macro name="anon">
+          <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+       </macro>
+       <macro name="author">
+          <names variable="author">
+             <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter=", " delimiter-precedes-last="never" and="text"/>
+             <label form="short" prefix=", " suffix="." text-case="capitalize-first" strip-periods="true"/>
+             <substitute>
+                <names variable="editor"/>
+                <text macro="anon"/>
+             </substitute>
+          </names>
+       </macro>
+       <macro name="author-short">
+          <names variable="author">
+             <name form="short" and="text" delimiter=", " initialize-with=". "/>
+             <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <text macro="anon"/>
+             </substitute>
+          </names>
+       </macro>
+       <macro name="access">
+          <choose>
+             <if variable="URL">
+                <text term="online" prefix="[" suffix="]"/>
+                <text value=" Available from: "/>
+                <text variable="URL"/>
+                <group prefix=" (" delimiter=" " suffix=")">
+                   <text term="accessed" text-case="capitalize-first"/>
+                   <date variable="accessed">
+                      <date-part name="day" suffix=" "/>
+                      <date-part name="month" suffix=" "/>
+                      <date-part name="year"/>
+                   </date>
+                </group>
+             </if>
+          </choose>
+       </macro>
+       <macro name="title">
+          <text variable="title"/>
+       </macro>
+       <macro name="publisher">
+          <group delimiter=", ">
+             <text variable="publisher"/>
+             <text variable="publisher-place"/>
+          </group>
+       </macro>
+       <macro name="year-date">
+          <choose>
+             <if variable="issued">
+                <date variable="issued">
+                   <date-part name="year"/>
+                </date>
+             </if>
+             <else>
+                <text term="no date" form="short"/>
+             </else>
+          </choose>
+       </macro>
+       <macro name="published-date">
+          <choose>
+             <if type="article-newspaper">
+                <date variable="issued">
+                   <date-part name="day" form="ordinal" suffix=" "/>
+                   <date-part name="month" form="long"/>
+                </date>
+             </if>
+          </choose>
+       </macro>
+       <macro name="pages">
+          <text variable="page"/>
+       </macro>
+       <macro name="refpages">
+          <label variable="page" form="short" suffix=". " strip-periods="true"/>
+          <text variable="page"/>
+       </macro>
+       <macro name="edition">
+          <choose>
+             <if is-numeric="edition">
+                <group delimiter=" ">
+                   <number variable="edition" form="ordinal"/>
+                   <text term="edition" form="short" suffix="." strip-periods="true"/>
+                </group>
+             </if>
+             <else>
+                <text variable="edition" suffix="."/>
+             </else>
+          </choose>
+       </macro>
+       <macro name="doi">
+          <text variable="DOI" prefix="doi:"/>
+       </macro>
+       <macro name="container">
+          <group delimiter=", ">
+             <group delimiter=" ">
+                <text term="in" text-case="lowercase"/>
+                <text variable="container-title"/>
+             </group>
+             <group delimiter=" ">
+                <text term="volume" form="short" suffix="." strip-periods="true"/>
+                <text variable="volume"/>
+             </group>
+             <text macro="editor"/>
+          </group>
+       </macro>
+       <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
+          <sort>
+             <key macro="author"/>
+             <key macro="year-date"/>
+          </sort>
+          <layout prefix="(" suffix=")" delimiter="; ">
+             <group delimiter=", ">
+                <group delimiter=", ">
+                   <text macro="author-short"/>
+                   <text macro="year-date"/>
+                </group>
+                <text variable="locator" prefix="p."/>
+             </group>
+          </layout>
+       </citation>
+       <bibliography et-al-min="11" et-al-use-first="11">
+          <sort>
+             <key macro="author"/>
+             <key macro="year-date"/>
+             <key variable="title"/>
+          </sort>
+          <layout>
+             <group delimiter=" " suffix=":">
+                <text macro="author"/>
+             </group>
+             <choose>
+                <if type="bill book graphic legal_case motion_picture report song" match="any">
+                   <group delimiter=", " prefix=" " suffix=".">
+                      <text macro="title"/>
+                      <text macro="edition"/>
+                      <text macro="editor"/>
+                      <text variable="genre"/>
+                      <text macro="publisher"/>
+                   </group>
+                </if>
+                <else-if type="chapter paper-conference" match="any">
+                   <group delimiter=", " prefix=" " suffix=".">
+                      <text macro="title"/>
+                      <text macro="container"/>
+                      <text macro="refpages"/>
+                      <text macro="publisher"/>
+                   </group>
+                </else-if>
+                <else-if type="thesis">
+                   <group delimiter=", " prefix=" " suffix=".">
+                      <text macro="title"/>
+                      <text variable="genre"/>
+                      <text variable="page" suffix=" pp."/>
+                      <text macro="publisher"/>
+                      <date variable="issued">
+                         <date-part name="day" suffix=" "/>
+                         <date-part name="month" form="long"/>
+                      </date>
+                   </group>
+                </else-if>
+                <else>
+                   <group delimiter=", " suffix="," prefix=" ">
+                      <text macro="title"/>
+                      <text macro="editor"/>
+                   </group>
+                   <group prefix=" ">
+                      <text variable="container-title" form="short"/>
+                      <group prefix=", " delimiter=", ">
+                         <group>
+                            <text variable="volume"/>
+                            <text variable="issue" prefix="(" suffix=")"/>
+                            <text macro="published-date"/>
+                         </group>
+                         <text macro="pages"/>
+                         <text macro="doi"/>
+                      </group>
+                   </group>
+                </else>
+             </choose>
+             <text prefix=" " macro="access"/>
+             <text macro="year-date" prefix=", " suffix="."/>
+          </layout>
+       </bibliography>
+    </style>
+    """
+    And the following input:
+    """
+    [{"author":[{"family":"Roe","given":"Jane"}],"id":"ITEM-1","issued":{"date-parts":[[1996]]},"type":"book"},{"author":[{"family":"Roe","given":"Jane"}],"id":"ITEM-2","issued":{"date-parts":[[1995]]},"type":"book"}]
+    """
+    When I render the entire bibliography
+    Then the bibliography should be:
+    """
+    <div class="csl-bib-body">
+      <div class="csl-entry">Roe, J.:, 1995.</div>
+      <div class="csl-entry">Roe, J.:, 1996.</div>
+    </div>
+    """

data/features/bugreports/SortedIeeeItalicsFail.feature

@@ -0,0 +1,296 @@
+Feature: bugreports
+  As a CSL cite processor hacker
+  I want the test bugreports_SortedIeeeItalicsFail to pass
+
+  @bibliography @bugreports
+  Scenario: Sorted Ieee Italics Fail
+    Given the following style:
+    """
+    <?xml version="1.0" encoding="utf-8"?>
+    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
+       <info>
+           <title>IEEE - modified by Dan Sorin</title>
+          <id>IEEE - Dan Sorin</id>
+          <link href="http://www.zotero.org/styles/ieee" rel="self"/>
+          <author>
+             <name>Dan Sorin</name>
+             <email>sorin@ee.duke.edu</email>
+          </author>
+          <category field="engineering"/>
+          <category field="generic-base"/>
+          <category citation-format="numeric"/>
+          <updated>2011-05-12T00:16:08+00:00</updated>
+          <rights>
+    			This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License:
+    			http://creativecommons.org/licenses/by-sa/3.0/
+    		</rights>
+          <link href="http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/authors/transjnl/stylemanual.pdf" rel="documentation"/>
+          <link href="http://www.ieee.org/documents/auinfo07.pdf" rel="documentation"/>
+       </info><!-- Macros -->
+       <macro name="edition">
+          <choose>
+             <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+                <choose>
+                   <if is-numeric="edition">
+                      <group delimiter=" ">
+                         <number variable="edition" form="ordinal"/>
+                         <text term="edition" form="short" suffix="." strip-periods="true"/>
+                      </group>
+                   </if>
+                   <else>
+                      <text variable="edition" text-case="capitalize-first" suffix="."/>
+                   </else>
+                </choose>
+             </if>
+          </choose>
+       </macro>
+       <macro name="issued">
+          <choose>
+             <if type="article-journal">
+                <date variable="issued">
+                   <date-part name="month" form="short" suffix=". " strip-periods="true"/>
+                   <date-part name="year" form="long"/>
+                </date>
+             </if>
+             <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
+                <date variable="issued">
+                   <date-part name="year" form="long"/>
+                </date>
+             </else-if>
+             <else>
+                <date variable="issued">
+                   <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+                   <date-part name="month" form="short" suffix="-" strip-periods="true"/>
+                   <date-part name="year" form="long"/>
+                </date>
+             </else>
+          </choose>
+       </macro>
+       <macro name="author">
+          <names variable="author">
+             <name initialize-with=". " delimiter=", " and="text"/>
+             <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
+             <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+             </substitute>
+          </names>
+       </macro>
+       <macro name="editor">
+          <names variable="editor">
+             <name initialize-with=". " delimiter=", " and="text"/>
+             <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
+          </names>
+       </macro>
+       <macro name="locators">
+          <group delimiter=", ">
+             <text macro="edition"/>
+             <group delimiter=" ">
+                <text term="volume" form="short" suffix="." strip-periods="true"/>
+                <number variable="volume" form="numeric"/>
+             </group>
+             <group delimiter=" ">
+                <number variable="number-of-volumes" form="numeric"/>
+                <text term="volume" form="short" suffix="." plural="true" strip-periods="true"/>
+             </group>
+             <group delimiter=" ">
+                <text term="issue" form="short" suffix="." strip-periods="true"/>
+                <number variable="issue" form="numeric"/>
+             </group>
+          </group>
+       </macro>
+       <macro name="title">
+          <choose>
+             <if type="bill book graphic legal_case motion_picture report song" match="any">
+                <text variable="title" font-style="italic"/>
+             </if>
+             <else>
+                <text variable="title" quotes="true"/>
+             </else>
+          </choose>
+       </macro>
+       <macro name="publisher">
+          <choose>
+             <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+                <text variable="publisher-place" suffix=": "/>
+                <text variable="publisher"/>
+             </if>
+             <else>
+                <text variable="publisher"/>
+             </else>
+          </choose>
+       </macro>
+       <macro name="event">
+          <choose>
+             <if type="paper-conference">
+                <choose><!-- Published Conference Paper -->
+                   <if variable="container-title">
+                      <group delimiter=", ">
+                         <text variable="container-title" prefix="in " font-style="italic"/>
+                         <text variable="event-place"/>
+                      </group>
+                   </if><!-- Unpublished Conference Paper -->
+                   <else>
+                      <group delimiter=", ">
+                         <text variable="event" prefix="presented at the "/>
+                         <text variable="event-place"/>
+                      </group>
+                   </else>
+                </choose>
+             </if>
+          </choose>
+       </macro>
+       <macro name="access">
+          <choose>
+             <if type="webpage">
+                <choose>
+                   <if variable="URL">
+                      <group delimiter=". ">
+                         <text value="[Online]"/>
+                         <text variable="URL" prefix="Available: "/>
+                         <group prefix="[" suffix="]">
+                            <date variable="accessed" prefix="Accessed: ">
+                               <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+                               <date-part name="month" form="short" suffix="-" strip-periods="true"/>
+                               <date-part name="year" form="long"/>
+                            </date>
+                         </group>
+                      </group>
+                   </if>
+                </choose>
+             </if>
+          </choose>
+       </macro>
+       <macro name="page">
+          <group>
+             <label variable="page" form="short" suffix=". " strip-periods="true"/>
+             <text variable="page"/>
+          </group>
+       </macro><!-- Citation -->
+       <citation et-al-min="7" et-al-use-first="1" collapse="citation-number">
+          <sort>
+             <key variable="citation-number"/>
+          </sort>
+          <layout prefix="[" suffix="]" delimiter="], [">
+             <text variable="citation-number"/>
+          </layout>
+       </citation><!-- Bibliography -->
+       <bibliography et-al-min="7" et-al-use-first="1" entry-spacing="0" second-field-align="flush">
+          <sort>
+             <key macro="author"/>
+             <key variable="issued"/>
+          </sort>
+          <layout suffix="."><!-- Citation Number -->
+             <text variable="citation-number" prefix="[" suffix="]"/><!-- Author(s) -->
+             <text macro="author" prefix=" " suffix=", "/><!-- Rest of Citation -->
+             <choose><!-- Specific Formats -->
+                <if type="article-journal">
+                   <group delimiter=", ">
+                      <text macro="title"/>
+                      <text variable="container-title" font-style="italic"/>
+                      <text macro="locators"/>
+                      <text macro="page"/>
+                      <text macro="issued"/>
+                   </group>
+                </if>
+                <else-if type="paper-conference">
+                   <group delimiter=", ">
+                      <text macro="title"/>
+                      <text macro="event"/>
+                      <text macro="issued"/>
+                      <text macro="locators"/>
+                      <text macro="page"/>
+                   </group>
+                </else-if>
+                <else-if type="thesis">
+                   <group delimiter=", ">
+                      <text macro="title"/>
+                      <text variable="genre"/>
+                      <text macro="publisher"/>
+                      <text macro="issued"/>
+                   </group>
+                </else-if>
+                <else-if type="webpage">
+                   <group delimiter=", " suffix=". ">
+                      <text macro="title"/>
+                      <text variable="container-title" font-style="italic"/>
+                      <text macro="issued"/>
+                   </group>
+                   <text macro="access"/>
+                </else-if>
+                <else-if type="patent">
+                   <text macro="title" suffix=", "/>
+                   <text variable="number" prefix="U.S. Patent "/>
+                   <text macro="issued"/>
+                </else-if><!-- Generic/Fallback Formats -->
+                <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+                   <group delimiter=", " suffix=". ">
+                      <text macro="title"/>
+                      <text macro="locators"/>
+                   </group>
+                   <group delimiter=", ">
+                      <text macro="publisher"/>
+                      <text macro="issued"/>
+                      <text macro="page"/>
+                   </group>
+                </else-if>
+                <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+                   <group delimiter=", ">
+                      <text macro="title"/>
+                      <text variable="container-title" font-style="italic"/>
+                      <text macro="locators"/>
+                      <text macro="publisher"/>
+                      <text macro="page"/>
+                      <text macro="issued"/>
+                   </group>
+                </else-if>
+                <else-if type="chapter paper-conference" match="any">
+                   <group delimiter=", " suffix=", ">
+                      <text macro="title"/>
+                      <text variable="container-title" prefix="in " font-style="italic"/>
+                      <text macro="locators"/>
+                   </group>
+                   <text macro="editor" suffix=" "/>
+                   <group delimiter=", ">
+                      <text macro="publisher"/>
+                      <text macro="issued"/>
+                      <text macro="page"/>
+                   </group>
+                </else-if>
+                <else>
+                   <group delimiter=", " suffix=". ">
+                      <text macro="title"/>
+                      <text variable="container-title" font-style="italic"/>
+                      <text macro="locators"/>
+                   </group>
+                   <group delimiter=", ">
+                      <text macro="publisher"/>
+                      <text macro="page"/>
+                      <text macro="issued"/>
+                   </group>
+                </else>
+             </choose>
+          </layout>
+       </bibliography>
+    </style>
+
+    """
+    And the following input:
+    """
+    [{"author":[{"family":"Roe","given":"Jane"}],"container-title":"Journal of Obscurity","id":"ITEM-2","issued":{"date-parts":[["1965","6","1"]]},"page":"15","title":"His Anonymous Article","type":"article-journal","volume":"100"},{"author":[{"family":"Doe","given":"John"}],"container-title":"Journal of Obscurity","id":"ITEM-1","issued":{"date-parts":[["1965","6","1"]]},"page":"15","title":"His Anonymous Article","type":"article-journal","volume":"100"},{"author":[{"family":"Everhardt","given":"Ganzaheit"}],"container-title":"Journal of Obscurity","id":"ITEM-3","issued":{"date-parts":[["1965","6","1"]]},"page":"15","title":"His Anonymous Article","type":"article-journal","volume":"100"}]
+    """
+    When I render the entire bibliography
+    Then the bibliography should be:
+    """
+    <div class="csl-bib-body">
+      <div class="csl-entry">
+        <div class="csl-left-margin">[1]</div><div class="csl-right-inline"> J. Doe, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, Jun. 1965.</div>
+      </div>
+      <div class="csl-entry">
+        <div class="csl-left-margin">[2]</div><div class="csl-right-inline"> G. Everhardt, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, Jun. 1965.</div>
+      </div>
+      <div class="csl-entry">
+        <div class="csl-left-margin">[3]</div><div class="csl-right-inline"> J. Roe, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, Jun. 1965.</div>
+      </div>
+    </div>
+    """