A bit of a clean up using some lessons learnt.

This commit is contained in:
Julian Onions 2007-12-05 16:55:57 +00:00
parent a9fff072a5
commit bbcd904339

View File

@ -15,16 +15,16 @@
<source>http://www.wisc.edu/writing/Handbook/DocAPSA.html</source> <source>http://www.wisc.edu/writing/Handbook/DocAPSA.html</source>
</info> </info>
<macro name="editor"> <macro name="editor">
<names variable="editor" prefix="" suffix="" delimiter=", "> <names variable="editor" delimiter=", ">
<name and="text" initialize-with=". " delimiter=", "/> <label form="short" text-case="lowercase" suffix=". "/>
<label form="short" prefix=", " text-case="lowercase" suffix="."/> <name and="text" delimiter=", "/>
</names> </names>
</macro> </macro>
<macro name="author"> <macro name="author">
<names variable="author"> <names variable="author">
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " <name name-as-sort-order="first" and="text" sort-separator=", "
delimiter=", " delimiter-precedes-last="always"/> delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" " suffix="." text-case="lowercase"/> <label form="short" prefix=", " suffix="." text-case="lowercase"/>
<substitute> <substitute>
<names variable="editor"/> <names variable="editor"/>
<text variable="title"/> <text variable="title"/>
@ -42,10 +42,10 @@
</names> </names>
</macro> </macro>
<macro name="access"> <macro name="access">
<group> <group delimiter=" ">
<text value="Available at:" suffix=" "/> <text value="Available at:"/>
<text variable="URL"/> <text variable="URL"/>
<group prefix=" [" suffix="]"> <group prefix="[" suffix="]">
<text term="accessed" text-case="capitalize-first" suffix=" "/> <text term="accessed" text-case="capitalize-first" suffix=" "/>
<date variable="accessed"> <date variable="accessed">
<date-part name="month" suffix=" "/> <date-part name="month" suffix=" "/>
@ -113,29 +113,26 @@
<key variable="title"/> <key variable="title"/>
</sort> </sort>
<layout> <layout>
<text macro="author"/> <text macro="author" suffix="."/>
<date variable="issued" prefix=" " suffix="."> <date variable="issued" prefix=" " suffix=".">
<date-part name="year"/> <date-part name="year"/>
</date> </date>
<choose> <choose>
<if type="book"> <if type="book">
<group suffix=","> <group prefix=" " delimiter=" ">
<text macro="title" prefix=" "/> <text macro="title" suffix="."/>
<text variable="edition" prefix=" " suffix=" ed."/> <text variable="edition" suffix=" ed."/>
<text macro="editor" prefix=" "/> <text macro="editor" suffix="."/>
</group> </group>
<text prefix=" " suffix="." macro="publisher"/> <text prefix=" " suffix="." macro="publisher"/>
</if> </if>
<else-if type="chapter"> <else-if type="chapter">
<text macro="title" prefix=" " suffix="." quotes="true"/> <text macro="title" prefix=" " suffix="." quotes="true"/>
<group class="container" prefix=" "> <group class="container" prefix=" " delimiter=" ">
<text term="in" text-case="capitalize-first"/> <text term="in" text-case="capitalize-first"/>
<text variable="container-title" font-style="italic" prefix=" " suffix="."/> <text variable="container-title" font-style="italic" suffix=","/>
<text variable="collection-title" prefix=" " suffix="."/> <text variable="collection-title" suffix=","/>
<names variable="editor" prefix=", " suffix="." delimiter=", "> <text macro="editor" suffix="."/>
<label form="short" suffix=". " text-case="lowercase"/>
<name and="text" sort-separator=", " initialize-with=". "/>
</names>
<group suffix="."> <group suffix=".">
<text macro="publisher" prefix=" "/> <text macro="publisher" prefix=" "/>
<group prefix=", "> <group prefix=", ">
@ -145,19 +142,17 @@
</group> </group>
</else-if> </else-if>
<else> <else>
<group suffix="."> <group prefix=" " delimiter=" " suffix=".">
<text macro="title" prefix=" " quotes="true"/> <text macro="title" quotes="true"/>
<text macro="editor" prefix=" "/> <text macro="editor" />
</group> </group>
<group class="container" prefix=" " suffix="."> <group class="container" prefix=" " suffix=".">
<text variable="container-title" font-style="italic"/> <text variable="container-title" font-style="italic"/>
<group prefix=", "> <group prefix=" ">
<text variable="volume" /> <text variable="volume" />
<text variable="issue" prefix="(" suffix=")"/> <text variable="issue" prefix="(" suffix=")"/>
</group> </group>
<group prefix=":"> <text variable="page" prefix=":"/>
<text variable="page"/>
</group>
</group> </group>
</else> </else>
</choose> </choose>