[CHNOSZ-commits] r198 - in pkg/CHNOSZ: . R inst man

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

Author: jedick
Date: 2017-05-03 16:38:51 +0200 (Wed, 03 May 2017)
New Revision: 198

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/R/util.expression.R
   pkg/CHNOSZ/inst/NEWS
   pkg/CHNOSZ/man/util.expression.Rd
Log:
syslab(): add 'dash' argument


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2017-05-03 09:45:02 UTC (rev 197)
+++ pkg/CHNOSZ/DESCRIPTION	2017-05-03 14:38:51 UTC (rev 198)
@@ -1,6 +1,6 @@
 Date: 2017-05-03
 Package: CHNOSZ
-Version: 1.0.8-86
+Version: 1.0.8-87
 Title: Chemical Thermodynamics and Activity Diagrams
 Author: Jeffrey Dick
 Maintainer: Jeffrey Dick <j3ffdick at gmail.com>

Modified: pkg/CHNOSZ/R/util.expression.R
===================================================================
--- pkg/CHNOSZ/R/util.expression.R	2017-05-03 09:45:02 UTC (rev 197)
+++ pkg/CHNOSZ/R/util.expression.R	2017-05-03 14:38:51 UTC (rev 198)
@@ -270,11 +270,11 @@
 }
 
 # make formatted text for thermodynamic system 20170217
-syslab <- function(system = c("K2O", "Al2O3", "SiO2", "H2O")) {
+syslab <- function(system = c("K2O", "Al2O3", "SiO2", "H2O"), dash="\u2013") {
   for(i in seq_along(system)) {
     expr <- expr.species(system[i])
     # use en dash here
-    if(i==1) lab <- expr else lab <- substitute(a*"\u2013"*b, list(a=lab, b=expr))
+    if(i==1) lab <- expr else lab <- substitute(a*dash*b, list(a=lab, dash=dash, b=expr))
   }
   lab
 }

Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS	2017-05-03 09:45:02 UTC (rev 197)
+++ pkg/CHNOSZ/inst/NEWS	2017-05-03 14:38:51 UTC (rev 198)
@@ -1,4 +1,4 @@
-CHANGES IN CHNOSZ 1.0.8-86 (2017-05-03)
+CHANGES IN CHNOSZ 1.0.8-87 (2017-05-03)
 ---------------------------------------
 
 DOCUMENTATION:

Modified: pkg/CHNOSZ/man/util.expression.Rd
===================================================================
--- pkg/CHNOSZ/man/util.expression.Rd	2017-05-03 09:45:02 UTC (rev 197)
+++ pkg/CHNOSZ/man/util.expression.Rd	2017-05-03 14:38:51 UTC (rev 198)
@@ -23,7 +23,7 @@
   describe.property(property, value, digits = 1, oneline = FALSE,
     ret.val = FALSE)
   describe.reaction(reaction, iname = numeric(), states = NULL)
-  syslab(system = c("K2O", "Al2O3", "SiO2", "H2O"))
+  syslab(system = c("K2O", "Al2O3", "SiO2", "H2O"), dash="\u2013")
   ratlab(ion = "K+")
 }
 
@@ -46,6 +46,7 @@
   \item{iname}{numeric, show names instead of formulas for these species}
   \item{states}{character, if \samp{all}, show states for all species}
   \item{system}{character, thermodynamic components}
+  \item{dash}{character to use for dash between components}
   \item{ion}{character, an ion}
 }