Skip to content

Commit

Permalink
Merge pull request #1 from citation-style-language/master
Browse files Browse the repository at this point in the history 
Syn with Origin
  • Loading branch information
@anritsupolii
anritsupolii authored Apr 13, 2020
2 parents a51eb4f + 449eaec commit 7dfb630
Show file tree
Hide file tree
Showing 38 changed files with 6,815 additions and 703 deletions.
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ To submit a style, please follow the following steps (for locale files, follow t

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

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

#### 3. Create a pull request

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

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).
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.
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.
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.
3. Click the edit icon (in the shape of a pencil).
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).
Expand All @@ -52,30 +52,30 @@ We often request you to make some changes to your pull request.
Don't create a new pull request right away if your original submission has issues.
It's much easier for us if you update your original pull request instead.

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.
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.
These tests usually finish within a few minutes.
If there are problems, @csl-bot will give a link to the test report, which contains the identified errors.
If there are problems, [@csl-bot](https://github.com/csl-bot) will leave a comment with the identified errors.
If you have trouble understanding these errors, please post a comment in the pull request and ask for help.

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

To update your pull request:

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

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

Once we are satisfied, we will **merge** your pull request.
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.
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.

#### 5. Make additional changes after merging

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

Please always start from the latest version of the style from our repository, because we often perform maintenance on the repository styles.
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.

## Asking for help

Expand Down
136 changes: 68 additions & 68 deletions archeosciences.csl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
<!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
<info>
<title>ArchéoSciences (French)</title>
<id>http://www.zotero.org/styles/archeosciences</id>
Expand All @@ -17,13 +17,13 @@
<issn>1960-1360</issn>
<eissn>2104-3728</eissn>
<summary>Style pour ArchéoSciences, revue d'Archéométrie.</summary>
<updated>2019-03-22T12:49:09+00:00</updated>
<updated>2020-04-09T17:01:16+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="fr">
<terms>
<term name="editor" form="short">dir.</term>
<term name="in">dans</term>
<term name="in">in</term>
<term name="anonymous">anonyme</term>
<term name="anonymous" form="short">anon.</term>
<term name="accessed">consulté le</term>
Expand All @@ -32,26 +32,23 @@
</terms>
</locale>
<macro name="author">
<names variable="author" delimiter=" ">
<names variable="author">
<name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
<substitute>
<text macro="editor"/>
<text term="anonymous" text-case="capitalize-first"/>
<choose>
<if match="any" variable="editor">
<text macro="editor"/>
</if>
<else>
<text term="anonymous" text-case="capitalize-first"/>
</else>
</choose>
</substitute>
</names>
</macro>
<macro name="editor">
<names variable="editor">
<name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
<label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
</names>
</macro>
<macro name="pages">
<text variable="page"/>
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="symbol" delimiter-precedes-last="never"/>
<name form="short" and="symbol" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1"/>
<et-al font-style="italic"/>
<substitute>
<choose>
Expand All @@ -65,32 +62,36 @@
</substitute>
</names>
</macro>
<macro name="editor">
<names variable="editor">
<name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
<label form="short" plural="never" text-case="lowercase" prefix=" (" suffix=")"/>
</names>
</macro>
<macro name="pages">
<text variable="page"/>
</macro>
<macro name="editor-short">
<names variable="editor">
<name form="short" and="symbol" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
<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"/>
<et-al font-style="italic"/>
</names>
</macro>
<macro name="URLaccess">
<group delimiter=" " suffix=".">
<text term="available at" text-case="capitalize-first" suffix=":"/>
<text variable="URL"/>
<text macro="access"/>
</group>
</macro>
<macro name="access">
<group prefix="(" suffix=")">
<text term="accessed" form="short" suffix=" "/>
<date form="numeric" variable="accessed"/>
<macro name="URL">
<group delimiter=", ">
<group delimiter=" ">
<text term="available at" text-case="capitalize-first"/>
<text variable="URL"/>
</group>
<group>
<text term="accessed" form="short" text-case="lowercase" suffix=" "/>
<date form="numeric" variable="accessed"/>
</group>
</group>
</macro>
<macro name="editor-text">
<text macro="editor"/>
<text macro="publisher" suffix=", "/>
</macro>
<macro name="title">
<choose>
<if type="book dataset map report webpage" match="any">
<if type="book" match="any">
<text variable="title" font-style="italic"/>
</if>
<else>
Expand All @@ -115,26 +116,25 @@
<text term="no date" form="short"/>
</else>
</choose>
<choose>
<if is-numeric="edition">
<number variable="edition" prefix=" (" suffix=")"/>
</if>
<else>
<text variable="edition" prefix=" (" suffix=")"/>
</else>
</choose>
</macro>
<macro name="DOI">
<text variable="DOI" prefix="DOI: "/>
<text variable="DOI" prefix="DOI : "/>
</macro>
<macro name="collection">
<group delimiter=", " suffix=".">
<group delimiter=" " suffix=".">
<text variable="collection-title"/>
<text variable="collection-number"/>
</group>
</macro>
<macro name="editor-text">
<group delimiter=" ">
<text term="in" text-case="capitalize-first" font-style="italic"/>
<text macro="editor"/>
</group>
</macro>
<citation et-al-min="3" et-al-use-first="1" delimiter-precedes-et-al="never" disambiguate-add-year-suffix="true">
<sort>
<key variable="issued"/>
<key variable="author"/>
</sort>
<layout delimiter="&#160;; " prefix="(" suffix=")">
Expand All @@ -158,49 +158,49 @@
</group>
<text macro="title"/>
<choose>
<if type="thesis">
<text macro="publisher"/>
</if>
<else-if type="article-journal article-magazine article-newspaper broadcast personal_communication entry-dictionary entry-encyclopedia" match="any">
<group delimiter=", " suffix=".">
<text variable="container-title" font-style="italic"/>
<text variable="volume"/>
<text variable="issue"/>
<text macro="pages"/>
<if type="article-journal article-magazine article-newspaper" match="any">
<group>
<text variable="container-title" font-style="italic" suffix=", "/>
<text variable="volume" suffix=", "/>
<text variable="issue" suffix=" "/>
<text macro="pages" prefix=": "/>
</group>
</else-if>
</if>
<else-if type="book" match="any">
<text macro="collection"/>
<text macro="publisher"/>
</else-if>
<else-if type="chapter paper-conference" match="any">
<text macro="editor-text"/>
<choose>
<if match="all" variable="editor author">
<text macro="editor-text"/>
<if type="chapter" match="any">
<text variable="container-title" font-style="italic"/>
</if>
<else>
<text macro="publisher"/>
<text variable="container-title"/>
</else>
</choose>
<text variable="event"/>
<text macro="collection"/>
<text macro="publisher"/>
</else-if>
<else-if type="chapter paper-conference" match="any">
<group delimiter=" " suffix=".">
<text term="in" text-case="capitalize-first"/>
<text macro="editor"/>
</group>
<text variable="container-title" font-style="italic"/>
<else-if type="thesis" match="any">
<group delimiter=", ">
<text variable="genre"/>
<text macro="publisher"/>
<text macro="pages"/>
</group>
</else-if>
<else-if type="dataset report" match="any">
<else-if type="report dataset" match="any">
<text variable="genre"/>
<text variable="version" prefix="Version "/>
<text macro="collection"/>
<text variable="note" suffix="."/>
<text macro="publisher"/>
<text macro="URLaccess"/>
<text variable="URL" prefix="URL : "/>
</else-if>
<else-if type="webpage">
<text macro="URLaccess"/>
<text macro="URL"/>
</else-if>
<else>
<text variable="title" font-style="italic" suffix=". "/>
<text macro="publisher"/>
</else>
</choose>
Expand Down
Loading

0 comments on commit 7dfb630

Please sign in to comment.