Bug fix to the bug fix

spatstat · Jul 1, 2024 · 21ee7a4 · 21ee7a4
1 parent 0cc22fd
commit 21ee7a4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: spatstat.geom
-Version: 3.2-9.029
+Version: 3.2-9.030
 Date: 2024-07-01
 Title: Geometrical Functionality of the 'spatstat' Family 
 Authors@R: c(person("Adrian", "Baddeley", 

diff --git a/NEWS b/NEWS
@@ -1,4 +1,4 @@
-        CHANGES IN spatstat.geom VERSION 3.2-9.029
+        CHANGES IN spatstat.geom VERSION 3.2-9.030
 
 OVERVIEW
 

diff --git a/R/symbolmap.R b/R/symbolmap.R
@@ -1,7 +1,7 @@
 ##
 ## symbolmap.R
 ##
-##   $Revision: 1.57 $  $Date: 2024/07/01 04:12:07 $
+##   $Revision: 1.58 $  $Date: 2024/07/01 05:57:44 $
 ##
 
 symbolmap <- local({
@@ -666,8 +666,10 @@ plot.symbolmap <- function(x, ..., main,
 
   ## ................. draw annotation ..................
   dotargs <- list(...)
-  if(length(dotargs$col) > 1) {
-    ## colourmap or multiple colour values - remove
+  axiscol <- dotargs$col
+  nac <- length(axiscol)
+  if(nac > 0 && (!is.colour(axiscol) || nac > 1)) {
+    ## only a single colour is permitted for 'axis'
     dotargs$col <- NULL
   }
   if(annotate && length(ll) > 0) {

diff --git a/inst/doc/packagesizes.txt b/inst/doc/packagesizes.txt
@@ -26,4 +26,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2023-10-20" "3.2-7" 451 1203 0 35983 15822
 "2024-01-26" "3.2-8" 452 1204 0 36234 15822
 "2024-02-28" "3.2-9" 452 1209 0 36325 15824
-"2024-07-01" "3.2-9.029" 442 1186 0 35636 15596
+"2024-07-01" "3.2-9.030" 442 1186 0 35638 15596
diff --git a/inst/info/packagesizes.txt b/inst/info/packagesizes.txt
@@ -26,4 +26,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2023-10-20" "3.2-7" 451 1203 0 35983 15822
 "2024-01-26" "3.2-8" 452 1204 0 36234 15822
 "2024-02-28" "3.2-9" 452 1209 0 36325 15824
-"2024-07-01" "3.2-9.029" 442 1186 0 35636 15596
+"2024-07-01" "3.2-9.030" 442 1186 0 35638 15596