[CHNOSZ-commits] r817 - in pkg/CHNOSZ: . vignettes

[noreply at r-forge.r-project.org]

Author: jedick
Date: 2023-11-29 06:45:23 +0100 (Wed, 29 Nov 2023)
New Revision: 817

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/vignettes/FAQ.Rmd
   pkg/CHNOSZ/vignettes/multi-metal.Rmd
Log:
multi-metal.Rmd: Parse RH95.7 to get correct bibliography key (RH95)


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2023-11-29 02:26:29 UTC (rev 816)
+++ pkg/CHNOSZ/DESCRIPTION	2023-11-29 05:45:23 UTC (rev 817)
@@ -1,6 +1,6 @@
 Date: 2023-11-29
 Package: CHNOSZ
-Version: 2.0.0-36
+Version: 2.0.0-37
 Title: Thermodynamic Calculations and Diagrams for Geochemistry
 Authors at R: c(
     person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"),

Modified: pkg/CHNOSZ/vignettes/FAQ.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/FAQ.Rmd	2023-11-29 02:26:29 UTC (rev 816)
+++ pkg/CHNOSZ/vignettes/FAQ.Rmd	2023-11-29 05:45:23 UTC (rev 817)
@@ -225,7 +225,7 @@
 thermo.refs(info("alanine"))
 ```
 
-* Mineral data in OBIGT are based on @Ber88 together with sulfides and other non-conflicting minerals from @HDNB78. For a reaction such as the pyrite-pyrrhotite-magnetite (PPM) oxygen fugacity buffer, all the sources of data can be listed as follows (for the corresponding sulfur fugacity buffer, the code could be written with hematite and `r S2` in place of pyrrhotite and oxygen):
+* Mineral data in OBIGT are based on @Ber88 together with sulfides and other non-conflicting minerals from @HDNB78. For a reaction such as the pyrite-pyrrhotite-magnetite (PPM) oxygen fugacity buffer, all the sources of data can be listed as follows:
 
 ```{r PPM_refs, message = FALSE}
 basis(c("pyrite", "pyrrhotite", "oxygen"))

Modified: pkg/CHNOSZ/vignettes/multi-metal.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/multi-metal.Rmd	2023-11-29 02:26:29 UTC (rev 816)
+++ pkg/CHNOSZ/vignettes/multi-metal.Rmd	2023-11-29 05:45:23 UTC (rev 817)
@@ -661,7 +661,8 @@
 ```{r stack2.cite, results = "asis"}
 allyears <- lapply(iall, function(x) thermo.refs(x)$year)
 o <- order(unlist(allyears))
-cat(paste(paste0("@", unique(unlist(allkeys)[o])), collapse = "; "))
+keys <- gsub("\\..*", "", unique(unlist(allkeys)[o]))
+cat(paste(paste0("@", keys), collapse = "; "))
 ```
 
 ## Mixing 2