From 1d1625a109fdee833760e9dc6b87e7014271afce Mon Sep 17 00:00:00 2001
From: github actions <jabrefmail+webfeedback@gmail.com>
Date: Fri, 3 Apr 2020 13:54:56 +0000
Subject: [PATCH] Squashed 'src/main/resources/csl-styles/' changes from
 a51eb4f920..8695d972da

8695d972da Update societe-francaise-detude-de-la-ceramique-antique-en-gaule.csl (#4660)
0dc2e37ca2 Update freshwater-science.csl (#4658)
118cfabffa Update ayer.csl (#4659)
3ba11bc582 Create optics-letters.csl (#4661)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 8695d972da10ec3eb26ca8c607d600e3d9715e5a
---
 ayer.csl                                      |  35 +--
 freshwater-science.csl                        |  69 ++++--
 optics-letters.csl                            | 231 ++++++++++++++++++
 ...etude-de-la-ceramique-antique-en-gaule.csl |  22 +-
 4 files changed, 295 insertions(+), 62 deletions(-)
 create mode 100644 optics-letters.csl

diff --git a/ayer.csl b/ayer.csl
index d9bc1b6425a5..b05a762cae3e 100644
--- a/ayer.csl
+++ b/ayer.csl
@@ -15,7 +15,7 @@
     <issn>1134-2277</issn>
     <eissn>2255-5838</eissn>
     <summary>Journal of the Association for Contemporary History (AHC), co-edited by the AHC and Marcial Pons-Ediciones de Historia.</summary>
-    <updated>2020-02-14T11:54:59+00:00</updated>
+    <updated>2020-03-31T14:42:43+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>
@@ -66,16 +66,6 @@
       <text macro="locators-specific-note"/>
     </group>
   </macro>
-  <macro name="title-sort-substitute">
-    <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" font-style="italic" text-case="title" form="short"/>
-      </if>
-      <else>
-        <text variable="title" quotes="true" text-case="title" form="short"/>
-      </else>
-    </choose>
-  </macro>
   <macro name="editor-translator">
     <text term="in" suffix=" "/>
     <names variable="editor" delimiter=", ">
@@ -181,23 +171,6 @@
       <name and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="recipient-short">
-    <names variable="recipient">
-      <label form="verb" prefix=" " suffix=" "/>
-      <name form="short" and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="contributors-short">
-    <names variable="author">
-      <name form="short" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="title-sort-substitute"/>
-      </substitute>
-    </names>
-    <text macro="recipient-short"/>
-  </macro>
   <macro name="locators-newspaper">
     <choose>
       <if type="article-newspaper">
@@ -260,7 +233,7 @@
         </group>
       </if>
       <else>
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="locator" form="short"/>
           <text variable="locator" form="long"/>
         </group>
@@ -307,7 +280,7 @@
     </choose>
   </macro>
   <macro name="locators-subsequent">
-    <group>
+    <group delimiter=" ">
       <label variable="locator" form="short"/>
       <text variable="locator"/>
     </group>
@@ -325,7 +298,7 @@
           <text term="ibid" form="short"/>
         </else-if>
         <else-if position="subsequent">
-          <text macro="contributors-short"/>
+          <text macro="contributors-note"/>
           <text macro="title-short" prefix=", "/>
           <text macro="locators-subsequent" prefix=", "/>
         </else-if>
diff --git a/freshwater-science.csl b/freshwater-science.csl
index a18a4ab9eed6..f2e0b66f9101 100644
--- a/freshwater-science.csl
+++ b/freshwater-science.csl
@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-US" version="1.0" demote-non-dropping-particle="sort-only">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
     <title>Freshwater Science</title>
+    <title-short>FWS</title-short>
     <id>http://www.zotero.org/styles/freshwater-science</id>
     <link href="http://www.zotero.org/styles/freshwater-science" rel="self"/>
     <link href="http://www.zotero.org/styles/ecology" rel="template"/>
-    <link href="http://www.press.uchicago.edu/journals/fws/instruct.html?journal=fws#instructions" rel="documentation"/>
+    <link href="https://www.journals.uchicago.edu/journals/fws/instruct" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="biology"/>
     <issn>2161-9549</issn>
     <eissn>2161-9565</eissn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2020-03-31T19:41:25+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="en">
+    <terms>
+      <term name="available at">available from</term>
+    </terms>
+  </locale>
   <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference" match="any">
@@ -38,7 +47,7 @@
     </choose>
   </macro>
   <macro name="author">
-    <names variable="author" font-variant="small-caps">
+    <names variable="author" font-variant="normal">
       <name name-as-sort-order="first" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
@@ -67,8 +76,11 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="webpage">
-        <text variable="URL"/>
+      <if type="webpage post post-weblog report" match="any">
+        <group delimiter=": " prefix="(" suffix=")">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -76,7 +88,14 @@
     <group delimiter=", ">
       <choose>
         <if type="article-journal article-magazine" match="none">
-          <text variable="genre"/>
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <choose>
+              <if type="report" match="any">
+                <text variable="number"/>
+              </if>
+            </choose>
+          </group>
           <text variable="publisher"/>
           <text variable="publisher-place"/>
         </if>
@@ -135,14 +154,20 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <text variable="container-title" prefix=". "/>
-        <text variable="volume" prefix=" "/>
-        <text variable="page" prefix=":"/>
+        <group delimiter=" ">
+          <text variable="container-title"/>
+          <group delimiter=":">
+            <text variable="volume"/>
+            <text variable="page"/>
+          </group>
+        </group>
       </if>
-      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=". " delimiter=" ">
-          <label variable="page" form="long" text-case="capitalize-first"/>
-          <text variable="page"/>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song webpage" match="any">
+        <group delimiter=" ">
+          <group delimiter=" ">
+            <label variable="page" form="long" text-case="capitalize-first"/>
+            <text variable="page"/>
+          </group>
           <text macro="container-contributors"/>
           <text macro="secondary-contributors"/>
           <text variable="container-title"/>
@@ -174,16 +199,16 @@
       <key macro="author"/>
       <key variable="issued"/>
     </sort>
-    <layout suffix=".">
-      <text macro="author" suffix="."/>
-      <text macro="issued" suffix=" "/>
-      <text variable="title"/>
-      <text macro="locators"/>
-      <text macro="edition"/>
-      <group delimiter=". " prefix=". ">
+    <layout>
+      <group delimiter=". " suffix=".">
+        <text macro="author"/>
+        <text macro="issued"/>
+        <text variable="title"/>
+        <text macro="locators"/>
+        <text macro="edition"/>
         <text macro="publisher"/>
-        <text macro="access"/>
       </group>
+      <text macro="access" prefix=" "/>
     </layout>
   </bibliography>
 </style>
diff --git a/optics-letters.csl b/optics-letters.csl
new file mode 100644
index 000000000000..c274b13427f9
--- /dev/null
+++ b/optics-letters.csl
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" demote-non-dropping-particle="sort-only" version="1.0" class="in-text" default-locale="en-US">
+  <info>
+    <title>Optics Letters</title>
+    <title-short>OL</title-short>
+    <id>http://www.zotero.org/styles/optics-letters</id>
+    <link href="http://www.zotero.org/styles/optics-letters" rel="self"/>
+    <link href="http://www.zotero.org/styles/optics-express" rel="template"/>
+    <link href="https://www.osapublishing.org/submit/templates/wordwp/OL_legacy.docx" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="physics"/>
+    <issn>0146-9592</issn>
+    <eissn>1539-4794</eissn>
+    <updated>2020-04-01T15:08:56+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="author">
+    <names variable="author">
+      <name and="text" delimiter=", " initialize-with=". "/>
+      <label prefix=", " form="short"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="text" delimiter=", " initialize-with=". "/>
+      <label prefix=", " form="short"/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text form="short" term="no date"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="day-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="month" form="long" suffix=" "/>
+          <date-part name="day" suffix=", "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text form="short" term="no date"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " prefix="(" suffix=")">
+      <text variable="publisher"/>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <text variable="volume" font-weight="bold"/>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text form="short" term="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="series">
+    <group delimiter=" ">
+      <text variable="collection-title" text-case="title"/>
+      <text variable="collection-number" prefix="No. "/>
+    </group>
+  </macro>
+  <macro name="personal-communication">
+    <group prefix="personal communication (" suffix=")">
+      <text macro="day-date"/>
+    </group>
+  </macro>
+  <macro name="patent-authority-number">
+    <choose>
+      <if variable="authority">
+        <group>
+          <text variable="authority" suffix=" patent "/>
+          <text variable="number"/>
+        </group>
+      </if>
+      <else>
+        <group>
+          <text variable="number" prefix="U.S. patent "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography second-field-align="flush" entry-spacing="0">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author" suffix=", "/>
+      <choose>
+        <if match="any" type="bill book graphic legal_case legislation motion_picture report song">
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <text macro="edition"/>
+              <text macro="series"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="volume"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </if>
+        <else-if type="paper-conference">
+          <group delimiter=" ">
+            <text term="in"/>
+            <group delimiter=", ">
+              <text variable="container-title" form="long" text-case="title" font-style="italic"/>
+              <text macro="editor"/>
+              <text macro="series"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="volume"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="speech">
+          <group delimiter=", ">
+            <text variable="event" prefix=" presented at " form="long" text-case="title"/>
+            <text variable="event-place" text-case="title"/>
+          </group>
+          <text prefix=" (" suffix=")" macro="day-date"/>
+        </else-if>
+        <else-if match="any" type="chapter paper-conference">
+          <group delimiter=" ">
+            <text term="in"/>
+            <group delimiter=", ">
+              <text variable="container-title" form="long" text-case="title" font-style="italic"/>
+              <text macro="editor"/>
+              <text macro="edition"/>
+              <text macro="series"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="volume"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text macro="patent-authority-number"/>
+            <text prefix=" (" suffix=")" macro="day-date"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=", ">
+            <text variable="genre"/>
+            <text variable="publisher"/>
+          </group>
+          <text prefix=" (" suffix=")" macro="year-date"/>
+        </else-if>
+        <else-if type="webpage post post-weblog">
+          <text variable="title" prefix="&quot;" suffix=",&quot; "/>
+          <text variable="URL"/>
+        </else-if>
+        <else-if type="personal_communication">
+          <text macro="personal-communication"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text variable="container-title" form="long"/>
+          <text prefix=" (" suffix=")" macro="day-date"/>
+        </else-if>
+        <else-if type="report">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+            <text variable="publisher" prefix="("/>
+            <text prefix=", " suffix=")," macro="day-date"/>
+            <text variable="URL"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=" ">
+            <text variable="container-title" form="short"/>
+            <group delimiter=", ">
+              <text macro="volume"/>
+              <group delimiter=" ">
+                <text variable="page-first" form="short"/>
+                <text prefix="(" suffix=")" macro="year-date"/>
+              </group>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/societe-francaise-detude-de-la-ceramique-antique-en-gaule.csl b/societe-francaise-detude-de-la-ceramique-antique-en-gaule.csl
index f6077ee82ff5..882490b52598 100644
--- a/societe-francaise-detude-de-la-ceramique-antique-en-gaule.csl
+++ b/societe-francaise-detude-de-la-ceramique-antique-en-gaule.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="never" page-range-format="expanded" default-locale="fr-FR">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" demote-non-dropping-particle="never" page-range-format="expanded" default-locale="fr-FR">
   <info>
     <title>Société Française d’Étude de la Céramique Antique en Gaule (French)</title>
     <title-short>SFECAG</title-short>
@@ -10,11 +10,11 @@
     <author>
       <name>Patrick O'Brien</name>
     </author>
-    <category citation-format="note"/>
+    <category citation-format="author-date"/>
     <category field="history"/>
     <category field="anthropology"/>
     <issn>1297-8213</issn>
-    <updated>2020-03-30T08:49:30+00:00</updated>
+    <updated>2020-04-01T10:13:11+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">
@@ -31,7 +31,9 @@
   </locale>
   <macro name="author">
     <names variable="author" delimiter=", ">
-      <name sort-separator=", " initialize-with=". " delimiter=", "/>
+      <name sort-separator=", " initialize-with=". " delimiter=", ">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
       <et-al font-variant="normal" font-style="italic"/>
       <substitute>
         <text macro="container-author"/>
@@ -79,17 +81,19 @@
   <macro name="locator">
     <choose>
       <if locator="paragraph">
-        <text variable="locator" prefix=", § "/>
+        <text variable="locator" prefix="§ "/>
       </if>
       <else>
-        <group prefix=", ">
+        <group>
           <choose>
             <if locator="page">
               <text variable="locator"/>
             </if>
             <else>
-              <label variable="locator" form="short" suffix=". "/>
-              <text variable="locator"/>
+              <group delimiter=" ">
+                <label variable="locator" form="short"/>
+                <text variable="locator"/>
+              </group>
             </else>
           </choose>
         </group>
@@ -101,7 +105,7 @@
       <if type="book" match="any">
         <text variable="title" font-style="italic"/>
       </if>
-      <else-if type="webpage" match="any">
+      <else-if type="webpage post post-weblog" match="any">
         <text variable="title"/>
       </else-if>
       <else-if variable="container-title" match="none">