Skip to content

Commit c8ead6b

Browse files
committed
Revert "Squashed 'src/main/resources/csl-styles/' changes from a995c63..bf698ac"
This reverts commit c7795e9. This hopefully fixes the issue with the csl files. Signed-off-by: Dominik Voigt <[email protected]> # Conflicts: # src/main/resources/csl-styles/common-market-law-review.csl # src/main/resources/csl-styles/dependent/prifysgol-caerdydd-harvard.csl # src/main/resources/csl-styles/geographische-zeitschrift.csl # src/main/resources/csl-styles/kunstakademie-munster.csl # src/main/resources/csl-styles/tijdschrift-voor-geneeskunde.csl
1 parent 9054011 commit c8ead6b

22 files changed

+165
-1433
lines changed

src/main/resources/csl-styles/aerosol-science-and-technology.csl

+6-8
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
<link href="http://www.tandfonline.com/action/authorSubmission?journalCode=uast20&amp;page=instructions" rel="documentation"/>
99
<author>
1010
<name>Patrick O'Brien</name>
11+
<email>[email protected]</email>
1112
</author>
1213
<category citation-format="author-date"/>
1314
<category field="chemistry"/>
1415
<issn>0278-6826</issn>
15-
<updated>2020-07-09T20:19:32+00:00</updated>
16+
<updated>2017-03-29T13:20:23+00:00</updated>
1617
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
1718
</info>
1819
<macro name="author">
@@ -87,7 +88,7 @@
8788
<text variable="container-title" form="short"/>
8889
</else-if>
8990
<else>
90-
<group delimiter=", " prefix=" ">
91+
<group delimiter=", " prefix=" " suffix=",">
9192
<text variable="container-title" form="short"/>
9293
<text variable="collection-title"/>
9394
</group>
@@ -96,7 +97,7 @@
9697
</macro>
9798
<macro name="access">
9899
<choose>
99-
<if type="webpage post post-weblog" match="any">
100+
<if type="webpage">
100101
<group delimiter=" ">
101102
<text term="available at" text-case="capitalize-first"/>
102103
<text variable="URL"/>
@@ -110,9 +111,6 @@
110111
</group>
111112
</group>
112113
</if>
113-
<else-if type="article-journal" match="any">
114-
<text variable="DOI" prefix="doi:"/>
115-
</else-if>
116114
</choose>
117115
</macro>
118116
<macro name="publisher">
@@ -158,7 +156,7 @@
158156
<choose>
159157
<if type="article-journal article-magazine article-newspaper" match="any">
160158
<group delimiter=":" prefix=" ">
161-
<group delimiter=" ">
159+
<group>
162160
<text variable="volume"/>
163161
<text variable="issue" prefix="(" suffix=")"/>
164162
</group>
@@ -207,7 +205,7 @@
207205
<key macro="author"/>
208206
<key macro="issued" sort="descending"/>
209207
</sort>
210-
<layout suffix=".">
208+
<layout>
211209
<group suffix=".">
212210
<text macro="author" suffix=""/>
213211
<text macro="issued" prefix=" (" suffix=")"/>

src/main/resources/csl-styles/apa-annotated-bibliography.csl

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@
190190
</locale>
191191
<locale xml:lang="la">
192192
<terms>
193-
<term name="letter"/>
193+
<term name="letter"></term>
194194
<term name="letter" form="short">epistula</term>
195195
</terms>
196196
</locale>
197197
<locale xml:lang="lt">
198198
<terms>
199199
<term name="letter">communicationis personalis</term>
200-
<term name="letter" form="short"/>
200+
<term name="letter" form="short"></term>
201201
</terms>
202202
</locale>
203203
<locale xml:lang="lv">

src/main/resources/csl-styles/apa-cv.csl

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@
190190
</locale>
191191
<locale xml:lang="la">
192192
<terms>
193-
<term name="letter"/>
193+
<term name="letter"></term>
194194
<term name="letter" form="short">epistula</term>
195195
</terms>
196196
</locale>
197197
<locale xml:lang="lt">
198198
<terms>
199199
<term name="letter">communicationis personalis</term>
200-
<term name="letter" form="short"/>
200+
<term name="letter" form="short"></term>
201201
</terms>
202202
</locale>
203203
<locale xml:lang="lv">

src/main/resources/csl-styles/apa-no-ampersand.csl

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@
190190
</locale>
191191
<locale xml:lang="la">
192192
<terms>
193-
<term name="letter"/>
193+
<term name="letter"></term>
194194
<term name="letter" form="short">epistula</term>
195195
</terms>
196196
</locale>
197197
<locale xml:lang="lt">
198198
<terms>
199199
<term name="letter">communicationis personalis</term>
200-
<term name="letter" form="short"/>
200+
<term name="letter" form="short"></term>
201201
</terms>
202202
</locale>
203203
<locale xml:lang="lv">

src/main/resources/csl-styles/apa-single-spaced.csl

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@
190190
</locale>
191191
<locale xml:lang="la">
192192
<terms>
193-
<term name="letter"/>
193+
<term name="letter"></term>
194194
<term name="letter" form="short">epistula</term>
195195
</terms>
196196
</locale>
197197
<locale xml:lang="lt">
198198
<terms>
199199
<term name="letter">communicationis personalis</term>
200-
<term name="letter" form="short"/>
200+
<term name="letter" form="short"></term>
201201
</terms>
202202
</locale>
203203
<locale xml:lang="lv">

src/main/resources/csl-styles/apa-with-abstract.csl

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@
190190
</locale>
191191
<locale xml:lang="la">
192192
<terms>
193-
<term name="letter"/>
193+
<term name="letter"></term>
194194
<term name="letter" form="short">epistula</term>
195195
</terms>
196196
</locale>
197197
<locale xml:lang="lt">
198198
<terms>
199199
<term name="letter">communicationis personalis</term>
200-
<term name="letter" form="short"/>
200+
<term name="letter" form="short"></term>
201201
</terms>
202202
</locale>
203203
<locale xml:lang="lv">

src/main/resources/csl-styles/apa.csl

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@
190190
</locale>
191191
<locale xml:lang="la">
192192
<terms>
193-
<term name="letter"/>
193+
<term name="letter"></term>
194194
<term name="letter" form="short">epistula</term>
195195
</terms>
196196
</locale>
197197
<locale xml:lang="lt">
198198
<terms>
199199
<term name="letter">communicationis personalis</term>
200-
<term name="letter" form="short"/>
200+
<term name="letter" form="short"></term>
201201
</terms>
202202
</locale>
203203
<locale xml:lang="lv">

src/main/resources/csl-styles/australian-guide-to-legal-citation.csl

+7-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<category citation-format="note"/>
1515
<category field="law"/>
1616
<summary>Support for the development of the CSL style was provided by the Faculty of Law, University of Technology Sydney. The AGLC is published by the University of Melbourne Faculty of Law.</summary>
17-
<updated>2020-07-09T03:49:56+00:00</updated>
17+
<updated>2018-09-03T17:14:48+00:00</updated>
1818
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
1919
</info>
2020
<locale>
@@ -398,14 +398,17 @@
398398
</choose>
399399
<choose>
400400
<if type="article-newspaper">
401-
<group delimiter=", ">
402-
<text variable="publisher-place"/>
401+
<group delimiter=" ">
403402
<choose>
404403
<if variable="URL">
405404
<text term="online"/>
405+
<text term="at"/>
406406
</if>
407407
</choose>
408-
<text macro="issued-full"/>
408+
<group delimiter=", ">
409+
<text variable="publisher-place"/>
410+
<text macro="issued-full"/>
411+
</group>
409412
</group>
410413
</if>
411414
<else-if type="legislation bill" match="any">

0 commit comments

Comments
 (0)