[CHNOSZ-commits] r291 - in pkg/CHNOSZ: . inst vignettes

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

Author: jedick
Date: 2017-11-12 02:39:09 +0100 (Sun, 12 Nov 2017)
New Revision: 291

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/inst/NEWS
   pkg/CHNOSZ/vignettes/equilibrium.Rnw
   pkg/CHNOSZ/vignettes/equilibrium.lyx
Log:
prepare version 1.1.1 for CRAN submission


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2017-11-11 02:35:55 UTC (rev 290)
+++ pkg/CHNOSZ/DESCRIPTION	2017-11-12 01:39:09 UTC (rev 291)
@@ -1,6 +1,6 @@
 Date: 2017-11-11
 Package: CHNOSZ
-Version: 1.1.0-87
+Version: 1.1.1
 Title: Thermodynamic Calculations for Geobiochemistry
 Authors at R: c(
     person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"),
@@ -8,6 +8,8 @@
     person("R Core Team", role = "ctb",
       comment = "code derived from R's pmax()")
     )
+Author: Jeffrey Dick [aut, cre] (0000-0002-0687-5890),
+  R Core Team [ctb] (code derived from R's pmax())
 Maintainer: Jeffrey Dick <j3ffdick at gmail.com>
 Depends: R (>= 3.1.0)
 Suggests: limSolve, testthat, knitr, rmarkdown, tufte, RSVGTipsDevice

Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS	2017-11-11 02:35:55 UTC (rev 290)
+++ pkg/CHNOSZ/inst/NEWS	2017-11-12 01:39:09 UTC (rev 291)
@@ -1,5 +1,5 @@
-CHANGES IN CHNOSZ 1.1.0-86 (2017-11-11)
----------------------------------------
+CHANGES IN CHNOSZ 1.1.1 (2017-11-11)
+------------------------------------
 
 MAJOR CHANGES:
 

Modified: pkg/CHNOSZ/vignettes/equilibrium.Rnw
===================================================================
--- pkg/CHNOSZ/vignettes/equilibrium.Rnw	2017-11-11 02:35:55 UTC (rev 290)
+++ pkg/CHNOSZ/vignettes/equilibrium.Rnw	2017-11-12 01:39:09 UTC (rev 291)
@@ -19,7 +19,6 @@
  {hyperref}
 \hypersetup{
  citecolor=magenta, urlcolor=blue}
-\usepackage{breakurl}
 
 \makeatletter
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User specified LaTeX commands.
@@ -327,7 +326,7 @@
 # figure B
 st <- system.time(dB <- aaB())
 showtime(st)
-title(main=paste("loga(total species) =", round(dB$loga.balance, 2)), cex.main=1)
+title(main=paste("loga(total species) =", round(dB$loga.balance[1], 2)), cex.main=1)
 label.figure("B", col="blue", yfrac=0.9, xfrac=0.1)
 
 ## row 2 (balance = nCO2)
@@ -343,7 +342,7 @@
 # figure D
 st <- system.time(dD <- aaD())
 showtime(st)
-title(main=paste("loga(total CO2) =", round(dD$loga.balance, 2)), cex.main=1)
+title(main=paste("loga(total CO2) =", round(dD$loga.balance[1], 2)), cex.main=1)
 label.figure("D", col="blue", yfrac=0.9, xfrac=0.1)
 
 ## right (speciation at different total activity of CO2)
@@ -354,12 +353,12 @@
 # figure E
 st <- system.time(dE <- aaE())
 showtime(st)
-title(main=paste("loga(total CO2) =", round(dE$loga.balance, 2)), cex.main=1)
+title(main=paste("loga(total CO2) =", round(dE$loga.balance[1], 2)), cex.main=1)
 label.figure("E", col="blue", yfrac=0.9, xfrac=0.1)
 # figure F
 st <- system.time(dF <- aaF())
 showtime(st)
-title(main=paste("loga(total CO2) =", round(dF$loga.balance, 2)), cex.main=1)
+title(main=paste("loga(total CO2) =", round(dF$loga.balance[1], 2)), cex.main=1)
 label.figure("F", col="blue", yfrac=0.9, xfrac=0.1)
 
 @

Modified: pkg/CHNOSZ/vignettes/equilibrium.lyx
===================================================================
--- pkg/CHNOSZ/vignettes/equilibrium.lyx	2017-11-11 02:35:55 UTC (rev 290)
+++ pkg/CHNOSZ/vignettes/equilibrium.lyx	2017-11-12 01:39:09 UTC (rev 291)
@@ -1326,7 +1326,8 @@
 
 \begin_layout Plain Layout
 
-title(main=paste("loga(total species) =", round(dB$loga.balance, 2)), cex.main=1)
+title(main=paste("loga(total species) =", round(dB$loga.balance[1], 2)),
+ cex.main=1)
 \end_layout
 
 \begin_layout Plain Layout
@@ -1405,7 +1406,7 @@
 
 \begin_layout Plain Layout
 
-title(main=paste("loga(total CO2) =", round(dD$loga.balance, 2)), cex.main=1)
+title(main=paste("loga(total CO2) =", round(dD$loga.balance[1], 2)), cex.main=1)
 \end_layout
 
 \begin_layout Plain Layout
@@ -1459,7 +1460,7 @@
 
 \begin_layout Plain Layout
 
-title(main=paste("loga(total CO2) =", round(dE$loga.balance, 2)), cex.main=1)
+title(main=paste("loga(total CO2) =", round(dE$loga.balance[1], 2)), cex.main=1)
 \end_layout
 
 \begin_layout Plain Layout
@@ -1484,7 +1485,7 @@
 
 \begin_layout Plain Layout
 
-title(main=paste("loga(total CO2) =", round(dF$loga.balance, 2)), cex.main=1)
+title(main=paste("loga(total CO2) =", round(dF$loga.balance[1], 2)), cex.main=1)
 \end_layout
 
 \begin_layout Plain Layout