Skip to content

Commit

Permalink
updates based on ISO 690 styles in French & English (#6748)
Browse files Browse the repository at this point in the history
  • Loading branch information
@grolimur
grolimur authored Nov 27, 2023
1 parent 7eb42ed commit 42f54b2
Show file tree
Hide file tree
Showing 5 changed files with 315 additions and 136 deletions.
113 changes: 88 additions & 25 deletions haute-ecole-de-gestion-de-geneve-iso-690.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</contributor>
<category citation-format="author-date"/>
<category field="generic-base"/>
<updated>2023-09-17T00:00:02+00:00</updated>
<updated>2023-10-24T10:00:00+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-FR">
Expand All @@ -42,6 +42,28 @@
<term name="special-section">publié le</term>
</terms>
</locale>
<locale xml:lang="fr-CA">
<terms>
<term name="no date">[sans date]</term>
<term name="online">en&#160;ligne</term>
<term name="retrieved">disponible</term>
<term name="issue" form="short">
<single>no</single>
<multiple>nos</multiple>
</term>
<term name="page" form="short">
<single>p.</single>
<multiple>pp.</multiple>
</term>
<term name="number-of-pages" form="short">
<single>p.</single>
<multiple>pp.</multiple>
</term>
<!-- the 2 following terms, never used in any citation style published on https://zotero.org/styles, are hijacked to distinguish the diffrents dates (submitted, issued) of a patent -->
<term name="special-issue">déposé le</term>
<term name="special-section">publié le</term>
</terms>
</locale>
<locale xml:lang="en-US">
<terms>
<term name="issue">no.</term>
Expand All @@ -50,6 +72,14 @@
<term name="special-section">published on</term>
</terms>
</locale>
<locale xml:lang="en-UK">
<terms>
<term name="issue">no.</term>
<!-- the 2 following terms, never used in any citation style published on https://zotero.org/styles, are hijacked to distinguish the diffrents dates (submitted, issued) of a patent -->
<term name="special-issue">submitted on</term>
<term name="special-section">published on</term>
</terms>
</locale>
<macro name="editor">
<names variable="editor">
<name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
Expand Down Expand Up @@ -115,13 +145,28 @@
</macro>
<macro name="year-date">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year" form="long"/>
</date>
<if is-uncertain-date="issued">
<group prefix="[" suffix="]">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year" form="long" suffix="?"/>
</date>
</if>
<else>
<text term="no date"/>
</else>
</choose>
</group>
</if>
<else>
<text term="no date"/>
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year" form="long"/>
</date>
</if>
</choose>
</else>
</choose>
</macro>
Expand All @@ -139,7 +184,8 @@
</choose>
</if>
<else-if type="software">
<text variable="title" font-style="italic" suffix=" [logiciel]"/>
<text variable="title" font-style="italic"/>
<text term="software" prefix=" [" suffix="]"/>
</else-if>
<else-if type="paper-conference chapter article-journal article-magazine article-newspaper entry entry-dictionary entry-encyclopedia post-weblog post webpage broadcast" match="any">
<choose>
Expand Down Expand Up @@ -185,7 +231,7 @@
</else-if>
<else-if type="report">
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text variable="title" font-style="italic"/>
</if>
<else>
Expand All @@ -197,7 +243,7 @@
</else-if>
<else-if type="patent">
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text variable="title" font-style="italic"/>
</if>
<else>
Expand Down Expand Up @@ -284,6 +330,22 @@
<date-part name="year"/>
</date>
</if>
</choose>
<choose>
<if is-uncertain-date="issued">
<group prefix="[" suffix="]">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year" form="long" suffix="?"/>
</date>
</if>
<else>
<text term="no date"/>
</else>
</choose>
</group>
</if>
<else>
<choose>
<if variable="issued">
Expand Down Expand Up @@ -322,7 +384,7 @@
<choose>
<if variable="volume">
<group delimiter="&#160;">
<text term="issue"/>
<text term="issue" form="short"/>
<text variable="issue"/>
</group>
<group delimiter="&#160;">
Expand All @@ -332,7 +394,7 @@
</if>
<else-if variable="issue">
<group delimiter="&#160;">
<text term="issue" text-case="capitalize-first"/>
<text term="issue" form="short" text-case="capitalize-first"/>
<text variable="issue"/>
</group>
<group delimiter="&#160;">
Expand Down Expand Up @@ -421,7 +483,7 @@
<if type="book map" match="any">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -435,7 +497,7 @@
<else-if type="article-journal article-magazine" match="any">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -448,7 +510,7 @@
<else-if type="article-newspaper">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -462,7 +524,7 @@
<else-if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -477,7 +539,7 @@
<else-if type="speech">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -491,7 +553,7 @@
<else-if type="paper-conference">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -508,7 +570,7 @@
<else-if type="thesis">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -521,7 +583,7 @@
<else-if type="post-weblog post webpage" match="any">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -548,7 +610,7 @@
<else-if type="report">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -562,7 +624,7 @@
<else-if type="manuscript">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -576,20 +638,21 @@
<else-if type="patent">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
<text macro="date" suffix=". "/>
<text macro="publisher-group" suffix=". "/>
<text macro="collection" suffix=". "/>
<text macro="url"/>
<text macro="url" suffix=". "/>
<text macro="accessed" suffix=". "/>
<text macro="number" suffix=". "/>
</else-if>
<else-if type="software">
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand All @@ -604,7 +667,7 @@
<else>
<text macro="responsability" suffix=". "/>
<choose>
<if variable="author editor translator" match="any">
<if variable="author editor translator director" match="any">
<text macro="title" suffix=". "/>
</if>
</choose>
Expand Down
Loading

0 comments on commit 42f54b2

Please sign in to comment.