apa.csl in csl-1.0.0.pre13

- old
+ new

@@ -25,51 +25,49 @@
       <name>Sebastian Karcher</name>
     </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2012-09-04T02:31:02+00:00</updated>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <updated>2012-09-27T22:06:38+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
     <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
       <term name="translator" form="short">
         <single>trans.</single>
         <multiple>trans.</multiple>
       </term>
     </terms>
   </locale>
   <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <names variable="editor" delimiter=", " suffix=", ">
+        <names variable="editor translator" delimiter=", " suffix=", ">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
-          <substitute>
-            <names variable="translator"/>
-          </substitute>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
         </names>
       </if>
     </choose>
   </macro>
   <macro name="secondary-contributors">
     <choose>
       <if type="chapter paper-conference" match="none">
-        <names variable="translator" delimiter=", " prefix=" (" suffix=")">
+        <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
-          <substitute>
-            <names variable="editor"/>
-          </substitute>
+          <label form="short" prefix=", " text-case="title" suffix=""/>
         </names>
       </if>
     </choose>
   </macro>
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
         <choose>
           <if type="report">
@@ -134,15 +132,11 @@
             <choose>
               <if type="webpage">
                 <group delimiter=" ">
                   <text term="retrieved" text-case="capitalize-first" suffix=" "/>
                   <group>
-                    <date variable="accessed" suffix=", ">
-                      <date-part name="month" suffix=" "/>
-                      <date-part name="day" suffix=", "/>
-                      <date-part name="year"/>
-                    </date>
+                    <date variable="accessed" form="text" suffix=", "/>
                   </group>
                   <text term="from"/>
                   <text variable="URL"/>
                 </group>
               </if>
@@ -291,11 +285,11 @@
   <macro name="edition">
     <choose>
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" suffix="." strip-periods="true"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
       <else>
         <text variable="edition" suffix="."/>
       </else>
@@ -320,15 +314,15 @@
       </else-if>
       <else-if type="book graphic motion_picture report song chapter paper-conference" match="any">
         <group prefix=" (" suffix=")" delimiter=", ">
           <text macro="edition"/>
           <group>
-            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
             <number variable="number-of-volumes" form="numeric" prefix="1-"/>
           </group>
           <group>
-            <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
             <number variable="volume" form="numeric"/>
           </group>
           <group>
             <label variable="page" form="short" suffix=" "/>
             <text variable="page"/>
@@ -336,15 +330,11 @@
         </group>
       </else-if>
       <else-if type="legal_case">
         <group prefix=" (" suffix=")" delimiter=" ">
           <text variable="authority"/>
-          <date variable="issued" delimiter=" ">
-            <date-part name="month" form="short"/>
-            <date-part name="day" suffix=","/>
-            <date-part name="year"/>
-          </date>
+          <date variable="issued" form="text"/>
         </group>
       </else-if>
       <else-if type="bill legislation">
         <date variable="issued" prefix=" (" suffix=")">
           <date-part name="year"/>
@@ -352,20 +342,27 @@
       </else-if>
     </choose>
   </macro>
   <macro name="citation-locator">
     <group>
-      <label variable="locator" form="short"/>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" form="long" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
   <macro name="container">
     <group>
       <choose>
-	<if type="chapter paper-conference entry-encyclopedia" match="any">
-	  <text term="in" text-case="capitalize-first" suffix=" "/>
-	</if>
+        <if type="chapter paper-conference entry-encyclopedia" match="any">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+        </if>
       </choose>
       <text macro="container-contributors"/>
       <text macro="secondary-contributors"/>
       <text macro="container-title"/>
     </group>
@@ -380,11 +377,11 @@
           <choose>
             <if variable="container-title">
               <text variable="volume"/>
               <text variable="container-title"/>
               <group delimiter=" ">
-		<!--change to label variable="section" as that becomes available -->
+                <!--change to label variable="section" as that becomes available -->
                 <text term="section" form="symbol"/>
                 <text variable="section"/>
               </group>
               <text variable="page"/>
             </if>
@@ -394,11 +391,11 @@
                   <text variable="number" prefix="No. "/>
                 </if>
                 <else>
                   <text variable="number" prefix="Pub. L. No. "/>
                   <group delimiter=" ">
-		    <!--change to label variable="section" as that becomes available -->
+                    <!--change to label variable="section" as that becomes available -->
                     <text term="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </else>
               </choose>
@@ -430,10 +427,10 @@
       <group suffix=".">
         <group delimiter=". ">
           <text macro="author"/>
           <text macro="issued"/>
           <text macro="title" prefix=" "/>
-	  <text macro="container"/>
+          <text macro="container"/>
         </group>
         <text macro="locators"/>
         <group delimiter=", " prefix=". ">
           <text macro="event"/>
           <text macro="publisher"/>