Skip to content

Commit 3363453

Browse files
moritzshoremoritzshore
committed
Fix vignette files
1 parent 178ea8d commit 3363453

5 files changed

+374
-6
lines changed

‎.Rbuildignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
^LICENSE\.md$
77
^\.github$
88
_pkgdown.yaml
9-
apa-5th-edition.csl
10-
references.bib
9+
^doc$
10+
^Meta$

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ docs
44
pkgdown
55
_pkgdown.yaml
66
inst/doc
7-
apa-5th-edition.csl
8-
references.bib
7+
/doc/
8+
/Meta/

‎vignettes/Norwegian_Soil_Classification.Rmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ vignette: >
88
editor_options:
99
markdown:
1010
wrap: 72
11-
bibliography: ../references.bib
12-
csl: ../apa-5th-edition.csl
11+
bibliography: ../vignettes/references.bib
12+
csl: ../vignettes/apa-5th-edition.csl
1313

1414
---
1515

‎vignettes/apa-5th-edition.csl

+355
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,355 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
3+
<info>
4+
<title>American Psychological Association 5th edition</title>
5+
<title-short>APA (5th ed.)</title-short>
6+
<id>http://www.zotero.org/styles/apa-5th-edition</id>
7+
<link href="http://www.zotero.org/styles/apa-5th-edition" rel="self"/>
8+
<link href="http://rdc.libguides.com/content.php?pid=63487" rel="documentation"/>
9+
<author>
10+
<name>Simon Kornblith</name>
11+
<email>[email protected]</email>
12+
</author>
13+
<contributor>
14+
<name>Bruce D'Arcus</name>
15+
</contributor>
16+
<contributor>
17+
<name>Curtis M. Humphrey</name>
18+
</contributor>
19+
<contributor>
20+
<name>Richard Karnesky</name>
21+
<email>[email protected]</email>
22+
<uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
23+
</contributor>
24+
<contributor>
25+
<name>Sebastian Karcher</name>
26+
</contributor>
27+
<category citation-format="author-date"/>
28+
<category field="psychology"/>
29+
<category field="generic-base"/>
30+
<updated>2022-07-26T18:07:54+00:00</updated>
31+
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
32+
</info>
33+
<locale xml:lang="fr">
34+
<terms>
35+
<term name="editor" form="short">
36+
<single>éd.</single>
37+
<multiple>éds.</multiple>
38+
</term>
39+
</terms>
40+
</locale>
41+
<macro name="container-contributors">
42+
<choose>
43+
<if type="chapter paper-conference" match="any">
44+
<text term="in" text-case="capitalize-first" suffix=" "/>
45+
<names variable="editor" delimiter=", " suffix=", ">
46+
<name and="symbol" initialize-with=". " delimiter=", "/>
47+
<label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
48+
<substitute>
49+
<names variable="translator"/>
50+
</substitute>
51+
</names>
52+
</if>
53+
</choose>
54+
</macro>
55+
<macro name="secondary-contributors">
56+
<choose>
57+
<if type="chapter paper-conference" match="none">
58+
<names variable="translator" delimiter=", " prefix=" (" suffix=")">
59+
<name and="symbol" initialize-with=". " delimiter=", "/>
60+
<label form="short" prefix=", " text-case="capitalize-first"/>
61+
<substitute>
62+
<names variable="editor"/>
63+
</substitute>
64+
</names>
65+
</if>
66+
</choose>
67+
</macro>
68+
<macro name="author">
69+
<names variable="author">
70+
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
71+
<label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
72+
<substitute>
73+
<names variable="editor"/>
74+
<names variable="translator"/>
75+
<text macro="title"/>
76+
</substitute>
77+
</names>
78+
</macro>
79+
<macro name="author-short">
80+
<names variable="author">
81+
<name form="short" and="symbol" delimiter=", " initialize-with=". "/>
82+
<substitute>
83+
<names variable="editor"/>
84+
<names variable="translator"/>
85+
<choose>
86+
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
87+
<text variable="title" form="short" font-style="italic"/>
88+
</if>
89+
<else>
90+
<text variable="title" form="short" quotes="true"/>
91+
</else>
92+
</choose>
93+
</substitute>
94+
</names>
95+
</macro>
96+
<macro name="access">
97+
<choose>
98+
<if type="thesis">
99+
<choose>
100+
<if variable="archive" match="any">
101+
<group>
102+
<text term="retrieved" text-case="capitalize-first" suffix=" "/>
103+
<text term="from" suffix=" "/>
104+
<text variable="archive" suffix="."/>
105+
<text variable="archive_location" prefix=" (" suffix=")"/>
106+
</group>
107+
</if>
108+
<else>
109+
<group>
110+
<text term="retrieved" text-case="capitalize-first" suffix=" "/>
111+
<date variable="accessed" suffix=", ">
112+
<date-part name="month" suffix=" "/>
113+
<date-part name="day" suffix=", "/>
114+
<date-part name="year"/>
115+
</date>
116+
<text term="from" suffix=" "/>
117+
<text variable="URL"/>
118+
</group>
119+
</else>
120+
</choose>
121+
</if>
122+
<else>
123+
<choose>
124+
<if variable="URL">
125+
<choose>
126+
<if variable="archive">
127+
<group>
128+
<text term="retrieved" text-case="capitalize-first" suffix=" "/>
129+
<text term="from" suffix=" "/>
130+
<text variable="archive" suffix="."/>
131+
</group>
132+
</if>
133+
<else>
134+
<group>
135+
<text term="retrieved" text-case="capitalize-first" suffix=" "/>
136+
<date variable="accessed" suffix=", ">
137+
<date-part name="month" suffix=" "/>
138+
<date-part name="day" suffix=", "/>
139+
<date-part name="year"/>
140+
</date>
141+
<group>
142+
<text term="from" suffix=" "/>
143+
<text variable="URL"/>
144+
</group>
145+
</group>
146+
</else>
147+
</choose>
148+
</if>
149+
</choose>
150+
</else>
151+
</choose>
152+
</macro>
153+
<macro name="title">
154+
<choose>
155+
<if type="report thesis" match="any">
156+
<text variable="title" font-style="italic"/>
157+
<group prefix=" (" suffix=")">
158+
<text variable="genre"/>
159+
<text variable="number" prefix=" No. "/>
160+
</group>
161+
</if>
162+
<else-if type="bill book graphic legal_case legislation manuscript motion_picture report song speech" match="any">
163+
<text variable="title" font-style="italic"/>
164+
</else-if>
165+
<else>
166+
<text variable="title"/>
167+
</else>
168+
</choose>
169+
</macro>
170+
<macro name="publisher">
171+
<choose>
172+
<if type="report" match="any">
173+
<group delimiter=": ">
174+
<text variable="publisher-place"/>
175+
<text variable="publisher"/>
176+
</group>
177+
</if>
178+
<else-if type="thesis" match="any">
179+
<group delimiter=", ">
180+
<text variable="publisher"/>
181+
<text variable="publisher-place"/>
182+
</group>
183+
</else-if>
184+
<else>
185+
<choose>
186+
<if variable="event event-title" match="none">
187+
<text variable="genre" suffix=", "/>
188+
</if>
189+
</choose>
190+
<group delimiter=": ">
191+
<text variable="publisher-place"/>
192+
<text variable="publisher"/>
193+
</group>
194+
</else>
195+
</choose>
196+
</macro>
197+
<macro name="event">
198+
<choose>
199+
<if variable="event event-title" match="any">
200+
<choose>
201+
<if variable="genre" match="none">
202+
<text term="presented at" text-case="capitalize-first" suffix=" "/>
203+
<text macro="event-title"/>
204+
</if>
205+
<else>
206+
<group delimiter=" ">
207+
<text variable="genre" text-case="capitalize-first"/>
208+
<text term="presented at"/>
209+
<text macro="event-title"/>
210+
</group>
211+
</else>
212+
</choose>
213+
</if>
214+
</choose>
215+
</macro>
216+
<macro name="event-title">
217+
<choose>
218+
<!-- TODO: We expect "event-title" to be used,
219+
but processors and applications may not be updated yet.
220+
This macro ensures that either "event" or "event-title" can be accpeted.
221+
Remove if procesor logic and application adoption can handle this. -->
222+
<if variable="event-title">
223+
<text variable="event-title"/>
224+
</if>
225+
<else>
226+
<text variable="event"/>
227+
</else>
228+
</choose>
229+
</macro>
230+
<macro name="issued">
231+
<choose>
232+
<if variable="issued">
233+
<group prefix=" (" suffix=").">
234+
<date variable="issued">
235+
<date-part name="year"/>
236+
</date>
237+
<choose>
238+
<if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
239+
<date variable="issued">
240+
<date-part prefix=", " name="month"/>
241+
<date-part prefix=" " name="day"/>
242+
</date>
243+
</if>
244+
</choose>
245+
</group>
246+
</if>
247+
<else>
248+
<text prefix=" (" term="no date" suffix=")." form="short"/>
249+
</else>
250+
</choose>
251+
</macro>
252+
<macro name="issued-year">
253+
<choose>
254+
<if variable="issued">
255+
<date variable="issued">
256+
<date-part name="year"/>
257+
</date>
258+
</if>
259+
<else>
260+
<text term="no date" form="short"/>
261+
</else>
262+
</choose>
263+
</macro>
264+
<macro name="edition">
265+
<choose>
266+
<if is-numeric="edition">
267+
<group delimiter=" ">
268+
<number variable="edition" form="ordinal"/>
269+
<text term="edition" form="short"/>
270+
</group>
271+
</if>
272+
<else>
273+
<text variable="edition" suffix="."/>
274+
</else>
275+
</choose>
276+
</macro>
277+
<macro name="locators">
278+
<choose>
279+
<if type="article-journal article-magazine article-newspaper" match="any">
280+
<group prefix=", " delimiter=", ">
281+
<group>
282+
<text variable="volume" font-style="italic"/>
283+
<text variable="issue" prefix="(" suffix=")"/>
284+
</group>
285+
<text variable="page"/>
286+
</group>
287+
</if>
288+
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
289+
<group prefix=" (" suffix=")" delimiter=", ">
290+
<text macro="edition"/>
291+
<group>
292+
<text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
293+
<number variable="number-of-volumes" form="numeric" prefix="1-"/>
294+
</group>
295+
<group>
296+
<text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
297+
<number variable="volume" form="numeric"/>
298+
</group>
299+
<group>
300+
<label variable="page" form="short" suffix=" "/>
301+
<text variable="page"/>
302+
</group>
303+
</group>
304+
</else-if>
305+
</choose>
306+
</macro>
307+
<macro name="citation-locator">
308+
<group>
309+
<label variable="locator" form="short"/>
310+
<text variable="locator" prefix=" "/>
311+
</group>
312+
</macro>
313+
<citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year">
314+
<sort>
315+
<key macro="author"/>
316+
<key macro="issued-year"/>
317+
</sort>
318+
<layout prefix="(" suffix=")" delimiter="; ">
319+
<group delimiter=", ">
320+
<text macro="author-short"/>
321+
<text macro="issued-year"/>
322+
<text macro="citation-locator"/>
323+
</group>
324+
</layout>
325+
</citation>
326+
<bibliography hanging-indent="true" et-al-min="8" et-al-use-first="7" entry-spacing="0" line-spacing="2">
327+
<sort>
328+
<key macro="author"/>
329+
<key macro="issued-year" sort="ascending"/>
330+
</sort>
331+
<layout>
332+
<group suffix=".">
333+
<text macro="author" suffix="."/>
334+
<text macro="issued" suffix=" "/>
335+
<group delimiter=". ">
336+
<text macro="title"/>
337+
<group>
338+
<text macro="container-contributors"/>
339+
<text macro="secondary-contributors"/>
340+
<group delimiter=", ">
341+
<text variable="container-title" font-style="italic"/>
342+
<text variable="collection-title"/>
343+
</group>
344+
</group>
345+
</group>
346+
<text macro="locators"/>
347+
<group delimiter=", " prefix=". ">
348+
<text macro="event"/>
349+
<text macro="publisher"/>
350+
</group>
351+
</group>
352+
<text macro="access" prefix=". "/>
353+
</layout>
354+
</bibliography>
355+
</style>

‎vignettes/references.bib

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@article{ditzler2017soil,
2+
title={Soil Survey Manual: Soil Science Division Staff},
3+
author={Ditzler, C and Scheffe, K and Monger, HC},
4+
journal={Goverment Printing Office: Washington, DC, USA},
5+
year={2017}
6+
}
7+
8+
@article{sveistrup1984kornstorrelsesgrupper,
9+
title={Kornst{\o}rrelsesgrupper i mineraljord. Revidert forslag til klassifisering},
10+
author={Sveistrup, TE and Nj{\o}s, A},
11+
year={1984},
12+
publisher={Det Norske Jord-og Myrselskap}
13+
}

0 commit comments

Comments
 (0)