Skip to content

Commit

Permalink
D8CORE-7656: Update citation format markups
Browse files Browse the repository at this point in the history
  • Loading branch information
pookmish committed Dec 9, 2024
1 parent 7267ae4 commit 677b300
Showing 1 changed file with 91 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</contributor>
<contributor>
<name>Andrew Dunning</name>
<email>[email protected]</email>
<uri>https://orcid.org/0000-0003-0464-5036</uri>
</contributor>
<contributor>
<name>Sebastian Karcher</name>
Expand All @@ -34,7 +34,7 @@
<category citation-format="note"/>
<category field="generic-base"/>
<summary>Chicago format with full notes and bibliography</summary>
<updated>2020-04-26T18:22:50+00:00</updated>
<updated>2022-01-16T19:46:01+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">
Expand Down Expand Up @@ -185,9 +185,12 @@
<text macro="editor"/>
<text macro="translator"/>
<choose>
<if type="webpage post-weblog" match="any">
<text variable="container-title"/>
<if type="article-magazine article-newspaper" match="any">
<text variable="container-title" font-style="italic"/>
</if>
<else-if type="webpage post-weblog" match="any">
<text variable="container-title"/>
</else-if>
</choose>
</substitute>
</names>
Expand Down Expand Up @@ -218,6 +221,11 @@
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<choose>
<if type="article-magazine article-newspaper webpage post-weblog" match="any">
<text variable="container-title"/>
</if>
</choose>
<text macro="title"/>
</substitute>
</names>
Expand Down Expand Up @@ -260,37 +268,37 @@
<macro name="title">
<group>
<text variable="link-beginning"/>
<choose>
<if variable="title" match="none">
<choose>
<if type="personal_communication" match="none">
<text variable="genre" text-case="capitalize-first"/>
</if>
</choose>
</if>
<else-if type="book graphic motion_picture song" match="any">
<text variable="title" text-case="title" font-style="italic"/>
<group prefix=" (" suffix=")" delimiter=" ">
<text term="version"/>
<text variable="version"/>
</group>
</else-if>
<else-if variable="reviewed-author">
<group delimiter=", ">
<text variable="title" font-style="italic" prefix="Review of "/>
<names variable="reviewed-author">
<label form="verb-short" text-case="lowercase" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
</group>
</else-if>
<else-if type="bill legislation legal_case interview patent" match="any">
<text variable="title"/>
</else-if>
<else>
<text variable="title" text-case="title" quotes="true"/>
</else>
</choose>
<choose>
<if variable="title" match="none">
<choose>
<if type="personal_communication" match="none">
<text variable="genre" text-case="capitalize-first"/>
</if>
</choose>
</if>
<else-if type="book graphic motion_picture song" match="any">
<text variable="title" text-case="title" font-style="italic"/>
<group prefix=" (" suffix=")" delimiter=" ">
<text term="version"/>
<text variable="version"/>
</group>
</else-if>
<else-if variable="reviewed-author">
<group delimiter=", ">
<text variable="title" font-style="italic" prefix="Review of "/>
<names variable="reviewed-author">
<label form="verb-short" text-case="lowercase" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
</group>
</else-if>
<else-if type="bill legislation legal_case interview patent" match="any">
<text variable="title"/>
</else-if>
<else>
<text variable="title" text-case="title" quotes="true"/>
</else>
</choose>
<text variable="link-ending"/>
</group>
</macro>
Expand Down Expand Up @@ -450,7 +458,7 @@
<choose>
<if type="article-journal">
<group delimiter=" ">
<text variable="collection-title" font-style="italic"/>
<text variable="collection-title"/>
<text variable="collection-number"/>
</group>
</if>
Expand Down Expand Up @@ -536,9 +544,12 @@
<else-if type="book chapter graphic motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<text macro="edition-note"/>
<group delimiter=" ">
<text term="volume" form="short"/>
<number variable="volume" form="numeric"/>
<group delimiter=", ">
<group delimiter=" ">
<text term="volume" form="short"/>
<number variable="volume" form="numeric"/>
</group>
<text variable="volume-title" font-style="italic"/>
</group>
<choose>
<if variable="locator" match="none">
Expand All @@ -565,7 +576,20 @@
<text term="section" form="symbol"/>
<text variable="section"/>
</group>
<text variable="page"/>
<group delimiter=", ">
<text variable="page"/>
<choose>
<if locator="page" match="any">
<text variable="locator"/>
</if>
<else>
<group delimiter=" ">
<label variable="locator" form="short"/>
<text variable="locator"/>
</group>
</else>
</choose>
</group>
</if>
<else>
<text variable="number" prefix="No. "/>
Expand Down Expand Up @@ -657,15 +681,17 @@
<else-if type="book graphic motion_picture report song" match="any">
<group delimiter=". ">
<text macro="edition"/>
<group delimiter=" ">
<text term="volume" form="short" text-case="capitalize-first"/>
<number variable="volume" form="numeric"/>
<group delimiter=", ">
<group delimiter=" ">
<text term="volume" form="short" text-case="capitalize-first"/>
<number variable="volume" form="numeric"/>
</group>
<text variable="volume-title" font-style="italic"/>
</group>
<group delimiter=" ">
<number variable="number-of-volumes" form="numeric"/>
<text term="volume" form="short" plural="true"/>
</group>
<text variable="subtitle" text-case="title"/>
</group>
</else-if>
<else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
Expand Down Expand Up @@ -1099,7 +1125,6 @@
</choose>
</else-if>
<else-if type="article-newspaper">
<text macro="publisher"/>
<text macro="issued"/>
</else-if>
<else-if type="manuscript thesis speech" match="any">
Expand Down Expand Up @@ -1151,9 +1176,17 @@
<choose>
<if type="article-journal bill legislation legal_case" match="none">
<choose>
<if type="speech" variable="publisher publisher-place" match="any">
<text macro="issue"/>
<!-- We need a perdiod here when the container title gets moved up into author position, otherwise a comma (below)-->
<if type="article-newspaper article-magazine" match="any">
<choose>
<if variable="author editor" match="none">
<text macro="issue"/>
</if>
</choose>
</if>
<else-if type="speech" variable="publisher publisher-place" match="any">
<text macro="issue"/>
</else-if>
</choose>
</if>
</choose>
Expand All @@ -1164,9 +1197,16 @@
<choose>
<if type="article-journal" match="none">
<choose>
<if type="speech" variable="publisher publisher-place" match="none">
<text macro="issue"/>
<if type="article-newspaper article-magazine" match="any">
<choose>
<if variable="author editor" match="any">
<text macro="issue"/>
</if>
</choose>
</if>
<else-if type="speech" variable="publisher publisher-place" match="none">
<text macro="issue"/>
</else-if>
</choose>
</if>
<else-if variable="volume issue" match="none">
Expand Down Expand Up @@ -1208,10 +1248,7 @@
</else-if>
<!--Chicago doesn't use publisher/place for Newspapers -->
<else-if type="article-newspaper">
<group delimiter=", ">
<text variable="publisher" font-style="italic"/>
<text macro="issued" />
</group>
<text macro="issued"/>
</else-if>
<else-if variable="publisher-place publisher" match="any">
<group delimiter=", ">
Expand Down Expand Up @@ -1447,7 +1484,7 @@
</group>
<text macro="issue-join-with-space"/>
</group>

<text macro="issue-join-with-comma"/>
<text macro="locators-journal-join-with-comma"/>
<text macro="locators-newspaper"/>
</group>
Expand Down

0 comments on commit 677b300

Please sign in to comment.