|
12 | 12 | </author> |
13 | 13 | <category citation-format="author-date"/> |
14 | 14 | <category field="generic-base"/> |
15 | | - <updated>2020-01-13T00:52:05+00:00</updated> |
| 15 | + <updated>2020-04-13T04:40:00+00:00</updated> |
16 | 16 | <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> |
17 | 17 | </info> |
18 | 18 | <locale xml:lang="en"> |
|
86 | 86 | </macro> |
87 | 87 | <macro name="access"> |
88 | 88 | <choose> |
89 | | - <if variable="URL" type="webpage"> |
| 89 | + <if variable="URL" type="article-newspaper webpage speech"> |
90 | 90 | <group prefix=" " delimiter=", "> |
91 | 91 | <date variable="accessed" prefix="viewed "> |
92 | 92 | <date-part name="day" suffix=" "/> |
|
98 | 98 | </if> |
99 | 99 | </choose> |
100 | 100 | </macro> |
| 101 | + <macro name="newspaper-webpage"> |
| 102 | + <choose> |
| 103 | + <if type="article-newspaper"> |
| 104 | + <group prefix=" " delimiter=", "> |
| 105 | + <date variable="issued" prefix=""> |
| 106 | + <date-part name="day" suffix=" "/> |
| 107 | + <date-part name="month" suffix=""/> |
| 108 | + </date> |
| 109 | + </group> |
| 110 | + </if> |
| 111 | + </choose> |
| 112 | + </macro> |
| 113 | + <macro name="presentation"> |
| 114 | + <choose> |
| 115 | + <if type="speech"> |
| 116 | + <group delimiter=", "> |
| 117 | + <!-- suffix=", "> --> |
| 118 | + <text variable="genre"/> |
| 119 | + <!-- <text term="presented at"/> --> |
| 120 | + <text variable="event"/> |
| 121 | + <text variable="event-place"/> |
| 122 | + </group> |
| 123 | + </if> |
| 124 | + </choose> |
| 125 | + </macro> |
101 | 126 | <macro name="title"> |
102 | 127 | <choose> |
103 | 128 | <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any"> |
|
148 | 173 | </else> |
149 | 174 | </choose> |
150 | 175 | </macro> |
151 | | - <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year"> |
| 176 | + <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year"> |
152 | 177 | <layout prefix="(" suffix=")" delimiter="; "> |
153 | 178 | <group delimiter=", "> |
154 | 179 | <group delimiter=" "> |
155 | 180 | <text macro="author-short"/> |
156 | 181 | <text macro="year-date"/> |
157 | 182 | </group> |
158 | | - <group> |
| 183 | + <group delimiter=" "> |
159 | 184 | <label variable="locator" form="short"/> |
160 | 185 | <text variable="locator"/> |
161 | 186 | </group> |
|
210 | 235 | </group> |
211 | 236 | </else> |
212 | 237 | </choose> |
| 238 | + <text prefix=", " macro="presentation"/> |
| 239 | + <text prefix=", " macro="newspaper-webpage"/> |
213 | 240 | <text prefix=", " macro="access"/> |
214 | 241 | </layout> |
215 | 242 | </bibliography> |
|
0 commit comments