|
48 | 48 | </locale> |
49 | 49 | <locale xml:lang="en-GB"> |
50 | 50 | <date form="text"> |
51 | | - <date-part name="day" form="ordinal" suffix=" "/> |
| 51 | + <date-part name="day" form="numeric" suffix=" "/> |
52 | 52 | <date-part name="month" suffix=" "/> |
53 | 53 | <date-part name="year"/> |
54 | 54 | </date> |
55 | 55 | </locale> |
56 | 56 | <macro name="container-contributors"> |
57 | 57 | <choose> |
58 | | - <if type="chapter paper-conference" match="any"> |
| 58 | + <if type="chapter" match="any"> |
59 | 59 | <names variable="editor translator"> |
60 | 60 | <name and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="contextual"/> |
61 | 61 | <label form="short" prefix=" (" suffix=")"/> |
|
65 | 65 | </macro> |
66 | 66 | <macro name="secondary-contributors"> |
67 | 67 | <choose> |
68 | | - <if type="chapter paper-conference" match="none"> |
| 68 | + <if type="chapter paper-conference article-journal" match="none"> |
69 | 69 | <names variable="editor translator" delimiter=", " prefix=" (" suffix=")"> |
70 | 70 | <name and="text" initialize-with=". " delimiter=", " delimiter-precedes-last="contextual"/> |
71 | 71 | <label form="short" prefix=", "/> |
|
131 | 131 | </macro> |
132 | 132 | <macro name="title"> |
133 | 133 | <choose> |
134 | | - <if type="report thesis article-journal paper-conference" match="any"> |
| 134 | + <if type="report article-journal paper-conference" match="any"> |
135 | 135 | <text variable="title" quotes="true" suffix=","/> |
136 | 136 | <group prefix=" "> |
137 | 137 | <text variable="genre"/> |
138 | 138 | <text term="number" prefix=" " suffix=" "/> |
139 | 139 | <text variable="number"/> |
140 | 140 | </group> |
141 | 141 | </if> |
142 | | - <else-if type="bill book graphic legal_case legislation manuscript motion_picture report song" match="any"> |
| 142 | + <else-if type="bill book graphic legal_case legislation manuscript motion_picture report song thesis" match="any"> |
143 | 143 | <text variable="title" font-style="italic"/> |
144 | 144 | </else-if> |
145 | 145 | <else> |
|
149 | 149 | </macro> |
150 | 150 | <macro name="publisher"> |
151 | 151 | <choose> |
152 | | - <if type="report thesis" match="any"> |
| 152 | + <if type="report"> |
153 | 153 | <group delimiter=": "> |
154 | 154 | <text variable="publisher-place"/> |
155 | 155 | <text variable="publisher"/> |
156 | 156 | </group> |
157 | 157 | </if> |
| 158 | + <else-if type="thesis"> |
| 159 | + <text variable="publisher" prefix="Dissertation, "/> |
| 160 | + <text variable="publisher-place" prefix=" "/> |
| 161 | + </else-if> |
158 | 162 | <else> |
159 | 163 | <choose> |
160 | 164 | <if variable="event" match="none"> |
|
230 | 234 | </group> |
231 | 235 | </if> |
232 | 236 | <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any"> |
233 | | - <group delimiter=", " prefix=" "> |
| 237 | + <group delimiter=" " prefix=" "> |
234 | 238 | <text macro="edition"/> |
235 | | - <group> |
236 | | - <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/> |
237 | | - <number variable="number-of-volumes" form="numeric" prefix="1-"/> |
238 | | - </group> |
239 | | - <group> |
240 | | - <text term="volume" form="short" text-case="capitalize-first" suffix=" "/> |
241 | | - <number variable="volume" form="numeric"/> |
242 | | - </group> |
| 239 | + <choose> |
| 240 | + <if variable="number-of-volumes" match="any"> |
| 241 | + <group delimiter=""> |
| 242 | + <text term="volume" form="short" text-case="capitalize-first" prefix="(" suffix=" "/> |
| 243 | + <number variable="volume" form="numeric"/> |
| 244 | + <number variable="number-of-volumes" form="numeric" prefix="/" suffix=")"/> |
| 245 | + </group> |
| 246 | + </if> |
| 247 | + <else> |
| 248 | + <text term="volume" form="short" text-case="capitalize-first" prefix="(" suffix=""/> |
| 249 | + <number variable="volume" form="numeric" suffix=")"/> |
| 250 | + </else> |
| 251 | + </choose> |
243 | 252 | </group> |
244 | 253 | </else-if> |
245 | 254 | </choose> |
|
253 | 262 | <macro name="container-phrase"> |
254 | 263 | <group> |
255 | 264 | <choose> |
256 | | - <if type="chapter paper-conference speech" match="any"> |
| 265 | + <if type="paper-conference speech" match="any"> |
257 | 266 | <choose> |
258 | 267 | <if variable="container-title" match="none"> |
| 268 | + <text term="presented at" suffix=" "/> |
259 | 269 | <text variable="event" font-style="italic"/> |
260 | 270 | </if> |
261 | 271 | <else> |
|
0 commit comments