forked from mirrors/org-mode
Merge branch 'bugfix'
This commit is contained in:
commit
20630fcdcb
|
@ -1,6 +1,6 @@
|
||||||
These data files are used by Org's oc-csl.el library.
|
These data files are used by Org's oc-csl.el library.
|
||||||
|
|
||||||
COPYRIGHT AND LICENSE INFORMATION
|
LICENSE INFORMATION
|
||||||
|
|
||||||
chicago-author-date.csl
|
chicago-author-date.csl
|
||||||
locales-en-US.xml
|
locales-en-US.xml
|
||||||
|
|
|
@ -20,11 +20,20 @@
|
||||||
<contributor>
|
<contributor>
|
||||||
<name>Andrew Dunning</name>
|
<name>Andrew Dunning</name>
|
||||||
<email>andrew.dunning@utoronto.ca</email>
|
<email>andrew.dunning@utoronto.ca</email>
|
||||||
|
<uri>https://orcid.org/0000-0003-0464-5036</uri>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Matthew Roth</name>
|
||||||
|
<email>matthew.g.roth@yale.edu</email>
|
||||||
|
<uri> https://orcid.org/0000-0001-7902-6331</uri>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Brenton M. Wiernik</name>
|
||||||
</contributor>
|
</contributor>
|
||||||
<category citation-format="author-date"/>
|
<category citation-format="author-date"/>
|
||||||
<category field="generic-base"/>
|
<category field="generic-base"/>
|
||||||
<summary>The author-date variant of the Chicago style</summary>
|
<summary>The author-date variant of the Chicago style</summary>
|
||||||
<updated>2017-10-12T12:00:00+00:00</updated>
|
<updated>2018-01-24T12:00:00+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>
|
<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>
|
</info>
|
||||||
<locale xml:lang="en">
|
<locale xml:lang="en">
|
||||||
|
@ -32,16 +41,13 @@
|
||||||
<term name="editor" form="verb-short">ed.</term>
|
<term name="editor" form="verb-short">ed.</term>
|
||||||
<term name="container-author" form="verb">by</term>
|
<term name="container-author" form="verb">by</term>
|
||||||
<term name="translator" form="verb-short">trans.</term>
|
<term name="translator" form="verb-short">trans.</term>
|
||||||
<term name="editortranslator" form="verb">
|
<term name="editortranslator" form="verb">edited and translated by</term>
|
||||||
<single>edited and translated by</single>
|
|
||||||
<multiple>edited and translated by</multiple>
|
|
||||||
</term>
|
|
||||||
<term name="translator" form="short">trans.</term>
|
<term name="translator" form="short">trans.</term>
|
||||||
</terms>
|
</terms>
|
||||||
</locale>
|
</locale>
|
||||||
<macro name="secondary-contributors">
|
<macro name="secondary-contributors">
|
||||||
<choose>
|
<choose>
|
||||||
<if type="chapter paper-conference" match="none">
|
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
|
||||||
<group delimiter=". ">
|
<group delimiter=". ">
|
||||||
<names variable="editor translator" delimiter=". ">
|
<names variable="editor translator" delimiter=". ">
|
||||||
<label form="verb" text-case="capitalize-first" suffix=" "/>
|
<label form="verb" text-case="capitalize-first" suffix=" "/>
|
||||||
|
@ -57,7 +63,7 @@
|
||||||
</macro>
|
</macro>
|
||||||
<macro name="container-contributors">
|
<macro name="container-contributors">
|
||||||
<choose>
|
<choose>
|
||||||
<if type="chapter paper-conference" match="any">
|
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
||||||
<group prefix=", " delimiter=", ">
|
<group prefix=", " delimiter=", ">
|
||||||
<names variable="container-author" delimiter=", ">
|
<names variable="container-author" delimiter=", ">
|
||||||
<label form="verb" suffix=" "/>
|
<label form="verb" suffix=" "/>
|
||||||
|
@ -250,7 +256,7 @@
|
||||||
</else>
|
</else>
|
||||||
</choose>
|
</choose>
|
||||||
</if>
|
</if>
|
||||||
<else-if type="chapter paper-conference" match="any">
|
<else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
||||||
<choose>
|
<choose>
|
||||||
<if is-numeric="edition">
|
<if is-numeric="edition">
|
||||||
<group delimiter=" " prefix=", ">
|
<group delimiter=" " prefix=", ">
|
||||||
|
@ -317,7 +323,7 @@
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</else-if>
|
</else-if>
|
||||||
<else-if type="chapter paper-conference" match="any">
|
<else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
||||||
<choose>
|
<choose>
|
||||||
<if variable="page" match="none">
|
<if variable="page" match="none">
|
||||||
<group prefix=". ">
|
<group prefix=". ">
|
||||||
|
@ -331,7 +337,7 @@
|
||||||
</macro>
|
</macro>
|
||||||
<macro name="locators-chapter">
|
<macro name="locators-chapter">
|
||||||
<choose>
|
<choose>
|
||||||
<if type="chapter paper-conference" match="any">
|
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
||||||
<choose>
|
<choose>
|
||||||
<if variable="page">
|
<if variable="page">
|
||||||
<group prefix=", ">
|
<group prefix=", ">
|
||||||
|
@ -360,7 +366,7 @@
|
||||||
<else-if type="article-journal">
|
<else-if type="article-journal">
|
||||||
<choose>
|
<choose>
|
||||||
<if variable="volume issue" match="any">
|
<if variable="volume issue" match="any">
|
||||||
<text variable="page" prefix=":"/>
|
<text variable="page" prefix=": "/>
|
||||||
</if>
|
</if>
|
||||||
<else>
|
<else>
|
||||||
<text variable="page" prefix=", "/>
|
<text variable="page" prefix=", "/>
|
||||||
|
@ -407,7 +413,7 @@
|
||||||
</macro>
|
</macro>
|
||||||
<macro name="container-title">
|
<macro name="container-title">
|
||||||
<choose>
|
<choose>
|
||||||
<if type="chapter paper-conference" match="any">
|
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
||||||
<text macro="container-prefix" suffix=" "/>
|
<text macro="container-prefix" suffix=" "/>
|
||||||
</if>
|
</if>
|
||||||
</choose>
|
</choose>
|
||||||
|
@ -416,14 +422,14 @@
|
||||||
<text variable="container-title" text-case="title"/>
|
<text variable="container-title" text-case="title"/>
|
||||||
</if>
|
</if>
|
||||||
<else-if type="legal_case" match="none">
|
<else-if type="legal_case" match="none">
|
||||||
<group delimiter=" ">
|
<group delimiter=" ">
|
||||||
<text variable="container-title" text-case="title" font-style="italic"/>
|
<text variable="container-title" text-case="title" font-style="italic"/>
|
||||||
<choose>
|
<choose>
|
||||||
<if type="post-weblog">
|
<if type="post-weblog">
|
||||||
<text value="(blog)"/>
|
<text value="(blog)"/>
|
||||||
</if>
|
</if>
|
||||||
</choose>
|
</choose>
|
||||||
</group>
|
</group>
|
||||||
</else-if>
|
</else-if>
|
||||||
</choose>
|
</choose>
|
||||||
</macro>
|
</macro>
|
||||||
|
@ -506,14 +512,21 @@
|
||||||
</choose>
|
</choose>
|
||||||
</macro>
|
</macro>
|
||||||
<macro name="event">
|
<macro name="event">
|
||||||
<group>
|
<group delimiter=" ">
|
||||||
<text term="presented at" suffix=" "/>
|
<choose>
|
||||||
|
<if variable="genre">
|
||||||
|
<text term="presented at"/>
|
||||||
|
</if>
|
||||||
|
<else>
|
||||||
|
<text term="presented at" text-case="capitalize-first"/>
|
||||||
|
</else>
|
||||||
|
</choose>
|
||||||
<text variable="event"/>
|
<text variable="event"/>
|
||||||
</group>
|
</group>
|
||||||
</macro>
|
</macro>
|
||||||
<macro name="description">
|
<macro name="description">
|
||||||
<choose>
|
<choose>
|
||||||
<if type="interview">
|
<if variable="interviewer" type="interview" match="any">
|
||||||
<group delimiter=". ">
|
<group delimiter=". ">
|
||||||
<text macro="interviewer"/>
|
<text macro="interviewer"/>
|
||||||
<text variable="medium" text-case="capitalize-first"/>
|
<text variable="medium" text-case="capitalize-first"/>
|
||||||
|
@ -581,6 +594,7 @@
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</else-if>
|
</else-if>
|
||||||
|
<else-if type="article-journal" match="any"/>
|
||||||
<else>
|
<else>
|
||||||
<group prefix=". " delimiter=", ">
|
<group prefix=". " delimiter=", ">
|
||||||
<choose>
|
<choose>
|
||||||
|
@ -593,7 +607,7 @@
|
||||||
</else>
|
</else>
|
||||||
</choose>
|
</choose>
|
||||||
</macro>
|
</macro>
|
||||||
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year">
|
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
|
||||||
<layout prefix="(" suffix=")" delimiter="; ">
|
<layout prefix="(" suffix=")" delimiter="; ">
|
||||||
<group delimiter=", ">
|
<group delimiter=", ">
|
||||||
<choose>
|
<choose>
|
||||||
|
|
|
@ -1,6 +1,15 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="en-US">
|
<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="en-US">
|
||||||
<info>
|
<info>
|
||||||
|
<translator>
|
||||||
|
<name>Andrew Dunning</name>
|
||||||
|
</translator>
|
||||||
|
<translator>
|
||||||
|
<name>Sebastian Karcher</name>
|
||||||
|
</translator>
|
||||||
|
<translator>
|
||||||
|
<name>Rintze M. Zelle</name>
|
||||||
|
</translator>
|
||||||
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
|
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
|
||||||
<updated>2015-10-10T23:31:02+00:00</updated>
|
<updated>2015-10-10T23:31:02+00:00</updated>
|
||||||
</info>
|
</info>
|
||||||
|
|
Loading…
Reference in a new issue