Permalink
Browse files

update handling of journal articles with no volume in all CMoS styles

  • Loading branch information...
1 parent 06fdbac commit dfd7a5ea072dd5aa5e9ce2ec6830ca6e44921012 @adam3smith adam3smith committed Mar 2, 2014
@@ -239,6 +239,9 @@
<else-if type="legal_case interview" match="any">
<text variable="title"/>
</else-if>
+ <else-if variable="reviewed-author">
+ <text variable="title" font-style="italic" prefix="review of "/>
+ </else-if>
<else>
<text variable="title" text-case="title" quotes="true"/>
</else>
@@ -260,6 +263,15 @@
<text variable="version"/>
</group>
</else-if>
+ <else-if variable="reviewed-author">
+ <group delimiter=", ">
+ <text variable="title" font-style="italic" prefix="Review of "/>
+ <names variable="reviewed-author">
+ <label form="verb-short" text-case="lowercase" suffix=" "/>
+ <name and="text" delimiter=", "/>
+ </names>
+ </group>
+ </else-if>
<else-if type="legal_case interview" match="any">
<text variable="title"/>
</else-if>
@@ -399,7 +411,7 @@
</macro>
<macro name="locators-note-join-with-space">
<choose>
- <if type="article-journal">
+ <if type="article-journal" variable="volume" match="all">
<text macro="locators-note"/>
</if>
</choose>
@@ -409,6 +421,9 @@
<if type="article-journal" match="none">
<text macro="locators-note"/>
</if>
+ <else-if variable="volume" match="none">
+ <text macro="locators-note"/>
+ </else-if>
</choose>
</macro>
<macro name="locators-note">
@@ -453,7 +468,7 @@
</macro>
<macro name="locators-join-with-space">
<choose>
- <if type="article-journal">
+ <if type="article-journal" variable="volume" match="all">
<text macro="locators"/>
</if>
</choose>
@@ -463,6 +478,13 @@
<if type="legal_case">
<text macro="locators"/>
</if>
+ <else-if type="article-journal">
+ <choose>
+ <if variable="volume" match="none">
+ <text macro="locators"/>
+ </if>
+ </choose>
+ </else-if>
</choose>
</macro>
<macro name="locators-join-with-period">
@@ -632,7 +654,11 @@
<if type="article-journal">
<choose>
<if variable="locator page" match="any">
- <text macro="point-locators"/>
+ <choose>
+ <if variable="volume issue" match="any">
+ <text macro="point-locators"/>
+ </if>
+ </choose>
</if>
</choose>
</if>
@@ -643,6 +669,9 @@
<if type="article-journal" match="none">
<text macro="point-locators"/>
</if>
+ <else-if variable="volume issue" match="none">
+ <text macro="point-locators"/>
+ </else-if>
</choose>
</macro>
<macro name="point-locators">
@@ -694,13 +723,29 @@
</if>
</choose>
</macro>
- <macro name="locators-journal">
+ <macro name="locators-journal-join-with-colon">
<choose>
<if type="article-journal">
- <text variable="page"/>
+ <choose>
+ <if variable="volume issue" match="any">
+ <text variable="page"/>
+ </if>
+ </choose>
+ </if>
+ </choose>
+ </macro>
+ <macro name="locators-journal-join-with-comma">
+ <choose>
+ <if type="article-journal">
+ <choose>
+ <if variable="volume issue" match="none">
+ <text variable="page"/>
+ </if>
+ </choose>
</if>
</choose>
</macro>
+
<macro name="archive-note">
<choose>
<if type="thesis">
@@ -741,7 +786,11 @@
<!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
<choose>
<if type="article-newspaper" match="none">
- <text macro="issue-note"/>
+ <choose>
+ <if variable="issue volume" match="any">
+ <text macro="issue-note"/>
+ </if>
+ </choose>
</if>
</choose>
</if>
@@ -755,13 +804,30 @@
<else-if type="article-newspaper">
<text macro="issue-note"/>
</else-if>
+ <else-if type="article-journal">
+ <choose>
+ <if variable="volume issue" match="none">
+ <text macro="issue-note"/>
+ </if>
+ </choose>
+ </else-if>
</choose>
</macro>
<macro name="issue-note">
<choose>
- <if type="article-journal legal_case" match="any">
+ <if type="legal_case" match="any">
<text macro="issued" prefix="(" suffix=")"/>
</if>
+ <else-if type="article-journal">
+ <choose>
+ <if variable="volume issue" match="any">
+ <text macro="issued" prefix="(" suffix=")"/>
+ </if>
+ <else>
+ <text macro="issued"/>
+ </else>
+ </choose>
+ </else-if>
<else-if type="article-newspaper">
<text macro="issued"/>
</else-if>
@@ -788,7 +854,11 @@
<macro name="issue-join-with-space">
<choose>
<if type="article-journal legal_case" match="any">
- <text macro="issue"/>
+ <choose>
+ <if variable="issue volume" match="any">
+ <text macro="issue"/>
+ </if>
+ </choose>
</if>
</choose>
</macro>
@@ -812,13 +882,26 @@
</if>
</choose>
</if>
+ <else-if variable="volume issue" match="none">
+ <text macro="issue"/>
+ </else-if>
</choose>
</macro>
<macro name="issue">
<choose>
- <if type="article-journal legal_case" match="any">
- <text macro="issued" prefix=" (" suffix=")"/>
+ <if type="legal_case" match="any">
+ <text macro="issued" prefix="(" suffix=")"/>
</if>
+ <else-if type="article-journal">
+ <choose>
+ <if variable="issue volume" match="any">
+ <text macro="issued" prefix="(" suffix=")"/>
+ </if>
+ <else>
+ <text macro="issued"/>
+ </else>
+ </choose>
+ </else-if>
<else-if type="speech">
<group delimiter=", ">
<group delimiter=" ">
@@ -1001,9 +1084,10 @@
<text macro="issue-join-with-space"/>
</group>
<text macro="issue-join-with-comma"/>
+ <text macro="locators-journal-join-with-comma"/>
<text macro="locators-newspaper"/>
</group>
- <text macro="locators-journal"/>
+ <text macro="locators-journal-join-with-colon"/>
</group>
<text macro="access"/>
</group>
View
@@ -20,7 +20,7 @@
<category citation-format="author-date"/>
<category field="generic-base"/>
<summary>The author-date variant of the Chicago style</summary>
- <updated>2014-01-06T06:51:01+00:00</updated>
+ <updated>2014-01-19T17:47:01+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale>
@@ -217,8 +217,37 @@
<macro name="locators">
<choose>
<if type="article-journal">
- <text variable="volume" prefix=" "/>
- <text variable="issue" prefix=" (" suffix=")"/>
+ <choose>
+ <if variable="volume">
+ <text variable="volume" prefix=" "/>
+ <group prefix=" (" suffix=")">
+ <choose>
+ <if variable="issue">
+ <text variable="issue"/>
+ </if>
+ <else>
+ <date variable="issued">
+ <date-part name="month"/>
+ </date>
+ </else>
+ </choose>
+ </group>
+ </if>
+ <else-if variable="issue">
+ <group delimiter=" " prefix=", ">
+ <text term="issue" form="short"/>
+ <text variable="issue"/>
+ <date variable="issued" prefix="(" suffix=")">
+ <date-part name="month"/>
+ </date>
+ </group>
+ </else-if>
+ <else>
+ <date variable="issued" prefix=", ">
+ <date-part name="month"/>
+ </date>
+ </else>
+ </choose>
</if>
<else-if type="legal_case">
<text variable="volume" prefix=", "/>
@@ -278,7 +307,14 @@
</group>
</if>
<else-if type="article-journal">
- <text variable="page" prefix=": "/>
+ <choose>
+ <if variable="volume issue" match="any">
+ <text variable="page" prefix=": "/>
+ </if>
+ <else>
+ <text variable="page" prefix=", "/>
+ </else>
+ </choose>
</else-if>
</choose>
</macro>
Oops, something went wrong.

0 comments on commit dfd7a5e

Please sign in to comment.