Skip to content

Commit

Permalink
Multiple CMS fixes
Browse files Browse the repository at this point in the history 
Fixes #3756
Fixes #3243
Fixes duplicate dates in map and artwork: 
https://forums.zotero.org/discussion/69887/date-in-cms-map-citation#latest
Extends uncertain date to all 17th edition Chicago styles
  • Loading branch information
@adam3smith
adam3smith authored Oct 15, 2019
1 parent 1c90dec commit 4f1eb52
Show file tree
Hide file tree
Showing 7 changed files with 278 additions and 223 deletions.
86 changes: 48 additions & 38 deletions chicago-annotated-bibliography.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@
<substitute>
<text macro="editor"/>
<text macro="translator"/>
<choose>
<if type="webpage post-weblog" match="any">
<text variable="container-title"/>
</if>
</choose>
</substitute>
</names>
<text macro="recipient"/>
Expand Down Expand Up @@ -292,9 +297,6 @@
<else-if type="manuscript speech" 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 graphic motion_picture song" match="any">
Expand All @@ -316,7 +318,7 @@
</macro>
<macro name="date-disambiguate">
<choose>
<if disambiguate="true">
<if disambiguate="true" type="personal_communication" match="any">
<text macro="issued"/>
</if>
</choose>
Expand Down Expand Up @@ -714,7 +716,14 @@
<text variable="original-publisher-place"/>
<text variable="original-publisher"/>
</group>
<date variable="original-date" form="text" date-parts="year"/>
<choose>
<if is-uncertain-date="original-date">
<date variable="original-date" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
</if>
<else>
<date variable="original-date" form="numeric" date-parts="year"/>
</else>
</choose>
</group>
</macro>
<macro name="reprint-note">
Expand Down Expand Up @@ -758,10 +767,7 @@
<choose>
<if variable="issued">
<choose>
<if type="graphic report" match="any">
<date variable="issued" form="text"/>
</if>
<else-if type="legal_case">
<if type="legal_case">
<group delimiter=" ">
<text variable="authority"/>
<choose>
Expand All @@ -774,11 +780,16 @@
</else>
</choose>
</group>
</else-if>
<else-if type="book bill chapter graphic legislation motion_picture paper-conference report song thesis" match="any">
<date variable="issued">
<date-part name="year"/>
</date>
</if>
<else-if type="book bill chapter legislation motion_picture paper-conference song thesis" match="any">
<choose>
<if is-uncertain-date="issued">
<date variable="issued" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
</if>
<else>
<date variable="issued" form="numeric" date-parts="year"/>
</else>
</choose>
</else-if>
<else-if type="patent">
<group delimiter=", ">
Expand All @@ -800,7 +811,14 @@
</group>
</else-if>
<else>
<date variable="issued" form="text"/>
<choose>
<if is-uncertain-date="issued">
<date variable="issued" form="text" prefix="[" suffix="?]"/>
</if>
<else>
<date variable="issued" form="text"/>
</else>
</choose>
</else>
</choose>
</if>
Expand Down Expand Up @@ -1004,7 +1022,7 @@
</macro>
<macro name="issue-note-join-with-space">
<choose>
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place event-place publisher" match="any">
<!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
<choose>
<if type="article-newspaper" match="none">
Expand All @@ -1023,9 +1041,10 @@
</macro>
<macro name="issue-note-join-with-comma">
<choose>
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
<if type="graphic map" match="any"/>
<else-if type="article-journal bill legislation legal_case manuscript thesis" variable="event-place publisher-place publisher" match="none">
<text macro="issue-note"/>
</if>
</else-if>
<else-if type="article-newspaper">
<text macro="issue-note"/>
</else-if>
Expand Down Expand Up @@ -1068,6 +1087,17 @@
<else-if type="article-newspaper">
<text macro="issued"/>
</else-if>
<else-if type="manuscript thesis speech" match="any">
<group delimiter=", " prefix="(" suffix=")">
<choose>
<if variable="title" match="any">
<text variable="genre"/>
</if>
</choose>
<text variable="publisher"/>
<text macro="issued"/>
</group>
</else-if>
<else-if variable="publisher-place event-place publisher" match="any">
<group prefix="(" suffix=")" delimiter=", ">
<text macro="event-note"/>
Expand All @@ -1081,26 +1111,6 @@
<text macro="issued"/>
</group>
</else-if>
<else-if variable="title" match="none">
<choose>
<if variable="genre">
<choose>
<if type="manuscript thesis speech" match="any">
<group delimiter=", " prefix="(" suffix=")">
<text variable="genre"/>
<text macro="issued"/>
</group>
</if>
<else>
<text macro="issued"/>
</else>
</choose>
</if>
<else>
<text macro="issued"/>
</else>
</choose>
</else-if>
<else>
<text macro="issued"/>
</else>
Expand Down
51 changes: 25 additions & 26 deletions chicago-fullnote-bibliography-fr.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<names variable="container-author reviewed-author">
<label form="verb-short" text-case="lowercase" suffix=" "/>
<name and="text" delimiter=", "/>
<et-al/>
</names>
</group>
</if>
Expand Down Expand Up @@ -66,27 +65,25 @@
</macro>
<macro name="secondary-contributors">
<choose>
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
<names variable="editor translator" delimiter=". ">
<label form="verb" text-case="capitalize-first" suffix=" "/>
<name and="text" delimiter=", "/>
<et-al/>
</names>
</if>
</choose>
</macro>
<macro name="container-contributors">
<choose>
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<group delimiter=", ">
<choose>
<if variable="author">
<choose>
<if variable="container-author" match="any">
<names variable="container-author">
<label form="verb-short" suffix=" " text-case="lowercase"/>
<label form="verb-short" text-case="lowercase" suffix=" "/>
<name and="text" delimiter=", "/>
<et-al/>
</names>
</if>
</choose>
Expand All @@ -98,15 +95,13 @@
<names variable="editor translator" delimiter=", ">
<label form="verb" suffix=" "/>
<name and="text" delimiter=", "/>
<et-al/>
</names>
</group>
</if>
<else>
<names variable="editor translator" delimiter=", ">
<label form="verb" text-case="lowercase" suffix=" "/>
<name and="text" delimiter=", "/>
<et-al/>
</names>
</else>
</choose>
Expand All @@ -127,7 +122,6 @@
<names variable="author">
<name and="text" delimiter=", " form="long"/>
<label form="short" prefix=", "/>
<et-al/>
<substitute>
<text macro="editor"/>
<text macro="translator"/>
Expand All @@ -140,14 +134,12 @@
<names variable="editor">
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=", "/>
<et-al/>
</names>
</macro>
<macro name="translator">
<names variable="translator">
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="verb-short" prefix=", "/>
<et-al/>
</names>
</macro>
<macro name="recipient">
Expand All @@ -171,10 +163,14 @@
<group delimiter=". ">
<names variable="author">
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<et-al/>
<substitute>
<text macro="editor"/>
<text macro="translator"/>
<choose>
<if type="webpage post-weblog" match="any">
<text variable="container-title"/>
</if>
</choose>
</substitute>
</names>
<text macro="recipient"/>
Expand All @@ -190,7 +186,6 @@
<group delimiter=" ">
<names variable="author">
<name form="short" and="text" delimiter=", "/>
<et-al/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
Expand All @@ -202,7 +197,6 @@
<macro name="contributors-sort">
<names variable="author">
<name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<et-al/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
Expand Down Expand Up @@ -288,9 +282,6 @@
<else-if type="manuscript speech" 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 graphic motion_picture song" match="any">
Expand All @@ -312,7 +303,7 @@
</macro>
<macro name="date-disambiguate">
<choose>
<if disambiguate="true">
<if disambiguate="true" type="personal_communication" match="any">
<text macro="issued"/>
</if>
</choose>
Expand Down Expand Up @@ -396,7 +387,7 @@
<macro name="container-title">
<group delimiter=" ">
<choose>
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<text term="in" text-case="capitalize-first"/>
</if>
</choose>
Expand Down Expand Up @@ -654,7 +645,7 @@
</group>
</group>
</else-if>
<else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
<else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<group delimiter=". ">
<text macro="edition"/>
<choose>
Expand Down Expand Up @@ -710,7 +701,14 @@
<text variable="original-publisher-place"/>
<text variable="original-publisher"/>
</group>
<date variable="original-date" form="text" date-parts="year"/>
<choose>
<if is-uncertain-date="original-date">
<date variable="original-date" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
</if>
<else>
<date variable="original-date" form="numeric" date-parts="year"/>
</else>
</choose>
</group>
</macro>
<macro name="reprint-note">
Expand Down Expand Up @@ -948,7 +946,7 @@
</macro>
<macro name="locators-chapter">
<choose>
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<choose>
<if variable="author container-author" match="all"/>
<else>
Expand Down Expand Up @@ -1021,7 +1019,7 @@
</macro>
<macro name="issue-note-join-with-space">
<choose>
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place event-place publisher" match="any">
<!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
<choose>
<if type="article-newspaper" match="none">
Expand All @@ -1040,9 +1038,10 @@
</macro>
<macro name="issue-note-join-with-comma">
<choose>
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
<if type="graphic map" match="any"/>
<else-if type="article-journal bill legislation legal_case manuscript thesis" variable="event-place publisher-place publisher" match="none">
<text macro="issue-note"/>
</if>
</else-if>
<else-if type="article-newspaper">
<text macro="issue-note"/>
</else-if>
Expand Down Expand Up @@ -1237,7 +1236,7 @@
<if type="graphic" match="any">
<text macro="archive-note"/>
</if>
<else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference report" match="none">
<else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
<text macro="archive-note"/>
</else-if>
</choose>
Expand Down
Loading

0 comments on commit 4f1eb52

Please sign in to comment.