Permalink
Browse files

Merge pull request #311 from libora/patch-5

Update iso690-author-date-cs.csl
  • Loading branch information...
rmzelle committed Dec 6, 2012
2 parents ff023f4 + f20fe13 commit aa7e4ae8ad0328e7c2b801d06a2aea62f7bc6203
Showing with 14 additions and 4 deletions.
  1. +14 −4 iso690-author-date-cs.csl
View
@@ -179,9 +179,12 @@
</else>
</choose>
<choose>
- <if variable="URL">
+ <if variable="DOI">
<text term="online" prefix=" [" suffix="]"/>
</if>
+ <else-if variable="URL">
+ <text term="online" prefix=" [" suffix="]"/>
+ </else-if>
</choose>
</macro>
<macro name="number">
@@ -314,13 +317,20 @@
</macro>
<macro name="url">
<choose>
- <if variable="URL">
+ <if variable="DOI">
+ <group>
+ <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+ <text term="from" suffix=": doi:"/>
+ <text variable="DOI"/>
+ </group>
+ </if>
+ <else-if variable="URL">
<group>
<text term="retrieved" suffix=" " text-case="capitalize-first"/>
<text term="from" suffix=": "/>
<text variable="URL"/>
</group>
- </if>
+ </else-if>
</choose>
</macro>
<macro name="archive">
@@ -404,7 +414,7 @@
<text macro="issue" suffix=". "/>
<text macro="accessed" suffix=". "/>
<text macro="issn" suffix=". "/>
- <text macro="doi" suffix=". "/>
+ <!--text macro="doi" suffix=". "/-->
<text macro="url"/>
</group>
</else-if>

0 comments on commit aa7e4ae

Please sign in to comment.