Updated to be more macro oriented
This commit is contained in:
parent
28d91b1309
commit
9751b5948c
1 changed files with 41 additions and 52 deletions
|
@ -67,7 +67,7 @@
|
||||||
<text variable="title" font-style="italic"/>
|
<text variable="title" font-style="italic"/>
|
||||||
</if>
|
</if>
|
||||||
<else>
|
<else>
|
||||||
<text variable="title" quotes="true"/>
|
<text variable="title" prefix="‘" suffix="’"/>
|
||||||
</else>
|
</else>
|
||||||
</choose>
|
</choose>
|
||||||
</macro>
|
</macro>
|
||||||
|
@ -89,6 +89,14 @@
|
||||||
</else>
|
</else>
|
||||||
</choose>
|
</choose>
|
||||||
</macro>
|
</macro>
|
||||||
|
<macro name="locator">
|
||||||
|
<choose>
|
||||||
|
<if type="article-journal">
|
||||||
|
<text variable="volume" />
|
||||||
|
<text variable="issue" prefix="(" suffix=")"/>
|
||||||
|
</if>
|
||||||
|
</choose>
|
||||||
|
</macro>
|
||||||
<macro name="published-date">
|
<macro name="published-date">
|
||||||
<choose>
|
<choose>
|
||||||
<if type="article-newspaper">
|
<if type="article-newspaper">
|
||||||
|
@ -100,8 +108,12 @@
|
||||||
</choose>
|
</choose>
|
||||||
</macro>
|
</macro>
|
||||||
<macro name="pages">
|
<macro name="pages">
|
||||||
|
<choose>
|
||||||
|
<if type="chapter article-journal" match="any">
|
||||||
<label variable="page" form="short" suffix=". "/>
|
<label variable="page" form="short" suffix=". "/>
|
||||||
<text variable="page"/>
|
<text variable="page"/>
|
||||||
|
</if>
|
||||||
|
</choose>
|
||||||
</macro>
|
</macro>
|
||||||
<macro name="edition">
|
<macro name="edition">
|
||||||
<choose>
|
<choose>
|
||||||
|
@ -116,6 +128,13 @@
|
||||||
</else>
|
</else>
|
||||||
</choose>
|
</choose>
|
||||||
</macro>
|
</macro>
|
||||||
|
<macro name="container-prefix">
|
||||||
|
<choose>
|
||||||
|
<if type="chapter">
|
||||||
|
<text term="in" text-case="capitalize-first"/>
|
||||||
|
</if>
|
||||||
|
</choose>
|
||||||
|
</macro>
|
||||||
<citation>
|
<citation>
|
||||||
<option name="et-al-min" value="4"/>
|
<option name="et-al-min" value="4"/>
|
||||||
<option name="et-al-use-first" value="1"/>
|
<option name="et-al-use-first" value="1"/>
|
||||||
|
@ -146,55 +165,25 @@
|
||||||
<key macro="author"/>
|
<key macro="author"/>
|
||||||
<key variable="title"/>
|
<key variable="title"/>
|
||||||
</sort>
|
</sort>
|
||||||
<layout>
|
<layout suffix=".">
|
||||||
<group delimiter=" " suffix=" ">
|
<group delimiter=" ">
|
||||||
<text macro="author" />
|
<text macro="author" />
|
||||||
<text macro="year-date" prefix="(" suffix=")"/>
|
<text macro="year-date" prefix="(" suffix=")"/>
|
||||||
</group>
|
<text macro="title" suffix=","/>
|
||||||
<choose>
|
|
||||||
<if type="book">
|
|
||||||
<group suffix="," delimiter=" ">
|
|
||||||
<text macro="title"/>
|
|
||||||
<text macro="edition"/>
|
<text macro="edition"/>
|
||||||
|
<text macro="container-prefix"/>
|
||||||
|
<group delimiter=", ">
|
||||||
<text macro="editor" />
|
<text macro="editor" />
|
||||||
</group>
|
<text variable="container-title" font-style="italic" />
|
||||||
<group delimiter=", " prefix=" ">
|
<text variable="collection-title" />
|
||||||
<text variable="genre"/>
|
<text variable="genre"/>
|
||||||
<text prefix=" " suffix="." macro="publisher"/>
|
<text macro="publisher" />
|
||||||
</group>
|
<text macro="locator" />
|
||||||
</if>
|
|
||||||
<else-if type="chapter">
|
|
||||||
<text macro="title" prefix=" "/>
|
|
||||||
<group class="container" prefix=", ">
|
|
||||||
<text term="in" text-case="lowercase"/>
|
|
||||||
<text macro="editor" prefix=" " suffix=", "/>
|
|
||||||
<text variable="container-title" font-style="italic" prefix=" " suffix=","/>
|
|
||||||
<text variable="collection-title" prefix=" " suffix=","/>
|
|
||||||
<group suffix="." delimiter=", ">
|
|
||||||
<text macro="publisher" prefix=" "/>
|
|
||||||
<text macro="pages"/>
|
|
||||||
</group>
|
|
||||||
</group>
|
|
||||||
</else-if>
|
|
||||||
<else>
|
|
||||||
<group suffix=".">
|
|
||||||
<text macro="title" prefix=" " />
|
|
||||||
<text macro="editor" prefix=" "/>
|
|
||||||
</group>
|
|
||||||
<group class="container" prefix=" " suffix=".">
|
|
||||||
<text variable="container-title" font-style="italic"/>
|
|
||||||
<group prefix=", " delimiter=", ">
|
|
||||||
<group>
|
|
||||||
<text variable="volume" />
|
|
||||||
<text variable="issue" prefix="(" suffix=")"/>
|
|
||||||
<text macro="published-date"/>
|
<text macro="published-date"/>
|
||||||
</group>
|
|
||||||
<text macro="pages"/>
|
<text macro="pages"/>
|
||||||
|
<text macro="access" />
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
<text prefix=" " macro="access" />
|
|
||||||
</layout>
|
</layout>
|
||||||
</bibliography>
|
</bibliography>
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in a new issue