apa.csl in csl-1.0.0.pre9

- old
+ new

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+  <!-- This style was edited with the Visual CSL Editor (http://steveridout.com/csl/visualEditor/) -->
   <info>
     <title>American Psychological Association 6th Edition</title>
     <id>http://www.zotero.org/styles/apa</id>
     <link href="http://www.zotero.org/styles/apa" rel="self"/>
     <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
@@ -21,14 +22,14 @@
       <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
     </contributor>
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
+    <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <category citation-format="author-date"/>
-    <updated>2010-01-27T20:08:03+00:00</updated>
+    <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>
   </info>
   <locale xml:lang="en">
     <terms>
       <term name="translator" form="short">
@@ -38,11 +39,10 @@
     </terms>
   </locale>
   <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <text term="in" text-case="capitalize-first" suffix=" "/>
         <names variable="editor" delimiter=", " suffix=", ">
           <name and="symbol" initialize-with=". " delimiter=", "/>
           <label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
           <substitute>
             <names variable="translator"/>
@@ -231,11 +231,11 @@
   <macro name="issued">
     <choose>
       <if type="bill legal_case legislation" match="none">
         <choose>
           <if variable="issued">
-            <group prefix=" (" suffix=").">
+            <group prefix=" (" suffix=")">
               <date variable="issued">
                 <date-part name="year"/>
               </date>
               <text variable="year-suffix"/>
               <choose>
@@ -247,11 +247,11 @@
                 </if>
               </choose>
             </group>
           </if>
           <else>
-            <group prefix=" (" suffix=").">
+            <group prefix=" (" suffix=")">
               <text term="no date" form="short"/>
               <text variable="year-suffix" prefix="-"/>
             </group>
           </else>
         </choose>
@@ -357,10 +357,22 @@
       <label variable="locator" form="short"/>
       <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>
+      </choose>
+      <text macro="container-contributors"/>
+      <text macro="secondary-contributors"/>
+      <text macro="container-title"/>
+    </group>
+  </macro>
+  <macro name="container-title">
     <choose>
       <if type="bill legal_case legislation" match="none">
         <text variable="container-title" font-style="italic"/>
       </if>
       <else>
@@ -368,11 +380,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>
@@ -382,11 +394,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>
@@ -407,30 +419,21 @@
         <text macro="issued-year"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="7" entry-spacing="0" line-spacing="2">
+  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
     <sort>
       <key macro="author"/>
       <key macro="issued-sort" sort="ascending"/>
     </sort>
     <layout>
       <group suffix=".">
         <group delimiter=". ">
           <text macro="author"/>
           <text macro="issued"/>
-        </group>
-        <group delimiter=". ">
           <text macro="title" prefix=" "/>
-          <group>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <group delimiter=", ">
-              <text macro="container"/>
-              <text variable="collection-title"/>
-            </group>
-          </group>
+	  <text macro="container"/>
         </group>
         <text macro="locators"/>
         <group delimiter=", " prefix=". ">
           <text macro="event"/>
           <text macro="publisher"/>