Skip to content

Commit ca3839b

Browse files
adam3smithadam3smith
authored
Fix sort by a single macro (#5136)
So styles don't rely on the behavior described in citation-style-language/test-suite#31
1 parent 5d1a7e8 commit ca3839b

10 files changed

+115
-10
lines changed

‎beltz-padagogik.csl

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<bibliography>
129129
<sort>
130130
<key macro="creator-short"/>
131-
<key macro="creator-year-short"/>
131+
<key macro="year"/>
132132
</sort>
133133
<layout>
134134
<group delimiter=". " suffix=".">

‎berlin-school-of-economics-and-law-international-marketing-management.csl

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<bibliography>
147147
<sort>
148148
<key macro="creator-short"/>
149-
<key macro="creator-year-short"/>
149+
<key macro="year"/>
150150
</sort>
151151
<layout>
152152
<group delimiter=", ">

‎biuletyn-polskiego-towarzystwa-jezykoznawczego.csl

+4-1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
</else>
7979
</choose>
8080
</macro>
81+
<macro name="year">
82+
<date date-parts="year" form="text" variable="issued"/>
83+
</macro>
8184
<macro name="collection-title-number">
8285
<group delimiter=" " prefix="(= " suffix=")">
8386
<text variable="collection-title"/>
@@ -132,7 +135,7 @@
132135
<bibliography delimiter-precedes-et-al="never" et-al-min="3" et-al-use-first="2" hanging-indent="true">
133136
<sort>
134137
<key macro="creator-short"/>
135-
<key macro="creator-year-short"/>
138+
<key macro="year"/>
136139
</sort>
137140
<layout>
138141
<group delimiter=". " suffix=".">

‎deutsche-sprache.csl

+4-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
<date date-parts="year" form="text" variable="issued"/>
6161
</group>
6262
</macro>
63+
<macro name="year">
64+
<date date-parts="year" form="text" variable="issued"/>
65+
</macro>
6366
<macro name="edition">
6467
<choose>
6568
<if match="any" is-numeric="edition">
@@ -135,7 +138,7 @@
135138
<bibliography et-al-min="4" et-al-use-first="1">
136139
<sort>
137140
<key macro="creator-short"/>
138-
<key macro="creator-year-short"/>
141+
<key macro="year"/>
139142
</sort>
140143
<layout>
141144
<group delimiter=". " suffix=".">

‎hochschule-hannover-soziale-arbeit.csl

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<bibliography>
130130
<sort>
131131
<key macro="creator-short"/>
132-
<key macro="creator-year-short"/>
132+
<key macro="year"/>
133133
</sort>
134134
<layout>
135135
<group delimiter=". " suffix=".">

‎keel-ja-kirjandus.csl

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
<date date-parts="year" form="text" variable="issued"/>
6464
</group>
6565
</macro>
66+
<macro name="year">
67+
<date date-parts="year" form="text" variable="issued"/>
68+
</macro>
6669
<macro name="edition">
6770
<choose>
6871
<if match="any" is-numeric="edition">
@@ -138,7 +141,7 @@
138141
<bibliography et-al-min="4" et-al-use-first="1">
139142
<sort>
140143
<key macro="creator-short"/>
141-
<key macro="creator-year-short"/>
144+
<key macro="year"/>
142145
</sort>
143146
<layout>
144147
<group delimiter=". " suffix=".">

‎wirtschaftsuniversitat-wien-abteilung-fur-bildungswissenschaft.csl

+33-1
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,36 @@
232232
</else>
233233
</choose>
234234
</macro>
235+
<macro name="author-sort">
236+
<choose>
237+
<if type="legislation" match="any">
238+
<group delimiter=" ">
239+
<text variable="title"/>
240+
<text variable="title-short" prefix="(" suffix=")"/>
241+
</group>
242+
</if>
243+
<else>
244+
<choose>
245+
<if type="bill" match="any">
246+
<choose>
247+
<if match="none" variable="author editor">
248+
<text variable="title-short"/>
249+
</if>
250+
<else>
251+
<text macro="u__author"/>
252+
</else>
253+
</choose>
254+
</if>
255+
<else-if type="article-newspaper" match="any">
256+
<text variable="container-title"/>
257+
</else-if>
258+
<else>
259+
<text macro="u__author"/>
260+
</else>
261+
</choose>
262+
</else>
263+
</choose>
264+
</macro>
235265
<macro name="b__container">
236266
<choose>
237267
<if type="chapter report paper-conference" match="any">
@@ -412,7 +442,9 @@
412442
</citation>
413443
<bibliography et-al-min="4" et-al-use-first="3" initialize="false" entry-spacing="0" hanging-indent="true">
414444
<sort>
415-
<key macro="b__author-year-title"/>
445+
<key macro="author-sort"/>
446+
<key macro="u__issued"/>
447+
<key macro="u__title"/>
416448
</sort>
417449
<layout suffix=".">
418450
<group delimiter=". ">

‎wirtschaftsuniversitat-wien-unternehmensrechnung-und-controlling.csl

+33-1
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,36 @@
220220
</else>
221221
</choose>
222222
</macro>
223+
<macro name="author-sort">
224+
<choose>
225+
<if type="legislation" match="any">
226+
<group delimiter=" ">
227+
<text variable="title"/>
228+
<text variable="title-short" prefix="(" suffix=")"/>
229+
</group>
230+
</if>
231+
<else>
232+
<choose>
233+
<if type="bill" match="any">
234+
<choose>
235+
<if match="none" variable="author editor">
236+
<text variable="title-short"/>
237+
</if>
238+
<else>
239+
<text macro="u__author"/>
240+
</else>
241+
</choose>
242+
</if>
243+
<else-if type="article-newspaper" match="any">
244+
<text variable="container-title"/>
245+
</else-if>
246+
<else>
247+
<text macro="u__author"/>
248+
</else>
249+
</choose>
250+
</else>
251+
</choose>
252+
</macro>
223253
<macro name="b__container">
224254
<choose>
225255
<if type="chapter report paper-conference" match="any">
@@ -389,7 +419,9 @@
389419
</citation>
390420
<bibliography entry-spacing="0" hanging-indent="true">
391421
<sort>
392-
<key macro="b__author-year-title"/>
422+
<key macro="author-sort"/>
423+
<key macro="u__issued"/>
424+
<key macro="u__title"/>
393425
</sort>
394426
<layout suffix=".">
395427
<choose>

‎wirtschaftsuniversitat-wien-wirtschaftspadagogik.csl

+33-1
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,36 @@
277277
</else>
278278
</choose>
279279
</macro>
280+
<macro name="author-sort">
281+
<choose>
282+
<if type="legislation" match="any">
283+
<group delimiter=" ">
284+
<text variable="title"/>
285+
<text variable="title-short" prefix="(" suffix=")"/>
286+
</group>
287+
</if>
288+
<else>
289+
<choose>
290+
<if type="bill" match="any">
291+
<choose>
292+
<if match="none" variable="author editor">
293+
<text variable="title-short"/>
294+
</if>
295+
<else>
296+
<text macro="u__author"/>
297+
</else>
298+
</choose>
299+
</if>
300+
<else-if type="article-newspaper" match="any">
301+
<text variable="container-title"/>
302+
</else-if>
303+
<else>
304+
<text macro="u__author"/>
305+
</else>
306+
</choose>
307+
</else>
308+
</choose>
309+
</macro>
280310
<macro name="b__in-editor-container">
281311
<choose>
282312
<if type="chapter report paper-conference" match="any">
@@ -459,7 +489,9 @@
459489
<bibliography initialize="false" entry-spacing="0" hanging-indent="true">
460490
<sort>
461491
<key macro="sort_keys"/>
462-
<key macro="b__author-year-title"/>
492+
<key macro="author-sort"/>
493+
<key macro="u__issued"/>
494+
<key macro="u__title"/>
463495
</sort>
464496
<layout>
465497
<group delimiter=". ">

‎zeitschrift-fur-qualitative-forschung.csl

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<bibliography>
139139
<sort>
140140
<key macro="creator-short"/>
141-
<key macro="creator-year-short"/>
141+
<key macro="year"/>
142142
</sort>
143143
<layout>
144144
<group delimiter=". " suffix=".">

0 commit comments

Comments
 (0)