Skip to content

Commit 4785699

Browse files
author
github actions
committed
Squashed 'src/main/resources/csl-styles/' changes from 88726cb..db54e56
db54e56 Update CONTRIBUTING.md 2f16a9b Update CONTRIBUTING.md 4cd05ba Create associacao-brasileira-de-normas-tecnicas-ufrgs-footnote-ibid.csl (#4369) 4d4655e Update instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abn… (#4684) 5948265 Update instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abn… (#4683) f8b744c Create aberdeen-university-school-of-education-harvard.csl (#4685) 807930a Update trabajos-de-prehistoria.csl (#4680) c25709f Update society-for-american-archaeology.csl (#4681) 86f888a Update archeosciences.csl (#4682) 99c4fd3 Create sylwan.csl (#4678) d9ba2de Update equine-veterinary-education.csl (#4677) 7d30659 Update equine-veterinary-education.csl (#4675) 9a7791f Update equine-veterinary-education.csl (#4674) 0a46235 Create norois.csl (#4673) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: db54e56
1 parent ff72b06 commit 4785699

11 files changed

+3043
-588
lines changed

‎CONTRIBUTING.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To submit a style, please follow the following steps (for locale files, follow t
1010

1111
#### 1. Check that your style meets all our [style requirements](https://github.com/citation-style-language/styles/wiki/Style-Requirements)
1212

13-
#### 2. [Validate](https://github.com/citation-style-language/styles/wiki/Validation) your style against the CSL schema, and correct any validation errors
13+
#### 2. [Validate](https://validator.citationstyles.org/) your style against the CSL schema, and correct any validation errors
1414

1515
#### 3. Create a pull request
1616

@@ -33,7 +33,7 @@ To start, create a GitHub account and sign in.
3333
##### 3b. Submitting changes to an existing style
3434

3535
1. Visit https://github.com/citation-style-language/styles and find the style you wish to change (dependent styles are stored in the [dependent](https://github.com/citation-style-language/styles/tree/master/dependent) subdirectory).
36-
To search by file name press "t" (this activates GitHub’s [File Finder](https://github.com/blog/793-introducing-the-file-finder)) and start typing.
36+
To search the repository by file name, click the "Find file" button or press <kbd>t</kbd> to activate GitHub’s [file finder](https://help.github.com/en/github/searching-for-information-on-github/finding-files-on-github) and start typing.
3737
2. Click on the style name, which will bring you to a page like https://github.com/citation-style-language/styles/blob/master/apa.csl.
3838
3. Click the edit icon (in the shape of a pencil).
3939
This opens a code editor in which you can make your changes (you can for example copy and paste your modified style into this window).
@@ -52,30 +52,30 @@ We often request you to make some changes to your pull request.
5252
Don't create a new pull request right away if your original submission has issues.
5353
It's much easier for us if you update your original pull request instead.
5454

55-
After you create a pull request, our @csl-bot will first automatically run a number of tests to check whether your style validates and follows our style requirements.
55+
After you create a pull request, our [@csl-bot](https://github.com/csl-bot) will first automatically run a number of tests to check whether your style validates and follows our style requirements.
5656
These tests usually finish within a few minutes.
57-
If there are problems, @csl-bot will give a link to the test report, which contains the identified errors.
57+
If there are problems, [@csl-bot](https://github.com/csl-bot) will leave a comment with the identified errors.
5858
If you have trouble understanding these errors, please post a comment in the pull request and ask for help.
5959

60-
We also have a handful of volunteers who review pull requests, usually within a day or two.
60+
We also have a handful of volunteers who review pull requests, usually within a week or two.
6161

6262
To update your pull request:
6363

6464
1. Visit the "Files changed" tab of your pull request.
65-
2. Click the edit (pencil) icon at the top-right of your style.
65+
2. Click the ellipsis button at the top-right of your style, and select "Edit file" in the ellipsis menu.
6666
3. Make your changes, and click the "Commit changes" button.
6767

6868
Any changes made this way will automatically appear in the pull request, and each commit will trigger a new test report.
6969

7070
Once we are satisfied, we will **merge** your pull request.
71-
This can take hours or days, depending on how busy we are, and on how much back and forth is needed to get your style in acceptable shape.
71+
This can take days or weeks, depending on how busy we are, and on how much back and forth is needed to get your style in acceptable shape.
7272

7373
#### 5. Make additional changes after merging
7474

7575
Once a pull request has been merged, it can no longer be used to submit further changes.
7676
So, if you wish to make additional changes, just create a new pull request.
7777

78-
Please always start from the latest version of the style from our repository, because we often perform maintenance on the repository styles.
78+
Please always start from the latest version of the style from our repository, because we may have performed maintenance on your style or accepted corrections from other contributors.
7979

8080
## Asking for help
8181

‎archeosciences.csl

+68-68
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" delimiter-precedes-et-al="never" delimiter-precedes-last="never" page-range-format="expanded" demote-non-dropping-particle="never" default-locale="fr-FR">
3-
<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
3+
<!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
44
<info>
55
<title>ArchéoSciences (French)</title>
66
<id>http://www.zotero.org/styles/archeosciences</id>
@@ -17,13 +17,13 @@
1717
<issn>1960-1360</issn>
1818
<eissn>2104-3728</eissn>
1919
<summary>Style pour ArchéoSciences, revue d'Archéométrie.</summary>
20-
<updated>2019-03-22T12:49:09+00:00</updated>
20+
<updated>2020-04-09T17:01:16+00:00</updated>
2121
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
2222
</info>
2323
<locale xml:lang="fr">
2424
<terms>
2525
<term name="editor" form="short">dir.</term>
26-
<term name="in">dans</term>
26+
<term name="in">in</term>
2727
<term name="anonymous">anonyme</term>
2828
<term name="anonymous" form="short">anon.</term>
2929
<term name="accessed">consulté le</term>
@@ -32,26 +32,23 @@
3232
</terms>
3333
</locale>
3434
<macro name="author">
35-
<names variable="author" delimiter=" ">
35+
<names variable="author">
3636
<name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
3737
<substitute>
38-
<text macro="editor"/>
39-
<text term="anonymous" text-case="capitalize-first"/>
38+
<choose>
39+
<if match="any" variable="editor">
40+
<text macro="editor"/>
41+
</if>
42+
<else>
43+
<text term="anonymous" text-case="capitalize-first"/>
44+
</else>
45+
</choose>
4046
</substitute>
4147
</names>
4248
</macro>
43-
<macro name="editor">
44-
<names variable="editor">
45-
<name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
46-
<label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
47-
</names>
48-
</macro>
49-
<macro name="pages">
50-
<text variable="page"/>
51-
</macro>
5249
<macro name="author-short">
5350
<names variable="author">
54-
<name form="short" and="symbol" delimiter-precedes-last="never"/>
51+
<name form="short" and="symbol" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1"/>
5552
<et-al font-style="italic"/>
5653
<substitute>
5754
<choose>
@@ -65,32 +62,36 @@
6562
</substitute>
6663
</names>
6764
</macro>
65+
<macro name="editor">
66+
<names variable="editor">
67+
<name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
68+
<label form="short" plural="never" text-case="lowercase" prefix=" (" suffix=")"/>
69+
</names>
70+
</macro>
71+
<macro name="pages">
72+
<text variable="page"/>
73+
</macro>
6874
<macro name="editor-short">
6975
<names variable="editor">
70-
<name form="short" and="symbol" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
76+
<name form="short" and="symbol" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with=". " name-as-sort-order="all"/>
7177
<et-al font-style="italic"/>
7278
</names>
7379
</macro>
74-
<macro name="URLaccess">
75-
<group delimiter=" " suffix=".">
76-
<text term="available at" text-case="capitalize-first" suffix=":"/>
77-
<text variable="URL"/>
78-
<text macro="access"/>
79-
</group>
80-
</macro>
81-
<macro name="access">
82-
<group prefix="(" suffix=")">
83-
<text term="accessed" form="short" suffix=" "/>
84-
<date form="numeric" variable="accessed"/>
80+
<macro name="URL">
81+
<group delimiter=", ">
82+
<group delimiter=" ">
83+
<text term="available at" text-case="capitalize-first"/>
84+
<text variable="URL"/>
85+
</group>
86+
<group>
87+
<text term="accessed" form="short" text-case="lowercase" suffix=" "/>
88+
<date form="numeric" variable="accessed"/>
89+
</group>
8590
</group>
8691
</macro>
87-
<macro name="editor-text">
88-
<text macro="editor"/>
89-
<text macro="publisher" suffix=", "/>
90-
</macro>
9192
<macro name="title">
9293
<choose>
93-
<if type="book dataset map report webpage" match="any">
94+
<if type="book" match="any">
9495
<text variable="title" font-style="italic"/>
9596
</if>
9697
<else>
@@ -115,26 +116,25 @@
115116
<text term="no date" form="short"/>
116117
</else>
117118
</choose>
118-
<choose>
119-
<if is-numeric="edition">
120-
<number variable="edition" prefix=" (" suffix=")"/>
121-
</if>
122-
<else>
123-
<text variable="edition" prefix=" (" suffix=")"/>
124-
</else>
125-
</choose>
126119
</macro>
127120
<macro name="DOI">
128-
<text variable="DOI" prefix="DOI: "/>
121+
<text variable="DOI" prefix="DOI : "/>
129122
</macro>
130123
<macro name="collection">
131-
<group delimiter=", " suffix=".">
124+
<group delimiter=" " suffix=".">
132125
<text variable="collection-title"/>
133126
<text variable="collection-number"/>
134127
</group>
135128
</macro>
129+
<macro name="editor-text">
130+
<group delimiter=" ">
131+
<text term="in" text-case="capitalize-first" font-style="italic"/>
132+
<text macro="editor"/>
133+
</group>
134+
</macro>
136135
<citation et-al-min="3" et-al-use-first="1" delimiter-precedes-et-al="never" disambiguate-add-year-suffix="true">
137136
<sort>
137+
<key variable="issued"/>
138138
<key variable="author"/>
139139
</sort>
140140
<layout delimiter="&#160;; " prefix="(" suffix=")">
@@ -158,49 +158,49 @@
158158
</group>
159159
<text macro="title"/>
160160
<choose>
161-
<if type="thesis">
162-
<text macro="publisher"/>
163-
</if>
164-
<else-if type="article-journal article-magazine article-newspaper broadcast personal_communication entry-dictionary entry-encyclopedia" match="any">
165-
<group delimiter=", " suffix=".">
166-
<text variable="container-title" font-style="italic"/>
167-
<text variable="volume"/>
168-
<text variable="issue"/>
169-
<text macro="pages"/>
161+
<if type="article-journal article-magazine article-newspaper" match="any">
162+
<group>
163+
<text variable="container-title" font-style="italic" suffix=", "/>
164+
<text variable="volume" suffix=", "/>
165+
<text variable="issue" suffix=" "/>
166+
<text macro="pages" prefix=": "/>
170167
</group>
171-
</else-if>
168+
</if>
172169
<else-if type="book" match="any">
170+
<text macro="collection"/>
171+
<text macro="publisher"/>
172+
</else-if>
173+
<else-if type="chapter paper-conference" match="any">
174+
<text macro="editor-text"/>
173175
<choose>
174-
<if match="all" variable="editor author">
175-
<text macro="editor-text"/>
176+
<if type="chapter" match="any">
177+
<text variable="container-title" font-style="italic"/>
176178
</if>
177179
<else>
178-
<text macro="publisher"/>
180+
<text variable="container-title"/>
179181
</else>
180182
</choose>
183+
<text variable="event"/>
184+
<text macro="collection"/>
185+
<text macro="publisher"/>
181186
</else-if>
182-
<else-if type="chapter paper-conference" match="any">
183-
<group delimiter=" " suffix=".">
184-
<text term="in" text-case="capitalize-first"/>
185-
<text macro="editor"/>
186-
</group>
187-
<text variable="container-title" font-style="italic"/>
187+
<else-if type="thesis" match="any">
188188
<group delimiter=", ">
189+
<text variable="genre"/>
189190
<text macro="publisher"/>
190-
<text macro="pages"/>
191191
</group>
192192
</else-if>
193-
<else-if type="dataset report" match="any">
193+
<else-if type="report dataset" match="any">
194+
<text variable="genre"/>
195+
<text variable="version" prefix="Version "/>
194196
<text macro="collection"/>
195-
<text variable="note" suffix="."/>
196197
<text macro="publisher"/>
197-
<text macro="URLaccess"/>
198+
<text variable="URL" prefix="URL : "/>
198199
</else-if>
199200
<else-if type="webpage">
200-
<text macro="URLaccess"/>
201+
<text macro="URL"/>
201202
</else-if>
202203
<else>
203-
<text variable="title" font-style="italic" suffix=". "/>
204204
<text macro="publisher"/>
205205
</else>
206206
</choose>

0 commit comments

Comments
 (0)