American Naturalist: Fix cite collapsing & some other issues

APSA: use short title
citation-style-language · Nov 24, 2015 · af76571859d6890b96a146cf5894c2d866c71bac · af76571
1 parent 34e4ca2
commit af76571859d6890b96a146cf5894c2d866c71bac
Unified Split

Showing with 22 additions and 19 deletions.

+1 −1 american-political-science-association.csl

+21 −18 the-american-naturalist.csl
diff --git a/american-political-science-association.csl b/american-political-science-association.csl
@@ -63,7 +63,7 @@
      <substitute>
        <names variable="editor"/>
        <names variable="translator"/>
-  
-        <text macro="title"/>
+  
+        <text variable="title" form="short"/>
      </substitute>
    </names>
  </macro>

diff --git a/the-american-naturalist.csl b/the-american-naturalist.csl
@@ -29,14 +29,20 @@
  <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=", "/>
-  
-          <substitute>
-  
-            <names variable="translator"/>
-  
-          </substitute>
-  
-        </names>
+  
+        <group delimiter=" ">
+  
+          <group delimiter=" ">
+  
+            <label variable="page"  text-case="capitalize-first"/>
+  
+            <text variable="page"/>
+  
+          </group>
+  
+          <text term="in"   font-style="italic"/>
+  
+          <names variable="editor" delimiter=", " suffix=" ">
+  
+            <name and="text" initialize-with=". " delimiter=", "/>
+  
+            <label form="short" prefix=", "/>
+  
+            <substitute>
+  
+              <names variable="translator"/>
+  
+            </substitute>
+  
+          </names>
+  
+        </group>
      </if>
    </choose>
  </macro>
@@ -165,13 +171,13 @@
              <date variable="issued">
                <date-part name="year"/>
              </date>
-  
-              <text variable="year-suffix"/>
+  
+              <text variable="year-suffix" font-style="italic"/>
            </group>
          </if>
          <else>
            <group prefix=" " suffix=".">
              <text term="no date" form="short"/>
-  
-              <text variable="year-suffix" prefix="-"/>
+  
+              <text variable="year-suffix" prefix="-" font-style="italic"/>
            </group>
          </else>
        </choose>
@@ -184,11 +190,11 @@
        <date variable="issued">
          <date-part name="year"/>
        </date>
-  
-        <text variable="year-suffix"/>
+  
+        <text variable="year-suffix" font-style="italic"/>
      </if>
      <else>
        <text term="no date" form="short"/>
-  
-        <text variable="year-suffix" prefix="-"/>
+  
+        <text variable="year-suffix" prefix="-" font-style="italic"/>
      </else>
    </choose>
  </macro>
@@ -230,10 +236,7 @@
            <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"/>
-  
-          </group>
+  
+
        </group>
      </else-if>
      <else-if type="legal_case">
@@ -297,7 +300,7 @@
      </else>
    </choose>
  </macro>
-  
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
+  
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
    <sort>
      <key macro="issued-year"/>
      <key macro="author"/>
@@ -312,7 +315,7 @@
      </group>
    </layout>
  </citation>
-  
-  <bibliography et-al-min="8" et-al-use-first="7" entry-spacing="0">
+  
+  <bibliography et-al-min="8" et-al-use-first="7" entry-spacing="0" subsequent-author-substitute="&#8212;&#8212;&#8212;">
    <sort>
      <key macro="author"/>
      <key macro="issued-year" sort="ascending"/>