Skip to content

Commit

Permalink
Merge remote branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Walter Vogel committed Oct 8, 2013
2 parents 73be1cc + 81d731d commit 35d684e
Show file tree
Hide file tree
Showing 117 changed files with 3,380 additions and 521 deletions.
2 changes: 1 addition & 1 deletion academy-of-management-review.csl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<text term="in" text-case="capitalize-first" suffix=" "/>
<names variable="editor translator" delimiter=", " suffix=", ">
<name and="symbol" initialize-with=". " delimiter=", "/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=".)" strip-periods="true"/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
</names>
</if>
</choose>
Expand Down
2 changes: 1 addition & 1 deletion acta-universitatis-agriculturae-sueciae.csl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<text term="in" text-case="capitalize-first" suffix=":"/>
<names variable="editor translator" delimiter=", " prefix=" ">
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", "/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=".)" strip-periods="true"/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
</names>
</if>
</choose>
Expand Down
2 changes: 1 addition & 1 deletion american-journal-of-primatology.csl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<macro name="author">
<group suffix=".">
<names variable="author">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
<label prefix=", "/>
<substitute>
<names variable="editor"/>
Expand Down
2 changes: 1 addition & 1 deletion american-society-for-microbiology.csl
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<text term="in" text-case="capitalize-first" prefix=". " suffix=" " font-style="italic"/>
<names variable="editor" delimiter=", " suffix=", ">
<name initialize-with="" delimiter=", " name-as-sort-order="all" delimiter-precedes-last="always"/>
<label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
<label form="short" prefix=" (" suffix=")"/>
</names>
</if>
</choose>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<names variable="author">
<name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" (" suffix=")" strip-periods="true"/>
<et-al font-style="italic"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
Expand Down
2 changes: 1 addition & 1 deletion analytica-chimica-acta.csl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<macro name="editor">
<names variable="editor">
<name initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=".)" strip-periods="true"/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
</names>
</macro>
<macro name="author">
Expand Down
36 changes: 27 additions & 9 deletions annales.csl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<category citation-format="note"/>
<category field="social_science"/>
<issn>0395-2649</issn>
<updated>2012-09-27T22:06:38+00:00</updated>
<updated>2013-08-29T04:18:55+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">
Expand All @@ -37,7 +37,7 @@
<if variable="author">
<names variable="author">
<name form="long" and="text" sort-separator=" " font-style="normal">
</name>
</name>
</names>
</if>
<else-if variable="editor">
Expand Down Expand Up @@ -133,7 +133,10 @@
<text variable="number-of-volumes" prefix=". " suffix="/"/>
<text variable="volume"/>
</group>
<text variable="locator" prefix="p.&#160;"/>
<group delimiter="&#8239;">
<label variable="locator" form="short"/>
<text variable="locator" />
</group>
</group>
</if>
<else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
Expand All @@ -149,7 +152,10 @@
<label variable="page" form="short"/>
<group delimiter=", ">
<text variable="page"/>
<text variable="locator" prefix="p.&#160;"/>
<group delimiter="&#8239;">
<label variable="locator" form="short"/>
<text variable="locator" />
</group>
</group>
</group>
</else-if>
Expand All @@ -158,7 +164,10 @@
<label variable="page" form="short"/>
<group delimiter=", ">
<text variable="page"/>
<text variable="locator" prefix="p.&#160;"/>
<group delimiter="&#8239;">
<label variable="locator" form="short"/>
<text variable="locator" />
</group>
</group>
</group>
</else-if>
Expand All @@ -172,7 +181,10 @@
<group delimiter=" " font-style="normal">
<choose>
<if variable="locator" match="any">
<text variable="locator" prefix="p.&#160;"/>
<group delimiter="&#8239;">
<label variable="locator" form="short"/>
<text variable="locator" />
</group>
</if>
<else-if variable="locator" match="none">
<label variable="page" form="short"/>
Expand Down Expand Up @@ -269,7 +281,10 @@
<if position="ibid-with-locator">
<group delimiter=", ">
<text term="ibid" text-case="capitalize-first" font-style="italic" suffix="."/>
<text variable="locator" prefix="p. "/>
<group delimiter="&#8239;">
<label variable="locator" form="short"/>
<text variable="locator" />
</group>
</group>
</if>
<else-if position="ibid">
Expand All @@ -287,7 +302,10 @@
</else>
</choose>
<text term="cited" font-style="italic" suffix="."/>
<text variable="locator" prefix="p.&#160;"/>
<group delimiter="&#8239;">
<label variable="locator" form="short"/>
<text variable="locator" />
</group>
</group>
</else-if>
<else>
Expand Down Expand Up @@ -321,4 +339,4 @@
</group>
</layout>
</bibliography>
</style>
</style>
170 changes: 170 additions & 0 deletions archiv-fur-geschichte-der-philosophie.csl
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
<?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" default-locale="en-US">
<info>
<title>Archiv für Geschichte der Philosophie</title>
<title-short>AGP</title-short>
<id>http://www.zotero.org/styles/archiv-fur-geschichte-der-philosophie</id>
<link href="http://www.zotero.org/styles/archiv-fur-geschichte-der-philosophie" rel="self"/>
<link href="http://www.zotero.org/styles/environment-and-planning" rel="template"/>
<link href="www.degruyter.com/view/supplement/s16130650_Instructions_for_Authors_en.pdf" rel="documentation"/>
<author>
<name>Jamie Dow</name>
</author>
<category citation-format="author-date"/>
<category field="philosophy"/>
<issn>0003-9101</issn>
<eissn>1613-0650</eissn>
<summary>Style for Archiv für Geschichte der Philosophie</summary>
<updated>2013-09-20T19:03:14+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">
<style-options punctuation-in-quote="false"/>
</locale>
<macro name="editor">
<names variable="editor" delimiter=",">
<label form="short" text-case="capitalize-first" suffix=" "/>
<name sort-separator=", " and="text" initialize-with="." delimiter=", "/>
</names>
</macro>
<macro name="author">
<names variable="author">
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=" " delimiter=", "/>
<label form="short" prefix=" (" suffix=")"/>
<substitute>
<names variable="editor"/>
<text variable="title"/>
</substitute>
</names>
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter=", " initialize-with="."/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<text variable="title"/>
</substitute>
</names>
</macro>
<macro name="title">
<choose>
<if type="book thesis" match="any">
<text variable="title" font-style="italic" prefix=" "/>
</if>
<else>
<text variable="title" quotes="true" prefix=" "/>
</else>
</choose>
</macro>
<macro name="publisher">
<choose>
<if type="book chapter paper-conference" match="any">
<group delimiter=", " prefix=" ">
<text variable="publisher-place"/>
</group>
</if>
<else>
<group delimiter=", " prefix=", ">
<text variable="publisher-place"/>
</group>
</else>
</choose>
</macro>
<macro name="year-date">
<date variable="issued">
<date-part name="year"/>
</date>
</macro>
<macro name="edition">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
<number variable="edition" form="ordinal"/>
<text term="edition" strip-periods="true"/>
</group>
</if>
<else>
<text variable="edition"/>
</else>
</choose>
</macro>
<macro name="locator">
<group delimiter=" ">
<!-- <label variable="locator"/> -->
<text variable="locator"/>
</group>
</macro>
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
<sort>
<key macro="author-short"/>
<key macro="year-date" sort="ascending"/>
</sort>
<layout delimiter="; ">
<group delimiter=", ">
<group delimiter=" ">
<text macro="author-short"/>
<text macro="year-date"/>
</group>
<text macro="locator"/>
</group>
</layout>
</citation>
<bibliography hanging-indent="true" et-al-min="21" et-al-use-first="20">
<sort>
<key macro="author"/>
<key variable="title"/>
</sort>
<layout suffix=".">
<group delimiter=". ">
<group>
<group delimiter=". " suffix=".">
<text macro="author"/>
<date variable="issued">
<date-part name="year"/>
</date>
</group>
<text macro="title" suffix="."/>
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
<group delimiter=" " prefix=" ">
<text macro="edition"/>
<text macro="editor" suffix="."/>
</group>
<text macro="publisher"/>
</if>
<else-if type="chapter paper-conference" match="any">
<text term="in" text-case="capitalize-first" prefix=" "/>
<group prefix=" " delimiter=" " suffix=".">
<group suffix=".">
<text variable="container-title" font-style="italic"/>
<text macro="edition"/>
</group>
<text macro="editor" suffix="."/>
<text variable="collection-title"/>
</group>
<group>
<text macro="publisher" prefix=" "/>
<group prefix=", ">
<!-- <label variable="page" suffix=" " form="short" strip-periods="true"/> -->
<text variable="page"/>
</group>
</group>
</else-if>
<else>
<group delimiter=" " prefix=" ">
<text variable="container-title" font-style="italic"/>
<group suffix=",">
<text variable="volume"/>
<text variable="issue" prefix="."/>
</group>
<text variable="page"/>
</group>
</else>
</choose>
</group>
<text variable="URL"/>
</group>
</layout>
</bibliography>
</style>
2 changes: 1 addition & 1 deletion associacao-brasileira-de-normas-tecnicas-ufpr.csl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<text value="In:" suffix=" "/>
<names variable="editor translator" delimiter=", " suffix="; ">
<name initialize-with=". " delimiter="; "/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=".)" strip-periods="true"/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
</names>
</if>
</choose>
Expand Down
6 changes: 3 additions & 3 deletions avian-conservation-and-ecology.csl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Avian Conservation and Ecology</title>
<id>http://www.zotero.org/styles/avian-conservation-and-ecology</id>
<link href="http://www.zotero.org/styles/avian-conservation-and-ecology" rel="self"/>
<link href="http://www.zotero.org/styles/ecology" rel="template"/>
<link href="http://www.zotero.org/styles/ecology" rel="template"/>
<link href="http://www.ace-eco.org/about/submissions.php#literaturecited" rel="documentation"/>
<author>
<name>Sebastian Karcher</name>
Expand Down Expand Up @@ -185,10 +185,10 @@
</group>
</layout>
</citation>
<bibliography entry-spacing="0" et-al-min="99" et-al-use-first="98">
<bibliography entry-spacing="0" et-al-min="99" et-al-use-first="98">
<sort>
<key macro="author"/>
<key variable="issued"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
<text macro="author" suffix="."/>
Expand Down
2 changes: 1 addition & 1 deletion biochimica-et-biophysica-acta.csl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<macro name="editor">
<names variable="editor">
<name initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=".)" strip-periods="true"/>
<label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
</names>
</macro>
<macro name="year-date">
Expand Down
4 changes: 2 additions & 2 deletions biometrics.csl
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<author>
<name>Sebastian Karcher</name>
</author>
<issn>0006-341X</issn>
<eissn>1541-0420</eissn>
<category citation-format="author-date"/>
<category field="social_science"/>
<issn>0006-341X</issn>
<eissn>1541-0420</eissn>
<updated>2013-04-05T01:56:49+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 Down
2 changes: 1 addition & 1 deletion biotropica.csl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<macro name="editor">
<names variable="editor" delimiter=", ">
<name and="text" initialize-with=". " delimiter=", "/>
<label form="short" prefix=" (" text-case="title" suffix=".)" strip-periods="true"/>
<label form="short" prefix=" (" text-case="title" suffix=")"/>
</names>
</macro>
<macro name="anon">
Expand Down
Loading

0 comments on commit 35d684e

Please sign in to comment.