Skip to content

Commit

Permalink
Squashed 'src/main/resources/csl-styles/' changes from 9e81857..9454897
Browse files Browse the repository at this point in the history
9454897 Update ASA style
b3c6efd Reorder/reindent (JabRef#4571)
aa52aaa Encrypt Travis CI notification email addresses (JabRef#4570)
d8f2843 Update ayer.csl (JabRef#4569)
448e67e Create ayer.csl (JabRef#4565)
bf1ddae Update springer-basic-author-date.csl (JabRef#4562)
db525ac Update american-journal-of-physical-anthropology.csl (JabRef#4567)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 9454897
  • Loading branch information
github actions committed Feb 19, 2020
1 parent fea0ce6 commit 95a188f
Show file tree
Hide file tree
Showing 14 changed files with 426 additions and 44 deletions.
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ dist: bionic
language: ruby
cache: bundler
rvm:
- 2.6.5
- 2.6.5
install:
- bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
- bundle update sheldon
- bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
- bundle update sheldon
notifications:
email:
recipients:
- rintze.zelle@gmail.com
- karcher@u.northwestern.edu
on_success: change
on_failure: always
recipients:
- secure: Ko9SzcdByE/HOMP7s9ddTpRdqahnO5LJ1MGJWX/cmymQc8fDRMgP9jgI6D/G5Ntgo6uGUO+xkcV5mBbOAoI5v8U2GQ5nICDXHdQrX8kJzve9JDiQJOy0c17TYi3d7bBeS1bOhy7E0TxHRax2wWWxDhqz80GwSo9JAhQbcusR/1U=
- secure: Ov0xcwOVBSbc7uuCk0Qu+ILmh3HuFNa9PnfI363at9V3aG05oJHiTRseFXvfiHgK5663Wcytcl3DU+A2vYZSz7Y3ZGzcUzhlRBLMUfebncB2nAsX3NJsieJ6FoYlkRBZdzA2lzt3FVv99hebuZnU4OiANdnHFiLmFzeWRaPZfIQ=
webhooks:
urls:
- https://shelbot.herokuapp.com/build
- https://styles-update.zotero.org:8826/
- https://styles-update.zotero.org:8827/
- https://shelbot.herokuapp.com/build
- https://styles-update.zotero.org:8826/
- https://styles-update.zotero.org:8827/
on_success: always
on_failure: always
on_start: never
6 changes: 3 additions & 3 deletions american-sociological-association.csl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago">
<info>
<title>American Sociological Association</title>
<title>American Sociological Association 6th edition</title>
<title-short>ASA</title-short>
<id>http://www.zotero.org/styles/american-sociological-association</id>
<link href="http://www.zotero.org/styles/american-sociological-association" rel="self"/>
Expand All @@ -15,7 +15,7 @@
</contributor>
<category citation-format="author-date"/>
<category field="sociology"/>
<summary>The ASA style.</summary>
<summary>The ASA style following the 6th edition of the Style Guide</summary>
<updated>2018-04-20T10:42:41+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>
Expand All @@ -30,7 +30,7 @@
</macro>
<macro name="author">
<names variable="author">
<name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="contextual" initialize="false" initialize-with=". "/>
<name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize="false" initialize-with=". "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
Expand Down
2 changes: 1 addition & 1 deletion apa-no-ampersand.csl
Original file line number Diff line number Diff line change
Expand Up @@ -1711,4 +1711,4 @@
</choose>
</layout>
</bibliography>
</style>
</style>
2 changes: 1 addition & 1 deletion apa-single-spaced.csl
Original file line number Diff line number Diff line change
Expand Up @@ -1711,4 +1711,4 @@
</choose>
</layout>
</bibliography>
</style>
</style>
2 changes: 1 addition & 1 deletion apa.csl
Original file line number Diff line number Diff line change
Expand Up @@ -1711,4 +1711,4 @@
</choose>
</layout>
</bibliography>
</style>
</style>
8 changes: 4 additions & 4 deletions associacao-brasileira-de-normas-tecnicas-ufrgs.csl
Original file line number Diff line number Diff line change
Expand Up @@ -102,29 +102,29 @@
<macro name="translator">
<text value="Tradução "/>
<names variable="translator" delimiter="; ">
<name delimiter="; " sort-separator=" " delimiter-precedes-last="always"></name>
<name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
<et-al font-style="italic"/>
</names>
</macro>
<macro name="composer">
<text value="Compositor: "/>
<names variable="composer" delimiter="; ">
<name delimiter="; " sort-separator=" " delimiter-precedes-last="always"></name>
<name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
<et-al font-style="italic"/>
</names>
</macro>
<macro name="recipient">
<text value="Destinatário: "/>
<names variable="recipient" delimiter="; ">
<name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"></name>
<name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
<et-al font-style="italic"/>
</names>
</macro>
<macro name="author">
<choose>
<if type="motion_picture broadcast song" match="any">
<names variable="author">
<name></name>
<name/>
</names>
</if>
<else>
Expand Down
Loading

0 comments on commit 95a188f

Please sign in to comment.