|
94 | 94 | </choose>
|
95 | 95 | </macro>
|
96 | 96 | <macro name="contributors">
|
97 |
| - <choose> |
98 |
| - <if type="book"> |
99 |
| - <group delimiter=". "> |
100 |
| - <names variable="author"> |
101 |
| - <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/> |
102 |
| - <et-al/> |
103 |
| - <label form="short" prefix=", "/> |
104 |
| - <substitute> |
105 |
| - <names variable="editor"/> |
106 |
| - <names variable="translator"/> |
107 |
| - <names variable="director"/> |
108 |
| - <text macro="substitute-title"/> |
109 |
| - <text macro="title"/> |
110 |
| - </substitute> |
111 |
| - </names> |
112 |
| - <text macro="recipient"/> |
113 |
| - </group> |
114 |
| - </if> |
115 |
| - <else-if type="book" match="none"> |
116 |
| - <group delimiter=". "> |
117 |
| - <names variable="author"> |
118 |
| - <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/> |
119 |
| - <et-al/> |
120 |
| - <label form="short" prefix=", "/> |
121 |
| - <substitute> |
122 |
| - <names variable="editor"/> |
123 |
| - <names variable="translator"/> |
124 |
| - <names variable="director"/> |
125 |
| - <text macro="substitute-title"/> |
126 |
| - <text macro="title"/> |
127 |
| - </substitute> |
128 |
| - </names> |
129 |
| - <text macro="recipient"/> |
130 |
| - </group> |
131 |
| - </else-if> |
| 97 | + <choose> |
| 98 | + <if type="book"> |
| 99 | + <group delimiter=". "> |
| 100 | + <names variable="author"> |
| 101 | + <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/> |
| 102 | + <et-al/> |
| 103 | + <label form="short" prefix=", "/> |
| 104 | + <substitute> |
| 105 | + <names variable="editor"/> |
| 106 | + <names variable="translator"/> |
| 107 | + <names variable="director"/> |
| 108 | + <text macro="substitute-title"/> |
| 109 | + <text macro="title"/> |
| 110 | + </substitute> |
| 111 | + </names> |
| 112 | + <text macro="recipient"/> |
| 113 | + </group> |
| 114 | + </if> |
| 115 | + <else-if type="book" match="none"> |
| 116 | + <group delimiter=". "> |
| 117 | + <names variable="author"> |
| 118 | + <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/> |
| 119 | + <et-al/> |
| 120 | + <label form="short" prefix=", "/> |
| 121 | + <substitute> |
| 122 | + <names variable="editor"/> |
| 123 | + <names variable="translator"/> |
| 124 | + <names variable="director"/> |
| 125 | + <text macro="substitute-title"/> |
| 126 | + <text macro="title"/> |
| 127 | + </substitute> |
| 128 | + </names> |
| 129 | + <text macro="recipient"/> |
| 130 | + </group> |
| 131 | + </else-if> |
132 | 132 | </choose>
|
133 | 133 | </macro>
|
134 | 134 | <macro name="contributors-long">
|
|
187 | 187 | </if>
|
188 | 188 | <else-if type="post-weblog">
|
189 | 189 | <date variable="issued">
|
190 |
| - <date-part name="day" form="numeric"/> |
191 |
| - <date-part name="month" form="long" prefix=" "/> |
| 190 | + <date-part name="day" form="numeric"/> |
| 191 | + <date-part name="month" form="long" prefix=" "/> |
192 | 192 | </date>
|
193 | 193 | </else-if>
|
194 | 194 | <else-if type="entry-encyclopedia" variable="DOI" match="all">
|
|
667 | 667 | </sort>
|
668 | 668 | <layout suffix=".">
|
669 | 669 | <choose>
|
670 |
| - <if type="entry-encyclopedia"> |
671 |
| - <group delimiter=" "> |
672 |
| - |
673 |
| - <choose> |
674 |
| - <if variable="author" match="none"> |
| 670 | + <if type="entry-encyclopedia"> |
| 671 | + <group delimiter=" "> |
| 672 | + <choose> |
| 673 | + <if variable="author" match="none"> |
| 674 | + <group delimiter=", "> |
| 675 | + <text variable="container-title" font-style="italic" suffix="."/> |
| 676 | + <group delimiter=". "> |
| 677 | + <text macro="container-contributors"/> |
675 | 678 | <group delimiter=", ">
|
676 |
| - <text variable="container-title" font-style="italic" suffix="."/> |
677 |
| - <group delimiter=". "> |
678 |
| - <text macro="container-contributors"/> |
679 |
| - <group delimiter=", "> |
680 |
| - <text macro="publisher"/> |
681 |
| - <text macro="date"/> |
682 |
| - </group> |
683 |
| - </group> |
684 |
| - <text variable="title" prefix=" s.v. " quotes="true"/> |
685 |
| - </group> |
686 |
| - </if> |
687 |
| - <else-if variable="author"> |
688 |
| - <group delimiter=". "> |
689 |
| - <text macro="contributors" suffix="."/> |
690 |
| - <text macro="date"/> |
691 |
| - <text variable="title" quotes="true"/> |
692 |
| - <text macro="container-title"/> |
693 |
| - <text macro="container-contributors" text-case="capitalize-first"/> |
694 | 679 | <text macro="publisher"/>
|
695 |
| - <text macro="access"/> |
| 680 | + <text macro="date"/> |
696 | 681 | </group>
|
697 |
| - </else-if> |
698 |
| - </choose> |
699 |
| - </group> |
700 |
| - </if> |
701 |
| - |
| 682 | + </group> |
| 683 | + <text variable="title" prefix=" s.v. " quotes="true"/> |
| 684 | + </group> |
| 685 | + </if> |
| 686 | + <else-if variable="author"> |
| 687 | + <group delimiter=". "> |
| 688 | + <text macro="contributors" suffix="."/> |
| 689 | + <text macro="date"/> |
| 690 | + <text variable="title" quotes="true"/> |
| 691 | + <text macro="container-title"/> |
| 692 | + <text macro="container-contributors" text-case="capitalize-first"/> |
| 693 | + <text macro="publisher"/> |
| 694 | + <text macro="access"/> |
| 695 | + </group> |
| 696 | + </else-if> |
| 697 | + </choose> |
| 698 | + </group> |
| 699 | + </if> |
702 | 700 | <else-if type="motion_picture">
|
703 | 701 | <group delimiter=". ">
|
704 | 702 | <group delimiter=". ">
|
705 | 703 | <group delimiter=" ">
|
706 |
| - <group delimiter=". "> |
707 |
| - <group delimiter=", "> |
| 704 | + <group delimiter=". "> |
| 705 | + <group delimiter=", "> |
708 | 706 | <text variable="title" font-style="italic"/>
|
709 | 707 | <text variable="medium"/>
|
710 |
| - </group> |
711 |
| - <text macro="contributors-long" prefix="Réalisé par "/> |
712 |
| - <group delimiter=", "> |
| 708 | + </group> |
| 709 | + <text macro="contributors-long" prefix="Réalisé par "/> |
| 710 | + <group delimiter=", "> |
713 | 711 | <text macro="publisher"/>
|
714 | 712 | <text macro="date"/>
|
715 | 713 | </group>
|
|
718 | 716 | </group>
|
719 | 717 | </group>
|
720 | 718 | </else-if>
|
721 |
| - |
722 |
| - <else-if type="legislation"> |
723 |
| - <text macro="contributors" suffix=". "/> |
724 |
| - <group delimiter=" "> |
725 |
| - <text variable="title" font-style="italic"/> |
726 |
| - <group prefix="(" suffix=")" delimiter=", "> |
727 |
| - <text variable="section" prefix="chapitre "/> |
728 |
| - <text variable="volume" prefix="r. "/> |
729 |
| - </group> |
| 719 | + <else-if type="legislation"> |
| 720 | + <text macro="contributors" suffix=". "/> |
| 721 | + <group delimiter=" "> |
| 722 | + <text variable="title" font-style="italic"/> |
| 723 | + <group prefix="(" suffix=")" delimiter=", "> |
| 724 | + <text variable="section" prefix="chapitre "/> |
| 725 | + <text variable="volume" prefix="r. "/> |
730 | 726 | </group>
|
| 727 | + </group> |
731 | 728 | </else-if>
|
732 |
| - |
733 | 729 | <else-if type="bill">
|
734 |
| - <text macro="contributors" suffix=". "/> |
735 |
| - <group delimiter=" "> |
736 |
| - <text variable="title" font-style="italic"/> |
737 |
| - <group prefix="(RLRQ, " suffix=")" delimiter=", "> |
738 |
| - <text variable="section" prefix="chapitre "/> |
739 |
| - <text variable="number" prefix="r. "/> |
740 |
| - </group> |
| 730 | + <text macro="contributors" suffix=". "/> |
| 731 | + <group delimiter=" "> |
| 732 | + <text variable="title" font-style="italic"/> |
| 733 | + <group prefix="(RLRQ, " suffix=")" delimiter=", "> |
| 734 | + <text variable="section" prefix="chapitre "/> |
| 735 | + <text variable="number" prefix="r. "/> |
741 | 736 | </group>
|
| 737 | + </group> |
742 | 738 | </else-if>
|
743 |
| - <else> |
744 |
| - <group delimiter=". "> |
745 |
| - <text macro="contributors"/> |
746 |
| - <text macro="date"/> |
747 |
| - <text macro="title"/> |
748 |
| - </group> |
749 |
| - <text macro="description"/> |
750 |
| - <text macro="secondary-contributors" prefix=". "/> |
751 |
| - <text macro="container-title" prefix=". "/> |
752 |
| - <text macro="container-contributors"/> |
753 |
| - <text macro="edition"/> |
754 |
| - <text macro="locators-chapter"/> |
755 |
| - <text macro="collection-title-journal" prefix=", " suffix=", "/> |
756 |
| - <text macro="locators"/> |
757 |
| - <text macro="collection-title" prefix=". "/> |
758 |
| - <text macro="issue"/> |
759 |
| - <text macro="locators-article"/> |
760 |
| - <text macro="access" prefix=". "/> |
761 |
| - </else> |
| 739 | + <else> |
| 740 | + <group delimiter=". "> |
| 741 | + <text macro="contributors"/> |
| 742 | + <text macro="date"/> |
| 743 | + <text macro="title"/> |
| 744 | + </group> |
| 745 | + <text macro="description"/> |
| 746 | + <text macro="secondary-contributors" prefix=". "/> |
| 747 | + <text macro="container-title" prefix=". "/> |
| 748 | + <text macro="container-contributors"/> |
| 749 | + <text macro="edition"/> |
| 750 | + <text macro="locators-chapter"/> |
| 751 | + <text macro="collection-title-journal" prefix=", " suffix=", "/> |
| 752 | + <text macro="locators"/> |
| 753 | + <text macro="collection-title" prefix=". "/> |
| 754 | + <text macro="issue"/> |
| 755 | + <text macro="locators-article"/> |
| 756 | + <text macro="access" prefix=". "/> |
| 757 | + </else> |
762 | 758 | </choose>
|
763 | 759 | </layout>
|
764 | 760 | </bibliography>
|
|
0 commit comments