Skip to content

Commit

Permalink
Squashed 'buildres/csl/csl-styles/' changes from 6b7fdff8cb..4b4e8f442d
Browse files Browse the repository at this point in the history 
4b4e8f442d Create silva-fennica.csl (#6568)
dd8760bb2b Update american-journal-of-botany.csl (#6569)
8b0e505363 Update haute-ecole-de-gestion-de-geneve-iso-690.csl (#6560)
016050c4b7 Update geographie-et-cultures.csl (#6563)
e8b62f1c80 Update and rename dependent/retina.csl to retina.csl (#6565)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 4b4e8f442d2de454c638393fbb9dd911c8b7aca7
  • Loading branch information
github actions committed Jun 15, 2023
1 parent 7ba7591 commit 97f4ff5
Show file tree
Hide file tree
Showing 6 changed files with 698 additions and 170 deletions.
2 changes: 1 addition & 1 deletion american-journal-of-botany.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
</else>
</choose>
</macro>
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" collapse="year-suffix">
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" collapse="year-suffix" cite-group-delimiter=", ">
<sort>
<key macro="year-date"/>
</sort>
Expand Down
16 changes: 0 additions & 16 deletions dependent/retina.csl
View file

This file was deleted.

85 changes: 41 additions & 44 deletions geographie-et-cultures.csl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="fr-FR">
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" delimiter-precedes-last="never" demote-non-dropping-particle="never" default-locale="fr-FR">
<info>
<title>Géographie et cultures (Français)</title>
<id>http://www.zotero.org/styles/geographie-et-cultures</id>
Expand All @@ -9,44 +9,47 @@
<author>
<name>Martine Drozdz</name>
</author>
<contributor>
<name>Patrick O'Brien</name>
</contributor>
<category citation-format="author-date"/>
<category field="geography"/>
<issn>1165-0354</issn>
<eissn>2267-6759</eissn>
<updated>2019-01-11T04:00:34+00:00</updated>
<updated>2023-05-30T10:07:19+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="issue" form="short">No.</term>
<term name="editor" form="short">dir.</term>
</terms>
</locale>
<macro name="container-contributors">
<choose>
<if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
<names variable="editor translator container-author" delimiter=", " suffix=", ">
<name and="symbol" initialize-with=". " delimiter=", "/>
<label form="short" prefix=" (" text-case="title" suffix=")"/>
<name/>
<label form="short" prefix=" (" suffix=")"/>
</names>
</if>
</choose>
</macro>
<macro name="secondary-contributors">
<choose>
<if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
<names variable="translator editor container-author" delimiter=", " prefix=" (" suffix=")">
<names variable="translator editor container-author" delimiter="; " prefix=" (" suffix=")">
<name and="symbol" initialize-with=". " delimiter=", "/>
<label form="short" prefix=", " text-case="title"/>
<label form="short" prefix=", "/>
</names>
</if>
</choose>
</macro>
<macro name="author">
<names variable="author">
<name and="symbol" delimiter-precedes-last="always" initialize-with=" " name-as-sort-order="all" sort-separator=" ">
<name name-as-sort-order="all" sort-separator=" ">
<name-part name="family" text-case="uppercase"/>
</name>
<label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
<label form="short" prefix=" (" suffix=")"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
Expand All @@ -64,7 +67,8 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="symbol" delimiter=", " initialize-with=". "/>
<name form="short" initialize-with=". "/>
<et-al font-style="italic"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
Expand Down Expand Up @@ -143,7 +147,7 @@
</macro>
<macro name="title">
<choose>
<if type="report thesis book graphic motion_picture report song manuscript speech" match="any">
<if type="report thesis book graphic motion_picture report song manuscript speech post post-weblog" match="any">
<choose>
<if variable="version" type="book" match="any">
<text variable="title" font-style="italic"/>
Expand All @@ -154,7 +158,7 @@
</choose>
</if>
<else>
<text variable="title"/>
<text variable="title" quotes="true"/>
</else>
</choose>
</macro>
Expand Down Expand Up @@ -196,7 +200,7 @@
<text variable="publisher-place"/>
</group>
</else-if>
<else-if type="post-weblog webpage" match="none">
<else-if type="post-weblog webpage post" match="none">
<group delimiter=", ">
<choose>
<if variable="event version" type="speech" match="none">
Expand Down Expand Up @@ -253,7 +257,7 @@
<if type="bill legal_case legislation" match="none">
<choose>
<if variable="issued">
<group prefix=" (" suffix=")">
<group>
<date variable="issued">
<date-part name="year"/>
</date>
Expand Down Expand Up @@ -343,23 +347,17 @@
</macro>
<macro name="locators">
<choose>
<if type="article-journal article-magazine" match="any">
<group prefix=", " delimiter=", ">
<if type="article-journal article-magazine article-newspaper" match="any">
<group delimiter=", ">
<group delimiter=" ">
<label text-case="capitalize-first" variable="volume" form="short"/>
<label variable="volume" form="short"/>
<text variable="volume" font-style="normal"/>
</group>
<group delimiter=" ">
<label variable="issue" form="short"/>
<text variable="issue"/>
</group>
<group delimiter=" ">
<label plural="never" variable="page" form="short"/>
<text variable="page"/>
</group>
<date delimiter="" variable="issued">
<date-part name="month"/>
</date>
<text macro="pages"/>
</group>
<choose>
<if variable="issued">
Expand All @@ -371,14 +369,8 @@
</if>
</choose>
</if>
<else-if type="article-newspaper">
<group delimiter=" " prefix=", ">
<label variable="page" form="short"/>
<text variable="page"/>
</group>
</else-if>
<else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
<group prefix=" (" suffix=")" delimiter=", ">
<group delimiter=", ">
<text macro="edition"/>
<choose>
<if variable="volume" match="any">
Expand All @@ -394,10 +386,13 @@
</group>
</else>
</choose>
<group>
<label variable="page" form="short" suffix=" "/>
<text variable="page"/>
<text macro="publisher"/>
<text macro="pages"/>
<group delimiter=" ">
<text variable="number-of-pages"/>
<label variable="number-of-pages" form="short"/>
</group>
<text macro="event"/>
</group>
</else-if>
<else-if type="legal_case">
Expand Down Expand Up @@ -432,7 +427,7 @@
<group>
<choose>
<if type="chapter paper-conference entry-encyclopedia" match="any">
<text term="in" text-case="capitalize-first" suffix=" "/>
<text term="in" suffix=" "/>
</if>
</choose>
<text macro="container-contributors"/>
Expand Down Expand Up @@ -495,39 +490,41 @@
</if>
</choose>
</macro>
<macro name="pages">
<group>
<label variable="page" form="short" suffix=" "/>
<text variable="page"/>
</group>
</macro>
<citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year">
<sort>
<key macro="author"/>
<key macro="issued-sort"/>
<key macro="author"/>
</sort>
<layout prefix="(" suffix=")" delimiter="; ">
<layout delimiter=" ; " prefix="(" suffix=")">
<group delimiter=", ">
<text macro="author-short"/>
<text macro="issued-year"/>
<text macro="citation-locator"/>
</group>
</layout>
</citation>
<bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
<bibliography entry-spacing="0" line-spacing="2" hanging-indent="true">
<sort>
<key macro="author"/>
<key macro="issued-sort" sort="ascending"/>
<key macro="title"/>
</sort>
<layout>
<group suffix=".">
<group delimiter=". ">
<group delimiter=", " suffix=".">
<group delimiter=", ">
<text macro="author"/>
<text macro="issued"/>
<text macro="title-plus-extra"/>
<text macro="container"/>
</group>
<text macro="legal-cites"/>
<text macro="locators"/>
<group delimiter=", " prefix=". ">
<text macro="event"/>
<text macro="publisher"/>
</group>
</group>
<text macro="access" prefix=" "/>
<text macro="original-date" prefix=" "/>
Expand Down
Loading

0 comments on commit 97f4ff5

Please sign in to comment.