Permalink
Browse files

remove Anon from the other AMA styles and align all AMA variants

  • Loading branch information...
1 parent b18c75b commit 72f9c1c99ee2d6ccc44e6c441465d34aa1d05144 @adam3smith adam3smith committed Oct 1, 2012
@@ -18,20 +18,17 @@
<macro name="editor">
<names variable="editor">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+ <label form="short" prefix=", "/>
</names>
</macro>
- <macro name="anon">
- <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
- </macro>
<macro name="author">
<group suffix=".">
<names variable="author">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
+ <label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
- <text macro="anon"/>
+ <text macro="title"/>
</substitute>
</names>
</group>
@@ -42,7 +39,6 @@
<substitute>
<names variable="editor"/>
<names variable="translator"/>
- <text macro="anon"/>
</substitute>
</names>
</macro>
@@ -103,7 +99,7 @@
<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>
@@ -134,7 +130,7 @@
<text macro="author"/>
<text macro="title" prefix=" " suffix="."/>
<choose>
- <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+ <if type="bill book graphic legislation motion_picture report song" match="any">
<group suffix="." prefix=" " delimiter=" ">
<text macro="edition"/>
<text macro="editor" prefix="(" suffix=")"/>
@@ -203,6 +199,22 @@
</else>
</choose>
</else-if>
+ <else-if type="legal_case">
+ <group suffix="," prefix=" " delimiter=" ">
+ <text macro="editor" prefix="(" suffix=")"/>
+ </group>
+ <group prefix=" " delimiter=" ">
+ <text variable="container-title"/>
+ <text variable="volume"/>
+ </group>
+ <text variable="page" prefix=", " suffix=" "/>
+ <group prefix="(" suffix=")." delimiter=" ">
+ <text variable="authority"/>
+ <date variable="issued">
+ <date-part name="year"/>
+ </date>
+ </group>
+ </else-if>
<else>
<text macro="editor" prefix=" " suffix="."/>
<group prefix=" " suffix=".">
@@ -18,20 +18,17 @@
<macro name="editor">
<names variable="editor">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+ <label form="short" prefix=", "/>
</names>
</macro>
- <macro name="anon">
- <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
- </macro>
<macro name="author">
<group suffix=".">
<names variable="author">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
+ <label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
- <text macro="anon"/>
+ <text macro="title"/>
</substitute>
</names>
</group>
@@ -42,12 +39,13 @@
<substitute>
<names variable="editor"/>
<names variable="translator"/>
- <text macro="anon"/>
</substitute>
</names>
</macro>
<macro name="access">
<choose>
+ <if type="article-newspaper" match="none">
+ <choose>
<if variable="URL">
<text value="Available at:" suffix=" "/>
<group delimiter=". ">
@@ -63,6 +61,8 @@
</group>
</if>
</choose>
+ </if>
+ </choose>
</macro>
<macro name="title">
<choose>
@@ -99,7 +99,7 @@
<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>
@@ -121,16 +121,16 @@
</citation>
<bibliography hanging-indent="false" et-al-min="99" et-al-use-first="98">
<layout>
- <text variable="citation-number" prefix="" suffix=". "/>
- <text macro="author" suffix=""/>
+ <text variable="citation-number" suffix=". "/>
+ <text macro="author"/>
+ <text macro="title" prefix=" " suffix="."/>
<choose>
- <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
- <group suffix=".">
- <text macro="title" prefix=" " suffix="."/>
- <text macro="edition" prefix=" "/>
+ <if type="bill book graphic legislation motion_picture report song" match="any">
+ <group suffix="." prefix=" " delimiter=" ">
+ <text macro="edition"/>
<text macro="editor" prefix=" (" suffix=")"/>
</group>
- <text prefix=" " suffix="" macro="publisher"/>
+ <text prefix=" " macro="publisher"/>
<group suffix="." prefix="; ">
<date variable="issued">
<date-part name="year"/>
@@ -139,7 +139,6 @@
</group>
</if>
<else-if type="chapter paper-conference" match="any">
- <text macro="title" prefix=" " suffix="."/>
<group prefix=" ">
<text term="in" text-case="capitalize-first" suffix=": "/>
<text macro="editor"/>
@@ -158,11 +157,61 @@
</group>
</group>
</else-if>
+ <else-if type="article-newspaper">
+ <text variable="container-title" font-style="italic" prefix=" " suffix=". "/>
+ <choose>
+ <if variable="URL">
+ <group delimiter=". " suffix=".">
+ <text variable="URL"/>
+ <group prefix="Published ">
+ <date variable="issued">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
+ <group>
+ <text term="accessed" text-case="capitalize-first" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
+ </group>
+ </if>
<else>
- <group suffix=".">
- <text macro="title" prefix=" "/>
- <text macro="editor" prefix=" "/>
+ <group delimiter=":" suffix=".">
+ <group>
+ <date variable="issued">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
+ <text variable="page"/>
+ </group>
+ </else>
+ </choose>
+ </else-if>
+ <else-if type="legal_case">
+ <group suffix="," prefix=" " delimiter=" ">
+ <text macro="editor" prefix="(" suffix=")"/>
</group>
+ <group prefix=" " delimiter=" ">
+ <text variable="container-title"/>
+ <text variable="volume"/>
+ </group>
+ <text variable="page" prefix=", " suffix=" "/>
+ <group prefix="(" suffix=")." delimiter=" ">
+ <text variable="authority"/>
+ <date variable="issued">
+ <date-part name="year"/>
+ </date>
+ </group>
+ </else-if>
+ <else>
+ <text macro="editor" prefix=" " suffix="."/>
<group prefix=" " suffix=".">
<text variable="container-title" font-style="italic" form="short" suffix="."/>
<group delimiter=";" prefix=" ">
@@ -18,20 +18,17 @@
<macro name="editor">
<names variable="editor">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+ <label form="short" prefix=", "/>
</names>
</macro>
- <macro name="anon">
- <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
- </macro>
<macro name="author">
<group suffix=".">
<names variable="author">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
+ <label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
- <text macro="anon"/>
+ <text macro="title"/>
</substitute>
</names>
</group>
@@ -42,7 +39,6 @@
<substitute>
<names variable="editor"/>
<names variable="translator"/>
- <text macro="anon"/>
</substitute>
</names>
</macro>
@@ -81,7 +77,7 @@
<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>
@@ -107,7 +103,7 @@
<text macro="author"/>
<text macro="title" prefix=" " suffix="."/>
<choose>
- <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+ <if type="bill book graphic legislation motion_picture report song" match="any">
<group suffix="." prefix=" " delimiter=" ">
<text macro="edition"/>
<text macro="editor" prefix="(" suffix=")"/>
@@ -176,6 +172,22 @@
</else>
</choose>
</else-if>
+ <else-if type="legal_case">
+ <group suffix="," prefix=" " delimiter=" ">
+ <text macro="editor" prefix="(" suffix=")"/>
+ </group>
+ <group prefix=" " delimiter=" ">
+ <text variable="container-title"/>
+ <text variable="volume"/>
+ </group>
+ <text variable="page" prefix=", " suffix=" "/>
+ <group prefix="(" suffix=")." delimiter=" ">
+ <text variable="authority"/>
+ <date variable="issued">
+ <date-part name="year"/>
+ </date>
+ </group>
+ </else-if>
<else>
<text macro="editor" prefix=" " suffix="."/>
<group prefix=" " suffix=".">

0 comments on commit 72f9c1c

Please sign in to comment.