Skip to content

Commit

Permalink
Squashed 'buildres/csl/csl-styles/' changes from e740261..845dee0
Browse files Browse the repository at this point in the history 
845dee0 Create meta.csl (#6088)
684bc3a Update universite-du-quebec-a-montreal.csl (#6087)
3602c18 Up-date & re-title pour-reussir/dionne (#6043)
0cc6e82 Fix Mainz Geography
cfc4cec Add DOI and fix printing author names in Population and Économie et statistique (#6079)
14e8b1d Update journal-of-neuroimaging.csl (#6084)
2c0e1f1 Update isnad-dipnotlu.csl (#6081)
02fdb9b Merge pull request #6082 from denismaier/patch-ube-muwi-note
9309378 removes default-locale

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 845dee0
  • Loading branch information
github actions committed Jun 15, 2022
1 parent e89145e commit 6b47992
Show file tree
Hide file tree
Showing 9 changed files with 1,827 additions and 547 deletions.
197 changes: 100 additions & 97 deletions economie-et-statistique.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" default-locale="fr-FR" page-range-format="expanded">
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="expanded" default-locale="fr-FR">
<info>
<title>Économie et Statistique (Français)</title>
<title-short>Éco &amp; Stat</title-short>
Expand All @@ -15,7 +15,7 @@
<category field="sociology"/>
<issn>0336-1454</issn>
<summary>Le style de la revue de l'INSEE Économie et Statistique.</summary>
<updated>2015-01-27T16:00:00+01:00</updated>
<updated>2022-05-27T11:00:00+02: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">
Expand All @@ -26,7 +26,7 @@
</locale>
<macro name="editor">
<names variable="editor" delimiter=" ">
<name and="text" delimiter=", " delimiter-precedes-last="never"/>
<name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
<label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
<substitute>
<names variable="editorial-director"/>
Expand All @@ -35,11 +35,11 @@
</macro>
<macro name="author-last">
<names variable="author">
<name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
<name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
<label form="short" prefix=" " text-case="lowercase"/>
<substitute>
<names variable="editor">
<name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
<name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
<label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
<substitute>
<names variable="editorial-director"/>
Expand All @@ -51,11 +51,11 @@
<!-- Same as author-last except that name is not initialized to sort on first name too -->
<macro name="author-sort">
<names variable="author">
<name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="never"/>
<name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
<label form="short" prefix=" " text-case="lowercase"/>
<substitute>
<names variable="editor">
<name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
<name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
<label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
<substitute>
<names variable="editorial-director"/>
Expand All @@ -66,7 +66,7 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter=", " delimiter-precedes-last="never"/>
<name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never"/>
<substitute>
<names variable="editor"/>
</substitute>
Expand All @@ -75,7 +75,7 @@
<macro name="translator">
<text term="translator" form="verb" suffix=" "/>
<names variable="translator">
<name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
<name and="symbol" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
</names>
</macro>
<macro name="publisher-collection">
Expand Down Expand Up @@ -165,101 +165,104 @@
<key macro="author-sort"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
<group suffix=", ">
<text macro="author-last" font-weight="bold"/>
<text macro="year-date-short" prefix=" (" suffix=")" font-weight="bold"/>
</group>
<choose>
<if type="report">
<group delimiter=", ">
<text variable="title" quotes="true"/>
<text macro="translator"/>
<text variable="genre"/>
<text variable="collection-title" font-style="italic"/>
<text variable="number" prefix=" n°"/>
<text variable="publisher-place"/>
<text variable="publisher"/>
</group>
</if>
<else-if type="book">
<group delimiter=", ">
<text variable="title" font-style="italic"/>
<text macro="translator"/>
<text variable="genre"/>
<text macro="editor"/>
<text macro="edition"/>
<text macro="publisher-collection"/>
<text variable="medium"/>
<group delimiter=" ">
<text term="version"/>
<text variable="version"/>
<layout>
<group suffix=".">
<group suffix=", ">
<text macro="author-last" font-weight="bold"/>
<text macro="year-date-short" prefix=" (" suffix=")" font-weight="bold"/>
</group>
<choose>
<if type="report">
<group delimiter=", ">
<text variable="title" quotes="true"/>
<text macro="translator"/>
<text variable="genre"/>
<text variable="collection-title" font-style="italic"/>
<text variable="number" prefix=" n°"/>
<text variable="publisher-place"/>
<text variable="publisher"/>
</group>
<text macro="number-of-pages"/>
</group>
</else-if>
<else-if type="thesis">
<group delimiter=", ">
<text variable="title" font-style="italic"/>
<text macro="translator"/>
<choose>
<if variable="genre">
<text variable="genre"/>
</if>
<else>
<text value="Thèse de doctorat"/>
</else>
</choose>
<text macro="edition"/>
<text macro="publisher-collection"/>
<text macro="number-of-pages"/>
</group>
</else-if>
<else-if type="chapter">
<text variable="title" quotes="true"/>
<group prefix=", ">
<text value="in" suffix=" " font-style="italic"/>
<text macro="editor" suffix=", "/>
</if>
<else-if type="book">
<group delimiter=", ">
<text variable="container-title" font-style="italic"/>
<text variable="title" font-style="italic"/>
<text macro="translator"/>
<text variable="genre"/>
<text macro="editor"/>
<text macro="edition"/>
<text macro="publisher-collection"/>
<text macro="page"/>
<text variable="medium"/>
<group delimiter=" ">
<text term="version"/>
<text variable="version"/>
</group>
<text macro="number-of-pages"/>
</group>
</group>
</else-if>
<else-if type="speech">
<group delimiter=", ">
<text variable="title" quotes="true"/>
<text variable="event"/>
<text variable="event-place"/>
<text macro="full-date"/>
<text macro="translator"/>
</group>
</else-if>
<else-if type="article-newspaper article-magazine interview broadcast" match="any">
<group delimiter=", ">
<text variable="title" quotes="true"/>
<text variable="container-title" font-style="italic" prefix=" "/>
<text macro="full-date"/>
<text macro="translator"/>
<text macro="page"/>
</group>
</else-if>
<else>
<group delimiter=" " suffix=",">
</else-if>
<else-if type="thesis">
<group delimiter=", ">
<text variable="title" font-style="italic"/>
<text macro="translator"/>
<choose>
<if variable="genre">
<text variable="genre"/>
</if>
<else>
<text value="Thèse de doctorat"/>
</else>
</choose>
<text macro="edition"/>
<text macro="publisher-collection"/>
<text macro="number-of-pages"/>
</group>
</else-if>
<else-if type="chapter">
<text variable="title" quotes="true"/>
<text macro="editor"/>
</group>
<group prefix=" " delimiter=", ">
<text variable="container-title" font-style="italic"/>
<text macro="issue"/>
<text macro="translator"/>
<text macro="page"/>
</group>
</else>
</choose>
<group prefix=", ">
<text value="in" suffix=" " font-style="italic"/>
<text macro="editor" suffix=", "/>
<group delimiter=", ">
<text variable="container-title" font-style="italic"/>
<text macro="translator"/>
<text macro="edition"/>
<text macro="publisher-collection"/>
<text macro="page"/>
</group>
</group>
</else-if>
<else-if type="speech">
<group delimiter=", ">
<text variable="title" quotes="true"/>
<text variable="event"/>
<text variable="event-place"/>
<text macro="full-date"/>
<text macro="translator"/>
</group>
</else-if>
<else-if type="article-newspaper article-magazine interview broadcast" match="any">
<group delimiter=", ">
<text variable="title" quotes="true"/>
<text variable="container-title" font-style="italic" prefix=" "/>
<text macro="full-date"/>
<text macro="translator"/>
<text macro="page"/>
</group>
</else-if>
<else>
<group delimiter=" " suffix=",">
<text variable="title" quotes="true"/>
<text macro="editor"/>
</group>
<group prefix=" " delimiter=", ">
<text variable="container-title" font-style="italic"/>
<text macro="issue"/>
<text macro="translator"/>
<text macro="page"/>
</group>
</else>
</choose>
</group>
<text variable="DOI" prefix=" https://doi.org/"/>
</layout>
</bibliography>
</style>
18 changes: 7 additions & 11 deletions isnad-dipnotlu.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<category field="humanities"/>
<category field="social_science"/>
<summary>ISNAD Citation Style full notes and bibliography format.</summary>
<updated>2020-04-08T12:59:16+00:00</updated>
<updated>2022-05-31T12:59: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>
<!--
Expand Down Expand Up @@ -763,11 +763,9 @@
<macro name="locators-note">
<choose>
<if type="article-journal article-magazine article-newspaper" match="any">
<group delimiter=", ">
<group>
<number suffix="/" variable="volume"/>
<number variable="issue"/>
</group>
<group delimiter="/">
<number variable="volume"/>
<number variable="issue"/>
</group>
</if>
<else-if type="bill legislation legal_case" match="any">
Expand Down Expand Up @@ -869,11 +867,9 @@
<macro name="locators">
<choose>
<if type="article-journal article-magazine article-newspaper" match="any">
<group delimiter=", ">
<group>
<number suffix="/" variable="volume"/>
<number variable="issue"/>
</group>
<group delimiter="/">
<number variable="volume"/>
<number variable="issue"/>
</group>
</if>
<else-if type="bill legislation legal_case" match="any">
Expand Down
4 changes: 2 additions & 2 deletions journal-of-neuroimaging.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<category field="medicine"/>
<issn>1051-2284</issn>
<eissn>1552-6569</eissn>
<updated>2022-05-01T19:04:20+00:00</updated>
<updated>2022-06-02T19:04:20+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>
<macro name="editor">
Expand Down Expand Up @@ -76,7 +76,7 @@
</group>
</layout>
</citation>
<bibliography hanging-indent="false" et-al-min="99" et-al-use-first="98" second-field-align="flush">
<bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3" second-field-align="flush">
<layout>
<text variable="citation-number" suffix=". "/>
<group delimiter=". ">
Expand Down
Loading

0 comments on commit 6b47992

Please sign in to comment.