|
69 | 69 | </macro>
|
70 | 70 | <macro name="author-short">
|
71 | 71 | <names variable="author">
|
72 |
| - <name form="short" and="text" initialize-with=". "/> |
| 72 | + <name form="short" and="text" initialize-with=". " et-al-min="3" et-al-use-first="1"/> |
73 | 73 | <substitute>
|
74 | 74 | <names variable="editor"/>
|
75 | 75 | <names variable="translator"/>
|
|
347 | 347 | <if type="article-journal article-magazine" match="any">
|
348 | 348 | <group prefix=", " delimiter=", ">
|
349 | 349 | <group>
|
350 |
| - <text variable="volume" font-style="normal" prefix="Vol. "/> |
351 |
| - <text variable="issue" prefix=", No. "/> |
| 350 | + <text variable="volume"/> |
| 351 | + <text variable="issue" prefix=", "/> |
352 | 352 | </group>
|
353 | 353 | </group>
|
354 | 354 | <choose>
|
|
478 | 478 | <macro name="pages">
|
479 | 479 | <text variable="page"/>
|
480 | 480 | </macro>
|
481 |
| - <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name"> |
| 481 | + <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" givenname-disambiguation-rule="primary-name"> |
482 | 482 | <sort>
|
483 | 483 | <key macro="author"/>
|
484 | 484 | <key macro="issued-sort"/>
|
485 | 485 | </sort>
|
486 | 486 | <layout delimiter=", " prefix="[" suffix="]">
|
487 |
| - <group delimiter=" "> |
| 487 | + <group delimiter=", "> |
488 | 488 | <text macro="author-short"/>
|
489 | 489 | <text macro="issued-year"/>
|
490 | 490 | <text macro="citation-locator"/>
|
|
499 | 499 | </sort>
|
500 | 500 | <layout>
|
501 | 501 | <group suffix=".">
|
502 |
| - <group delimiter=" " prefix="[" suffix="] "> |
| 502 | + <group delimiter=", " prefix="[" suffix="] "> |
503 | 503 | <text macro="author-short"/>
|
504 | 504 | <text macro="issued-year"/>
|
505 | 505 | </group>
|
|
514 | 514 | <text macro="event"/>
|
515 | 515 | <text macro="publisher"/>
|
516 | 516 | </group>
|
517 |
| - <text macro="issued"/> |
518 |
| - <group> |
519 |
| - <label prefix=", " suffix=" " variable="page" form="short"/> |
| 517 | + <group delimiter=", "> |
| 518 | + <text macro="issued"/> |
520 | 519 | <text macro="pages"/>
|
521 | 520 | </group>
|
522 | 521 | </group>
|
|
0 commit comments