Skip to content

Commit

Permalink
Squashed 'buildres/csl/csl-styles/' changes from a985762505..e8e06888fe
Browse files Browse the repository at this point in the history 
e8e06888fe Update harvard-university-of-the-west-of-england.csl (#6520)
dbbe5c1a95 Update united-states-international-trade-commission.csl (#6535)
b985431f03 Update american-society-for-horticultural-science.csl (#6543)
e1ff9f5546 Sort APA and derivatives on displayed date, not full date (#6545)
7302832d6d Localize original-work-published in APA (#6388)
77a61c0d82 Update united-states-international-trade-commission.csl (#6526)
541807a057 Update the-accounting-review.csl (#6521)
708626357a  Update united-states-international-trade-commission

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: e8e06888fe388e81e3fa9052573732a791e8025e
  • Loading branch information
github actions committed May 15, 2023
1 parent 802ad43 commit ac10899
Show file tree
Hide file tree
Showing 28 changed files with 472 additions and 498 deletions.
280 changes: 131 additions & 149 deletions american-society-for-horticultural-science.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,214 +5,196 @@
<title-short>ASHS</title-short>
<id>http://www.zotero.org/styles/american-society-for-horticultural-science</id>
<link href="http://www.zotero.org/styles/american-society-for-horticultural-science" rel="self"/>
<link href="http://www.zotero.org/styles/revista-de-biologia-tropical" rel="template"/>
<link href="https://aggie-horticulture.tamu.edu/syllabi/423/ASHS%20Publ%20Manual%202002.pdf" rel="documentation"/>
<link href="http://www.zotero.org/styles/springer-basic-author-date" rel="template"/>
<link href="https://cdn.ymaws.com/ashs.org/resource/resmgr/publications/ashspubsstylemanualweb.pdf" rel="documentation"/>
<author>
<name>Patrick O'Brien</name>
</author>
<category citation-format="author-date"/>
<category field="biology"/>
<category field="botany"/>
<updated>2022-06-14T08:25:19+00:00</updated>
<updated>2023-05-12T09:18:16+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="edition">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
<number variable="edition" form="ordinal"/>
<label variable="edition" form="short"/>
</group>
</if>
<else>
<text variable="edition"/>
</else>
</choose>
</macro>
<macro name="container">
<choose>
<if type="chapter paper-conference" match="any">
<group delimiter=": ">
<text term="in" text-case="capitalize-first" font-style="normal" prefix=". " suffix=" "/>
<names variable="editor translator" delimiter=", " suffix=". ">
<name initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol"/>
<label form="short" prefix=" (" suffix=")"/>
</names>
</group>
<group delimiter=", ">
<text variable="container-title" text-case="title"/>
<text variable="collection-title" text-case="title"/>
</group>
</if>
<else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
<group prefix=", " delimiter=", ">
<text variable="container-title"/>
<text variable="collection-title"/>
</group>
</else-if>
<else>
<group delimiter=", " prefix=". ">
<text variable="container-title" form="short"/>
<text variable="collection-title"/>
</group>
</else>
</choose>
</macro>
<macro name="author">
<locale>
<terms>
<term name="edition" form="short">edn.</term>
</terms>
</locale>
<macro name="author-short">
<names variable="author">
<name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="first"/>
<label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
<name form="short" and="text"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<text macro="title"/>
<text variable="title"/>
</substitute>
</names>
</macro>
<macro name="author-short">
<macro name="author">
<names variable="author">
<name form="short" and="symbol" delimiter=", " initialize-with=". "/>
<et-al font-style="italic"/>
<name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
<label form="short" strip-periods="true" prefix=" (" suffix=")"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
<text variable="title" form="short" font-style="italic"/>
</if>
<else>
<text variable="title" form="short" quotes="true"/>
</else>
</choose>
<text variable="title"/>
</substitute>
</names>
</macro>
<macro name="access">
<text variable="URL" prefix="&lt;" suffix="&gt;"/>
</macro>
<macro name="title">
<macro name="edition">
<choose>
<if type="chapter paper-conference" match="any">
<group delimiter=", ">
<text variable="title"/>
<group>
<label variable="page" form="short" suffix=" " plural="never"/>
<text variable="page"/>
</group>
<if is-numeric="edition">
<group delimiter=" ">
<number variable="edition" form="ordinal"/>
<text term="edition" form="short"/>
</group>
</if>
<else>
<text variable="title"/>
<text variable="edition"/>
</else>
</choose>
</macro>
<macro name="publisher">
<macro name="year">
<date variable="issued">
<date-part name="year"/>
</date>
</macro>
<macro name="title">
<choose>
<if type="report thesis" match="any">
<if type="book">
<group delimiter=", ">
<text variable="publisher"/>
<text variable="publisher-place"/>
<text variable="title"/>
<text macro="edition"/>
</group>
</if>
<else>
<group delimiter=", ">
<text variable="publisher"/>
<text variable="publisher-place"/>
</group>
<text variable="title"/>
</else>
</choose>
</macro>
<macro name="event">
<choose>
<if variable="event">
<text term="presented at" text-case="capitalize-first" suffix=" "/>
<text variable="event"/>
</if>
</choose>
<macro name="year-parenth">
<date date-parts="year" form="numeric" variable="issued"/>
</macro>
<macro name="issued">
<macro name="access">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year"/>
</date>
<if match="any" variable="DOI">
<text variable="DOI" prefix="https://doi.org/"/>
</if>
<else-if variable="accessed">
<choose>
<if type="webpage">
<else-if type="webpage post post-weblog" match="any">
<group delimiter=". ">
<text variable="URL"/>
<group delimiter=" " prefix="[" suffix="]">
<text term="accessed"/>
<date variable="accessed">
<date-part name="day" suffix=" "/>
<date-part name="month" form="short" suffix=" " strip-periods="true"/>
<date-part name="year"/>
</date>
</if>
<else>
<text term="no date" form="short"/>
</else>
</choose>
</else-if>
<else>
<text term="no date" form="short"/>
</else>
</choose>
</macro>
<macro name="locators">
<choose>
<if type="article-journal article-magazine article-newspaper" match="any">
<group delimiter=":" prefix=" ">
<text variable="volume"/>
<text variable="page"/>
</group>
</if>
<else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
<group delimiter=", " prefix=". ">
<text macro="edition"/>
<text macro="event"/>
<text macro="publisher"/>
<group>
<text variable="genre"/>
<text variable="number" prefix=" No. "/>
</group>
</group>
</else-if>
<else-if type="chapter paper-conference" match="any">
<group delimiter=", " prefix=". ">
<text macro="event"/>
<text macro="publisher"/>
</group>
</else-if>
<else-if type="webpage post post-weblog" match="any">
<group delimiter=". " prefix=". ">
<date form="text" date-parts="year-month-day" variable="issued"/>
<text macro="access"/>
</group>
</else-if>
</choose>
</macro>
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
<macro name="publisher">
<group delimiter=", ">
<text variable="publisher"/>
<text variable="publisher-place"/>
</group>
</macro>
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
<sort>
<key variable="issued"/>
<key macro="author"/>
<key macro="issued"/>
</sort>
<layout delimiter="; " prefix="(" suffix=")">
<group delimiter=", ">
<layout prefix="(" suffix=")" delimiter="; ">
<group delimiter=" ">
<text macro="author-short"/>
<text macro="issued"/>
<text macro="year"/>
</group>
</layout>
</citation>
<bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
<bibliography hanging-indent="true">
<sort>
<key macro="author"/>
<key macro="issued" sort="ascending"/>
<key variable="author" sort="ascending"/>
</sort>
<layout>
<group suffix=".">
<layout suffix=".">
<group delimiter=". ">
<text macro="author"/>
<text macro="issued" prefix=". " suffix=". "/>
<group>
<text macro="title"/>
<text macro="container"/>
</group>
<text macro="locators"/>
<text macro="year-parenth"/>
<choose>
<if type="chapter paper-conference" match="any">
<group delimiter=". ">
<group delimiter=", ">
<text macro="title"/>
<group delimiter=" ">
<label plural="never" strip-periods="true" variable="page" form="short"/>
<text variable="page"/>
</group>
</group>
<group delimiter=": ">
<text term="in" text-case="capitalize-first" suffix=":"/>
<names variable="editor">
<name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
<label form="short" strip-periods="true" prefix=" (" suffix=")"/>
</names>
</group>
<text variable="container-title"/>
<text macro="edition"/>
<group delimiter=", ">
<text macro="publisher"/>
</group>
</group>
</if>
<else-if type="article-journal">
<group delimiter=". ">
<text macro="title"/>
<group delimiter=". ">
<text variable="container-title" form="short" strip-periods="true"/>
<group delimiter=":" prefix=" ">
<group>
<text variable="volume"/>
<text variable="issue" prefix="(" suffix=")"/>
</group>
<text variable="page" prefix=":"/>
</group>
</group>
</group>
</else-if>
<else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
<group delimiter=". ">
<text macro="title"/>
<text macro="publisher"/>
</group>
</else-if>
<else-if type="webpage post-weblog" match="any">
<group delimiter=". ">
<text macro="title"/>
<text variable="container-title" form="short"/>
</group>
</else-if>
<else-if type="thesis">
<group delimiter=". ">
<group delimiter=" ">
<text macro="title"/>
<text variable="genre" text-case="capitalize-first" prefix="(" suffix=")"/>
</group>
<text macro="publisher"/>
</group>
</else-if>
<else>
<group delimiter=" ">
<text macro="title"/>
<text variable="container-title" form="short"/>
<group delimiter=":">
<text variable="volume"/>
<text variable="page"/>
</group>
</group>
</else>
</choose>
<text macro="access"/>
</group>
</layout>
</bibliography>
Expand Down
8 changes: 1 addition & 7 deletions apa-6th-edition-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1096,14 +1096,8 @@
<!--This should be localized -->
<choose>
<if type="bill legal_case legislation" match="any"/>
<else-if type="interview motion_picture song" match="any">
<text value="Original work recorded"/>
</else-if>
<else-if type="broadcast">
<text value="Original work broadcast"/>
</else-if>
<else>
<text value="Original work published"/>
<text term="original-work-published" text-case="capitalize-first"/>
</else>
</choose>
</macro>
Expand Down
8 changes: 1 addition & 7 deletions apa-6th-edition.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1095,14 +1095,8 @@
<!--This should be localized -->
<choose>
<if type="bill legal_case legislation" match="any"/>
<else-if type="interview motion_picture song" match="any">
<text value="Original work recorded"/>
</else-if>
<else-if type="broadcast">
<text value="Original work broadcast"/>
</else-if>
<else>
<text value="Original work published"/>
<text term="original-work-published" text-case="capitalize-first"/>
</else>
</choose>
</macro>
Expand Down
Loading

0 comments on commit ac10899

Please sign in to comment.