diff --git a/DESCRIPTION b/DESCRIPTION index f590db9..a5bbd7a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: spatstat.utils -Version: 3.1-0 -Date: 2024-08-17 +Version: 3.1-0.001 +Date: 2024-10-28 Title: Utility Functions for 'spatstat' Authors@R: c(person("Adrian", "Baddeley", role = c("aut", "cre"), diff --git a/NEWS b/NEWS index 6e6bff5..35e4b15 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,11 @@ + CHANGES IN spatstat.utils VERSION 3.1-0.001 + +OVERVIEW + + o Internal improvements. + + CHANGES IN spatstat.utils VERSION 3.1-0 OVERVIEW diff --git a/R/resolve.defaults.R b/R/resolve.defaults.R index c56643c..551b4fb 100644 --- a/R/resolve.defaults.R +++ b/R/resolve.defaults.R @@ -1,7 +1,7 @@ # # resolve.defaults.R # -# $Revision: 1.40 $ $Date: 2023/02/28 04:41:31 $ +# $Revision: 1.41 $ $Date: 2024/10/28 05:40:08 $ # # Resolve conflicts between several sets of defaults # Usage: @@ -154,6 +154,7 @@ graphicsPars <- local({ "claim.title.space"), lines = c("lwd", "lty", "col", "lend", "ljoin", "lmitre"), symbols = c(PlotArgs, "fg", "bg"), + points = c("pch", "col", "bg", "fg", "cex", "lwd", "lty"), text = TextArgs, persp = c("x", "y", "z", "xlim", "ylim", "zlim", @@ -167,7 +168,7 @@ graphicsPars <- local({ TheTable$ppp <- unique(c(TheTable$owin, TheTable$symbols, - "pch", "cex", "lty", "lwd", + TheTable$points, "etch", "annotate", "labelmap", "markrange", "marklevels")) diff --git a/inst/doc/packagesizes.txt b/inst/doc/packagesizes.txt index 2ba60ad..c3ede91 100644 --- a/inst/doc/packagesizes.txt +++ b/inst/doc/packagesizes.txt @@ -26,3 +26,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines "2023-10-24" "3.0-4" 39 186 0 3670 2031 "2024-06-17" "3.0-5" 41 189 0 3688 2031 "2024-08-17" "3.1-0" 41 189 0 3613 2429 +"2024-10-28" "3.1-0.001" 41 189 0 3614 2429 diff --git a/inst/info/packagesizes.txt b/inst/info/packagesizes.txt index 2ba60ad..c3ede91 100755 --- a/inst/info/packagesizes.txt +++ b/inst/info/packagesizes.txt @@ -26,3 +26,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines "2023-10-24" "3.0-4" 39 186 0 3670 2031 "2024-06-17" "3.0-5" 41 189 0 3688 2031 "2024-08-17" "3.1-0" 41 189 0 3613 2429 +"2024-10-28" "3.1-0.001" 41 189 0 3614 2429