Use the newly defined terms in place of literal text.

This commit is contained in:
Julian Onions 2007-12-05 15:48:52 +00:00
parent 7863cccbe0
commit a9fff072a5
7 changed files with 12 additions and 10 deletions

View file

@ -60,7 +60,7 @@
</macro> </macro>
<macro name="access"> <macro name="access">
<group> <group>
<text value="[online]" suffix=" "/> <text term="online" prefix="[" suffix="] "/>
<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=" "/>

View file

@ -67,8 +67,9 @@
<date-part name="month" prefix=" "/> <date-part name="month" prefix=" "/>
<date-part name="day" prefix=" "/> <date-part name="day" prefix=" "/>
</date> </date>
<group prefix=" [cited " suffix="]"> <group prefix=" [" suffix="]" delimiter=" ">
<date variable="accessed" delimiter=" "> <text term="cited"/>
<date variable="accessed" >
<date-part name="year"/> <date-part name="year"/>
<date-part name="month" prefix=" "/> <date-part name="month" prefix=" "/>
<date-part name="day" prefix=" "/> <date-part name="day" prefix=" "/>
@ -83,7 +84,7 @@
<text variable="container-title"/> <text variable="container-title"/>
<choose> <choose>
<if variable="URL"> <if variable="URL">
<text value=" [Internet]"/> <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
</if> </if>
</choose> </choose>
</macro> </macro>

View file

@ -53,7 +53,7 @@
<macro name="access"> <macro name="access">
<group delimiter=" "> <group delimiter=" ">
<group prefix=" [" suffix="]."> <group prefix=" [" suffix="].">
<text value="cited" text-case="lowercase" suffix=" "/> <text term="cited" text-case="lowercase" suffix=" "/>
<date variable="accessed"> <date variable="accessed">
<date-part name="day" suffix=" "/> <date-part name="day" suffix=" "/>
<date-part name="month" form="long" suffix=" "/> <date-part name="month" form="long" suffix=" "/>

View file

@ -50,7 +50,7 @@
</macro> </macro>
<macro name="access"> <macro name="access">
<group> <group>
<text value="[online]" suffix=" "/> <text term="online" prefix="[" suffix="] "/>
<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=" "/>

View file

@ -33,7 +33,7 @@
<macro name="access"> <macro name="access">
<group delimiter=" "> <group delimiter=" ">
<group prefix="[" suffix="]" delimiter=" "> <group prefix="[" suffix="]" delimiter=" ">
<text value="cited" text-case="lowercase"/> <text term="cited" text-case="lowercase"/>
<date variable="accessed" suffix=" "> <date variable="accessed" suffix=" ">
<date-part name="year"/> <date-part name="year"/>
<date-part name="month" prefix=" " form="short"/> <date-part name="month" prefix=" " form="short"/>
@ -51,7 +51,7 @@
<text variable="title"/> <text variable="title"/>
<choose> <choose>
<if variable="URL"> <if variable="URL">
<text value="[Internet]"/> <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
</if> </if>
</choose> </choose>
</group> </group>

View file

@ -46,7 +46,8 @@
<macro name="access"> <macro name="access">
<choose> <choose>
<if variable="URL"> <if variable="URL">
<text value="[online] Available from: " /> <text term="online" prefix="[" suffix="]"/>
<text value=" Available from: " />
<text variable="URL"/> <text variable="URL"/>
<group prefix=" (" delimiter=" " suffix=")"> <group prefix=" (" delimiter=" " suffix=")">
<text term="accessed" text-case="capitalize-first"/> <text term="accessed" text-case="capitalize-first"/>

View file

@ -50,7 +50,7 @@
</macro> </macro>
<macro name="access"> <macro name="access">
<group> <group>
<text value="[online]" suffix=" "/> <text term="online" suffix="] " prefix="["/>
<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=" "/>