Skip to content

Commit 1d1625a

Browse files
author
github actions
committed
Squashed 'src/main/resources/csl-styles/' changes from a51eb4f..8695d97
8695d97 Update societe-francaise-detude-de-la-ceramique-antique-en-gaule.csl (JabRef#4660) 0dc2e37 Update freshwater-science.csl (JabRef#4658) 118cfab Update ayer.csl (JabRef#4659) 3ba11bc Create optics-letters.csl (JabRef#4661) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 8695d97
1 parent 9be2604 commit 1d1625a

4 files changed

+295
-62
lines changed

‎ayer.csl

+4-31
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<issn>1134-2277</issn>
1616
<eissn>2255-5838</eissn>
1717
<summary>Journal of the Association for Contemporary History (AHC), co-edited by the AHC and Marcial Pons-Ediciones de Historia.</summary>
18-
<updated>2020-02-14T11:54:59+00:00</updated>
18+
<updated>2020-03-31T14:42:43+00:00</updated>
1919
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
2020
</info>
2121
<locale>
@@ -66,16 +66,6 @@
6666
<text macro="locators-specific-note"/>
6767
</group>
6868
</macro>
69-
<macro name="title-sort-substitute">
70-
<choose>
71-
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
72-
<text variable="title" font-style="italic" text-case="title" form="short"/>
73-
</if>
74-
<else>
75-
<text variable="title" quotes="true" text-case="title" form="short"/>
76-
</else>
77-
</choose>
78-
</macro>
7969
<macro name="editor-translator">
8070
<text term="in" suffix=" "/>
8171
<names variable="editor" delimiter=", ">
@@ -181,23 +171,6 @@
181171
<name and="text" delimiter=", "/>
182172
</names>
183173
</macro>
184-
<macro name="recipient-short">
185-
<names variable="recipient">
186-
<label form="verb" prefix=" " suffix=" "/>
187-
<name form="short" and="text" delimiter=", "/>
188-
</names>
189-
</macro>
190-
<macro name="contributors-short">
191-
<names variable="author">
192-
<name form="short" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
193-
<substitute>
194-
<names variable="editor"/>
195-
<names variable="translator"/>
196-
<text macro="title-sort-substitute"/>
197-
</substitute>
198-
</names>
199-
<text macro="recipient-short"/>
200-
</macro>
201174
<macro name="locators-newspaper">
202175
<choose>
203176
<if type="article-newspaper">
@@ -260,7 +233,7 @@
260233
</group>
261234
</if>
262235
<else>
263-
<group delimiter=" " prefix=", ">
236+
<group delimiter=" ">
264237
<label variable="locator" form="short"/>
265238
<text variable="locator" form="long"/>
266239
</group>
@@ -307,7 +280,7 @@
307280
</choose>
308281
</macro>
309282
<macro name="locators-subsequent">
310-
<group>
283+
<group delimiter=" ">
311284
<label variable="locator" form="short"/>
312285
<text variable="locator"/>
313286
</group>
@@ -325,7 +298,7 @@
325298
<text term="ibid" form="short"/>
326299
</else-if>
327300
<else-if position="subsequent">
328-
<text macro="contributors-short"/>
301+
<text macro="contributors-note"/>
329302
<text macro="title-short" prefix=", "/>
330303
<text macro="locators-subsequent" prefix=", "/>
331304
</else-if>

‎freshwater-science.csl

+47-22
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-US" version="1.0" demote-non-dropping-particle="sort-only">
2+
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
33
<info>
44
<title>Freshwater Science</title>
5+
<title-short>FWS</title-short>
56
<id>http://www.zotero.org/styles/freshwater-science</id>
67
<link href="http://www.zotero.org/styles/freshwater-science" rel="self"/>
78
<link href="http://www.zotero.org/styles/ecology" rel="template"/>
8-
<link href="http://www.press.uchicago.edu/journals/fws/instruct.html?journal=fws#instructions" rel="documentation"/>
9+
<link href="https://www.journals.uchicago.edu/journals/fws/instruct" rel="documentation"/>
910
<author>
1011
<name>Sebastian Karcher</name>
1112
</author>
13+
<contributor>
14+
<name>Patrick O'Brien</name>
15+
</contributor>
1216
<category citation-format="author-date"/>
1317
<category field="biology"/>
1418
<issn>2161-9549</issn>
1519
<eissn>2161-9565</eissn>
16-
<updated>2012-09-27T22:06:38+00:00</updated>
20+
<updated>2020-03-31T19:41:25+00:00</updated>
1721
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
1822
</info>
23+
<locale xml:lang="en">
24+
<terms>
25+
<term name="available at">available from</term>
26+
</terms>
27+
</locale>
1928
<macro name="container-contributors">
2029
<choose>
2130
<if type="chapter paper-conference" match="any">
@@ -38,7 +47,7 @@
3847
</choose>
3948
</macro>
4049
<macro name="author">
41-
<names variable="author" font-variant="small-caps">
50+
<names variable="author" font-variant="normal">
4251
<name name-as-sort-order="first" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
4352
<label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
4453
<substitute>
@@ -67,16 +76,26 @@
6776
</macro>
6877
<macro name="access">
6978
<choose>
70-
<if type="webpage">
71-
<text variable="URL"/>
79+
<if type="webpage post post-weblog report" match="any">
80+
<group delimiter=": " prefix="(" suffix=")">
81+
<text term="available at" text-case="capitalize-first"/>
82+
<text variable="URL"/>
83+
</group>
7284
</if>
7385
</choose>
7486
</macro>
7587
<macro name="publisher">
7688
<group delimiter=", ">
7789
<choose>
7890
<if type="article-journal article-magazine" match="none">
79-
<text variable="genre"/>
91+
<group delimiter=" ">
92+
<text variable="genre"/>
93+
<choose>
94+
<if type="report" match="any">
95+
<text variable="number"/>
96+
</if>
97+
</choose>
98+
</group>
8099
<text variable="publisher"/>
81100
<text variable="publisher-place"/>
82101
</if>
@@ -135,14 +154,20 @@
135154
<macro name="locators">
136155
<choose>
137156
<if type="article-journal article-magazine article-newspaper" match="any">
138-
<text variable="container-title" prefix=". "/>
139-
<text variable="volume" prefix=" "/>
140-
<text variable="page" prefix=":"/>
157+
<group delimiter=" ">
158+
<text variable="container-title"/>
159+
<group delimiter=":">
160+
<text variable="volume"/>
161+
<text variable="page"/>
162+
</group>
163+
</group>
141164
</if>
142-
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
143-
<group prefix=". " delimiter=" ">
144-
<label variable="page" form="long" text-case="capitalize-first"/>
145-
<text variable="page"/>
165+
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song webpage" match="any">
166+
<group delimiter=" ">
167+
<group delimiter=" ">
168+
<label variable="page" form="long" text-case="capitalize-first"/>
169+
<text variable="page"/>
170+
</group>
146171
<text macro="container-contributors"/>
147172
<text macro="secondary-contributors"/>
148173
<text variable="container-title"/>
@@ -174,16 +199,16 @@
174199
<key macro="author"/>
175200
<key variable="issued"/>
176201
</sort>
177-
<layout suffix=".">
178-
<text macro="author" suffix="."/>
179-
<text macro="issued" suffix=" "/>
180-
<text variable="title"/>
181-
<text macro="locators"/>
182-
<text macro="edition"/>
183-
<group delimiter=". " prefix=". ">
202+
<layout>
203+
<group delimiter=". " suffix=".">
204+
<text macro="author"/>
205+
<text macro="issued"/>
206+
<text variable="title"/>
207+
<text macro="locators"/>
208+
<text macro="edition"/>
184209
<text macro="publisher"/>
185-
<text macro="access"/>
186210
</group>
211+
<text macro="access" prefix=" "/>
187212
</layout>
188213
</bibliography>
189214
</style>

0 commit comments

Comments
 (0)