Skip to content

Commit 25d40cd

Browse files
OTFlorianrmzelle
authored andcommitted
Update iso690-full-note-cs.csl (JabRef#4480)
1 parent 5de3904 commit 25d40cd

File tree

1 file changed

+34
-23
lines changed

1 file changed

+34
-23
lines changed

Diff for: iso690-full-note-cs.csl

+34-23
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<category citation-format="note"/>
2222
<category field="law"/>
2323
<summary>Czech ISO-690, full note.</summary>
24-
<updated>2019-11-21T16:03:24+00:00</updated>
24+
<updated>2019-12-30T16:03:24+00:00</updated>
2525
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
2626
</info>
2727
<locale xml:lang="cs">
@@ -39,17 +39,17 @@
3939
<choose>
4040
<if variable="author">
4141
<names variable="author">
42-
<name name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="always">
42+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
4343
<name-part name="family" text-case="uppercase"/>
4444
</name>
4545
</names>
4646
</if>
4747
<else-if variable="editor">
4848
<names variable="editor">
49-
<name name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="always">
49+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
5050
<name-part name="family" text-case="uppercase"/>
5151
</name>
52-
<label prefix=". " form="short" plural="contextual" suffix="."/>
52+
<label prefix=", " form="short" plural="contextual" suffix="."/>
5353
</names>
5454
</else-if>
5555
</choose>
@@ -58,17 +58,17 @@
5858
<choose>
5959
<if variable="author">
6060
<names variable="author">
61-
<name name-as-sort-order="all" initialize-with="." sort-separator=", " delimiter=", " delimiter-precedes-last="always">
61+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
6262
<name-part name="family" text-case="uppercase"/>
6363
</name>
6464
</names>
6565
</if>
6666
<else-if variable="editor">
6767
<names variable="editor">
68-
<name name-as-sort-order="all" initialize-with="." sort-separator=", " delimiter=", " delimiter-precedes-last="always">
68+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
6969
<name-part name="family" text-case="uppercase"/>
7070
</name>
71-
<label prefix=". " form="short" plural="contextual" suffix="."/>
71+
<label prefix=", " form="short" plural="contextual" suffix="."/>
7272
</names>
7373
</else-if>
7474
</choose>
@@ -77,17 +77,17 @@
7777
<choose>
7878
<if variable="author">
7979
<names variable="author">
80-
<name form="short" name-as-sort-order="all" initialize-with="." sort-separator=", " delimiter=", " delimiter-precedes-last="always">
80+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
8181
<name-part name="family" text-case="uppercase"/>
8282
</name>
8383
</names>
8484
</if>
8585
<else-if variable="editor">
8686
<names variable="editor">
87-
<name form="short" name-as-sort-order="all" initialize-with="." sort-separator=", " delimiter=", " delimiter-precedes-last="always">
87+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
8888
<name-part name="family" text-case="uppercase"/>
8989
</name>
90-
<label prefix=". " form="short" plural="contextual" suffix="."/>
90+
<label prefix=", " form="short" plural="contextual" suffix="."/>
9191
</names>
9292
</else-if>
9393
</choose>
@@ -96,8 +96,10 @@
9696
<choose>
9797
<if variable="author" type="book" match="all">
9898
<names variable="editor translator" delimiter=", ">
99-
<label form="verb-short" text-case="uppercase"/>
100-
<name sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
99+
<label text-case="capitalize-first" suffix=" "/>
100+
<name sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
101+
<name-part name="family" text-case="uppercase"/>
102+
</name>
101103
</names>
102104
</if>
103105
</choose>
@@ -106,7 +108,7 @@
106108
<choose>
107109
<if variable="container-author">
108110
<names variable="container-author">
109-
<name name-as-sort-order="all" initialize-with="." sort-separator=", " delimiter=", " delimiter-precedes-last="always">
111+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
110112
<name-part name="family" text-case="uppercase"/>
111113
</name>
112114
</names>
@@ -115,10 +117,10 @@
115117
<choose>
116118
<if type="chapter paper-conference" match="any">
117119
<names variable="editor">
118-
<name name-as-sort-order="all" initialize-with="." sort-separator=", " delimiter=", " delimiter-precedes-last="always">
120+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
119121
<name-part name="family" text-case="uppercase"/>
120122
</name>
121-
<label prefix=". " form="short" plural="contextual" suffix="."/>
123+
<label prefix=", " form="short" plural="contextual" suffix="."/>
122124
</names>
123125
</if>
124126
</choose>
@@ -129,7 +131,7 @@
129131
<choose>
130132
<if variable="container-author">
131133
<names variable="container-author">
132-
<name name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="always">
134+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
133135
<name-part name="family" text-case="uppercase"/>
134136
</name>
135137
</names>
@@ -138,10 +140,10 @@
138140
<choose>
139141
<if type="chapter paper-conference" match="any">
140142
<names variable="editor">
141-
<name name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="always">
143+
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
142144
<name-part name="family" text-case="uppercase"/>
143145
</name>
144-
<label prefix=". " form="short" plural="contextual" suffix="."/>
146+
<label prefix=", " form="short" plural="contextual" suffix="."/>
145147
</names>
146148
</if>
147149
</choose>
@@ -151,7 +153,7 @@
151153
<macro name="title-long">
152154
<group delimiter=". ">
153155
<text variable="title"/>
154-
<text macro="secondary-contributors"/>
156+
<text macro="secondary-contributors" font-style="normal"/>
155157
</group>
156158
</macro>
157159
<macro name="title-short">
@@ -329,9 +331,18 @@
329331
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
330332
<layout delimiter="; ">
331333
<choose>
332-
<if position="subsequent">
333-
<text macro="contributors-short" suffix=", "/>
334-
<text macro="title-short"/>
334+
<if position="ibid-with-locator">
335+
<group delimiter=", ">
336+
<text term="ibid"/>
337+
<text prefix="s. " variable="locator" suffix="."/>
338+
</group>
339+
</if>
340+
<else-if position="ibid">
341+
<text term="ibid"/>
342+
</else-if>
343+
<else-if position="subsequent">
344+
<text macro="contributors-short" suffix=". "/>
345+
<text macro="title-short" font-style="italic"/>
335346
<choose>
336347
<if variable="locator">
337348
<text prefix=", " macro="citation-locator" suffix="."/>
@@ -342,7 +353,7 @@
342353
<text prefix=". " macro="identifier"/>
343354
</else-if>
344355
</choose>
345-
</if>
356+
</else-if>
346357
<else>
347358
<choose>
348359
<if type="book thesis manuscript report" match="any">

0 commit comments

Comments
 (0)