diff --git a/DESCRIPTION b/DESCRIPTION index bdbd147..ebc0fd6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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@R: c( person("Jeffrey", "Dick", , "j3ffdick@gmail.com", role = c("aut", "cre"), diff --git a/vignettes/FAQ.Rmd b/vignettes/FAQ.Rmd index 3b51651..713b8f0 100644 --- a/vignettes/FAQ.Rmd +++ b/vignettes/FAQ.Rmd @@ -225,7 +225,7 @@ info(info("alanine"))[c("ref1", "ref2")] 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")) diff --git a/vignettes/multi-metal.Rmd b/vignettes/multi-metal.Rmd index 1a0227a..7d7e537 100644 --- a/vignettes/multi-metal.Rmd +++ b/vignettes/multi-metal.Rmd @@ -661,7 +661,8 @@ The next code chunk prepends `@` to the reference keys and uses the chunk option ```{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