Updated with a number of fixes thanks to drrayl

This commit is contained in:
Julian Onions 2007-11-28 08:59:41 +00:00
parent 91b843a1ad
commit 465c023103

View file

@ -23,6 +23,20 @@
</substitute> </substitute>
</names> </names>
</macro> </macro>
<macro name="container-editor">
<group delimiter=" ">
<text term="in" suffix=" "/>
<names variable="editor">
<name and="text" delimiter=", " />
<label form="short" prefix=" (" suffix=".)"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<text macro="title"/>
</substitute>
</names>
</group>
</macro>
<macro name="title"> <macro name="title">
<choose> <choose>
<if type="thesis"> <if type="thesis">
@ -38,8 +52,8 @@
</macro> </macro>
<macro name="publisher"> <macro name="publisher">
<group delimiter=": "> <group delimiter=": ">
<text variable="publisher"/> <text variable="publisher"/>
<text variable="publisher-place"/> <text variable="publisher-place"/>
</group> </group>
</macro> </macro>
<macro name="date"> <macro name="date">
@ -59,6 +73,7 @@
<text variable="page"/> <text variable="page"/>
</macro> </macro>
<macro name="pageref"> <macro name="pageref">
<label variable="locator" suffix=". " form="short"/>
<text variable="locator"/> <text variable="locator"/>
</macro> </macro>
<macro name="volref"> <macro name="volref">
@ -68,7 +83,14 @@
</group> </group>
</macro> </macro>
<macro name="container"> <macro name="container">
<text variable="container-title" font-style="italic"/> <choose>
<if type="chapter">
<text variable="container-title" font-style="italic"/>
</if>
<else>
<text variable="container-title" font-style="italic"/>
</else>
</choose>
</macro> </macro>
<citation> <citation>
<layout suffix="." delimiter="; "> <layout suffix="." delimiter="; ">
@ -77,29 +99,41 @@
<choose> <choose>
<if type="book"> <if type="book">
<group delimiter=", "> <group delimiter=", ">
<text macro="title" /> <text macro="title" />
<text macro="volumes"/> <text macro="volumes"/>
</group>
<group prefix=" (" suffix=")" delimiter=", ">
<text macro="publisher"/>
<text macro="container"/>
<text macro="volref"/>
<text macro="date"/>
<text macro="pageno"/>
<text macro="pageref"/>
</group> </group>
<group prefix=" (" suffix=")" delimiter=", ">
<text macro="publisher"/>
<text macro="container"/>
<text macro="volref"/>
<text macro="date"/>
</group>
<text macro="pageref" prefix=". "/>
</if> </if>
<else> <else-if type="chapter">
<group delimiter=", "> <group delimiter=", ">
<text macro="title" /> <text macro="title" />
<text macro="container-editor"/>
<text macro="container"/>
<text macro="volref"/>
<text macro="volumes"/>
<group prefix=" (" suffix=")" delimiter=", ">
<text macro="publisher"/> <text macro="publisher"/>
<text macro="container"/>
<text macro="volref"/>
<text macro="date"/> <text macro="date"/>
<text macro="volumes"/> </group>
<text macro="pageno"/> </group>
<text macro="pageref"/> <text macro="pageref" prefix=", "/>
</group> </else-if>
<else>
<group delimiter=", ">
<text macro="title" />
<text macro="publisher"/>
<text macro="container"/>
<text macro="volref"/>
<text macro="date"/>
<text macro="volumes"/>
<text macro="pageref"/>
</group>
</else> </else>
</choose> </choose>
</group> </group>