Sync PCOR_public staging-internal branch

NIEHS · Jul 11, 2024 · eea8083 · eea8083
1 parent beee69e
commit eea8083
Show file tree

Hide file tree

Showing 13 changed files with 798 additions and 115 deletions.
diff --git a/bibliography/book.bib b/bibliography/book.bib
@@ -44,7 +44,7 @@ @manual{r-tigris
 	author       = {Kyle Walker},
 	year         = 2023,
 	url          = {https://CRAN.R-project.org/package=tigris},
-	note         = {R package version 2.0.3}
+	note         = {R Package Version 2.0.3}
 }
 
 @article{r-tmap,
@@ -63,7 +63,7 @@ @manual{r-tidycensus
 	author       = {Kyle Walker and Matt Herman},
 	year         = 2023,
 	url          = {https://CRAN.R-project.org/package=tidycensus},
-	note         = {R package version 1.4.4}
+	note         = {R Package Version 1.4.4}
 }
 
 @book{walker2023analyzing,
@@ -119,15 +119,15 @@ @manual{r-tidycensus
 	author       = {Kyle Walker and Matt Herman},
 	year         = 2023,
 	url          = {https://CRAN.R-project.org/package=tidycensus},
-	note         = {R package version 1.4.4}
+	note         = {R Package Version 1.4.4}
 }
 
 @manual{r-terra,
 	title        = {{terra}: Spatial Data Analysis},
 	author       = {Robert J. Hijmans},
 	year         = 2024,
 	url          = {https://CRAN.R-project.org/package=terra},
-	note         = {R package version 1.7-71}
+	note         = {R Package Version 1.7-71}
 }
 
 @book{r-ggplot2,
@@ -144,7 +144,7 @@ @manual{r-ggpubr
 	author       = {Alboukadel Kassambara},
 	year         = 2023,
 	url          = {https://CRAN.R-project.org/package=ggpubr},
-	note         = {R package version 0.6.0}
+	note         = {R Package Version 0.6.0}
 }
 
 @manual{r-sf-article1,
@@ -165,7 +165,7 @@ @manual{r-dplyr
 	author       = {Hadley Wickham and Romain François and Lionel Henry and Kirill Müller and Davis Vaughan},
 	year         = 2023,
 	url          = {https://CRAN.R-project.org/package=dplyr},
-	note         = {R package version 1.1.4}
+	note         = {R Package Version 1.1.4}
 }
 
 @manual{dplyr-introduction,
@@ -176,7 +176,7 @@ @manual{dplyr-introduction
 }
 
 @article{r-tidyterra,
-	title        = {Using the {tidyverse} with {terra} objects: the {tidyterra} package},
+	title        = {Using the {tidyverse} with {terra} Objects: the {tidyterra} Package},
 	author       = {Diego Hernangómez},
 	year         = 2023,
 	journal      = {Journal of Open Source Software},
@@ -212,7 +212,7 @@ @incollection{geocomputation-24
 @book{lovelace_geocomputation_2019,
   title = {Geocomputation with {{R}}},
   isbn = {1-138-30451-4},
-  abstract = {Book on geographic data with R.},
+  abstract = {Book on Geographic Data with {R}},
   publisher = {{CRC Press}},
   author = {Lovelace, Robin and Nowosad, Jakub and Muenchow, Jannes},
   year = {2019},

diff --git a/bibliography/chicago-author-date-with-note.csl b/bibliography/chicago-author-date-with-note.csl
@@ -29,7 +29,7 @@
     <contributor>
       <name>Brenton M. Wiernik</name>
     </contributor>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>The author-date variant of the Chicago style</summary>
     <updated>2024-04-09T10:33:14+00:00</updated>
@@ -638,35 +638,17 @@
       </else>
     </choose>
   </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" after-collapse-delimiter="; ">
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <choose>
-          <if variable="issued" match="any">
-            <group delimiter=" ">
-              <text macro="contributors-short"/>
-              <text macro="date-in-text"/>
-            </group>
-          </if>
-          <!---comma before forthcoming and n.d.-->
-          <else>
-            <group delimiter=", ">
-              <text macro="contributors-short"/>
-              <text macro="date-in-text"/>
-            </group>
-          </else>
-        </choose>
-        <text macro="point-locators"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+  <citation collapse="citation-number">
     <sort>
-      <key macro="contributors"/>
-      <key macro="date-sort"/>
-      <key variable="title"/>
+      <key variable="citation-number"/>
     </sort>
-    <layout suffix=".">
+    <layout prefix="(" suffix=")" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix="."/>
       <group delimiter=". ">
         <text macro="contributors"/>
         <text macro="date"/>