Skip to content

Commit 4f1eb52

Browse files
adam3smithadam3smith
authored
Multiple CMS fixes
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
1 parent 1c90dec commit 4f1eb52

7 files changed

+278
-223
lines changed

‎chicago-annotated-bibliography.csl

+48-38
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,11 @@
181181
<substitute>
182182
<text macro="editor"/>
183183
<text macro="translator"/>
184+
<choose>
185+
<if type="webpage post-weblog" match="any">
186+
<text variable="container-title"/>
187+
</if>
188+
</choose>
184189
</substitute>
185190
</names>
186191
<text macro="recipient"/>
@@ -292,9 +297,6 @@
292297
<else-if type="manuscript speech" match="any">
293298
<text variable="genre" form="short"/>
294299
</else-if>
295-
<else-if type="personal_communication">
296-
<text macro="issued"/>
297-
</else-if>
298300
</choose>
299301
</if>
300302
<else-if type="book graphic motion_picture song" match="any">
@@ -316,7 +318,7 @@
316318
</macro>
317319
<macro name="date-disambiguate">
318320
<choose>
319-
<if disambiguate="true">
321+
<if disambiguate="true" type="personal_communication" match="any">
320322
<text macro="issued"/>
321323
</if>
322324
</choose>
@@ -714,7 +716,14 @@
714716
<text variable="original-publisher-place"/>
715717
<text variable="original-publisher"/>
716718
</group>
717-
<date variable="original-date" form="text" date-parts="year"/>
719+
<choose>
720+
<if is-uncertain-date="original-date">
721+
<date variable="original-date" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
722+
</if>
723+
<else>
724+
<date variable="original-date" form="numeric" date-parts="year"/>
725+
</else>
726+
</choose>
718727
</group>
719728
</macro>
720729
<macro name="reprint-note">
@@ -758,10 +767,7 @@
758767
<choose>
759768
<if variable="issued">
760769
<choose>
761-
<if type="graphic report" match="any">
762-
<date variable="issued" form="text"/>
763-
</if>
764-
<else-if type="legal_case">
770+
<if type="legal_case">
765771
<group delimiter=" ">
766772
<text variable="authority"/>
767773
<choose>
@@ -774,11 +780,16 @@
774780
</else>
775781
</choose>
776782
</group>
777-
</else-if>
778-
<else-if type="book bill chapter graphic legislation motion_picture paper-conference report song thesis" match="any">
779-
<date variable="issued">
780-
<date-part name="year"/>
781-
</date>
783+
</if>
784+
<else-if type="book bill chapter legislation motion_picture paper-conference song thesis" match="any">
785+
<choose>
786+
<if is-uncertain-date="issued">
787+
<date variable="issued" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
788+
</if>
789+
<else>
790+
<date variable="issued" form="numeric" date-parts="year"/>
791+
</else>
792+
</choose>
782793
</else-if>
783794
<else-if type="patent">
784795
<group delimiter=", ">
@@ -800,7 +811,14 @@
800811
</group>
801812
</else-if>
802813
<else>
803-
<date variable="issued" form="text"/>
814+
<choose>
815+
<if is-uncertain-date="issued">
816+
<date variable="issued" form="text" prefix="[" suffix="?]"/>
817+
</if>
818+
<else>
819+
<date variable="issued" form="text"/>
820+
</else>
821+
</choose>
804822
</else>
805823
</choose>
806824
</if>
@@ -1004,7 +1022,7 @@
10041022
</macro>
10051023
<macro name="issue-note-join-with-space">
10061024
<choose>
1007-
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
1025+
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place event-place publisher" match="any">
10081026
<!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
10091027
<choose>
10101028
<if type="article-newspaper" match="none">
@@ -1023,9 +1041,10 @@
10231041
</macro>
10241042
<macro name="issue-note-join-with-comma">
10251043
<choose>
1026-
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
1044+
<if type="graphic map" match="any"/>
1045+
<else-if type="article-journal bill legislation legal_case manuscript thesis" variable="event-place publisher-place publisher" match="none">
10271046
<text macro="issue-note"/>
1028-
</if>
1047+
</else-if>
10291048
<else-if type="article-newspaper">
10301049
<text macro="issue-note"/>
10311050
</else-if>
@@ -1068,6 +1087,17 @@
10681087
<else-if type="article-newspaper">
10691088
<text macro="issued"/>
10701089
</else-if>
1090+
<else-if type="manuscript thesis speech" match="any">
1091+
<group delimiter=", " prefix="(" suffix=")">
1092+
<choose>
1093+
<if variable="title" match="any">
1094+
<text variable="genre"/>
1095+
</if>
1096+
</choose>
1097+
<text variable="publisher"/>
1098+
<text macro="issued"/>
1099+
</group>
1100+
</else-if>
10711101
<else-if variable="publisher-place event-place publisher" match="any">
10721102
<group prefix="(" suffix=")" delimiter=", ">
10731103
<text macro="event-note"/>
@@ -1081,26 +1111,6 @@
10811111
<text macro="issued"/>
10821112
</group>
10831113
</else-if>
1084-
<else-if variable="title" match="none">
1085-
<choose>
1086-
<if variable="genre">
1087-
<choose>
1088-
<if type="manuscript thesis speech" match="any">
1089-
<group delimiter=", " prefix="(" suffix=")">
1090-
<text variable="genre"/>
1091-
<text macro="issued"/>
1092-
</group>
1093-
</if>
1094-
<else>
1095-
<text macro="issued"/>
1096-
</else>
1097-
</choose>
1098-
</if>
1099-
<else>
1100-
<text macro="issued"/>
1101-
</else>
1102-
</choose>
1103-
</else-if>
11041114
<else>
11051115
<text macro="issued"/>
11061116
</else>

‎chicago-fullnote-bibliography-fr.csl

+25-26
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<names variable="container-author reviewed-author">
3838
<label form="verb-short" text-case="lowercase" suffix=" "/>
3939
<name and="text" delimiter=", "/>
40-
<et-al/>
4140
</names>
4241
</group>
4342
</if>
@@ -66,27 +65,25 @@
6665
</macro>
6766
<macro name="secondary-contributors">
6867
<choose>
69-
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
68+
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
7069
<names variable="editor translator" delimiter=". ">
7170
<label form="verb" text-case="capitalize-first" suffix=" "/>
7271
<name and="text" delimiter=", "/>
73-
<et-al/>
7472
</names>
7573
</if>
7674
</choose>
7775
</macro>
7876
<macro name="container-contributors">
7977
<choose>
80-
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
78+
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
8179
<group delimiter=", ">
8280
<choose>
8381
<if variable="author">
8482
<choose>
8583
<if variable="container-author" match="any">
8684
<names variable="container-author">
87-
<label form="verb-short" suffix=" " text-case="lowercase"/>
85+
<label form="verb-short" text-case="lowercase" suffix=" "/>
8886
<name and="text" delimiter=", "/>
89-
<et-al/>
9087
</names>
9188
</if>
9289
</choose>
@@ -98,15 +95,13 @@
9895
<names variable="editor translator" delimiter=", ">
9996
<label form="verb" suffix=" "/>
10097
<name and="text" delimiter=", "/>
101-
<et-al/>
10298
</names>
10399
</group>
104100
</if>
105101
<else>
106102
<names variable="editor translator" delimiter=", ">
107103
<label form="verb" text-case="lowercase" suffix=" "/>
108104
<name and="text" delimiter=", "/>
109-
<et-al/>
110105
</names>
111106
</else>
112107
</choose>
@@ -127,7 +122,6 @@
127122
<names variable="author">
128123
<name and="text" delimiter=", " form="long"/>
129124
<label form="short" prefix=", "/>
130-
<et-al/>
131125
<substitute>
132126
<text macro="editor"/>
133127
<text macro="translator"/>
@@ -140,14 +134,12 @@
140134
<names variable="editor">
141135
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
142136
<label form="short" prefix=", "/>
143-
<et-al/>
144137
</names>
145138
</macro>
146139
<macro name="translator">
147140
<names variable="translator">
148141
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
149142
<label form="verb-short" prefix=", "/>
150-
<et-al/>
151143
</names>
152144
</macro>
153145
<macro name="recipient">
@@ -171,10 +163,14 @@
171163
<group delimiter=". ">
172164
<names variable="author">
173165
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
174-
<et-al/>
175166
<substitute>
176167
<text macro="editor"/>
177168
<text macro="translator"/>
169+
<choose>
170+
<if type="webpage post-weblog" match="any">
171+
<text variable="container-title"/>
172+
</if>
173+
</choose>
178174
</substitute>
179175
</names>
180176
<text macro="recipient"/>
@@ -190,7 +186,6 @@
190186
<group delimiter=" ">
191187
<names variable="author">
192188
<name form="short" and="text" delimiter=", "/>
193-
<et-al/>
194189
<substitute>
195190
<names variable="editor"/>
196191
<names variable="translator"/>
@@ -202,7 +197,6 @@
202197
<macro name="contributors-sort">
203198
<names variable="author">
204199
<name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
205-
<et-al/>
206200
<substitute>
207201
<names variable="editor"/>
208202
<names variable="translator"/>
@@ -288,9 +282,6 @@
288282
<else-if type="manuscript speech" match="any">
289283
<text variable="genre" form="short"/>
290284
</else-if>
291-
<else-if type="personal_communication">
292-
<text macro="issued"/>
293-
</else-if>
294285
</choose>
295286
</if>
296287
<else-if type="book graphic motion_picture song" match="any">
@@ -312,7 +303,7 @@
312303
</macro>
313304
<macro name="date-disambiguate">
314305
<choose>
315-
<if disambiguate="true">
306+
<if disambiguate="true" type="personal_communication" match="any">
316307
<text macro="issued"/>
317308
</if>
318309
</choose>
@@ -396,7 +387,7 @@
396387
<macro name="container-title">
397388
<group delimiter=" ">
398389
<choose>
399-
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
390+
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
400391
<text term="in" text-case="capitalize-first"/>
401392
</if>
402393
</choose>
@@ -654,7 +645,7 @@
654645
</group>
655646
</group>
656647
</else-if>
657-
<else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
648+
<else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
658649
<group delimiter=". ">
659650
<text macro="edition"/>
660651
<choose>
@@ -710,7 +701,14 @@
710701
<text variable="original-publisher-place"/>
711702
<text variable="original-publisher"/>
712703
</group>
713-
<date variable="original-date" form="text" date-parts="year"/>
704+
<choose>
705+
<if is-uncertain-date="original-date">
706+
<date variable="original-date" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
707+
</if>
708+
<else>
709+
<date variable="original-date" form="numeric" date-parts="year"/>
710+
</else>
711+
</choose>
714712
</group>
715713
</macro>
716714
<macro name="reprint-note">
@@ -948,7 +946,7 @@
948946
</macro>
949947
<macro name="locators-chapter">
950948
<choose>
951-
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
949+
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
952950
<choose>
953951
<if variable="author container-author" match="all"/>
954952
<else>
@@ -1021,7 +1019,7 @@
10211019
</macro>
10221020
<macro name="issue-note-join-with-space">
10231021
<choose>
1024-
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
1022+
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place event-place publisher" match="any">
10251023
<!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
10261024
<choose>
10271025
<if type="article-newspaper" match="none">
@@ -1040,9 +1038,10 @@
10401038
</macro>
10411039
<macro name="issue-note-join-with-comma">
10421040
<choose>
1043-
<if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
1041+
<if type="graphic map" match="any"/>
1042+
<else-if type="article-journal bill legislation legal_case manuscript thesis" variable="event-place publisher-place publisher" match="none">
10441043
<text macro="issue-note"/>
1045-
</if>
1044+
</else-if>
10461045
<else-if type="article-newspaper">
10471046
<text macro="issue-note"/>
10481047
</else-if>
@@ -1237,7 +1236,7 @@
12371236
<if type="graphic" match="any">
12381237
<text macro="archive-note"/>
12391238
</if>
1240-
<else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference report" match="none">
1239+
<else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
12411240
<text macro="archive-note"/>
12421241
</else-if>
12431242
</choose>

0 commit comments

Comments
 (0)