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

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

Author: jedick
Date: 2022-09-29 14:06:21 +0200 (Thu, 29 Sep 2022)
New Revision: 749

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/R/util.expression.R
   pkg/CHNOSZ/inst/NEWS.Rd
Log:
axis.label(): Use parentheses instead of comma to delimit units


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2022-09-29 09:08:20 UTC (rev 748)
+++ pkg/CHNOSZ/DESCRIPTION	2022-09-29 12:06:21 UTC (rev 749)
@@ -1,6 +1,6 @@
 Date: 2022-09-29
 Package: CHNOSZ
-Version: 1.9.9-40
+Version: 1.9.9-41
 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/R/util.expression.R
===================================================================
--- pkg/CHNOSZ/R/util.expression.R	2022-09-29 09:08:20 UTC (rev 748)
+++ pkg/CHNOSZ/R/util.expression.R	2022-09-29 12:06:21 UTC (rev 749)
@@ -175,7 +175,7 @@
     if(is.null(units)) units <- expr.units(label, prefix=prefix)
     # no comma needed if there are no units
     if(units=="") desc <- substitute(a, list(a=property))
-    else desc <- substitute(list(a, b), list(a=property, b=units))
+    else desc <- substitute(a~"("*b*")", list(a=property, b=units))
   }
   # done!
   return(desc)

Modified: pkg/CHNOSZ/inst/NEWS.Rd
===================================================================
--- pkg/CHNOSZ/inst/NEWS.Rd	2022-09-29 09:08:20 UTC (rev 748)
+++ pkg/CHNOSZ/inst/NEWS.Rd	2022-09-29 12:06:21 UTC (rev 749)
@@ -12,7 +12,7 @@
 % links to vignettes 20220723
 \newcommand{\viglink}{\ifelse{html}{\out{<a href="../CHNOSZ/doc/#1.html"><strong>#1.Rmd</strong></a>}}{\bold{#1.Rmd}}}
 
-\section{Changes in CHNOSZ version 1.9.9-40 (2022-09-29)}{
+\section{Changes in CHNOSZ version 1.9.9-41 (2022-09-29)}{
 
   \subsection{MAJOR USER-VISIBLE CHANGES}{
     \itemize{
@@ -166,6 +166,10 @@
   \subsection{OTHER CHANGES}{
     \itemize{
 
+      \item Most functions have been modified to use Joules in internal
+      variables. In particular, the value of the gas constant is expressed in
+      J K\S{-1} mol\S{-1} in \code{convert()} and other functions.
+
       \item The \code{\var{reaction}} component of the output of
       \code{subcrt()} contains the \code{model} for each species.
 
@@ -173,10 +177,6 @@
       \samp{DEW} \code{model} is requested but the DEW water model isn't
       activated.
 
-      \item Most functions have been modified to use Joules in internal
-      variables. In particular, the value of the gas constant is expressed in
-      J K\S{-1} mol\S{-1} in \code{convert()} and other functions.
-
       \item Add a \strong{zap} argument to \code{mod.OBIGT()} to clear
       parameters of preexisting species (used by \code{logB_to_OBIGT()}).
 
@@ -186,6 +186,9 @@
       \item Add tests \file{stack_mosaic.R} and \file{stack_solubility.R}
       (these create PDF files for visual inspection of results).
 
+      \item \code{axis.label()} now produces labels with units delimited by
+      parentheses instead of a comma.
+
     }
   }