Adds volumes, edition, section support to chicago full note w/ bibliography

This commit is contained in:
Elena Razlogova 2008-01-28 22:29:22 +00:00
parent cb6a8253fd
commit 60e4c87c41

View File

@ -21,25 +21,63 @@
<category term="numeric"/>
<updated></updated>
</info>
<macro name="editor-translator">
<names variable="editor translator" delimiter=", ">
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
<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="editor-translator-bib">
<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">
<group delimiter=", ">
<names variable="editor" delimiter=", ">
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
<name and="text" delimiter=", "/>
</names>
<choose>
<if type="article-journal article-magazine article-newspaper" match="none">
<text macro="translator"/>
</if>
</choose>
</group>
</macro>
<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">
<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"/>
</if>
</choose>
</macro>
<macro name="translator-article-bib">
<choose>
<if type="article-journal article-magazine article-newspaper" match="any">
<text macro="translator-bib"/>
</if>
</choose>
</macro>
@ -47,7 +85,7 @@
<names variable="author">
<name and="text" sort-separator=", "
delimiter=", "/>
<label form="short" prefix=", " suffix="."/>
<label form="verb-short" prefix=", " suffix="."/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@ -58,18 +96,7 @@
<names variable="author">
<name name-as-sort-order="first" and="text" sort-separator=", "
delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=", " suffix="."/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
</substitute>
</names>
</macro>
<macro name="author-full">
<names variable="author">
<name name-as-sort-order="all" 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"/>
@ -79,7 +106,18 @@
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter=", " />
<label form="short" prefix=", " suffix="."/>
<label form="verb-short" prefix=", " suffix="."/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
</substitute>
</names>
</macro>
<macro name="author-sort">
<names variable="author">
<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"/>
@ -92,6 +130,21 @@
<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=" "/>
@ -110,55 +163,173 @@
<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">
<choose>
<if type="book">
<text variable="title" font-style="italic"/>
<if variable="title" match="none">
<text variable="genre"/>
</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-bib">
<choose>
<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"/>
</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="event">
<text variable="event"/>
<text variable="event-place" prefix=", "/>
</macro>
<macro name="description">
<group delimiter=", ">
<text macro="interviewer"/>
<text variable="medium"/>
<choose>
<if variable="title" match="none"> </if>
<else-if type="thesis paper-conference" match="any"> </else-if>
<else>
<text variable="genre"/>
</else>
</choose>
</group>
</macro>
<macro name="description-bib">
<group prefix=". " delimiter=", ">
<text macro="interviewer-bib"/>
<text variable="medium" text-case="capitalize-first"/>
<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">
<choose>
<if type="chapter">
<text term="in" text-case="lowercase" suffix=" "/>
</if>
</choose>
</macro>
<macro name="container-prefix-bib">
<choose>
<if type="chapter">
<text term="in" text-case="capitalize-first" suffix=" "/>
</if>
</choose>
</macro>
<macro name="locators">
<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" 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-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">
@ -182,8 +353,132 @@
</else>
</choose>
</macro>
<macro name="locator">
<choose>
<if variable="locator" match="none">
<text macro="pages" prefix=", "/>
</if>
<else-if type="article-journal">
<text variable="locator" prefix=": "/>
</else-if>
<else>
<text variable="locator" prefix=", "/>
</else>
</choose>
</macro>
<macro name="pages">
<choose>
<if type="article-journal article-magazine chapter" match="any">
<text variable="page"/>
</if>
</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 article-magazine" match="any">
<text variable="page" prefix=", "/>
</if>
</choose>
</macro>
<macro name="archive">
<group delimiter=", ">
<text variable="archive_location"/>
<text variable="archive"/>
<text variable="archive-place"/>
</group>
</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">
<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="issue-bib">
<choose>
<if type="article-journal">
<text macro="issued" prefix=" (" suffix=")"/>
</if>
<else-if variable="publisher-place publisher" match="any">
<group delimiter=" ">
<choose>
<if variable="title" match="none"> </if>
<else-if type="thesis paper-conference" match="any">
<text variable="genre" text-case="capitalize-first" prefix=". "/>
</else-if>
</choose>
<text macro="event" prefix=" "/>
</group>
<group prefix=". " delimiter=", ">
<text macro="publisher"/>
<text macro="issued"/>
</group>
</else-if>
<else>
<text macro="issued" prefix=", "/>
</else>
</choose>
</macro>
<macro name="access">
<group delimiter=", ">
<choose>
<if type="graphic report" match="any">
<text macro="archive"/>
</if>
<else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
<text macro="archive"/>
</else-if>
</choose>
<text variable="URL"/>
</group>
</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>
@ -197,166 +492,47 @@
<option name="disambiguate-add-givenname" value="true"/>
<layout prefix="" suffix="." delimiter="; ">
<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-if position="subsequent">
<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>
</else-if>
<else>
<group delimiter=", ">
<group>
<text macro="author"/>
<text macro="recipient"/>
</group>
<text macro="title"/>
</group>
<choose>
<if type="thesis">
<group prefix=" (" delimiter=", " suffix=")">
<text variable="genre"/>
<text variable="publisher"/>
<text macro="issued"/>
</group>
</if>
<else-if type="chapter">
<group delimiter=", ">
<group class="container" prefix=", " delimiter=" ">
<text term="in" text-case="lowercase"/>
<text variable="container-title" font-style="italic"/>
</group>
<text macro="editor-translator"/>
</group>
<group prefix=" (" suffix=")" delimiter=", ">
<text macro="publisher"/>
<text macro="issued"/>
</group>
</else-if>
<else-if type="article-journal">
<group class="container" prefix=", ">
<text variable="container-title" font-style="italic" prefix=" "/>
<text macro="publisher"/>
<text variable="volume" prefix=" "/>
<text variable="issue" prefix=", no. "/>
<text macro="issued" prefix=" (" suffix=")"/>
</group>
</else-if>
<else-if type="article-newspaper article-magazine" match="any">
<group prefix=", " delimiter=", ">
<text macro="editor-translator"/>
<text variable="container-title" font-style="italic"/>
<text macro="issued"/>
</group>
</else-if>
<else-if type="paper-conference">
<text macro="editor-translator" prefix=", "/>
<text variable="genre" prefix=", " suffix=" presented at the "/>
<text macro="event" suffix=", "/>
<text macro="issued"/>
</else-if>
<else-if type="interview">
<group prefix=", " delimiter=", ">
<text macro="interviewer"/>
<text variable="medium"/>
<text macro="issued"/>
</group>
</else-if>
<else-if type="personal_communication">
<group prefix=", " delimiter=", ">
<text variable="genre"/>
<text macro="issued"/>
</group>
</else-if>
<else-if type="graphic">
<group prefix=", " delimiter=", ">
<text variable="medium"/>
<text macro="publisher"/>
<text macro="issued"/>
</group>
</else-if>
<else-if type="report">
<text macro="editor-translator" prefix=", "/>
<text variable="genre" prefix=", "/>
<choose>
<if variable="publisher-place publisher" match="any">
<group prefix=" (" suffix=")" delimiter=", ">
<text macro="publisher"/>
<text macro="issued"/>
</group>
</if>
<else>
<text macro="issued" prefix=", "/>
</else>
</choose>
</else-if>
<else-if type="book">
<text macro="editor-translator" prefix=", "/>
<text variable="collection-title" prefix=", "/>
<group prefix=" (" suffix=")" delimiter=", ">
<text macro="publisher"/>
<text macro="issued"/>
</group>
</else-if>
<else>
<group class="container" prefix=", " delimiter=", ">
<text macro="editor-translator"/>
<text variable="container-title" font-style="italic"/>
<text variable="collection-title" font-style="italic"/>
<text variable="genre"/>
<text variable="medium"/>
<text macro="issued"/>
</group>
</else>
</choose>
<choose>
<if type="article-journal">
<text variable="locator" prefix=": "/>
</if>
<else>
<text variable="locator" prefix=", "/>
</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" prefix=", "/>
</if>
</choose>
</else>
<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-if position="subsequent">
<group delimiter=", ">
<group>
<text macro="author-short"/>
<text macro="recipient-short"/>
</group>
<text macro="title-short"/>
<text variable="locator"/>
</group>
</else-if>
<else>
<group delimiter=", ">
<group>
<text macro="author"/>
<text macro="recipient"/>
</group>
<text macro="title"/>
<text macro="description"/>
<text macro="translator-article"/>
<group>
<text macro="container-prefix"/>
<text variable="container-title" font-style="italic"/>
</group>
<text macro="secondary-contributor"/>
</group>
<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>
@ -370,122 +546,26 @@
</sort>
<layout suffix=".">
<group delimiter=". ">
<text macro="author-bib"/>
<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">
<group delimiter=". ">
<group delimiter=" ">
<text term="in" text-case="capitalize-first"/>
<text variable="container-title" font-style="italic" />
</group>
<text variable="collection-title"/>
<text macro="editor-translator-bib" />
</group>
<text variable="page" prefix=", "/>
<text macro="publisher" prefix=". "/>
<text macro="issued" prefix=", "/>
</group>
</else-if>
<else-if type="article-journal">
<text macro="editor-translator-bib" 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-bib" 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-bib" 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-bib"/>
<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-bib" suffix=". "/>
<text variable="genre" suffix=". "/>
<text macro="publisher" suffix=", "/>
<text macro="issued"/>
</else-if>
<else-if type="book">
<text macro="editor-translator-bib" suffix=". "/>
<text variable="collection-title" suffix=". "/>
<text macro="publisher" suffix=", "/>
<text macro="issued"/>
</else-if>
<else>
<group class="container" delimiter=". ">
<text macro="editor-translator-bib"/>
<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 delimiter=". ">
<text variable="archive_location" text-case="title"/>
<text macro="archive"/>
</group>
</if>
<else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
<group delimiter=". ">
<text variable="archive_location" text-case="title"/>
<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"/>
<group>
<text macro="title-bib"/>
<text macro="description-bib"/>
</group>
<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" prefix=". "/>
<text macro="issue-bib"/>
<text macro="locators-newspaper" prefix=", "/>
<text macro="pages-article"/>
<text macro="access-bib" prefix=". "/>
</layout>
</bibliography>
</style>