From b91e65e2f1bfe6b45143a803cc0600a68deb99a1 Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:21:25 +0100
Subject: [PATCH 1/5] Update iso690-full-note-es.csl (Work in progress)

https://github.com/citation-style-language/styles/issues/7304
---
 iso690-full-note-es.csl | 48 +++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/iso690-full-note-es.csl b/iso690-full-note-es.csl
index f53f117533..8beaf9a53b 100644
--- a/iso690-full-note-es.csl
+++ b/iso690-full-note-es.csl
@@ -11,7 +11,7 @@
     </author>
     <category citation-format="note"/>
     <category field="generic-base"/>
-    <updated>2024-09-12T08:17:24+00:00</updated>
+    <updated>2024-11-04T17:05:21+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="es">
@@ -81,7 +81,7 @@
     <choose>
       <if variable="author" type="book" match="all">
         <names variable="editor translator" delimiter=", ">
-          <label form="verb-short" text-case="uppercase"/>
+          <label form="verb-short" text-case="uppercase" suffix=" "/>
           <name sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
         </names>
       </if>
@@ -147,18 +147,20 @@
   <macro name="container">
     <choose>
       <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
-        <text term="in" text-case="capitalize-first" suffix=" "/>
-        <text macro="container-contributors" suffix=" "/>
-        <choose>
-          <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
-            <text prefix=" " macro="medium"/>
-          </if>
-          <else-if variable="volume">
-            <text prefix=", " term="volume" form="short" suffix=". "/>
-            <text variable="volume"/>
-          </else-if>
-        </choose>
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <text macro="container-contributors"/>
+          <choose>
+            <if variable="container-title">
+              <text variable="container-title" font-style="italic"/>
+              <text prefix=" " macro="medium"/>
+            </if>
+            <else-if variable="volume">
+              <text prefix=", " term="volume" form="short" suffix=". "/>
+              <text variable="volume"/>
+            </else-if>
+          </choose>
+        </group>
       </if>
       <else-if type="article-journal article-magazine article-newspaper" match="any">
         <text term="in" text-case="capitalize-first" suffix=" "/>
@@ -233,12 +235,12 @@
       <if type="book chapter paper-conference" match="any">
         <text prefix=" " macro="publisher" suffix=", "/>
         <date variable="issued">
-          <date-part name="year" range-delimiter=" &#8211; "/>
+          <date-part name="year" range-delimiter=" – "/>
         </date>
       </if>
       <else-if type="article-journal article-magazine article-newspaper" match="any">
         <date variable="issued">
-          <date-part name="year" range-delimiter=" &#8211; "/>
+          <date-part name="year" range-delimiter=" – "/>
         </date>
         <choose>
           <if variable="volume">
@@ -319,7 +321,16 @@
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
     <layout delimiter="; ">
       <choose>
-        <if position="subsequent">
+        <if match="any" position="ibid-with-locator">
+          <group delimiter=". ">
+            <text term="ibid" form="short"/>
+            <text macro="citation-locator"/>
+          </group>
+        </if>
+        <else-if match="any" position="ibid">
+          <text term="ibid" form="short"/>
+        </else-if>
+        <else-if position="subsequent">
           <text macro="contributors-short" suffix=", "/>
           <text macro="title-short"/>
           <choose>
@@ -332,7 +343,7 @@
               <text prefix=". " macro="identifier"/>
             </else-if>
           </choose>
-        </if>
+        </else-if>
         <else>
           <choose>
             <if type="book thesis manuscript report" match="any">
@@ -361,6 +372,7 @@
                   <text prefix=", " macro="citation-locator" suffix="."/>
                 </else>
               </choose>
+              <text variable="ISBN" prefix=". ISBN "/>
             </if>
             <else-if type="chapter entry entry-dictionary entry-encyclopedia paper-conference" match="any">
               <text macro="contributors-long" suffix=". "/>

From a2d11762604ca7ada6f0b23adab73f9bba2f539a Mon Sep 17 00:00:00 2001
From: POBrien333 <POBrien333@users.noreply.github.com>
Date: Tue, 5 Nov 2024 08:23:48 +0000
Subject: [PATCH 2/5] Re-indent CSL styles

---
 iso690-full-note-es.csl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iso690-full-note-es.csl b/iso690-full-note-es.csl
index 8beaf9a53b..af0da1bce3 100644
--- a/iso690-full-note-es.csl
+++ b/iso690-full-note-es.csl
@@ -235,12 +235,12 @@
       <if type="book chapter paper-conference" match="any">
         <text prefix=" " macro="publisher" suffix=", "/>
         <date variable="issued">
-          <date-part name="year" range-delimiter=" – "/>
+          <date-part name="year" range-delimiter=" &#8211; "/>
         </date>
       </if>
       <else-if type="article-journal article-magazine article-newspaper" match="any">
         <date variable="issued">
-          <date-part name="year" range-delimiter=" – "/>
+          <date-part name="year" range-delimiter=" &#8211; "/>
         </date>
         <choose>
           <if variable="volume">

From 3cf870f072dcec2ff6f3febcfea043b29d7073be Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Sun, 8 Dec 2024 13:25:34 +0100
Subject: [PATCH 3/5] Update iso690-full-note-es.csl

---
 iso690-full-note-es.csl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/iso690-full-note-es.csl b/iso690-full-note-es.csl
index af0da1bce3..3dafe852ec 100644
--- a/iso690-full-note-es.csl
+++ b/iso690-full-note-es.csl
@@ -11,7 +11,7 @@
     </author>
     <category citation-format="note"/>
     <category field="generic-base"/>
-    <updated>2024-11-04T17:05:21+00:00</updated>
+    <updated>2024-12-08T12:25:21+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="es">
@@ -235,12 +235,12 @@
       <if type="book chapter paper-conference" match="any">
         <text prefix=" " macro="publisher" suffix=", "/>
         <date variable="issued">
-          <date-part name="year" range-delimiter=" &#8211; "/>
+          <date-part name="year" range-delimiter=" – "/>
         </date>
       </if>
       <else-if type="article-journal article-magazine article-newspaper" match="any">
         <date variable="issued">
-          <date-part name="year" range-delimiter=" &#8211; "/>
+          <date-part name="year" range-delimiter=" – "/>
         </date>
         <choose>
           <if variable="volume">
@@ -250,7 +250,7 @@
         </choose>
         <choose>
           <if variable="issue">
-            <text prefix=", " term="issue" form="short" suffix=". "/>
+            <text term="issue" form="short" strip-periods="true" prefix=", " suffix=" "/>
             <text variable="issue"/>
           </if>
         </choose>

From a9bc36f20afc45db3abdce069662531d87cf8a4f Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Thu, 23 Jan 2025 16:02:19 +0100
Subject: [PATCH 4/5] Update iso690-full-note-es.csl

---
 iso690-full-note-es.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iso690-full-note-es.csl b/iso690-full-note-es.csl
index 3dafe852ec..dec5c3e970 100644
--- a/iso690-full-note-es.csl
+++ b/iso690-full-note-es.csl
@@ -11,7 +11,7 @@
     </author>
     <category citation-format="note"/>
     <category field="generic-base"/>
-    <updated>2024-12-08T12:25:21+00:00</updated>
+    <updated>2024-12-09T12:25:21+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="es">

From 98d0592cdcd4d36988aece415d8f746bf6b70597 Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:04:34 +0000
Subject: [PATCH 5/5] Re-indent CSL styles

---
 iso690-full-note-es.csl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iso690-full-note-es.csl b/iso690-full-note-es.csl
index dec5c3e970..04fbb343a8 100644
--- a/iso690-full-note-es.csl
+++ b/iso690-full-note-es.csl
@@ -235,12 +235,12 @@
       <if type="book chapter paper-conference" match="any">
         <text prefix=" " macro="publisher" suffix=", "/>
         <date variable="issued">
-          <date-part name="year" range-delimiter=" – "/>
+          <date-part name="year" range-delimiter=" &#8211; "/>
         </date>
       </if>
       <else-if type="article-journal article-magazine article-newspaper" match="any">
         <date variable="issued">
-          <date-part name="year" range-delimiter=" – "/>
+          <date-part name="year" range-delimiter=" &#8211; "/>
         </date>
         <choose>
           <if variable="volume">