|
45 | 45 | <term name="timestamp">at</term> |
46 | 46 | <term form="verb-short" name="translator">trans.</term> |
47 | 47 | </terms> |
48 | | -@@ -3332,10 +3330,6 @@ |
| 48 | +@@ -3335,10 +3333,6 @@ |
49 | 49 | <if match="any" variable="collection-editor part-number part-title volume-title"> |
50 | 50 | <text macro="label-volume"/> |
51 | 51 | </if> |
|
56 | 56 | </choose> |
57 | 57 | </else-if> |
58 | 58 | <else-if variable="volume"> |
59 | | -@@ -3602,9 +3596,7 @@ |
| 59 | +@@ -3605,9 +3599,7 @@ |
60 | 60 | <if match="any" type="article-magazine article-newspaper"> |
61 | 61 | <group delimiter=", "> |
62 | 62 | <group delimiter=". "> |
|
67 | 67 | <!-- newspaper edition always capitalized (CMOS18 14.89) --> |
68 | 68 | <text macro="label-edition-capitalized"/> |
69 | 69 | </group> |
70 | | -@@ -3613,17 +3605,13 @@ |
| 70 | +@@ -3616,17 +3608,13 @@ |
71 | 71 | </if> |
72 | 72 | <else-if match="any" variable="issue supplement-number volume"> |
73 | 73 | <group delimiter=": "> |
|
87 | 87 | <text macro="source-serial-locator"/> |
88 | 88 | </group> |
89 | 89 | </else> |
90 | | -@@ -3677,9 +3665,7 @@ |
| 90 | +@@ -3680,9 +3668,7 @@ |
91 | 91 | <!-- nothing to substitute if there is no issue/supplement/volume --> |
92 | 92 | <else-if match="none" variable="issue volume"/> |
93 | 93 | <else> |
|
98 | 98 | </else> |
99 | 99 | </choose> |
100 | 100 | </if> |
101 | | -@@ -3721,16 +3707,12 @@ |
| 101 | +@@ -3724,16 +3710,12 @@ |
102 | 102 | <!-- date for unsigned reviews only appears here if it did not earlier (CMOS18 14.102) --> |
103 | 103 | <choose> |
104 | 104 | <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"> |
|
117 | 117 | </else> |
118 | 118 | </choose> |
119 | 119 | </group> |
120 | | -@@ -3743,9 +3725,7 @@ |
| 120 | +@@ -3746,9 +3728,7 @@ |
121 | 121 | </group> |
122 | 122 | <choose> |
123 | 123 | <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"> |
|
128 | 128 | </if> |
129 | 129 | </choose> |
130 | 130 | </group> |
131 | | -@@ -3780,9 +3760,7 @@ |
| 131 | +@@ -3783,9 +3763,7 @@ |
132 | 132 | <!-- date appears first if the review `container-title` has been substituted for a missing author (CMOS18 14.87, 14.102) --> |
133 | 133 | <choose> |
134 | 134 | <if match="none" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"> |
|
139 | 139 | </if> |
140 | 140 | </choose> |
141 | 141 | </if> |
142 | | -@@ -3855,9 +3833,7 @@ |
| 142 | +@@ -3858,9 +3836,7 @@ |
143 | 143 | <else-if match="any" variable="reviewed-genre reviewed-title title"/> |
144 | 144 | <else-if match="none" variable="genre section"/> |
145 | 145 | <else> |
|
150 | 150 | </else> |
151 | 151 | </choose> |
152 | 152 | </if> |
153 | | -@@ -3903,26 +3879,18 @@ |
| 153 | +@@ -3906,26 +3882,18 @@ |
154 | 154 | <!-- date appears first if a review `container-title` has been substituted for a missing author (CMOS18 14.89) --> |
155 | 155 | <choose> |
156 | 156 | <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"> |
|
181 | 181 | </else> |
182 | 182 | </choose> |
183 | 183 | </group> |
184 | | -@@ -3950,9 +3918,7 @@ |
| 184 | +@@ -3953,9 +3921,7 @@ |
185 | 185 | </choose> |
186 | 186 | <group delimiter=" "> |
187 | 187 | <text macro="source-date-status-bib"/> |
|
192 | 192 | </group> |
193 | 193 | </group> |
194 | 194 | </macro> |
195 | | -@@ -4068,11 +4034,9 @@ |
| 195 | +@@ -4071,11 +4037,9 @@ |
196 | 196 | </if> |
197 | 197 | </choose> |
198 | 198 | </else-if> |
|
204 | 204 | <else-if variable="chapter-number"> |
205 | 205 | <group delimiter=" "> |
206 | 206 | <text macro="label-chapter-number-capitalized"/> |
207 | | -@@ -4104,11 +4068,9 @@ |
| 207 | +@@ -4107,11 +4071,9 @@ |
208 | 208 | </if> |
209 | 209 | </choose> |
210 | 210 | </else-if> |
|
216 | 216 | <else-if variable="chapter-number"> |
217 | 217 | <group delimiter=" "> |
218 | 218 | <text macro="label-chapter-number"/> |
219 | | -@@ -4501,10 +4463,6 @@ |
| 219 | +@@ -4504,10 +4466,6 @@ |
220 | 220 | <if is-numeric="volume" match="none"> |
221 | 221 | <text macro="label-volume"/> |
222 | 222 | </if> |
|
227 | 227 | <else-if is-numeric="volume" variable="page"> |
228 | 228 | <choose> |
229 | 229 | <!-- check for variables that might come between the volume and page number --> |
230 | | -@@ -4545,8 +4503,6 @@ |
| 230 | +@@ -4548,8 +4506,6 @@ |
231 | 231 | <else-if variable="locator"> |
232 | 232 | <text macro="label-locator"/> |
233 | 233 | </else-if> |
|
236 | 236 | <else-if is-numeric="volume" variable="page"> |
237 | 237 | <!-- collapse the volume and page number if adjacent --> |
238 | 238 | <group delimiter=":"> |
239 | | -@@ -5313,7 +5269,7 @@ |
| 239 | +@@ -5316,7 +5272,7 @@ |
240 | 240 | </if> |
241 | 241 | <else-if variable="publisher"> |
242 | 242 | <group delimiter=": "> |
|
245 | 245 | <text text-case="capitalize-first" variable="publisher"/> |
246 | 246 | </group> |
247 | 247 | </else-if> |
248 | | -@@ -5339,7 +5295,7 @@ |
| 248 | +@@ -5342,7 +5298,7 @@ |
249 | 249 | </if> |
250 | 250 | <else-if variable="publisher"> |
251 | 251 | <group delimiter=": "> |
|
254 | 254 | <text variable="publisher"/> |
255 | 255 | </group> |
256 | 256 | </else-if> |
257 | | -@@ -5361,7 +5317,7 @@ |
| 257 | +@@ -5364,7 +5320,7 @@ |
258 | 258 | <choose> |
259 | 259 | <if variable="original-publisher"> |
260 | 260 | <group delimiter=": "> |
|
263 | 263 | <text text-case="capitalize-first" variable="original-publisher"/> |
264 | 264 | </group> |
265 | 265 | </if> |
266 | | -@@ -5374,7 +5330,7 @@ |
| 266 | +@@ -5377,7 +5333,7 @@ |
267 | 267 | <choose> |
268 | 268 | <if variable="original-publisher"> |
269 | 269 | <group delimiter=": "> |
|
272 | 272 | <text variable="original-publisher"/> |
273 | 273 | </group> |
274 | 274 | </if> |
275 | | -@@ -5396,9 +5352,7 @@ |
| 275 | +@@ -5399,9 +5355,7 @@ |
276 | 276 | <date date-parts="year" form="text" variable="available-date"/> |
277 | 277 | </else-if> |
278 | 278 | <else> |
|
283 | 283 | </else> |
284 | 284 | </choose> |
285 | 285 | </macro> |
286 | | -@@ -5459,14 +5413,10 @@ |
| 286 | +@@ -5462,14 +5416,10 @@ |
287 | 287 | <text macro="date-issued-full"/> |
288 | 288 | </if> |
289 | 289 | <else-if variable="issue volume"> |
|
300 | 300 | </else-if> |
301 | 301 | <else-if match="any" variable="issue volume"> |
302 | 302 | <text macro="date-issued-year-month"/> |
303 | | -@@ -5615,14 +5565,10 @@ |
| 303 | +@@ -5618,14 +5568,10 @@ |
304 | 304 | <macro name="source-date-original-full-serial"> |
305 | 305 | <choose> |
306 | 306 | <if variable="issue volume"> |
|
317 | 317 | </else-if> |
318 | 318 | <else-if match="any" variable="issue volume"> |
319 | 319 | <text macro="date-original-year-month"/> |
320 | | -@@ -6683,9 +6629,9 @@ |
| 320 | +@@ -6686,9 +6632,9 @@ |
321 | 321 | </else> |
322 | 322 | </choose> |
323 | 323 | </macro> |
|
330 | 330 | </layout> |
331 | 331 | </citation> |
332 | 332 | <!-- Bibliography --> |
333 | | -@@ -6833,19 +6779,22 @@ |
| 333 | +@@ -6836,19 +6782,22 @@ |
334 | 334 | </else> |
335 | 335 | </choose> |
336 | 336 | </macro> |
|
0 commit comments