From 349a5d646010088defcbb0ceeb4f9b6a1c4642e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Grolimund?= <grolimur@nous4.ch>
Date: Thu, 24 Mar 2022 01:29:32 +0100
Subject: [PATCH] update based on latest version of ISO 690 standard (#5976)

* Update haute-ecole-de-gestion-de-geneve-iso-690.csl

minor but important corrections

* Update iso690-author-date-fr.csl

* Update iso690-author-date-en.csl

* Update iso690-numeric-fr.csl

* Update iso690-numeric-en.csl
---
 haute-ecole-de-gestion-de-geneve-iso-690.csl | 80 ++++++++++++++------
 iso690-author-date-en.csl                    | 31 ++++----
 iso690-author-date-fr.csl                    | 27 ++++---
 iso690-numeric-en.csl                        | 31 ++++----
 iso690-numeric-fr.csl                        | 29 ++++---
 5 files changed, 126 insertions(+), 72 deletions(-)

diff --git a/haute-ecole-de-gestion-de-geneve-iso-690.csl b/haute-ecole-de-gestion-de-geneve-iso-690.csl
index bb3208d81f01..4698051bdad6 100644
--- a/haute-ecole-de-gestion-de-geneve-iso-690.csl
+++ b/haute-ecole-de-gestion-de-geneve-iso-690.csl
@@ -6,20 +6,37 @@
     <id>http://www.zotero.org/styles/haute-ecole-de-gestion-de-geneve-iso-690</id>
     <link href="http://www.zotero.org/styles/haute-ecole-de-gestion-de-geneve-iso-690" rel="self"/>
     <link href="http://www.zotero.org/styles/iso690-author-date-en" rel="template"/>
-    <link href="https://www.hesge.ch/heg/infotheque/citations-et-references-bibliographiques" rel="documentation"/>
+    <link href="https://www.hesge.ch/heg/campus/infotheque/citations-et-references-bibliographiques" rel="documentation"/>
     <author>
       <name>Melissa Paez</name>
       <email>paez.melissa@gmail.com</email>
     </author>
-    <contributor>
+    <author>
       <name>Raphael Grolimund</name>
       <email>grolimur@protonmail.ch</email>
-    </contributor>
+    </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2021-10-16T18:00:00+00:00</updated>
+    <updated>2022-03-21T10: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">
+    <terms>
+      <term name="no date">[sans date]</term>
+      <term name="in">in</term>
+      <term name="online">[en&#160;ligne]</term>
+      <term name="accessed">consulté&#160;le</term>
+      <term name="retrieved">disponible</term>
+      <term name="from">à l'adresse</term>
+      <term name="translator" form="short">trad.</term>
+      <term name="editor" form="short">éd.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="en-US">
+    <terms>
+      <term name="online">Online</term>
+    </terms>
+  </locale>
   <macro name="editor">
     <names variable="editor">
       <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
@@ -100,7 +117,7 @@
       <if type="book thesis map motion_picture song manuscript" match="any">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix="."/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -135,10 +152,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -168,7 +185,7 @@
       <else>
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -179,7 +196,7 @@
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -201,10 +218,6 @@
           </else>
         </choose>
       </if>
-      <else>
-        <text variable="genre"/>
-        <text variable="number" prefix=", "/>
-      </else>
     </choose>
   </macro>
   <macro name="date">
@@ -233,14 +246,14 @@
       <choose>
         <if variable="volume">
           <text variable="issue" prefix="no.&#160;"/>
-          <text variable="page" prefix="p.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </if>
         <else-if variable="issue">
           <text variable="issue" prefix="No.&#160;"/>
-          <text variable="page" prefix="p.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </else-if>
         <else>
-          <text variable="page" prefix="P.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </else>
       </choose>
     </group>
@@ -271,7 +284,7 @@
         <text variable="number-of-pages" suffix="&#160;p"/>
       </if>
       <else-if type="chapter paper-conference article-newspaper" match="any">
-        <text variable="page" prefix="p.&#160;"/>
+        <text variable="page" prefix="pp.&#160;"/>
       </else-if>
       <else-if type="report patent" match="any">
         <text variable="page" suffix="&#160;p"/>
@@ -286,12 +299,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -339,6 +356,8 @@
               <text macro="title" suffix=". "/>
             </if>
           </choose>
+          <text variable="version" prefix="version " suffix=". "/>
+          <!-- used for software until type="software" is implemented -->
           <text macro="genre" suffix=". "/>
           <text macro="edition" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
@@ -418,6 +437,7 @@
           <text macro="accessed" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="isbn" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
         </else-if>
         <else-if type="thesis">
@@ -500,6 +520,19 @@
           <text macro="collection" suffix=". "/>
           <text macro="url"/>
         </else-if>
+        <else-if type="software">
+          <text macro="responsability" suffix=". "/>
+          <choose>
+            <if variable="author editor translator" match="any">
+              <text macro="title" suffix=". "/>
+            </if>
+          </choose>
+          <text variable="version" prefix="version " suffix=". "/>
+          <text macro="date" suffix=". "/>
+          <text macro="publisher-group" suffix=". "/>
+          <text macro="accessed" suffix=". "/>
+          <text macro="url"/>
+        </else-if>
         <else>
           <text macro="responsability" suffix=". "/>
           <choose>
@@ -520,6 +553,7 @@
           <text macro="url"/>
         </else>
       </choose>
+      <text variable="note"/>
       <group display="right-inline">
         <text macro="archive"/>
       </group>
diff --git a/iso690-author-date-en.csl b/iso690-author-date-en.csl
index 91ce883ef4bd..bb4fed3090c8 100644
--- a/iso690-author-date-en.csl
+++ b/iso690-author-date-en.csl
@@ -21,7 +21,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(E), v1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10: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>
@@ -118,7 +118,7 @@
       <if type="book thesis map motion_picture song manuscript" match="any">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -153,10 +153,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -176,7 +176,7 @@
       <else-if type="patent">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title"/>
+            <text variable="title" suffix="."/>
           </if>
           <else>
             <text variable="title" suffix=", "/>
@@ -187,7 +187,7 @@
       <else>
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix="."/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -198,7 +198,7 @@
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" text-case="capitalize-first" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -304,12 +304,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -453,6 +457,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/iso690-author-date-fr.csl b/iso690-author-date-fr.csl
index 770f4f54ab80..13ad58e145ff 100644
--- a/iso690-author-date-fr.csl
+++ b/iso690-author-date-fr.csl
@@ -24,7 +24,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(F), V1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10: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>
@@ -127,7 +127,7 @@
       <if type="book thesis map motion_picture song manuscript" match="any">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -162,10 +162,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -185,7 +185,7 @@
       <else-if type="patent">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title"/>
+            <text variable="title" suffix="."/>
           </if>
           <else>
             <text variable="title" suffix=", "/>
@@ -313,12 +313,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix="&#160;: "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -462,6 +466,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/iso690-numeric-en.csl b/iso690-numeric-en.csl
index 1c6f11784b78..6a27e40259f0 100644
--- a/iso690-numeric-en.csl
+++ b/iso690-numeric-en.csl
@@ -20,7 +20,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(E), V1.1</summary>
-    <updated>2013-05-31T20:00:00+01:00</updated>
+    <updated>2022-03-21T10: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>
@@ -116,7 +116,7 @@
   <macro name="title">
     <choose>
       <if type="book thesis map motion_picture song manuscript" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix=". "/>
       </if>
       <else-if type="paper-conference speech chapter article-journal article-magazine article-newspaper entry entry-dictionary entry-encyclopedia post-weblog post webpage broadcast" match="any">
         <text variable="title" suffix=". "/>
@@ -137,10 +137,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -149,15 +149,15 @@
         <text variable="title" font-style="italic"/>
       </else-if>
       <else-if type="patent">
-        <text variable="title"/>
+        <text variable="title" suffix="."/>
       </else-if>
       <else>
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix="."/>
       </else>
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" text-case="capitalize-first" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -266,12 +266,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -393,6 +397,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/iso690-numeric-fr.csl b/iso690-numeric-fr.csl
index 859d029587ec..525408137691 100644
--- a/iso690-numeric-fr.csl
+++ b/iso690-numeric-fr.csl
@@ -20,7 +20,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(F), V1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10: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>
@@ -116,7 +116,7 @@
   <macro name="title">
     <choose>
       <if type="book thesis map motion_picture song manuscript" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix=". "/>
       </if>
       <else-if type="paper-conference speech chapter article-journal article-magazine article-newspaper entry entry-dictionary entry-encyclopedia post-weblog post webpage broadcast" match="any">
         <text variable="title" suffix=". "/>
@@ -137,10 +137,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -149,10 +149,10 @@
         <text variable="title" font-style="italic"/>
       </else-if>
       <else-if type="patent">
-        <text variable="title"/>
+        <text variable="title" suffix="."/>
       </else-if>
       <else>
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix="."/>
       </else>
     </choose>
     <choose>
@@ -263,12 +263,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix="&#160;: "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -390,6 +394,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>