www

commit 8304d0c67a51dd9bb2f9fcd4db4a8b04ff6cb425
parent 560b0310bd4e304667628975d3449b6a9ebf4b6f
Author: Nicolae Turcan <nicturcan@gmail.com>
Date:   Thu, 10 Jul 2008 12:17:38 +0000

New macro for pages

Diffstat:
M
csl/inter-ro.csl
 | 
16
+++++++++-------

1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/csl/inter-ro.csl b/csl/inter-ro.csl
@@ -139,6 +139,12 @@
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
+  <macro name="pages">
+    <group>
+      <label variable="page" suffix="." form="short"/>
+      <text variable="page" prefix=" "/>
+    </group>
+  </macro>
   <macro name="sort-key">
     <text macro="author-bib" suffix=" "/>
     <text variable="issue" suffix=" "/>
@@ -207,8 +213,6 @@
 	      <text variable="edition" prefix=", "/>
 	      <text macro="publisher" prefix=", "/>
 	      <text macro="issued" prefix=", "/>		   
-	      <text macro="locators" prefix=", "/>
-	      <text macro="access" prefix=", "/>
 	    </if>
 	    <else-if type="article-journal article-newspaper article-magazine" match="any">
 	      <group>
@@ -224,8 +228,6 @@
 		<text macro="translator" prefix=", "/>
 		<text variable="edition" prefix=", "/>
 		<text macro="publisher" prefix=", "/>
-		<text macro="locators" prefix=", "/>
-		<text macro="access" prefix=", "/>
 	      </group>
 	    </else-if>
 	    <else-if type="book">
@@ -241,18 +243,17 @@
 	      <text variable="edition" prefix=", "/>
 	      <text macro="publisher" prefix=", "/>
 	      <text macro="issued" prefix=", "/>
-	      <text macro="locators" prefix=", "/>
-	      <text macro="access" prefix=", "/>
 	    </else-if>
 	    <else>
 	      <group class="container">
 		<text variable="container-title" font-style="italic" prefix=", "/>
 		<text variable="volume" prefix=" "/>
 		<text variable="issue" prefix=", "/>
-		<text macro="locators" prefix=", "/>
 	      </group>
 	    </else>
 	  </choose>
+	  <text macro="locators" prefix=", "/>
+	  <text macro="access" prefix=", "/>
 	</else>
       </choose>
     </layout>
@@ -302,6 +303,7 @@
 	  <text macro="translator" prefix=", "/>
 	  <text variable="edition" prefix=", "/>
 	  <text macro="publisher" prefix=", "/>
+	  <text macro="pages" prefix=", "/>
 	</else-if>
 	<else-if type="book">
 	  <group>