Skip to content

Commit 9fb7eb7

Browse files
POBrien333POBrien333
authored
Bug fixes triangle.csl (#6251)
1 parent e6112ba commit 9fb7eb7

File tree

1 file changed

+57
-41
lines changed

1 file changed

+57
-41
lines changed

‎triangle.csl

Lines changed: 57 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<category field="social_science"/>
2121
<summary>Derived from Style EHESS-histoire, available at http://www.boiteaoutils.info/2011/06/styles-francais-de-citation-sous-zotero.html
2222
First version online in november 2012. Changes made to cover more documents types and to lighten URLS display. Should preferably be used ticking the quoting option (preferences/citer/styles): include URLs addresses in references.</summary>
23-
<updated>2021-04-07T01:50:30+00:00</updated>
23+
<updated>2022-09-29T01:50:30+00:00</updated>
2424
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
2525
</info>
2626
<locale xml:lang="fr">
@@ -62,27 +62,27 @@
6262
<choose>
6363
<if variable="collection-editor">
6464
<names variable="collection-editor">
65-
<name form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" " font-style="normal">
65+
<name form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" ">
6666
<name-part name="family" font-variant="small-caps"/>
6767
</name>
6868
</names>
6969
<text term="collection-editor" form="short" prefix="&#160;" suffix=",&#160;"/>
7070
<names variable="author">
71-
<name form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" " font-style="normal">
71+
<name form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" ">
7272
<name-part name="family" font-variant="small-caps"/>
7373
</name>
7474
</names>
7575
</if>
7676
<else-if variable="author">
7777
<names variable="author">
78-
<name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
78+
<name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
7979
<name-part name="family" font-variant="small-caps"/>
8080
</name>
8181
</names>
8282
</else-if>
8383
<else-if variable="editor">
8484
<names variable="editor">
85-
<name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
85+
<name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
8686
<name-part name="family" font-variant="small-caps"/>
8787
</name>
8888
<label form="short" prefix="&#160;"/>
@@ -95,27 +95,27 @@
9595
<choose>
9696
<if variable="collection-editor">
9797
<names variable="collection-editor">
98-
<name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" " font-style="normal">
98+
<name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" ">
9999
<name-part name="family" font-variant="small-caps"/>
100100
</name>
101101
</names>
102102
<text term="collection-editor" form="short" prefix="&#160;" suffix=",&#160;"/>
103103
<names variable="author">
104-
<name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" " font-style="normal">
104+
<name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" ">
105105
<name-part name="family" font-variant="small-caps"/>
106106
</name>
107107
</names>
108108
</if>
109109
<else-if variable="author">
110110
<names variable="author">
111-
<name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
111+
<name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
112112
<name-part name="family" font-variant="small-caps"/>
113113
</name>
114114
</names>
115115
</else-if>
116116
<else-if variable="editor">
117117
<names variable="editor">
118-
<name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
118+
<name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
119119
<name-part name="family" font-variant="small-caps"/>
120120
</name>
121121
<label form="short" prefix="&#160;"/>
@@ -126,7 +126,7 @@
126126
<!-- MACRO EDITEUR SCIENTIFIQUE APPELEE SEULEMENT PAR LA MACRO TITLE, type : chapitres d'ouvrage -->
127127
<macro name="editor">
128128
<names variable="editor">
129-
<name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
129+
<name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
130130
<name-part name="family" font-variant="small-caps"/>
131131
</name>
132132
<label form="short" prefix="&#160;"/>
@@ -137,7 +137,7 @@
137137
<choose>
138138
<if variable="translator">
139139
<names variable="translator">
140-
<name form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" " font-style="normal">
140+
<name form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" ">
141141
<name-part name="family" font-variant="small-caps"/>
142142
</name>
143143
</names>
@@ -151,7 +151,7 @@
151151
<if variable="interviewer">
152152
<text term="interviewer" form="verb" prefix="&#160;"/>
153153
<names variable="interviewer">
154-
<name form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" " font-style="normal">
154+
<name form="long" and="text" delimiter-precedes-last="never" delimiter=", " sort-separator=" ">
155155
<name-part name="family" font-variant="small-caps"/>
156156
</name>
157157
</names>
@@ -174,7 +174,7 @@
174174
<!-- AJOUT DES TYPES PAGES WEB ET BILLETS DE BLOG POUR AFFICHAGE DE LEUR TITRE ET DU TITRE DE LEUR CONTAINER-->
175175
<else-if type="article-journal article-newspaper article-magazine webpage post-weblog" match="any">
176176
<group delimiter=", ">
177-
<text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
177+
<text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»"/>
178178
<text variable="container-title" font-style="italic"/>
179179
</group>
180180
</else-if>
@@ -189,7 +189,7 @@
189189
</else-if>
190190
<else-if type="manuscript" match="any">
191191
<group delimiter=",">
192-
<text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
192+
<text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»"/>
193193
<text variable="genre" prefix=" "/>
194194
</group>
195195
</else-if>
@@ -227,7 +227,7 @@
227227
<macro name="yearpage-ndbp">
228228
<choose>
229229
<if type="bill book graphic legal_case motion_picture paper-conference manuscript report song thesis" match="any">
230-
<group delimiter=", " font-style="normal">
230+
<group delimiter=", ">
231231
<date variable="issued">
232232
<date-part name="year"/>
233233
</date>
@@ -240,18 +240,18 @@
240240
</group>
241241
</if>
242242
<else-if type="chapter" match="any">
243-
<group delimiter=", " font-style="normal">
243+
<group delimiter=", ">
244244
<date variable="issued">
245245
<date-part name="year"/>
246246
</date>
247-
<group delimiter=" " font-style="normal">
247+
<group delimiter=" ">
248248
<label variable="page" form="short"/>
249249
<text variable="page"/>
250250
</group>
251251
</group>
252252
</else-if>
253253
<else-if type="entry-dictionary entry-encyclopedia" match="any">
254-
<group delimiter=" " font-style="normal">
254+
<group delimiter=" ">
255255
<date variable="issued">
256256
<date-part name="year"/>
257257
</date>
@@ -263,7 +263,7 @@
263263
</group>
264264
</else-if>
265265
<else-if type="article-journal article-newspaper article-magazine" match="any">
266-
<group delimiter=" " font-style="normal">
266+
<group delimiter=" ">
267267
<label variable="page" form="short"/>
268268
<text variable="page"/>
269269
</group>
@@ -275,18 +275,22 @@
275275
<choose>
276276
<if type="bill book graphic legal_case motion_picture manuscript report song thesis" match="any">
277277
<group delimiter=", ">
278-
<group delimiter=", " font-style="normal">
279-
<date variable="issued">
280-
<date-part name="year"/>
281-
</date>
282-
<!-- UTILISATION DU CHAMP VOLUME POUR AFFICHAGE DU NUMERO POUR LES NUMEROS SPECIAUX DE REVUES QUI UTILISENT LE TYPE "BOOK"-->
283-
<group>
284-
<text term="issue" form="short" suffix="&#160;"/>
285-
<text variable="number-of-volumes" prefix=". " suffix="/"/>
286-
<text variable="volume"/>
287-
</group>
288-
<text variable="number-of-pages" suffix="&#160;p."/>
289-
<text variable="page" suffix="&#160;p."/>
278+
<date variable="issued">
279+
<date-part name="year"/>
280+
</date>
281+
<!-- UTILISATION DU CHAMP VOLUME POUR AFFICHAGE DU NUMERO POUR LES NUMEROS SPECIAUX DE REVUES QUI UTILISENT LE TYPE "BOOK"-->
282+
<group>
283+
<text term="issue" form="short" suffix="&#160;"/>
284+
<text variable="number-of-volumes" prefix=". " suffix="/"/>
285+
<text variable="volume"/>
286+
</group>
287+
<group delimiter=" ">
288+
<text variable="number-of-pages"/>
289+
<label variable="number-of-pages" form="short" plural="never"/>
290+
</group>
291+
<group delimiter=" ">
292+
<text variable="page"/>
293+
<label variable="page" form="short" plural="never"/>
290294
</group>
291295
<group>
292296
<label variable="locator" form="short"/>
@@ -295,7 +299,7 @@
295299
</group>
296300
</if>
297301
<else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
298-
<group delimiter=", " font-style="normal">
302+
<group delimiter=", ">
299303
<date variable="issued">
300304
<date-part name="year"/>
301305
</date>
@@ -304,14 +308,14 @@
304308
<text variable="number-of-volumes" prefix=". " suffix="/"/>
305309
<text variable="volume"/>
306310
</group>
307-
<group>
311+
<group delimiter=" ">
308312
<label variable="page" form="short"/>
309-
<text variable="page" prefix="&#160;"/>
313+
<text variable="page"/>
310314
</group>
311315
</group>
312316
</else-if>
313317
<else-if type="article-journal article-newspaper article-magazine" match="any">
314-
<group delimiter=" " font-style="normal">
318+
<group delimiter=" ">
315319
<label variable="page" form="short"/>
316320
<text variable="page"/>
317321
</group>
@@ -337,7 +341,7 @@
337341
</choose>
338342
</if>
339343
<else-if type="article-journal article-magazine article-newspaper interview webpage post-weblog" match="any">
340-
<group font-style="normal">
344+
<group>
341345
<choose>
342346
<if variable="issued">
343347
<date variable="issued">
@@ -445,7 +449,10 @@
445449
<if position="ibid-with-locator">
446450
<group delimiter=",&#160;">
447451
<text term="ibid" text-case="capitalize-first" font-style="italic" suffix="."/>
448-
<text variable="locator" prefix="p.&#160;"/>
452+
<group delimiter=" ">
453+
<label variable="locator" form="short"/>
454+
<text variable="locator"/>
455+
</group>
449456
</group>
450457
</if>
451458
<else-if position="ibid">
@@ -459,11 +466,14 @@
459466
<text variable="title" form="short" font-style="italic"/>
460467
</if>
461468
<else>
462-
<text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
469+
<text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="&#160;»"/>
463470
</else>
464471
</choose>
465472
<text term="cited" font-style="italic" suffix="."/>
466-
<text variable="locator" prefix="p.&#160;"/>
473+
<group delimiter=" ">
474+
<label variable="locator"/>
475+
<text variable="locator"/>
476+
</group>
467477
</group>
468478
</else-if>
469479
<else>
@@ -481,7 +491,10 @@
481491
<group>
482492
<text macro="yearpage-ndbp" prefix=",&#160;"/>
483493
<!-- intégration automatique de la localisation (pages indiqués)-->
484-
<text variable="locator" prefix=",&#160;p.&#160;"/>
494+
<group delimiter=" " prefix=", ">
495+
<label variable="locator"/>
496+
<text variable="locator"/>
497+
</group>
485498
<!-- intégration de la macro-test pour les adresses internet-->
486499
<text macro="internet-ndbp" prefix=",&#160;"/>
487500
</group>
@@ -507,7 +520,10 @@
507520
<text macro="collection"/>
508521
<text macro="yearpage-bib"/>
509522
<!-- intégration automatique de la localisation (pages indiqués)-->
510-
<text variable="locator" prefix="p.&#160;"/>
523+
<group delimiter=" ">
524+
<label variable="locator"/>
525+
<text variable="locator"/>
526+
</group>
511527
<!-- intégration de la macro-test pour les adresses internet-->
512528
<text macro="internet-bib"/>
513529
</group>

0 commit comments

Comments
 (0)