citeproc 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ef5a51c4293349898a747075a3e904884843e1
-  data.tar.gz: 1f81ce6ed54bf27c657fd75ca0f4f1b737e7468f
+  metadata.gz: b89224670504d01dbc64326c2b5d2e61d1e100a3
+  data.tar.gz: 82b418d1deaa37b4cbf14067f7c600fafea02806
 SHA512:
-  metadata.gz: ab468c07a8248a0fc03d55bab26a5f20c96341f01a33ce5c971c1b604a24ba7e95c7945625ba35e8a79c1b28487adb6d1a9d4523054a2cbf43baf665a3e33936
-  data.tar.gz: f759c43e6235d3a52c5a14408909b8ad9f049cbb22391fba4efc2d3bff463d89c6e0b4849263d1f6a4be6614154fd7ef8e12ddc3e5c0aa9a28bd55f079381604
+  metadata.gz: 1a35de704e987dbc28155e7fea788013495341d15c45a1d147512372a287dc43f7b547a1df731fdb87383acad782f77772f1d397d3cf3cf70d3a11d38ea1f95d
+  data.tar.gz: 4ad442f23a473e166dd4c33446fb840ac27216a2f05dfc458f8639e3fe86e5eb9d838a7e233737ed4e75a8ea52748f55592990427c127ad6a2ea1ba472058f42

data/Gemfile

@@ -17,39 +17,45 @@ end
 group :optional do
   gem 'nokogiri', '~>1.6'
   gem 'chronic', '~>0.10', :require => false
-  gem 'edtf', '~>2.1'
+  if RUBY_VERSION >= '2.2.2'
+    gem 'edtf', '~>3.0'
+  else
+    gem 'edtf', '~>2.0'
+  end
 
   gem 'bibtex-ruby', '~>4.0', :require => 'bibtex'
 
-  gem 'guard', '~>2.2'
-  gem 'guard-rspec', '~>4.2'
-  gem 'guard-cucumber', '~>2.0'
-
   gem 'pry'
 
-  gem 'unicode', '~>0.4', :platforms => [:ruby, :mswin, :mingw]
+  gem 'unicode', '>=0.4', '<1.0', :platforms => [:ruby, :mswin, :mingw]
 
   gem 'citeproc-ruby', :github => 'inukshuk/citeproc-ruby'
   #gem 'csl', :github => 'inukshuk/csl-ruby'
 end
 
 group :development do
-  gem 'rake'
+  gem 'rake', '~>10.0'
   gem 'cucumber'
   gem 'rspec', '~>3.0'
+  gem 'csl-styles', '~>1.0.1', :require => false
+end
+
+group :coverage do
+  gem 'coveralls', :require => false
   gem 'simplecov', '~>0.8', :require => false
   gem 'rubinius-coverage', :platform => :rbx
-  gem 'coveralls', :require => false
-  gem 'csl-styles', '~>1.0.1', :require => false
 end
 
 group :extra do
   gem 'yard', '~>0.8', :platforms => :ruby
   gem 'redcarpet', '~>3.0', :platform => :mri
+  gem 'guard', '~>2.2'
+  gem 'guard-rspec', '~>4.2'
+  gem 'guard-cucumber', '~>2.0'
 end
 
-platform :rbx do
-  gem 'rubysl', '~>2.0'
-  gem 'json', '~>1.8'
-  gem 'racc'
+group :rbx do
+  gem 'rubysl', :platforms => :rbx
+  gem 'racc', :platforms => :rbx
+  gem 'json', '~>1.8', :platforms => :rbx
 end

data/Rakefile

@@ -37,9 +37,13 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:cucumber)
 
-require 'coveralls/rake/task'
-Coveralls::RakeTask.new
-task :test_with_coveralls => [:spec, :cucumber, 'coveralls:push']
+begin
+  require 'coveralls/rake/task'
+  Coveralls::RakeTask.new
+  task :test_with_coveralls => [:spec, 'coveralls:push']
+rescue LoadError => e
+  # ignore
+end
 
 task :release do |t|
   system "gem build citeproc.gemspec"

data/features/affix/InterveningEmpty.feature

@@ -0,0 +1,52 @@
+Feature: affix
+  As a CSL cite processor hacker
+  I want the test affix_InterveningEmpty to pass
+
+  @citation @affix
+  Scenario: Intervening Empty
+    Given the following style:
+    """
+    <style 
+          xmlns="http://purl.org/net/xbiblio/csl"
+          class="note"
+          version="1.0">
+      <info>
+        <id />
+        <title />
+        <updated>2009-08-10T04:49:00+09:00</updated>
+      </info>
+      <macro name="author">
+        <names variable="author">
+          <name/>
+        </names>
+      </macro>
+      <macro name="title">
+        <text variable="title"/>
+      </macro>
+      <macro name="journal">
+        <text variable="container-title"/>
+      </macro>
+      <macro name="date">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </macro>
+      <citation>
+        <layout suffix=".">
+          <text macro="author"/>
+          <text macro="title" prefix=". "/>
+          <text macro="journal"/>
+          <text macro="date" prefix=". "/>
+        </layout>
+      </citation>
+    </style>
+    """
+    And the following input:
+    """
+    [{"author":[{"family":"Doe","given":"John"}],"id":"ITEM-1","issued":{"date-parts":[["1965","6","1"]]},"title":"His Anonymous Life","type":"book"}]
+    """
+    When I cite all items
+    Then the result should be:
+    """
+    John Doe. His Anonymous Life. 1965.
+    """

data/features/affix/PrefixFullCitationTextOnly.feature

@@ -0,0 +1,41 @@
+Feature: affix
+  As a CSL cite processor hacker
+  I want the test affix_PrefixFullCitationTextOnly to pass
+
+  @citation @affix @citation-items
+  Scenario: Prefix Full Citation Text Only
+    Given the following style:
+    """
+    <style 
+          xmlns="http://purl.org/net/xbiblio/csl"
+          class="note"
+          version="1.0">
+      <info>
+        <id />
+        <title />
+        <updated>2007-10-26T21:32:52+02:00</updated>
+      </info>
+      <citation>
+        <layout prefix="(" suffix=")">
+          <group delimiter=" ">
+            <names variable="author">
+              <name form="short" />
+            </names>
+            <date variable="issued">
+              <date-part name="year" />
+            </date>
+          </group>
+        </layout>
+      </citation>
+    </style>
+    """
+    And the following input:
+    """
+    [{"author":[{"family":"Smith","given":"John","static-ordering":false}],"id":"ITEM-1","issued":{"date-parts":[["2000","2","15"]]},"title":"Book C","type":"book"}]
+    """
+    When I cite the following items:
+    """
+    [[{"id":"ITEM-1","prefix":"As written in"}]]
+    """
+    Then the results should be:
+      | (As written in Smith 2000) |

data/features/affix/PrefixWithDecorations.feature

@@ -0,0 +1,41 @@
+Feature: affix
+  As a CSL cite processor hacker
+  I want the test affix_PrefixWithDecorations to pass
+
+  @citation @affix @citation-items
+  Scenario: Prefix With Decorations
+    Given the following style:
+    """
+    <style 
+          xmlns="http://purl.org/net/xbiblio/csl"
+          class="note"
+          version="1.0">
+      <info>
+        <id />
+        <title />
+        <updated>2007-10-26T21:32:52+02:00</updated>
+      </info>
+      <citation>
+        <layout prefix="(" suffix=")">
+          <group delimiter=" ">
+            <names variable="author">
+              <name form="short" />
+            </names>
+            <date variable="issued">
+              <date-part name="year" />
+            </date>
+          </group>
+        </layout>
+      </citation>
+    </style>
+    """
+    And the following input:
+    """
+    [{"author":[{"family":"Smith","given":"John","static-ordering":false}],"id":"ITEM-1","issued":{"date-parts":[["2000","2","15"]]},"title":"Book C","type":"book"}]
+    """
+    When I cite the following items:
+    """
+    [[{"id":"ITEM-1","prefix":"<sc>See</sc> "}]]
+    """
+    Then the results should be:
+      | (<span style="font-variant:small-caps;">See</span> Smith 2000) |

data/features/affix/SuppressDelimiterCharsWhenFullStopInSuffix.feature

@@ -0,0 +1,410 @@
+Feature: affix
+  As a CSL cite processor hacker
+  I want the test affix_SuppressDelimiterCharsWhenFullStopInSuffix to pass
+
+  @citation @affix @citations
+  Scenario: Suppress Delimiter Chars When Full Stop In Suffix
+    Given the following style:
+    """
+    <style
+           xmlns="http://purl.org/net/xbiblio/csl"
+          class="note"
+          version="1.1mlz1"
+          page-range-format="chicago">
+      <info>
+        <title>Bluebook (demo-x)</title>
+        <id>http://gsl-nagoya-u.net/http/pub/bluebook-demo-x</id>
+        <link rel="self" href="http://gsl-nagoya-u.net/http/pub/bluebook-demo-x.csl" />
+        <link href="http://www.legalbluebook.com/" rel="documentation" />
+        <author>
+          <name>Frank Bennett</name>
+          <email>biercenator@gmail.com</email>
+        </author>
+        <summary>Bluebook Style for legal materials (CSL 1.0 experimental)</summary>
+        <category field="generic-base" />
+        <category citation-format="note" />
+        <updated>2010-04-24T04:49:00+09:00</updated>
+      </info>
+      <locale>
+    	<terms>
+    	  <term name="ibid">id.</term>
+    	</terms>
+      </locale>
+    
+      <!-- ### BLUEBOOK AUTHOR ### -->
+      <macro name="bb-author">
+    	<names variable="author">
+    	  <name/>
+    	</names>
+      </macro>
+      <macro name="bb-author-short">
+    	<names variable="author">
+    	  <name form="short"/>
+    	</names>
+      </macro>
+    
+      <!-- ### BLUEBOOK ISSUED ### -->
+      <macro name="bb-issued">
+    	<group prefix="(" suffix=")">
+    	  <date variable="issued" form="text" date-parts="year"/>
+    	</group>
+      </macro>
+    
+      <!-- ### ID BACKREFERENCES ### -->
+      <macro name="bb-ibid">
+    	<choose> 
+    	  <if position="ibid-with-locator">
+    		<text term="ibid" font-style="italic"/>
+    		<group delimiter=" ">
+    		  <choose>
+    			<if locator="page">
+    			  <text value=" at"/>
+    			</if>
+    			<else>
+    			  <text value=", "/>
+    			  <label form="short" variable="locator"/>
+    			</else>
+    		  </choose>
+    		  <text variable="locator"/>
+    		</group>
+    	  </if>
+    	  <else-if position="ibid">
+    		<text term="ibid" font-style="italic"/>
+    	  </else-if>
+    	</choose>
+      </macro>
+    
+      <!-- ### POINT LOCATORS -->
+      <macro name="bb-point-locator-comma">
+    	<group delimiter=" ">
+    	  <choose>
+            <if variable="number page" position="ibid" match="any">
+    		  <text value=","/>
+            </if>
+    	  </choose>
+    	  <choose>
+            <if locator="page" match="none">
+    		  <label form="symbol" variable="locator" suffix=" "/>
+    	    </if>
+    	  </choose>
+    	  <text variable="locator"/>
+    	</group>
+      </macro>
+      <macro name="bb-point-locator-base">
+    	<choose>
+          <if locator="page" match="none">
+    		<label form="symbol" variable="locator" suffix=" "/>
+    	  </if>
+    	</choose>
+    	<text variable="locator"/>
+      </macro>
+    
+      <!-- ### LEGAL CASE ### -->
+      <macro name="bb-legal-case">
+    	<choose>
+    	  <if position="first">
+    		<text macro="bb-legal-case-first"/>
+    	  </if>
+    	  <else-if position="ibid">
+    		<text macro="bb-ibid"/>
+    	  </else-if>
+    	  <else-if position="near-note">
+    		<text macro="bb-legal-case-subsequent"/>
+    	  </else-if>
+    	  <else>
+    		<text macro="bb-legal-case-first"/>
+    	  </else>
+    	</choose>
+      </macro>
+      <macro name="bb-legal-case-first">
+        <choose>
+          <if variable="title">
+            <!-- Common law cases -->
+    		<group delimiter=", ">
+    		  <text variable="title"/>
+    		  <group delimiter=" ">
+    			<choose>
+    			  <if variable="issue">
+    				<text variable="volume" prefix="[" suffix="]"/>
+    				<text variable="issue"/>
+    			  </if>
+    			  <else>
+    				<text variable="volume"/>
+    			  </else>
+    			</choose>
+    			<text variable="container-title" form="short"/>
+    			<group>
+    			  <text variable="page"/>
+    			  <text macro="bb-point-locator-comma"/>
+    			</group>
+    			<group prefix="(" suffix=")" delimiter=" ">
+    			  <text variable="authority" form="short"/>
+    			  <date variable="issued">
+    				<date-part name="year"/>	
+    			  </date>
+    			</group>	
+    		  </group>
+    		</group>
+    	  </if>
+          <else>
+    		<!-- Civil law cases -->
+    		<group delimiter=", ">
+    		  <text variable="authority"/>
+    		  <text variable="title" form="short"/>
+    		  <date variable="issued" form="text"/>
+    		  <text variable="container-title" font-style="italic" strip-periods="true"/>
+    		  <text variable="volume"/>
+              <group delimiter=" ">
+    			<text variable="section"/>
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+    		  </group>
+              <text variable="number"/>
+              <group delimiter=" ">
+                <text variable="genre"/>
+      		    <names variable="author">
+    			  <name initialize-with="." font-variant="small-caps"/>
+    		    </names>
+    		  </group>
+    		</group>
+    	  </else>
+    	</choose>
+      </macro>
+      <macro name="bb-legal-case-subsequent">
+        <group delimiter=", ">
+          <text variable="title" form="short"/>
+          <group delimiter=" ">
+    		<choose>
+    		  <if variable="issue">
+    			<text variable="volume" prefix="[" suffix="]"/>
+    			<text variable="issue"/>
+    		  </if>
+    		  <else>
+    			<text variable="volume"/>
+    		  </else>
+    		</choose>
+            <text variable="container-title" form="short"/>
+    		<choose>
+              <if variable="locator">
+                <text macro="bb-point-locator-base"/>
+    		  </if>
+    		  <else>
+    		    <text variable="page"/>
+    		  </else>
+    		</choose>
+          </group>
+    	</group>
+      </macro>
+    
+      <!-- ### LEGISLATION ### -->
+      <macro name="bb-legislation">
+    	<choose>
+    	  <if position="first">
+    		<text macro="bb-legislation-first"/>
+    	  </if>
+    	  <else-if position="near-note">
+    		<text macro="bb-legislation-subsequent"/>
+    	  </else-if>
+    	  <else>
+    		<text macro="bb-legislation-first"/>
+    	  </else>
+    	</choose>
+      </macro>
+      <macro name="bb-legislation-first">
+    	<choose>
+    	  <if variable="container-title">
+    		<text macro="bb-statute-first"/>
+    	  </if>
+    	  <else>
+    		<text macro="bb-code-first"/>
+    	  </else>
+    	</choose>
+      </macro>
+      <macro name="bb-legislation-subsequent">
+    	<choose>
+    	  <if variable="container-title">
+    		<text macro="bb-statute-subsequent"/>
+    	  </if>
+    	  <else>
+    		<text macro="bb-code-subsequent"/>
+    	  </else>
+    	</choose>
+      </macro>
+      <macro name="bb-statute-first">
+    	<group delimiter=", ">
+    	  <text variable="title"/>
+    	  <text macro="bb-statute-subsequent"/>
+    	</group>
+      </macro>
+      <macro name="bb-statute-subsequent">
+    	<group delimiter="">
+    	  <group delimiter=" ">
+    		<text variable="volume"/>
+    		<text variable="container-title"/>
+    		<text variable="number"/>
+    		<text variable="page"/>
+    		<choose>
+    		  <if is-numeric="section">
+    			<text term="section" form="symbol"/>
+    			<text variable="section"/>
+    		  </if>
+    		</choose>
+    	  </group>
+    	  <text macro="bb-point-locator-comma"/>
+    	  <date prefix=" (" variable="issued" date-parts="year" form="text" suffix=")"/>
+    	</group>
+      </macro>
+      <macro name="bb-code-first">
+    	<group delimiter=" ">
+    	  <text variable="title" font-variant="small-caps"/>
+    	  <group delimiter=" ">
+    		<label variable="locator" form="symbol"/>
+    		<text variable="locator"/>
+    	  </group>
+    	</group>
+      </macro>
+      <macro name="bb-code-subsequent">
+    	<group delimiter=" ">
+    	  <text variable="title" form="short" font-variant="small-caps"/>
+    	  <group delimiter=" ">
+    		<label variable="locator" form="symbol"/>
+    		<text variable="locator"/>
+    	  </group>
+    	</group>
+      </macro>
+    
+      <!-- ### BOOK ### -->
+      <macro name="bb-book">
+    	<choose>
+    	  <if position="first">
+    		<text macro="bb-book-first"/>
+    	  </if>
+    	  <else-if position="ibid">
+    		<text macro="bb-ibid"/>
+    	  </else-if>
+    	  <else-if position="subsequent">
+    		<text macro="bb-book-subsequent"/>
+    	  </else-if>
+    	</choose>
+      </macro>
+      <macro name="bb-book-first">
+    	<group delimiter=", ">
+    	  <text macro="bb-author" font-variant="small-caps"/>
+    	  <group delimiter=" ">
+    		<text variable="title" font-variant="small-caps"/>
+    		<group delimiter=" ">
+    		  <choose>
+    			<if locator="page" match="none">
+    			  <label variable="locator" form="symbol"/>
+    			</if>
+    		  </choose>
+    		  <text variable="locator"/>
+    		</group>
+    		<text macro="bb-issued"/>
+    	  </group>
+    	</group>
+        <text variable="references" prefix=" [" suffix="]"/>
+      </macro>
+      <macro name="bb-book-subsequent">
+        <group delimiter=", ">
+    	  <text macro="bb-author-short" font-variant="small-caps"/>
+    	  <choose>
+    		<if disambiguate="true">
+    		  <text variable="title" font-variant="small-caps"/>
+    		</if>
+    	  </choose>
+    	  <group delimiter="">
+    		<group delimiter=" ">
+    		  <text value="supra" font-style="italic"/>
+    		  <choose>
+    			<if variable="first-reference-note-number">
+    			  <text value="note"/>
+    			  <text variable="first-reference-note-number"/>
+    			</if>
+    		  </choose>
+    		</group>
+    		<group delimiter=" ">
+    		  <choose>
+    			<if locator="page">
+    			  <text value=","/>
+    			  <text value="at"/>
+    			</if>
+    			<else>
+    			  <label variable="locator"/>
+    			</else>
+    		  </choose>
+    		  <text variable="locator"/>
+    		</group>
+    	  </group>
+    	</group>
+      </macro>
+    
+      <!-- ### PERIODICAL ### -->
+      <macro name="bb-periodical">
+    	<choose>
+    	  <if position="first">
+    		<text macro="bb-periodical-first"/>
+    	  </if>
+    	  <else-if position="ibid">
+    		<text term="ibid" font-style="italic"/>
+    	  </else-if>
+    	  <else-if position="subsequent">
+    		<text macro="bb-periodical-subsequent"/>
+    	  </else-if>
+    	</choose>
+      </macro>
+      <macro name="bb-periodical-first">
+    	<group delimiter=" ">
+    	  <group delimiter=", ">
+    		<names variable="author">
+    		  <name/>
+    		</names>
+    		<text variable="title" font-style="italic"/>
+    		<group delimiter=" ">
+    		  <text variable="volume"/>
+    		  <text variable="container-title" form="short" font-variant="small-caps"/>
+    		  <text variable="page-first"/>
+    		</group>
+    	  </group>
+    	  <text macro="bb-issued"/>
+    	</group>
+      </macro>
+      <macro name="bb-periodical-subsequent">
+    	<text value="bb-periodical-subsequent"/>
+      </macro>
+      <citation
+             near-note-distance="5"
+             et-al-min="2"
+             et-al-subsequent-min="4"
+             et-al-subsequent-use-first="2"
+             et-al-use-first="1">
+        <layout delimiter="; " suffix=".">
+          <choose>
+            <if type="legal_case">
+              <text macro="bb-legal-case"/>
+            </if>
+    		<else-if type="legislation">
+    		  <text macro="bb-legislation"/>
+    		</else-if>
+    		<else-if type="book" match="any">
+    		  <text macro="bb-book"/>
+    		</else-if>
+            <else>
+    		  <text macro="bb-periodical"/>
+    		</else>
+    	  </choose>
+        </layout>
+      </citation>
+    </style>
+
+    """
+    And the following input:
+    """
+    [{"author":[{"family":"Smith","given":"John"}],"id":"ITEM-1","issued":{"date-parts":[["1990"]]},"title":"First Book","type":"book"},{"author":[{"family":"Brown","given":"John"}],"id":"ITEM-2","issued":{"date-parts":[["2010"]]},"title":"Second Book","type":"book"},{"author":[{"family":"Green","given":"John"}],"id":"ITEM-3","issued":{"date-parts":[["2010"]]},"title":"Third Book","type":"book"}]
+    """
+    And I have a citations input
+    When I cite all items
+    Then the result should be:
+    """
+    >>[0] See <span style="font-variant:small-caps;">John Smith</span>, <span style="font-variant:small-caps;">First Book</span> (1990) for a detailed discussion. See also <span style="font-variant:small-caps;">John Brown</span>, <span style="font-variant:small-caps;">Second Book</span> (2010); <span style="font-variant:small-caps;">John Green</span>, <span style="font-variant:small-caps;">Third Book</span> (2010).
+    """