citeproc-ruby 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (98) hide show
  1. data/lib/citeproc/version.rb +1 -1
  2. data/lib/csl/nodes.rb +23 -3
  3. data/lib/plugins/formats/default.rb +1 -1
  4. data/resource/locale/locales-af-ZA.xml +289 -288
  5. data/resource/locale/locales-ar-AR.xml +291 -289
  6. data/resource/locale/locales-bg-BG.xml +289 -288
  7. data/resource/locale/locales-ca-AD.xml +289 -288
  8. data/resource/locale/locales-cs-CZ.xml +288 -287
  9. data/resource/locale/locales-da-DK.xml +289 -288
  10. data/resource/locale/locales-de-AT.xml +288 -288
  11. data/resource/locale/locales-de-CH.xml +288 -288
  12. data/resource/locale/locales-de-DE.xml +314 -314
  13. data/resource/locale/locales-el-GR.xml +241 -239
  14. data/resource/locale/locales-en-GB.xml +304 -0
  15. data/resource/locale/locales-en-US.xml +297 -297
  16. data/resource/locale/locales-es-ES.xml +289 -288
  17. data/resource/locale/locales-et-EE.xml +287 -287
  18. data/resource/locale/locales-eu.xml +305 -0
  19. data/resource/locale/locales-fa-IR.xml +304 -0
  20. data/resource/locale/locales-fi-FI.xml +304 -0
  21. data/resource/locale/locales-fr-CA.xml +306 -0
  22. data/resource/locale/locales-fr-FR.xml +290 -288
  23. data/resource/locale/locales-he-IL.xml +288 -288
  24. data/resource/locale/locales-hu-HU.xml +289 -288
  25. data/resource/locale/locales-is-IS.xml +288 -288
  26. data/resource/locale/locales-it-IT.xml +289 -288
  27. data/resource/locale/locales-ja-JP.xml +289 -288
  28. data/resource/locale/locales-km-KH.xml +304 -0
  29. data/resource/locale/locales-ko-KR.xml +289 -288
  30. data/resource/locale/locales-mn-MN.xml +290 -288
  31. data/resource/locale/locales-nb-NO.xml +288 -288
  32. data/resource/locale/locales-nl-NL.xml +288 -288
  33. data/resource/locale/locales-nn-NO.xml +288 -288
  34. data/resource/locale/locales-pl-PL.xml +289 -288
  35. data/resource/locale/locales-pt-BR.xml +288 -288
  36. data/resource/locale/locales-pt-PT.xml +289 -288
  37. data/resource/locale/locales-ro-RO.xml +289 -288
  38. data/resource/locale/locales-ru-RU.xml +290 -288
  39. data/resource/locale/locales-sk-SK.xml +288 -288
  40. data/resource/locale/locales-sl-SI.xml +289 -288
  41. data/resource/locale/locales-sr-RS.xml +289 -288
  42. data/resource/locale/locales-sv-SE.xml +289 -288
  43. data/resource/locale/locales-th-TH.xml +288 -288
  44. data/resource/locale/locales-tr-TR.xml +289 -288
  45. data/resource/locale/locales-uk-UA.xml +290 -288
  46. data/resource/locale/locales-vi-VN.xml +289 -288
  47. data/resource/locale/locales-zh-CN.xml +288 -288
  48. data/resource/locale/locales-zh-TW.xml +289 -288
  49. data/resource/style/apa.csl +316 -127
  50. data/resource/style/{bibtex-x2.csl → bibtex.csl} +7 -5
  51. data/resource/style/chicago-annotated-bibliography.csl +513 -0
  52. data/resource/style/chicago-author-date-basque.csl +707 -0
  53. data/resource/style/chicago-author-date-de.csl +394 -0
  54. data/resource/style/chicago-author-date.csl +223 -167
  55. data/resource/style/chicago-dated-note-biblio-no-ibid.csl +472 -0
  56. data/resource/style/chicago-fullnote-bibliography-delimiter-fixes.csl +972 -0
  57. data/resource/style/chicago-fullnote-bibliography-no-ibid-delimiter-fixes.csl +963 -0
  58. data/resource/style/chicago-fullnote-bibliography-no-ibid.csl +785 -0
  59. data/resource/style/chicago-fullnote-bibliography.csl +429 -321
  60. data/resource/style/chicago-library-list.csl +511 -0
  61. data/resource/style/chicago-note-biblio-no-ibid.csl +514 -0
  62. data/resource/style/chicago-note-bibliography.csl +276 -192
  63. data/resource/style/chicago-quick-copy.csl +685 -0
  64. data/resource/style/ieee.csl +296 -126
  65. data/resource/style/mla-notes.csl +796 -0
  66. data/resource/style/{mla-x.csl → mla-underline.csl} +14 -17
  67. data/resource/style/mla-url.csl +214 -0
  68. data/resource/style/mla.csl +289 -84
  69. data/resource/style/vancouver-brackets.csl +256 -0
  70. data/resource/style/vancouver-superscript-bracket-only-year.csl +165 -0
  71. data/resource/style/vancouver-superscript.csl +256 -0
  72. data/resource/style/vancouver.csl +256 -0
  73. data/spec/citeproc/date_spec.rb +7 -3
  74. data/spec/citeproc/variable_spec.rb +1 -1
  75. data/spec/csl/style_spec.rb +2 -2
  76. metadata +48 -48
  77. data/resource/style/acta-materialia-x.csl +0 -128
  78. data/resource/style/advanced-engineering-materials-x.csl +0 -121
  79. data/resource/style/ama.csl +0 -185
  80. data/resource/style/ama2-x.csl +0 -179
  81. data/resource/style/apa-x.csl +0 -324
  82. data/resource/style/apsa-x.csl +0 -163
  83. data/resource/style/apsa.csl +0 -176
  84. data/resource/style/asa-x.csl +0 -203
  85. data/resource/style/asa.csl +0 -216
  86. data/resource/style/asm-journals-x.csl +0 -131
  87. data/resource/style/bluebook-demo-x.csl +0 -392
  88. data/resource/style/bluebook-demo.csl +0 -942
  89. data/resource/style/greek-chicago-x.csl +0 -1182
  90. data/resource/style/harvard1-institution-italic.csl +0 -190
  91. data/resource/style/harvard1.csl +0 -181
  92. data/resource/style/mhra-x.csl +0 -312
  93. data/resource/style/mhra.csl +0 -390
  94. data/resource/style/mhra_note_without_bibliography-x.csl +0 -330
  95. data/resource/style/mhra_note_without_bibliography.csl +0 -338
  96. data/resource/style/nature-x.csl +0 -81
  97. data/resource/style/nature.csl +0 -88
  98. data/resource/style/nlm.csl +0 -117
@@ -1,12 +1,10 @@
1
- <style
2
- xmlns="http://purl.org/net/xbiblio/csl"
3
- class="note"
4
- xml:lang="en">
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
5
3
  <info>
6
- <title>Chicago Manual of Style (Note with Bibliography)</title>
4
+ <title>Chicago Manual of Style (note)</title>
7
5
  <id>http://www.zotero.org/styles/chicago-note-bibliography</id>
8
- <link href="http://www.zotero.org/styles/chicago-note-bibliography" />
9
- <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation" />
6
+ <link href="http://www.zotero.org/styles/chicago-note-bibliography" rel="self"/>
7
+ <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
10
8
  <author>
11
9
  <name>Julian Onions</name>
12
10
  <email>julian.onions@gmail.com</email>
@@ -20,27 +18,28 @@
20
18
  <email>elena.razlogova@gmail.com</email>
21
19
  </contributor>
22
20
  <summary>Chicago format with short notes and full bibliography</summary>
23
- <category term="generic-base" />
24
- <category term="numeric" />
25
- <updated />
21
+ <category field="generic-base"/>
22
+ <category citation-format="note"/>
23
+ <updated>2012-01-01T00:00:00+00:00</updated>
24
+ <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
26
25
  </info>
27
26
  <macro name="secondary-contributors">
28
27
  <choose>
29
- <if match="none" type="chapter">
28
+ <if type="chapter paper-conference" match="none">
30
29
  <group delimiter=". ">
31
30
  <choose>
32
31
  <if variable="author">
33
- <names delimiter=". " variable="editor">
34
- <label form="verb" prefix=" " suffix=" " text-case="capitalize-first" />
35
- <name and="text" delimiter=", " />
32
+ <names variable="editor" delimiter=". ">
33
+ <label form="verb" text-case="capitalize-first" suffix=" "/>
34
+ <name and="text" delimiter=", "/>
36
35
  </names>
37
36
  </if>
38
37
  </choose>
39
38
  <choose>
40
- <if match="any" variable="author editor">
41
- <names delimiter=". " variable="translator">
42
- <label form="verb" prefix=" " suffix=" " text-case="capitalize-first" />
43
- <name and="text" delimiter=", " />
39
+ <if variable="author editor" match="any">
40
+ <names variable="translator" delimiter=". ">
41
+ <label form="verb" text-case="capitalize-first" suffix=" "/>
42
+ <name and="text" delimiter=", "/>
44
43
  </names>
45
44
  </if>
46
45
  </choose>
@@ -50,21 +49,31 @@
50
49
  </macro>
51
50
  <macro name="container-contributors">
52
51
  <choose>
53
- <if type="chapter">
52
+ <if type="chapter paper-conference" match="any">
54
53
  <group delimiter=", ">
55
54
  <choose>
56
55
  <if variable="author">
57
- <names delimiter=", " variable="editor">
58
- <label form="verb" suffix=" " text-case="lowercase" />
59
- <name and="text" delimiter=", " />
56
+ <names variable="editor" delimiter=", ">
57
+ <label form="verb" text-case="lowercase" suffix=" "/>
58
+ <name and="text" delimiter=", "/>
60
59
  </names>
60
+ <choose>
61
+ <if variable="container-author">
62
+ <group>
63
+ <names variable="container-author">
64
+ <label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
65
+ <name and="text" delimiter=", "/>
66
+ </names>
67
+ </group>
68
+ </if>
69
+ </choose>
61
70
  </if>
62
71
  </choose>
63
72
  <choose>
64
- <if match="any" variable="author editor">
65
- <names delimiter=", " variable="translator">
66
- <label form="verb" suffix=" " text-case="lowercase" />
67
- <name and="text" delimiter=", " />
73
+ <if variable="author editor" match="any">
74
+ <names variable="translator" delimiter=", ">
75
+ <label form="verb" text-case="lowercase" suffix=" "/>
76
+ <name and="text" delimiter=", "/>
68
77
  </names>
69
78
  </if>
70
79
  </choose>
@@ -74,20 +83,20 @@
74
83
  </macro>
75
84
  <macro name="editor">
76
85
  <names variable="editor">
77
- <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
78
- <label form="short" prefix=", " suffix="." />
86
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
87
+ <label form="short" prefix=", " suffix="." strip-periods="true"/>
79
88
  </names>
80
89
  </macro>
81
90
  <macro name="translator">
82
91
  <names variable="translator">
83
- <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
84
- <label form="verb-short" prefix=", " suffix="." />
92
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
93
+ <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
85
94
  </names>
86
95
  </macro>
87
96
  <macro name="recipient-note">
88
- <names delimiter=", " variable="recipient">
89
- <label form="verb" prefix=" " suffix=" " text-case="lowercase" />
90
- <name and="text" delimiter=", " />
97
+ <names variable="recipient" delimiter=", ">
98
+ <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
99
+ <name and="text" delimiter=", "/>
91
100
  </names>
92
101
  </macro>
93
102
  <macro name="recipient">
@@ -95,159 +104,184 @@
95
104
  <if type="personal_communication">
96
105
  <choose>
97
106
  <if variable="genre">
98
- <text text-case="capitalize-first" variable="genre" />
107
+ <text variable="genre" text-case="capitalize-first"/>
99
108
  </if>
100
109
  <else>
101
- <text term="letter" text-case="capitalize-first" />
110
+ <text term="letter" text-case="capitalize-first"/>
102
111
  </else>
103
112
  </choose>
104
113
  </if>
105
114
  </choose>
106
- <text macro="recipient-note" prefix=" " />
115
+ <text macro="recipient-note" prefix=" "/>
107
116
  </macro>
108
117
  <macro name="contributors">
109
118
  <names variable="author">
110
- <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
119
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
111
120
  <substitute>
112
- <text macro="editor" />
113
- <text macro="translator" />
121
+ <text macro="editor"/>
122
+ <text macro="translator"/>
114
123
  </substitute>
115
124
  </names>
116
- <text macro="recipient" prefix=". " />
125
+ <text macro="recipient" prefix=". "/>
117
126
  </macro>
118
127
  <macro name="recipient-short">
119
128
  <names variable="recipient">
120
- <label form="verb" prefix=" " suffix=" " text-case="lowercase" />
121
- <name and="text" delimiter=", " form="short" />
129
+ <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
130
+ <name form="short" and="text" delimiter=", "/>
122
131
  </names>
123
132
  </macro>
124
133
  <macro name="contributors-short">
125
134
  <names variable="author">
126
- <name and="text" delimiter=", " form="short" />
135
+ <name form="short" and="text" delimiter=", "/>
127
136
  <substitute>
128
- <names variable="editor" />
129
- <names variable="translator" />
137
+ <names variable="editor"/>
138
+ <names variable="translator"/>
130
139
  </substitute>
131
140
  </names>
132
- <text macro="recipient-short" />
141
+ <text macro="recipient-short"/>
133
142
  </macro>
134
143
  <macro name="contributors-sort">
135
144
  <names variable="author">
136
- <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=", " />
137
- <label form="verb-short" prefix=", " suffix="." />
145
+ <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
146
+ <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
138
147
  <substitute>
139
- <names variable="editor" />
140
- <names variable="translator" />
148
+ <names variable="editor"/>
149
+ <names variable="translator"/>
141
150
  </substitute>
142
151
  </names>
143
152
  </macro>
144
153
  <macro name="interviewer">
145
- <names delimiter=", " variable="interviewer">
146
- <label form="verb" prefix=" " suffix=" " text-case="capitalize-first" />
147
- <name and="text" delimiter=", " />
154
+ <names variable="interviewer" delimiter=", ">
155
+ <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
156
+ <name and="text" delimiter=", "/>
148
157
  </names>
149
158
  </macro>
150
159
  <macro name="title">
151
160
  <choose>
152
- <if match="none" variable="title">
161
+ <if variable="title" match="none">
153
162
  <choose>
154
- <if match="none" type="personal_communication">
155
- <text text-case="capitalize-first" variable="genre" />
163
+ <if type="personal_communication" match="none">
164
+ <text variable="genre" text-case="capitalize-first"/>
156
165
  </if>
157
166
  </choose>
158
167
  </if>
159
- <else-if type="book">
160
- <text font-style="italic" variable="title" />
168
+ <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
169
+ <text variable="title" text-case="title" font-style="italic"/>
161
170
  </else-if>
162
171
  <else>
163
- <text quotes="true" variable="title" />
172
+ <text variable="title" text-case="title" quotes="true"/>
164
173
  </else>
165
174
  </choose>
166
175
  </macro>
167
176
  <macro name="title-short">
168
177
  <choose>
169
- <if match="none" variable="title">
178
+ <if variable="title" match="none">
170
179
  <choose>
171
180
  <if type="interview">
172
- <text term="interview" text-case="lowercase" />
181
+ <text term="interview" text-case="lowercase"/>
173
182
  </if>
174
- <else-if match="any" type="manuscript speech">
175
- <text form="short" variable="genre" />
183
+ <else-if type="manuscript speech" match="any">
184
+ <text variable="genre" form="short"/>
176
185
  </else-if>
177
186
  <else-if type="personal_communication">
178
- <text macro="issued" />
187
+ <text macro="issued"/>
179
188
  </else-if>
180
189
  </choose>
181
190
  </if>
182
- <else-if type="book">
183
- <text font-style="italic" form="short" variable="title" />
191
+ <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
192
+ <text variable="title" text-case="title" form="short" font-style="italic"/>
184
193
  </else-if>
185
194
  <else>
186
- <text form="short" quotes="true" variable="title" />
195
+ <text variable="title" text-case="title" form="short" quotes="true"/>
187
196
  </else>
188
197
  </choose>
189
198
  </macro>
190
199
  <macro name="description">
191
200
  <group delimiter=", ">
192
201
  <group delimiter=". ">
193
- <text macro="interviewer" />
194
- <text text-case="capitalize-first" variable="medium" />
202
+ <text macro="interviewer"/>
203
+ <text variable="medium" text-case="capitalize-first"/>
195
204
  </group>
196
205
  <choose>
197
- <if match="none" variable="title"> </if>
198
- <else-if match="any" type="thesis speech"> </else-if>
206
+ <if variable="title" match="none"/>
207
+ <else-if type="thesis speech" match="any"/>
199
208
  <else>
200
- <text text-case="capitalize-first" variable="genre" />
209
+ <text variable="genre" text-case="capitalize-first"/>
201
210
  </else>
202
211
  </choose>
203
212
  </group>
204
213
  </macro>
205
214
  <macro name="container-title">
206
215
  <choose>
207
- <if type="chapter">
208
- <text suffix=" " term="in" text-case="capitalize-first" />
216
+ <if type="chapter paper-conference" match="any">
217
+ <text term="in" text-case="capitalize-first" suffix=" "/>
218
+ </if>
219
+ </choose>
220
+ <choose>
221
+ <if type="legal_case" match="none">
222
+ <text variable="container-title" text-case="title" font-style="italic"/>
209
223
  </if>
210
224
  </choose>
211
- <text font-style="italic" variable="container-title" />
212
225
  </macro>
213
226
  <macro name="edition">
214
227
  <choose>
215
- <if match="any" type="book chapter">
228
+ <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
216
229
  <choose>
217
230
  <if is-numeric="edition">
218
231
  <group delimiter=" ">
219
- <number form="ordinal" variable="edition" />
220
- <text form="short" suffix="." term="edition" />
232
+ <number variable="edition" form="ordinal"/>
233
+ <text term="edition" form="short" suffix="." strip-periods="true"/>
221
234
  </group>
222
235
  </if>
223
236
  <else>
224
- <text suffix="." text-case="capitalize-first" variable="edition" />
237
+ <text variable="edition" text-case="capitalize-first" suffix="."/>
225
238
  </else>
226
239
  </choose>
227
240
  </if>
228
241
  </choose>
229
242
  </macro>
230
243
  <macro name="collection-title">
231
- <text variable="collection-title" />
232
- <text prefix=" " variable="collection-number" />
244
+ <text variable="collection-title" text-case="title"/>
245
+ <text variable="collection-number" prefix=" "/>
233
246
  </macro>
234
247
  <macro name="locators">
235
248
  <choose>
236
249
  <if type="article-journal">
237
- <text prefix=" " variable="volume" />
238
- <text prefix=", no. " variable="issue" />
250
+ <text variable="volume" prefix=" "/>
251
+ <group prefix=", ">
252
+ <text term="issue" form="short" suffix=". " strip-periods="true"/>
253
+ <number variable="issue"/>
254
+ </group>
239
255
  </if>
240
- <else-if type="book">
241
- <group delimiter=". " prefix=". ">
256
+ <else-if type="legal_case">
257
+ <text variable="volume" prefix=", "/>
258
+ <text variable="container-title" prefix=" "/>
259
+ <text variable="page" prefix=" "/>
260
+ </else-if>
261
+ <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
262
+ <group prefix=". " delimiter=". ">
242
263
  <group>
243
- <text form="short" suffix=". " term="volume" text-case="capitalize-first" />
244
- <number form="numeric" variable="volume" />
264
+ <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
265
+ <number variable="volume" form="numeric"/>
245
266
  </group>
246
267
  <group>
247
- <number form="numeric" variable="number-of-volumes" />
248
- <text form="short" plural="true" prefix=" " suffix="." term="volume" />
268
+ <number variable="number-of-volumes" form="numeric"/>
269
+ <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
249
270
  </group>
250
- <text macro="edition" />
271
+ <text macro="edition"/>
272
+ </group>
273
+ </else-if>
274
+ <else-if type="chapter paper-conference" match="any">
275
+ <group prefix=". " delimiter=". ">
276
+ <choose>
277
+ <if variable="page" match="none">
278
+ <group>
279
+ <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
280
+ <number variable="volume" form="numeric"/>
281
+ </group>
282
+ </if>
283
+ </choose>
284
+ <text macro="edition"/>
251
285
  </group>
252
286
  </else-if>
253
287
  </choose>
@@ -257,12 +291,12 @@
257
291
  <if type="article-newspaper">
258
292
  <group delimiter=", ">
259
293
  <group>
260
- <text suffix=" " variable="edition" />
261
- <text prefix=" " term="edition" />
294
+ <text variable="edition" suffix=" "/>
295
+ <text term="edition" prefix=" "/>
262
296
  </group>
263
297
  <group>
264
- <text form="short" suffix=". " term="section" />
265
- <text variable="section" />
298
+ <text term="section" form="short" suffix=". " strip-periods="true"/>
299
+ <text variable="section"/>
266
300
  </group>
267
301
  </group>
268
302
  </if>
@@ -270,177 +304,227 @@
270
304
  </macro>
271
305
  <macro name="event">
272
306
  <group>
273
- <text suffix=" " term="presented at" />
274
- <text variable="event" />
307
+ <text term="presented at" suffix=" "/>
308
+ <text variable="event"/>
275
309
  </group>
276
310
  </macro>
277
311
  <macro name="publisher">
278
- <group delimiter=": ">
279
- <text variable="publisher-place" />
280
- <text variable="publisher" />
281
- </group>
312
+ <choose>
313
+ <if type="thesis">
314
+ <text variable="publisher"/>
315
+ </if>
316
+ <else>
317
+ <group delimiter=": ">
318
+ <text variable="publisher-place"/>
319
+ <text variable="publisher"/>
320
+ </group>
321
+ </else>
322
+ </choose>
282
323
  </macro>
283
324
  <macro name="issued">
284
325
  <choose>
285
- <if match="any" type="graphic report">
286
- <date variable="issued">
287
- <date-part name="month" suffix=" " />
288
- <date-part name="day" suffix=", " />
289
- <date-part name="year" />
290
- </date>
326
+ <if variable="issued">
327
+ <choose>
328
+ <if type="graphic report" match="any">
329
+ <date variable="issued">
330
+ <date-part name="month" suffix=" "/>
331
+ <date-part name="day" suffix=", "/>
332
+ <date-part name="year"/>
333
+ </date>
334
+ </if>
335
+ <else-if type="legal_case">
336
+ <text variable="authority" suffix=" "/>
337
+ <date variable="issued">
338
+ <date-part name="year"/>
339
+ </date>
340
+ </else-if>
341
+ <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="any">
342
+ <date variable="issued">
343
+ <date-part name="year"/>
344
+ </date>
345
+ </else-if>
346
+ <else>
347
+ <date variable="issued">
348
+ <date-part name="month" suffix=" "/>
349
+ <date-part name="day" suffix=", "/>
350
+ <date-part name="year"/>
351
+ </date>
352
+ </else>
353
+ </choose>
291
354
  </if>
292
- <else-if match="any" type="book chapter thesis">
293
- <date variable="issued">
294
- <date-part name="year" />
295
- </date>
296
- </else-if>
297
355
  <else>
298
- <date variable="issued">
299
- <date-part name="month" suffix=" " />
300
- <date-part name="day" suffix=", " />
301
- <date-part name="year" />
302
- </date>
356
+ <text term="no date" form="short"/>
303
357
  </else>
304
358
  </choose>
305
359
  </macro>
306
- <macro name="pages-chapter">
360
+ <macro name="locators-chapter">
307
361
  <choose>
308
- <if type="chapter">
309
- <text suffix=":" variable="volume" />
310
- <text variable="page" />
362
+ <if type="chapter paper-conference" match="any">
363
+ <choose>
364
+ <if variable="page">
365
+ <text variable="volume" suffix=":"/>
366
+ <text variable="page"/>
367
+ </if>
368
+ </choose>
311
369
  </if>
312
370
  </choose>
313
371
  </macro>
314
- <macro name="pages-article">
372
+ <macro name="locators-journal">
315
373
  <choose>
316
374
  <if type="article-journal">
317
- <text prefix=": " variable="page" />
375
+ <text variable="page" prefix=": "/>
318
376
  </if>
319
377
  </choose>
320
378
  </macro>
321
379
  <macro name="point-locators-subsequent">
322
- <group>
323
- <choose>
324
- <if locator="page" match="none">
325
- <label form="short" strip-periods="false" suffix=" " variable="locator" />
326
- </if>
327
- </choose>
328
- <text variable="locator" />
329
- </group>
380
+ <choose>
381
+ <if variable="locator">
382
+ <choose>
383
+ <if locator="page" match="none">
384
+ <choose>
385
+ <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
386
+ <choose>
387
+ <if variable="volume">
388
+ <group>
389
+ <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
390
+ <number variable="volume" form="numeric"/>
391
+ <label variable="locator" form="short" prefix=", " suffix=" "/>
392
+ </group>
393
+ </if>
394
+ <else>
395
+ <label variable="locator" form="short" suffix=" "/>
396
+ </else>
397
+ </choose>
398
+ </if>
399
+ <else>
400
+ <label variable="locator" form="short" suffix=" "/>
401
+ </else>
402
+ </choose>
403
+ </if>
404
+ <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
405
+ <number variable="volume" form="numeric" suffix=":"/>
406
+ </else-if>
407
+ </choose>
408
+ <text variable="locator"/>
409
+ </if>
410
+ </choose>
330
411
  </macro>
331
412
  <macro name="archive">
332
- <group delimiter=". ">
333
- <text text-case="capitalize-first" variable="archive_location" />
334
- <text variable="archive" />
335
- <text variable="archive-place" />
336
- </group>
413
+ <choose>
414
+ <if type="thesis">
415
+ <group delimiter=" ">
416
+ <text variable="archive"/>
417
+ <text variable="archive_location" prefix="(" suffix=")"/>
418
+ </group>
419
+ </if>
420
+ <else>
421
+ <group delimiter=". ">
422
+ <text variable="archive_location" text-case="capitalize-first"/>
423
+ <text variable="archive"/>
424
+ <text variable="archive-place"/>
425
+ </group>
426
+ </else>
427
+ </choose>
337
428
  </macro>
338
429
  <macro name="issue">
339
430
  <choose>
340
- <if type="article-journal">
341
- <text macro="issued" prefix=" (" suffix=")" />
431
+ <if type="article-journal legal_case" match="any">
432
+ <text macro="issued" prefix=" (" suffix=")"/>
342
433
  </if>
343
434
  <else-if type="speech">
344
435
  <choose>
345
- <if match="none" variable="title"> </if>
436
+ <if variable="title" match="none"/>
346
437
  <else>
347
- <text prefix=". " text-case="capitalize-first" variable="genre" />
438
+ <text variable="genre" text-case="capitalize-first" prefix=". "/>
348
439
  </else>
349
440
  </choose>
350
- <text macro="event" prefix=" " />
351
- <text prefix=", " variable="event-place" />
352
- <text macro="issued" prefix=", " />
441
+ <text macro="event" prefix=" "/>
442
+ <text variable="event-place" prefix=", "/>
443
+ <text macro="issued" prefix=", "/>
353
444
  </else-if>
354
- <else-if match="any" variable="publisher-place publisher">
355
- <group delimiter=", " prefix=". ">
445
+ <else-if variable="publisher-place publisher" match="any">
446
+ <group prefix=". " delimiter=", ">
356
447
  <choose>
357
448
  <if type="thesis">
358
- <text text-case="capitalize-first" variable="genre" />
449
+ <text variable="genre" text-case="capitalize-first"/>
359
450
  </if>
360
451
  </choose>
361
- <text macro="publisher" />
362
- <text macro="issued" />
452
+ <text macro="publisher"/>
453
+ <text macro="issued"/>
363
454
  </group>
364
455
  </else-if>
365
456
  <else>
366
- <text macro="issued" prefix=", " />
457
+ <text macro="issued" prefix=", "/>
367
458
  </else>
368
459
  </choose>
369
460
  </macro>
370
461
  <macro name="access">
371
462
  <group delimiter=". ">
372
463
  <choose>
373
- <if match="any" type="graphic report">
374
- <text macro="archive" />
464
+ <if type="graphic report" match="any">
465
+ <text macro="archive"/>
375
466
  </if>
376
- <else-if match="none" type="book thesis chapter article-journal article-newspaper article-magazine">
377
- <text macro="archive" />
467
+ <else-if type="article-journal article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
468
+ <text macro="archive"/>
378
469
  </else-if>
379
470
  </choose>
380
- <text prefix="doi:" variable="DOI" />
381
- <text variable="URL" />
471
+ <choose>
472
+ <if type="legal_case" match="none">
473
+ <text variable="URL"/>
474
+ </if>
475
+ </choose>
382
476
  </group>
383
477
  </macro>
384
478
  <macro name="sort-key">
385
- <text macro="contributors-sort" suffix=" " />
386
- <text suffix=" " variable="title" />
387
- <text variable="genre" />
479
+ <text macro="contributors-sort" suffix=" "/>
480
+ <text variable="title" suffix=" "/>
481
+ <text variable="genre"/>
388
482
  </macro>
389
- <citation
390
- disambiguate-add-names="true"
391
- et-al-min="4"
392
- et-al-subsequent-min="4"
393
- et-al-subsequent-use-first="1"
394
- et-al-use-first="1">
395
- <layout delimiter="; " prefix="" suffix=".">
483
+ <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
484
+ <layout prefix="" suffix="." delimiter="; ">
396
485
  <choose>
397
486
  <if position="ibid-with-locator">
398
487
  <group delimiter=", ">
399
- <text suffix="." term="ibid" text-case="capitalize-first" />
400
- <text macro="point-locators-subsequent" />
488
+ <text term="ibid"/>
489
+ <text macro="point-locators-subsequent"/>
401
490
  </group>
402
491
  </if>
403
492
  <else-if position="ibid">
404
- <text suffix="." term="ibid" text-case="capitalize-first" />
493
+ <text term="ibid"/>
405
494
  </else-if>
406
495
  <else>
407
496
  <group delimiter=", ">
408
- <text macro="contributors-short" />
409
- <text macro="title-short" />
410
- <text macro="point-locators-subsequent" />
497
+ <text macro="contributors-short"/>
498
+ <text macro="title-short"/>
499
+ <text macro="point-locators-subsequent"/>
411
500
  </group>
412
501
  </else>
413
502
  </choose>
414
503
  </layout>
415
504
  </citation>
416
- <bibliography
417
- entry-spacing="0"
418
- et-al-min="11"
419
- et-al-use-first="7"
420
- hanging-indent="true"
421
- subsequent-author-substitute="---">
505
+ <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
422
506
  <sort>
423
- <key macro="sort-key" />
424
- <key variable="issued" />
507
+ <key macro="sort-key"/>
508
+ <key variable="issued"/>
425
509
  </sort>
426
510
  <layout suffix=".">
427
511
  <group delimiter=". ">
428
- <text macro="contributors" />
429
- <text macro="title" />
430
- <text macro="description" />
431
- <text macro="secondary-contributors" />
512
+ <text macro="contributors"/>
513
+ <text macro="title"/>
514
+ <text macro="description"/>
515
+ <text macro="secondary-contributors"/>
432
516
  <group delimiter=", ">
433
- <text macro="container-title" />
434
- <text macro="container-contributors" />
435
- <text macro="pages-chapter" />
517
+ <text macro="container-title"/>
518
+ <text macro="container-contributors"/>
519
+ <text macro="locators-chapter"/>
436
520
  </group>
437
521
  </group>
438
- <text macro="locators" />
439
- <text macro="collection-title" prefix=". " />
440
- <text macro="issue" />
441
- <text macro="locators-newspaper" prefix=", " />
442
- <text macro="pages-article" />
443
- <text macro="access" prefix=". " />
522
+ <text macro="locators"/>
523
+ <text macro="collection-title" prefix=". "/>
524
+ <text macro="issue"/>
525
+ <text macro="locators-newspaper" prefix=", "/>
526
+ <text macro="locators-journal"/>
527
+ <text macro="access" prefix=". "/>
444
528
  </layout>
445
529
  </bibliography>
446
- </style>
530
+ </style>