Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit baf11b4

Browse files
majazaloznikmajazaloznik
authoredAug 27, 2021
Update urad-rs-za-makroekonomske-analize-in-razvoj.csl (#5607)
1 parent 636affa commit baf11b4

File tree

1 file changed

+31
-78
lines changed

1 file changed

+31
-78
lines changed
 

‎urad-rs-za-makroekonomske-analize-in-razvoj.csl

+31-78
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
</author>
1414
<category citation-format="author-date"/>
1515
<category field="generic-base"/>
16-
<updated>2021-06-22T11:22:34+00:00</updated>
16+
<updated>2021-08-25T13:10:38+00:00</updated>
1717
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
1818
</info>
1919
<macro name="container-contributors-booklike">
2020
<choose>
2121
<if variable="container-title">
2222
<names variable="editor translator" delimiter=", &amp; ">
2323
<name and="text" initialize-with=". " delimiter=", "/>
24-
<label form="short" prefix=" (" text-case="title" suffix=")"/>
24+
<label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
2525
<substitute>
2626
<names variable="editorial-director"/>
2727
<names variable="collection-editor"/>
@@ -33,7 +33,6 @@
3333
</macro>
3434
<macro name="container-contributors">
3535
<choose>
36-
<!-- book is here to catch software with container titles -->
3736
<if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
3837
<text macro="container-contributors-booklike"/>
3938
</if>
@@ -74,7 +73,6 @@
7473
</macro>
7574
<macro name="secondary-contributors">
7675
<choose>
77-
<!-- book is here to catch software with container titles -->
7876
<if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
7977
<text macro="secondary-contributors-booklike"/>
8078
</if>
@@ -109,7 +107,6 @@
109107
<choose>
110108
<if variable="original-author composer" match="any">
111109
<group delimiter="; ">
112-
<!-- Replace prefix with performer label as that becomes available -->
113110
<names variable="author" prefix="Recorded by ">
114111
<label form="verb" text-case="title"/>
115112
<name and="text" initialize-with=". " delimiter=", "/>
@@ -183,12 +180,12 @@
183180
<choose>
184181
<if type="song">
185182
<names variable="composer" delimiter=", ">
186-
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
183+
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
187184
<substitute>
188185
<names variable="original-author"/>
189186
<names variable="author"/>
190187
<names variable="translator">
191-
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
188+
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
192189
<label form="short" prefix=" (" suffix=")" text-case="title"/>
193190
</names>
194191
<group delimiter=" ">
@@ -202,12 +199,12 @@
202199
<else-if type="treaty"/>
203200
<else>
204201
<names variable="author" font-weight="normal" delimiter=", ">
205-
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
202+
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
206203
<substitute>
207204
<names variable="illustrator"/>
208205
<names variable="composer"/>
209206
<names variable="director">
210-
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
207+
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
211208
<label form="long" prefix=" (" suffix=")" text-case="title"/>
212209
</names>
213210
<choose>
@@ -221,21 +218,21 @@
221218
</else>
222219
</choose>
223220
<names variable="translator">
224-
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
221+
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
225222
<label form="short" prefix=" (" suffix=")" text-case="title"/>
226223
</names>
227224
</if>
228225
</choose>
229226
<names variable="editor translator" delimiter=", ">
230-
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
227+
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
231228
<label form="short" prefix=" (" suffix=")" text-case="title"/>
232229
</names>
233230
<names variable="editorial-director">
234-
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
231+
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
235232
<label form="short" prefix=" (" suffix=")" text-case="title"/>
236233
</names>
237234
<names variable="collection-editor">
238-
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
235+
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
239236
<label form="short" prefix=" (" suffix=")" text-case="title"/>
240237
</names>
241238
<choose>
@@ -266,18 +263,17 @@
266263
<if variable="archive DOI publisher URL" match="none">
267264
<group delimiter=", ">
268265
<names variable="author">
269-
<name and="text" delimiter=", " initialize-with=". "/>
266+
<name and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
270267
<substitute>
271268
<text variable="title" form="short" text-case="title" quotes="true"/>
272269
</substitute>
273270
</names>
274-
<!-- This should be localized -->
275271
<text value="personal communication"/>
276272
</group>
277273
</if>
278274
<else>
279275
<names variable="author" delimiter=", ">
280-
<name form="short" and="text" delimiter=", " initialize-with=". "/>
276+
<name form="short" and="text" delimiter-precedes-last="never" delimiter=", " initialize-with=". "/>
281277
<substitute>
282278
<names variable="editor"/>
283279
<names variable="translator"/>
@@ -297,7 +293,7 @@
297293
</else-if>
298294
<else-if type="song">
299295
<names variable="composer" delimiter=", ">
300-
<name form="short" and="text" delimiter=", " initialize-with=". "/>
296+
<name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
301297
<substitute>
302298
<names variable="original-author"/>
303299
<names variable="author"/>
@@ -316,7 +312,7 @@
316312
</else-if>
317313
<else>
318314
<names variable="author" delimiter=", ">
319-
<name form="short" and="text" delimiter=", " initialize-with=". "/>
315+
<name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
320316
<substitute>
321317
<names variable="illustrator"/>
322318
<names variable="composer"/>
@@ -363,20 +359,18 @@
363359
</choose>
364360
</macro>
365361
<macro name="patent-number">
366-
<!-- authority: U.S. ; genre: patent ; number: 123,445 -->
367362
<group delimiter=" ">
368363
<text variable="authority"/>
369364
<choose>
370365
<if variable="genre">
371366
<text variable="genre" text-case="capitalize-first"/>
372367
</if>
373368
<else>
374-
<!-- This should be localized -->
375369
<text value="patent" text-case="capitalize-first"/>
376370
</else>
377371
</choose>
378372
<group delimiter=" ">
379-
<text term="issue" form="short" text-case="capitalize-first"/>
373+
<text term="issue" form="short" text-case="lowercase"/>
380374
<text variable="number"/>
381375
</group>
382376
</group>
@@ -392,7 +386,7 @@
392386
<text term="retrieved" text-case="capitalize-first"/>
393387
<choose>
394388
<if type="post post-weblog webpage" match="any">
395-
<date variable="accessed" form="text" suffix=","/>
389+
<date variable="accessed" form="numeric" suffix=""/>
396390
</if>
397391
</choose>
398392
<text term="from"/>
@@ -402,7 +396,6 @@
402396
<else-if variable="archive">
403397
<choose>
404398
<if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
405-
<!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
406399
<choose>
407400
<if variable="archive-place" match="none">
408401
<group delimiter=" ">
@@ -434,7 +427,6 @@
434427
<else-if variable="title">
435428
<choose>
436429
<if variable="version" type="book" match="all">
437-
<!---This is a hack until we have a software type -->
438430
<text variable="title"/>
439431
</if>
440432
<else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
@@ -467,12 +459,9 @@
467459
</else-if>
468460
</choose>
469461
</macro>
470-
<!-- APA has four descriptive sections following the title: -->
471-
<!-- (description), [format], container, event -->
472462
<macro name="description">
473463
<group>
474464
<choose>
475-
<!-- book is here to catch software with container titles -->
476465
<if type="book report" match="any">
477466
<choose>
478467
<if variable="container-title">
@@ -491,7 +480,6 @@
491480
<group delimiter=", ">
492481
<text variable="genre" text-case="capitalize-first"/>
493482
<choose>
494-
<!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
495483
<if variable="DOI URL archive" match="any">
496484
<text variable="publisher"/>
497485
</if>
@@ -540,30 +528,26 @@
540528
<group delimiter=", ">
541529
<choose>
542530
<if variable="genre">
543-
<!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
544531
<group delimiter=", ">
545532
<text variable="genre" text-case="capitalize-first"/>
546533
<choose>
547534
<if variable="reviewed-title">
548535
<text variable="reviewed-title" font-style="italic"/>
549536
</if>
550537
<else>
551-
<!-- Assume `title` is title of reviewed work -->
552538
<text variable="title" font-style="italic"/>
553539
</else>
554540
</choose>
555541
</group>
556542
</if>
557543
<else>
558-
<!-- This should be localized -->
559544
<group delimiter=" ">
560545
<text value="Review of"/>
561546
<choose>
562547
<if variable="reviewed-title">
563548
<text variable="reviewed-title" font-style="italic"/>
564549
</if>
565550
<else>
566-
<!-- Assume `title` is title of reviewed work -->
567551
<text variable="title" font-style="italic"/>
568552
</else>
569553
</choose>
@@ -589,14 +573,12 @@
589573
<if variable="reviewed-title" match="none">
590574
<choose>
591575
<if variable="genre">
592-
<!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
593576
<group delimiter=", ">
594577
<text variable="genre" text-case="capitalize-first"/>
595578
<text variable="title" form="short" text-case="title" font-style="italic"/>
596579
</group>
597580
</if>
598581
<else>
599-
<!-- This should be localized -->
600582
<group delimiter=" ">
601583
<text value="Review of"/>
602584
<text variable="title" form="short" text-case="title" font-style="italic"/>
@@ -612,7 +594,6 @@
612594
<else-if type="speech thesis" match="any">
613595
<text variable="medium" text-case="capitalize-first"/>
614596
</else-if>
615-
<!-- book is here to catch software with container titles -->
616597
<else-if type="book report" match="any">
617598
<choose>
618599
<if variable="container-title" match="none">
@@ -658,7 +639,6 @@
658639
</group>
659640
</if>
660641
<else-if type="dataset">
661-
<!-- This should be localized -->
662642
<text value="Data set"/>
663643
</else-if>
664644
</choose>
@@ -670,9 +650,7 @@
670650
<if variable="number">
671651
<group delimiter="; ">
672652
<group delimiter=" ">
673-
<text variable="genre" text-case="title"/>
674-
<!-- Replace with term="number" if that becomes available -->
675-
<text term="issue" form="short" text-case="capitalize-first"/>
653+
<text variable="genre"/>
676654
<text variable="number"/>
677655
</group>
678656
<text macro="locators"/>
@@ -697,7 +675,7 @@
697675
</choose>
698676
</macro>
699677
<macro name="title-and-descriptions">
700-
<group delimiter=" ">
678+
<group delimiter=", ">
701679
<text macro="title"/>
702680
<choose>
703681
<if variable="title interviewer" type="interview" match="any">
@@ -724,13 +702,11 @@
724702
</if>
725703
</choose>
726704
<group delimiter=" ">
727-
<!-- Replace "archive" with "archive_collection" as that becomes available -->
728705
<text variable="archive"/>
729706
<text variable="archive_location" prefix="(" suffix=")"/>
730707
</group>
731708
</group>
732709
<group delimiter=", ">
733-
<!-- Move "archive" here when "archive_collection" becomes available -->
734710
<text variable="archive-place"/>
735711
</group>
736712
</group>
@@ -783,7 +759,6 @@
783759
<choose>
784760
<if variable="event">
785761
<choose>
786-
<!-- Only print publisher info if published in a proceedings -->
787762
<if variable="collection-editor editor issue page volume" match="any">
788763
<group delimiter=": ">
789764
<text variable="publisher-place"/>
@@ -808,7 +783,6 @@
808783
<choose>
809784
<if variable="event" type="speech paper-conference" match="any">
810785
<choose>
811-
<!-- Don't print event info if published in a proceedings -->
812786
<if variable="collection-editor editor issue page volume" match="none">
813787
<group delimiter=" ">
814788
<group delimiter=" ">
@@ -855,8 +829,8 @@
855829
</if>
856830
<else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
857831
<date variable="issued">
858-
<date-part prefix=", " name="month"/>
859-
<date-part prefix=" " name="day"/>
832+
<date-part prefix=", " name="day" suffix="."/>
833+
<date-part prefix=" " name="month"/>
860834
</date>
861835
</else-if>
862836
<else-if type="paper-conference">
@@ -869,7 +843,6 @@
869843
</if>
870844
</choose>
871845
</else-if>
872-
<!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
873846
</choose>
874847
</group>
875848
</else-if>
@@ -909,7 +882,6 @@
909882
<if type="personal_communication">
910883
<choose>
911884
<if variable="archive DOI publisher URL" match="none">
912-
<!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
913885
<date variable="issued" form="text"/>
914886
</if>
915887
<else>
@@ -990,7 +962,6 @@
990962
</choose>
991963
</macro>
992964
<macro name="original-published">
993-
<!--This should be localized -->
994965
<choose>
995966
<if type="bill legal_case legislation" match="any"/>
996967
<else-if type="interview motion_picture song" match="any">
@@ -1122,7 +1093,6 @@
11221093
<text macro="locators"/>
11231094
</group>
11241095
<choose>
1125-
<!--for advance online publication-->
11261096
<if variable="issued">
11271097
<choose>
11281098
<if variable="page issue" match="none">
@@ -1140,7 +1110,6 @@
11401110
<text macro="locators"/>
11411111
</group>
11421112
<choose>
1143-
<!--for advance online publication-->
11441113
<if variable="issued">
11451114
<choose>
11461115
<if variable="page issue" match="none">
@@ -1152,10 +1121,9 @@
11521121
</if>
11531122
</choose>
11541123
</else-if>
1155-
<!-- book is here to catch software with container titles -->
11561124
<else-if type="book" variable="container-title" match="all">
11571125
<group delimiter=" ">
1158-
<text term="in" text-case="capitalize-first" suffix=" "/>
1126+
<text term="in" text-case="capitalize-first" suffix=": "/>
11591127
<group delimiter=", ">
11601128
<text macro="container-contributors"/>
11611129
<group delimiter=" ">
@@ -1168,7 +1136,7 @@
11681136
</else-if>
11691137
<else-if type="report" variable="container-title" match="all">
11701138
<group delimiter=" ">
1171-
<text term="in" text-case="capitalize-first" suffix=" "/>
1139+
<text term="in" text-case="capitalize-first" suffix=": "/>
11721140
<group delimiter=", ">
11731141
<text macro="container-contributors"/>
11741142
<group delimiter=" ">
@@ -1181,7 +1149,7 @@
11811149
</else-if>
11821150
<else-if type="song" variable="container-title" match="all">
11831151
<group delimiter=" ">
1184-
<text term="in" text-case="capitalize-first" suffix=" "/>
1152+
<text term="in" text-case="capitalize-first" suffix=": "/>
11851153
<group delimiter=", ">
11861154
<text macro="container-contributors"/>
11871155
<group delimiter=" ">
@@ -1210,7 +1178,6 @@
12101178
</else-if>
12111179
<else-if type="book">
12121180
<choose>
1213-
<!-- book and software should not cite collection-title, only container-title -->
12141181
<if variable="container-title">
12151182
<text macro="container-booklike"/>
12161183
</if>
@@ -1228,7 +1195,7 @@
12281195
<choose>
12291196
<if variable="container-title collection-title" match="any">
12301197
<group delimiter=" ">
1231-
<text term="in" text-case="capitalize-first"/>
1198+
<text term="in" text-case="capitalize-first" suffix=": "/>
12321199
<group delimiter=", ">
12331200
<text macro="container-contributors"/>
12341201
<choose>
@@ -1250,7 +1217,6 @@
12501217
</if>
12511218
</choose>
12521219
</group>
1253-
<!-- Replace with volume-title as that becomes available -->
12541220
<group delimiter=": ">
12551221
<text macro="container-title"/>
12561222
<choose>
@@ -1265,7 +1231,6 @@
12651231
</group>
12661232
</if>
12671233
<else>
1268-
<!-- Replace with volume-title as that becomes available -->
12691234
<group delimiter=": ">
12701235
<text macro="container-title"/>
12711236
<choose>
@@ -1311,16 +1276,12 @@
13111276
</else-if>
13121277
</choose>
13131278
</macro>
1314-
<!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
13151279
<macro name="publication-history">
13161280
<choose>
13171281
<if type="patent" match="none">
13181282
<group prefix="(" suffix=")">
13191283
<choose>
13201284
<if variable="references">
1321-
<!-- This provides the option for more elaborate description
1322-
of publication history, such as full "reprinted" references
1323-
(example 26) or retracted references -->
13241285
<text variable="references"/>
13251286
</if>
13261287
<else>
@@ -1354,14 +1315,13 @@
13541315
<macro name="legal-cites">
13551316
<choose>
13561317
<if type="legal_case">
1357-
<group delimiter=" " prefix=", ">
1318+
<group delimiter=" ">
13581319
<group delimiter=" ">
13591320
<choose>
13601321
<if variable="container-title">
13611322
<text variable="volume"/>
13621323
<text variable="container-title"/>
13631324
<group delimiter=" ">
1364-
<!--change to label variable="section" as that becomes available -->
13651325
<text term="section" form="symbol"/>
13661326
<text variable="section"/>
13671327
</group>
@@ -1371,8 +1331,7 @@
13711331
<group delimiter=" ">
13721332
<choose>
13731333
<if is-numeric="number">
1374-
<!-- Replace with term="number" if that becomes available -->
1375-
<text term="issue" form="short" text-case="capitalize-first"/>
1334+
<text term="issue" form="short" text-case="lowercase"/>
13761335
</if>
13771336
</choose>
13781337
<text variable="number"/>
@@ -1384,7 +1343,6 @@
13841343
<text variable="authority"/>
13851344
<choose>
13861345
<if variable="container-title" match="any">
1387-
<!--Only print year for cases published in reporters-->
13881346
<date variable="issued" form="numeric" date-parts="year"/>
13891347
</if>
13901348
<else>
@@ -1402,13 +1360,7 @@
14021360
</date>
14031361
<choose>
14041362
<if variable="number">
1405-
<!--There's a public law number-->
1406-
<text variable="number" prefix="Pub. L. No. "/>
1407-
<group delimiter=" ">
1408-
<!--change to label variable="section" as that becomes available -->
1409-
<text term="section" form="symbol"/>
1410-
<text variable="section"/>
1411-
</group>
1363+
<text variable="number" prefix="Ur. l. RS, št. "/>
14121364
<group delimiter=" ">
14131365
<text variable="volume"/>
14141366
<text variable="container-title"/>
@@ -1419,9 +1371,6 @@
14191371
<group delimiter=" ">
14201372
<text variable="volume"/>
14211373
<text variable="container-title"/>
1422-
<!--change to label variable="section" as that becomes available -->
1423-
<text term="section" form="symbol"/>
1424-
<text variable="section"/>
14251374
</group>
14261375
</else>
14271376
</choose>
@@ -1455,6 +1404,10 @@
14551404
<key macro="author"/>
14561405
<key macro="issued-sort" sort="ascending"/>
14571406
<key macro="title"/>
1407+
<key macro="container-title"/>
1408+
<key variable="volume"/>
1409+
<key variable="issue"/>
1410+
<key variable="number"/>
14581411
</sort>
14591412
<layout>
14601413
<group delimiter=" ">

0 commit comments

Comments
 (0)
Please sign in to comment.