commit 64056bc63234da39ea8dbb9a4d2cf04aefb2dc37
parent c8e67e164511aefcf85e9d1f37bf9ff716658f4a
Author: Elena Razlogova <elena.razlogova@gmail.com>
Date: Fri, 1 Feb 2008 22:52:25 +0000
Updates Chicago note styles with latest macros
Diffstat:
4 files changed, 349 insertions(+), 243 deletions(-)
diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
@@ -179,7 +179,7 @@
<macro name="title-bib">
<choose>
<if variable="title" match="none">
- <text variable="genre"/>
+ <text variable="genre" text-case="capitalize-first"/>
</if>
<else-if type="book">
<text variable="title" font-style="italic"/>
@@ -288,7 +288,7 @@
<else-if type="book">
<group prefix=". " delimiter=". ">
<group>
- <text term="volume" form="short" text-case="capitalize-first" suffix=". "/>
+ <text term="volume" form="short" text-case="capitalize-first" suffix=". "/>
<number variable="volume" form="numeric"/>
</group>
<choose>
@@ -401,7 +401,7 @@
</macro>
<macro name="archive-bib">
<group delimiter=". ">
- <text variable="archive_location"/>
+ <text variable="archive_location" text-case="capitalize-first"/>
<text variable="archive"/>
<text variable="archive-place"/>
</group>
@@ -447,7 +447,7 @@
<group prefix=". " delimiter=", ">
<choose>
<if type="thesis">
- <text variable="genre"/>
+ <text variable="genre" text-case="capitalize-first"/>
</if>
</choose>
<text macro="publisher"/>
@@ -567,7 +567,7 @@
<text macro="secondary-contributor-bib"/>
</group>
<text macro="locators-bib"/>
- <text variable="collection-title" prefix=". "/>
+ <text variable="collection-title" text-case="capitalize-first" prefix=". "/>
<text macro="issue-bib"/>
<text macro="locators-newspaper" prefix=", "/>
<text macro="pages-article"/>
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
@@ -23,48 +23,62 @@
<category term="numeric"/>
<updated></updated>
</info>
- <macro name="editor-translator">
- <names variable="editor translator" delimiter=". ">
+ <macro name="translator-bib">
+ <choose>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=". ">
<label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
+ </if>
+ </choose>
</macro>
- <macro name="editor-translator-short">
+ <macro name="secondary-contributor-bib">
+ <group delimiter=". ">
+ <names variable="editor" delimiter=". ">
+ <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+ <name and="text" delimiter=", "/>
+ </names>
+ <choose>
+ <if type="article-journal article-magazine article-newspaper" match="none">
+ <text macro="translator-bib"/>
+ </if>
+ </choose>
+ </group>
+ </macro>
+ <macro name="translator-article-bib">
<choose>
- <if variable="author">
- <names variable="editor translator" delimiter=", ">
- <label form="short" prefix=" " text-case="lowercase" suffix=". "/>
- <name and="text" delimiter=", "/>
- </names>
+ <if type="article-journal article-magazine article-newspaper" match="any">
+ <text macro="translator-bib"/>
</if>
</choose>
</macro>
- <macro name="author">
+ <macro name="author-bib">
<names variable="author">
<name name-as-sort-order="first" and="text" sort-separator=", "
delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=", " suffix="."/>
+ <label form="verb-short" prefix=", " suffix="."/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
</substitute>
</names>
- </macro>
- <macro name="author-full">
+ </macro>
+ <macro name="author-short">
<names variable="author">
- <name name-as-sort-order="all" and="text" sort-separator=", "
- delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=", " suffix="."/>
+ <name form="short" and="text" delimiter=", " />
+ <label form="verb-short" prefix=", " suffix="."/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
</substitute>
</names>
</macro>
- <macro name="author-short">
+ <macro name="author-sort">
<names variable="author">
- <name form="short" and="text" delimiter=", " />
- <label form="short" prefix=", " suffix="."/>
+ <name name-as-sort-order="all" and="text" sort-separator=", "
+ delimiter=", " delimiter-precedes-last="always"/>
+ <label form="verb-short" prefix=", " suffix="."/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -77,63 +91,144 @@
<name and="text" delimiter=", "/>
</names>
</macro>
+ <macro name="recipient-bib">
+ <choose>
+ <if type="personal_communication">
+ <choose>
+ <if variable="genre">
+ <text variable="genre" text-case="capitalize-first"/>
+ </if>
+ <else>
+ <text term="letter" text-case="capitalize-first"/>
+ </else>
+ </choose>
+ </if>
+ </choose>
+ <text macro="recipient" prefix=" "/>
+ </macro>
<macro name="recipient-short">
<names variable="recipient">
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
<name form="short" and="text" delimiter=", " />
</names>
</macro>
- <macro name="interviewer">
+ <macro name="interviewer-bib">
<names variable="interviewer" delimiter=", ">
<label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
</macro>
- <macro name="access">
- <group>
- <text variable="URL"/>
- <group prefix=" (" suffix=")" delimiter=" ">
- <text term="accessed" text-case="lowercase" suffix=" "/>
- <date variable="accessed" suffix=", ">
- <date-part name="month" suffix=" "/>
- <date-part name="day" suffix=", "/>
- <date-part name="year"/>
- </date>
- </group>
- </group>
- </macro>
- <macro name="title">
+ <macro name="title-bib">
<choose>
- <if type="book">
- <text variable="title" font-style="italic"/>
+ <if variable="title" match="none">
+ <text variable="genre" text-case="capitalize-first"/>
</if>
+ <else-if type="book">
+ <text variable="title" font-style="italic"/>
+ </else-if>
<else>
- <text variable="title" quotes="true"/>
+ <text variable="title" quotes="true"/>
</else>
</choose>
</macro>
<macro name="title-short">
<choose>
- <if type="book">
- <text variable="title" form="short" font-style="italic"/>
+ <if variable="title" match="none">
+ <choose>
+ <if type="interview">
+ <text term="interview" text-case="lowercase"/>
+ </if>
+ <else-if type="manuscript paper-conference" match="any">
+ <text variable="genre" form="short"/>
+ </else-if>
+ <else-if type="personal_communication">
+ <text macro="issued"/>
+ </else-if>
+ </choose>
</if>
+ <else-if type="book">
+ <text variable="title" form="short" font-style="italic"/>
+ </else-if>
<else>
- <text variable="title" form="short" quotes="true"/>
+ <text variable="title" form="short" quotes="true"/>
</else>
</choose>
</macro>
+ <macro name="description-bib">
+ <group delimiter=", ">
+ <group delimiter=". ">
+ <text macro="interviewer-bib"/>
+ <text variable="medium" text-case="capitalize-first"/>
+ </group>
+ <choose>
+ <if variable="title" match="none"> </if>
+ <else-if type="thesis paper-conference" match="any"> </else-if>
+ <else>
+ <text variable="genre" text-case="capitalize-first"/>
+ </else>
+ </choose>
+ </group>
+ </macro>
+ <macro name="container-prefix-bib">
+ <choose>
+ <if type="chapter">
+ <text term="in" text-case="capitalize-first" suffix=" "/>
+ </if>
+ </choose>
+ </macro>
+ <macro name="locators-bib">
+ <choose>
+ <if type="article-journal">
+ <text variable="volume" prefix=" "/>
+ <text variable="issue" prefix=", no. "/>
+ </if>
+ <else-if type="book">
+ <group prefix=". " delimiter=". ">
+ <group>
+ <text term="volume" form="short" text-case="capitalize-first" suffix=". "/>
+ <number variable="volume" form="numeric"/>
+ </group>
+ <choose>
+ <if variable="locator" match="none">
+ <group>
+ <number variable="number-of-volumes" form="numeric"/>
+ <text term="volume" form="short" prefix=" " suffix="." plural="true"/>
+ </group>
+ </if>
+ </choose>
+ <text variable="edition"/>
+ </group>
+ </else-if>
+ </choose>
+ </macro>
+ <macro name="locators-newspaper">
+ <choose>
+ <if type="article-newspaper">
+ <group delimiter=", ">
+ <group>
+ <text variable="edition" suffix=" "/>
+ <text term="edition" prefix=" "/>
+ </group>
+ <group>
+ <text term="section" form="short" suffix=". "/>
+ <text variable="section"/>
+ </group>
+ </group>
+ </if>
+ </choose>
+ </macro>
+ <macro name="event">
+ <group>
+ <text term="presented at" suffix=" "/>
+ <text variable="event"/>
+ </group>
+ </macro>
<macro name="publisher">
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
</group>
</macro>
- <macro name="archive">
- <group delimiter=", ">
- <text variable="archive"/>
- <text variable="archive-place"/>
- </group>
- </macro>
<macro name="issued">
<choose>
<if type="graphic report" match="any">
@@ -157,8 +252,70 @@
</else>
</choose>
</macro>
+ <macro name="pages-chapter">
+ <choose>
+ <if type="chapter">
+ <text variable="page" prefix=", "/>
+ </if>
+ </choose>
+ </macro>
+ <macro name="pages-article">
+ <choose>
+ <if type="article-journal">
+ <text variable="page" prefix=": "/>
+ </if>
+ </choose>
+ </macro>
+ <macro name="archive-bib">
+ <group delimiter=". ">
+ <text variable="archive_location" text-case="capitalize-first"/>
+ <text variable="archive"/>
+ <text variable="archive-place"/>
+ </group>
+ </macro>
+ <macro name="issue-bib">
+ <choose>
+ <if type="article-journal">
+ <text macro="issued" prefix=" (" suffix=")"/>
+ </if>
+ <else-if variable="publisher-place publisher" match="any">
+ <choose>
+ <if variable="title" match="none"> </if>
+ <else-if type="paper-conference">
+ <text variable="genre" text-case="capitalize-first" prefix=". "/>
+ </else-if>
+ </choose>
+ <text macro="event" prefix=" "/>
+ <group prefix=". " delimiter=", ">
+ <choose>
+ <if type="thesis">
+ <text variable="genre" text-case="capitalize-first"/>
+ </if>
+ </choose>
+ <text macro="publisher"/>
+ <text macro="issued"/>
+ </group>
+ </else-if>
+ <else>
+ <text macro="issued" prefix=", "/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="access-bib">
+ <group delimiter=". ">
+ <choose>
+ <if type="graphic report" match="any">
+ <text macro="archive-bib"/>
+ </if>
+ <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+ <text macro="archive-bib"/>
+ </else-if>
+ </choose>
+ <text variable="URL"/>
+ </group>
+ </macro>
<macro name="sort-key">
- <text macro="author-full" suffix=" "/>
+ <text macro="author-sort" suffix=" "/>
<text variable="title" suffix=" "/>
<text variable="genre"/>
</macro>
@@ -171,22 +328,27 @@
<option name="disambiguate-add-names" value="true"/>
<option name="disambiguate-add-givenname" value="true"/>
<layout prefix="" suffix="." delimiter="; ">
- <group delimiter=", ">
- <group>
- <text macro="author-short"/>
- <text macro="recipient-short"/>
- </group>
- <text macro="title-short"/>
- <choose>
- <if type="interview">
- <text term="interview" text-case="lowercase"/>
- </if>
- <else-if variable="recipient">
- <text macro="issued"/>
- </else-if>
- </choose>
- <text variable="locator"/>
- </group>
+ <choose>
+ <if position="ibid-with-locator">
+ <group delimiter=", ">
+ <text term="ibid" text-case="capitalize-first" suffix="."/>
+ <text variable="locator"/>
+ </group>
+ </if>
+ <else-if position="ibid">
+ <text term="ibid" text-case="capitalize-first" suffix="."/>
+ </else-if>
+ <else>
+ <group delimiter=", ">
+ <group>
+ <text macro="author-short"/>
+ <text macro="recipient-short"/>
+ </group>
+ <text macro="title-short"/>
+ <text variable="locator"/>
+ </group>
+ </else>
+ </choose>
</layout>
</citation>
<bibliography>
@@ -199,118 +361,24 @@
</sort>
<layout suffix=".">
<group delimiter=". ">
- <text macro="author"/>
- <text macro="title"/>
- <choose>
- <if type="thesis">
- <group delimiter=", ">
- <text variable="genre"/>
- <text variable="publisher"/>
- <text macro="issued"/>
- </group>
- </if>
- <else-if type="chapter">
- <group class="container">
- <text term="in" text-case="capitalize-first"/>
- <text variable="container-title" font-style="italic" prefix=" "/>
- <text variable="collection-title" prefix=". "/>
- <text macro="editor-translator" prefix=". "/>
- <text variable="page" prefix=", "/>
- <text macro="publisher" prefix=". "/>
- <text macro="issued" prefix=", "/>
- </group>
- </else-if>
- <else-if type="article-journal">
- <text macro="editor-translator" suffix=". "/>
- <group class="container">
- <text variable="container-title" font-style="italic"/>
- <text variable="volume" prefix=" "/>
- <text variable="issue" prefix=", no. "/>
- <text macro="issued" prefix=" (" suffix=")"/>
- <text variable="page" prefix=": "/>
- </group>
- </else-if>
- <else-if type="article-newspaper article-magazine" match="any">
- <text macro="editor-translator" suffix=". "/>
- <group delimiter=", ">
- <text variable="container-title" font-style="italic"/>
- <text macro="issued"/>
- </group>
- </else-if>
- <else-if type="paper-conference">
- <text macro="editor-translator" suffix=". "/>
- <text variable="genre" text-case="capitalize-first" suffix=" presented at the "/>
- <text variable="event" suffix=", "/>
- <text variable="event-place" suffix=", "/>
- <text macro="issued"/>
- </else-if>
- <else-if type="interview">
- <group delimiter=". " suffix=".">
- <text macro="interviewer"/>
- <text variable="medium" text-case="capitalize-first"/>
- <text macro="issued"/>
- </group>
- </else-if>
- <else-if type="personal_communication">
- <choose>
- <if variable="genre">
- <text variable="genre" text-case="capitalize-first"/>
- </if>
- <else>
- <text term="letter" text-case="capitalize-first"/>
- </else>
- </choose>
- <text macro="recipient" prefix=" "/>
- <text macro="issued" prefix=". "/>
- </else-if>
- <else-if type="graphic">
- <text variable="medium" text-case="capitalize-first" suffix=". "/>
- <text macro="publisher" suffix=", "/>
- <text macro="issued"/>
- </else-if>
- <else-if type="report">
- <text macro="editor-translator" suffix=". "/>
- <text variable="genre" suffix=". "/>
- <text macro="publisher" suffix=", "/>
- <text macro="issued"/>
- </else-if>
- <else-if type="book">
- <text macro="editor-translator" suffix=". "/>
- <text variable="collection-title" suffix=". "/>
- <text macro="publisher" suffix=", "/>
- <text macro="issued"/>
- </else-if>
- <else>
- <group class="container" delimiter=". ">
- <text macro="editor-translator"/>
- <text variable="container-title" font-style="italic"/>
- <text variable="collection-title" font-style="italic"/>
- <text variable="genre" text-case="capitalize-first"/>
- <text variable="medium" text-case="capitalize-first"/>
- <text macro="issued"/>
- </group>
- </else>
- </choose>
- <choose>
- <if type="graphic report" match="any">
- <group prefix=", " delimiter=", ">
- <text variable="archive_location"/>
- <text macro="archive"/>
- </group>
- </if>
- <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
- <group prefix=", " delimiter=", ">
- <text variable="archive_location"/>
- <text macro="archive"/>
- </group>
- </else-if>
- </choose>
- <choose>
- <if variable="page" match="none">
- <text variable="URL"/>
- </if>
- </choose>
+ <text macro="author-bib"/>
+ <text macro="recipient-bib"/>
+ <text macro="title-bib"/>
+ <text macro="description-bib"/>
+ <text macro="translator-article-bib"/>
+ <group>
+ <text macro="container-prefix-bib"/>
+ <text variable="container-title" font-style="italic"/>
+ <text macro="pages-chapter"/>
+ </group>
+ <text macro="secondary-contributor-bib"/>
</group>
+ <text macro="locators-bib"/>
+ <text variable="collection-title" text-case="capitalize-first" prefix=". "/>
+ <text macro="issue-bib"/>
+ <text macro="locators-newspaper" prefix=", "/>
+ <text macro="pages-article"/>
+ <text macro="access-bib" prefix=". "/>
</layout>
</bibliography>
</style>
diff --git a/csl/chicago-note-no-ibid.csl b/csl/chicago-note-no-ibid.csl
@@ -2,9 +2,9 @@
<?oxygen RNGSchema="http://xbiblio.svn.sourceforge.net/viewvc/*checkout*/xbiblio/csl/schema/trunk/csl.rnc" type="compact"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
<info>
- <title>Chicago Manual of Style (Note without Bibliography, no Ibid.)</title>
- <id>http://www.zotero.org/styles/chicago-note-no-ibid</id>
- <link href="http://www.zotero.org/styles/chicago-note-no-ibid"/>
+ <title>Chicago Manual of Style (Note without Bibliography)</title>
+ <id>http://www.zotero.org/styles/chicago-note</id>
+ <link href="http://www.zotero.org/styles/chicago-note"/>
<link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
<author>
<name>Julian Onions</name>
@@ -18,11 +18,21 @@
<name>Elena Razlogova</name>
<email>elena.razlogova@gmail.com</email>
</contributor>
- <summary>Chicago format with full notes, no bibliography, and no ibid.</summary>
+ <summary>Chicago format with full notes and no bibliography</summary>
<category term="generic-base"/>
<category term="note"/>
<updated/>
</info>
+ <macro name="translator">
+ <choose>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=", ">
+ <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
+ <name and="text" delimiter=", "/>
+ </names>
+ </if>
+ </choose>
+ </macro>
<macro name="secondary-contributor">
<group delimiter=", ">
<names variable="editor" delimiter=", ">
@@ -30,15 +40,19 @@
<name and="text" delimiter=", "/>
</names>
<choose>
- <if variable="author editor" match="any">
- <names variable="translator" delimiter=", ">
- <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
- <name and="text" delimiter=", "/>
- </names>
+ <if type="article-journal article-magazine article-newspaper" match="none">
+ <text macro="translator"/>
</if>
</choose>
</group>
</macro>
+ <macro name="translator-article">
+ <choose>
+ <if type="article-journal article-magazine article-newspaper" match="any">
+ <text macro="translator"/>
+ </if>
+ </choose>
+ </macro>
<macro name="author">
<names variable="author">
<name and="text" sort-separator=", " delimiter=", "/>
@@ -127,7 +141,11 @@
</group>
</macro>
<macro name="container-prefix">
+ <choose>
+ <if type="chapter">
<text term="in" text-case="lowercase" suffix=" "/>
+ </if>
+ </choose>
</macro>
<macro name="locators">
<choose>
@@ -154,6 +172,22 @@
</else-if>
</choose>
</macro>
+ <macro name="locators-newspaper">
+ <choose>
+ <if type="article-newspaper">
+ <group delimiter=", ">
+ <group>
+ <text variable="edition" suffix=" "/>
+ <text term="edition" prefix=" "/>
+ </group>
+ <group>
+ <text term="section" form="short" suffix=". "/>
+ <text variable="section"/>
+ </group>
+ </group>
+ </if>
+ </choose>
+ </macro>
<macro name="event">
<group>
<text term="presented at" suffix=" "/>
@@ -189,53 +223,20 @@
</else>
</choose>
</macro>
- <macro name="issue">
+ <macro name="pages">
<choose>
<if type="article-journal">
- <text macro="issued" prefix=" (" suffix=")"/>
+ <text variable="page" prefix=": "/>
</if>
- <else-if variable="publisher-place publisher" match="any">
- <group prefix=" (" suffix=")" delimiter=", ">
- <group delimiter=" ">
- <choose>
- <if variable="title" match="none"> </if>
- <else-if type="thesis paper-conference" match="any">
- <text variable="genre"/>
- </else-if>
- </choose>
- <text macro="event"/>
- </group>
- <text macro="publisher"/>
- <text macro="issued"/>
- </group>
+ <else-if type="chapter">
+ <text variable="page" prefix=", "/>
</else-if>
- <else>
- <text macro="issued" prefix=", "/>
- </else>
</choose>
</macro>
<macro name="locator">
<choose>
- <if type="article-newspaper">
- <group delimiter=", ">
- <group>
- <text variable="edition" suffix=" "/>
- <text term="edition" prefix=" "/>
- </group>
- <group>
- <text term="section" form="short" suffix=". "/>
- <text variable="section"/>
- </group>
- </group>
- </if>
- </choose>
- <choose>
<if variable="locator" match="none">
- <choose>
- <if type="article-journal article-magazine chapter" match="any">
- <text variable="page" prefix=", "/>
- </if>
- </choose>
+ <text macro="pages"/>
</if>
<else-if type="article-journal">
<text variable="locator" prefix=": "/>
@@ -252,6 +253,31 @@
<text variable="archive-place"/>
</group>
</macro>
+ <macro name="issue">
+ <choose>
+ <if type="article-journal">
+ <text macro="issued" prefix=" (" suffix=")"/>
+ </if>
+ <else-if variable="publisher-place publisher" match="any">
+ <group prefix=" (" suffix=")" delimiter=", ">
+ <group delimiter=" ">
+ <choose>
+ <if variable="title" match="none"> </if>
+ <else-if type="thesis paper-conference" match="any">
+ <text variable="genre"/>
+ </else-if>
+ </choose>
+ <text macro="event"/>
+ </group>
+ <text macro="publisher"/>
+ <text macro="issued"/>
+ </group>
+ </else-if>
+ <else>
+ <text macro="issued" prefix=", "/>
+ </else>
+ </choose>
+ </macro>
<macro name="access">
<group delimiter=", ">
<choose>
@@ -293,6 +319,7 @@
</group>
<text macro="title"/>
<text macro="description"/>
+ <text macro="translator-article"/>
<group>
<text macro="container-prefix"/>
<text variable="container-title" font-style="italic"/>
@@ -302,10 +329,11 @@
<text macro="locators"/>
<text variable="collection-title" prefix=", "/>
<text macro="issue"/>
+ <text macro="locators-newspaper" prefix=", "/>
<text macro="locator"/>
<text macro="access" prefix=", "/>
</else>
</choose>
</layout>
</citation>
-</style>
+</style>
+\ No newline at end of file
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
@@ -172,6 +172,22 @@
</else-if>
</choose>
</macro>
+ <macro name="locators-newspaper">
+ <choose>
+ <if type="article-newspaper">
+ <group delimiter=", ">
+ <group>
+ <text variable="edition" suffix=" "/>
+ <text term="edition" prefix=" "/>
+ </group>
+ <group>
+ <text term="section" form="short" suffix=". "/>
+ <text variable="section"/>
+ </group>
+ </group>
+ </if>
+ </choose>
+ </macro>
<macro name="event">
<group>
<text term="presented at" suffix=" "/>
@@ -207,28 +223,20 @@
</else>
</choose>
</macro>
- <macro name="locator">
+ <macro name="pages">
<choose>
- <if type="article-newspaper">
- <group delimiter=", ">
- <group>
- <text variable="edition" suffix=" "/>
- <text term="edition" prefix=" "/>
- </group>
- <group>
- <text term="section" form="short" suffix=". "/>
- <text variable="section"/>
- </group>
- </group>
+ <if type="article-journal">
+ <text variable="page" prefix=": "/>
</if>
+ <else-if type="chapter">
+ <text variable="page" prefix=", "/>
+ </else-if>
</choose>
+ </macro>
+ <macro name="locator">
<choose>
<if variable="locator" match="none">
- <choose>
- <if type="article-journal article-magazine chapter" match="any">
- <text variable="page" prefix=", "/>
- </if>
- </choose>
+ <text macro="pages"/>
</if>
<else-if type="article-journal">
<text variable="locator" prefix=": "/>
@@ -330,6 +338,7 @@
<text macro="locators"/>
<text variable="collection-title" prefix=", "/>
<text macro="issue"/>
+ <text macro="locators-newspaper" prefix=", "/>
<text macro="locator"/>
<text macro="access" prefix=", "/>
</else>
