Skip to content

Commit

Permalink
multi-metal.Rmd: Parse RH95.7 to get correct bibliography key (RH95)
Browse files Browse the repository at this point in the history
git-svn-id: svn://scm.r-forge.r-project.org/svnroot/chnosz/pkg/CHNOSZ@817 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
  • Loading branch information
jedick committed Nov 29, 2023
1 parent de8108a commit 3c312b3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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", , "[email protected]", role = c("aut", "cre"),
Expand Down
2 changes: 1 addition & 1 deletion vignettes/FAQ.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
3 changes: 2 additions & 1 deletion vignettes/multi-metal.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3c312b3

Please sign in to comment.