From 73c18b1735dd9ecb3b9a8e439111b85279e39892 Mon Sep 17 00:00:00 2001
From: Julian Onions <julian.onions@gmail.com>
Date: Tue, 12 Feb 2008 13:58:47 +0000
Subject: [PATCH] Change to use the more generic language independent page
 variables

---
 csl/harvard1.csl | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/csl/harvard1.csl b/csl/harvard1.csl
index 365f25c7c4..f24b2088b5 100644
--- a/csl/harvard1.csl
+++ b/csl/harvard1.csl
@@ -99,6 +99,12 @@
       </else>
     </choose>
   </macro>
+  <macro name="pages">
+    <group>
+        <label variable="page" form="short" include-period="true" suffix=" "/>
+  	<text variable="page"/>
+    </group>
+  </macro>
   <citation>
     <option name="et-al-min" value="4"/>
     <option name="et-al-use-first" value="1"/>
@@ -114,7 +120,10 @@
 	  <text macro="author-short"/>
 	  <text macro="year-date"/>
 	</group>
-	<text variable="locator" prefix="p."/>
+	<group>
+	  <label variable="locator" suffix="." form="short"/>
+	  <text variable="locator"/>
+	</group>
       </group>
     </layout>
   </citation>
@@ -142,16 +151,14 @@
 	</if>
 	<else-if type="chapter">
 	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" prefix=" ">
+	  <group class="container" prefix=" " delimiter=" ">
 	    <text term="in" text-case="capitalize-first"/>
-	    <text macro="editor" prefix=" "/>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
+	    <text macro="editor"/>
+	    <text variable="container-title" font-style="italic" suffix="."/>
+	    <text variable="collection-title" suffix="."/>
+	    <group suffix="." delimiter=", ">
 	      <text macro="publisher" prefix=" "/>
-	      <group prefix=", ">
-		<text variable="page" prefix="p. "/>
-	      </group>
+	      <text macro="pages" />
 	    </group>
 	  </group>
 	</else-if>
@@ -167,7 +174,8 @@
 	      <text variable="issue" prefix="(" suffix=")"/>
 	    </group>
 	    <group prefix=", ">
-	      <text variable="page" prefix="p."/>
+	      <label variable="locator" suffix="." form="short"/>
+	      <text variable="page"/>
 	    </group>
 	  </group>
 	</else>