[CHNOSZ-commits] r322 - in pkg/CHNOSZ: . vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Aug 30 07:54:11 CEST 2018
Author: jedick
Date: 2018-08-30 07:54:09 +0200 (Thu, 30 Aug 2018)
New Revision: 322
Modified:
pkg/CHNOSZ/DESCRIPTION
pkg/CHNOSZ/vignettes/anintro.Rmd
pkg/CHNOSZ/vignettes/eos-regress.Rmd
pkg/CHNOSZ/vignettes/obigt.Rmd
Log:
vignettes: link author to http://chnosz.net/jeff
Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION 2018-08-21 22:27:45 UTC (rev 321)
+++ pkg/CHNOSZ/DESCRIPTION 2018-08-30 05:54:09 UTC (rev 322)
@@ -1,6 +1,6 @@
-Date: 2018-08-22
+Date: 2018-08-30
Package: CHNOSZ
-Version: 1.1.3-29
+Version: 1.1.3-30
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/anintro.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/anintro.Rmd 2018-08-21 22:27:45 UTC (rev 321)
+++ pkg/CHNOSZ/vignettes/anintro.Rmd 2018-08-30 05:54:09 UTC (rev 322)
@@ -1,6 +1,6 @@
---
title: "An Introduction to [CHNOSZ](http://www.chnosz.net)"
-author: "Jeffrey M. Dick"
+author: "[Jeffrey M. Dick](http://chnosz.net/jeff)"
date: "`r Sys.Date()`"
output:
tufte::tufte_html:
Modified: pkg/CHNOSZ/vignettes/eos-regress.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/eos-regress.Rmd 2018-08-21 22:27:45 UTC (rev 321)
+++ pkg/CHNOSZ/vignettes/eos-regress.Rmd 2018-08-30 05:54:09 UTC (rev 322)
@@ -1,7 +1,7 @@
---
title: "Regressing thermodynamic data"
subtitle: "EOSregress in [CHNOSZ](http://www.chnosz.net)"
-author: "Jeffrey M. Dick"
+author: "[Jeffrey M. Dick](http://chnosz.net/jeff)"
date: "`r Sys.Date()`"
output:
tufte::tufte_html:
Modified: pkg/CHNOSZ/vignettes/obigt.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/obigt.Rmd 2018-08-21 22:27:45 UTC (rev 321)
+++ pkg/CHNOSZ/vignettes/obigt.Rmd 2018-08-30 05:54:09 UTC (rev 322)
@@ -248,7 +248,7 @@
### `r setfile("SUPCRT92.csv")`
```{r SUPCRT92, results="asis", echo=FALSE}
-cat("These minerals, taken from the SUPCRT92 database, were used by default in earlier versions of CHNOSZ but have since been superseded by the Berman dataset. They are kept as optional data for testing and comparison purposes. The minerals here include all of the silicates and Al-bearing minerals from [Helgeson et al., 1978](http://www.worldcat.org/oclc/13594862)), as well as calcite, dolomite, hematite, and magnetite. Note that other minerals from SUPCRT92 (including native elements, sulfides, halides, sulfates, and selected carbonates and oxides that do not duplicate those in the Berman dataset) are still present in the default database (**inorganic_cr.csv**).\n\n")
+cat("These minerals, taken from the SUPCRT92 database, were used by default in earlier versions of CHNOSZ but have since been superseded by the Berman dataset. They are kept as optional data for testing and comparison purposes. The minerals here include all of the silicates and Al-bearing minerals from [Helgeson et al., 1978](http://www.worldcat.org/oclc/13594862), as well as calcite, dolomite, hematite, and magnetite. Note that other minerals from SUPCRT92 (including native elements, sulfides, halides, sulfates, and selected carbonates and oxides that do not duplicate those in the Berman dataset) are still present in the default database (**inorganic_cr.csv**).\n\n")
```
```{r optreflist, results="asis", echo=FALSE}
More information about the CHNOSZ-commits
mailing list