Tweak to prettyinside

Author: baddstats

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: spatstat.utils
-Version: 3.2-2.002
-Date: 2026-04-15
+Version: 3.2-2.003
+Date: 2026-04-29
 Title: Utility Functions for 'spatstat'
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre"),

NEWS

@@ -1,5 +1,5 @@
 
-        CHANGES IN spatstat.utils VERSION 3.2-2.002
+        CHANGES IN spatstat.utils VERSION 3.2-2.003
 
 OVERVIEW
 

R/utilseq.R

@@ -3,7 +3,7 @@
 #'
 #'  Utilities for sequences, vectors, ranges of values
 #'
-#'       $Revision: 1.26 $ $Date: 2026/01/21 06:26:39 $
+#'       $Revision: 1.27 $ $Date: 2026/04/29 06:58:44 $
 #'
 #'  ==>>  ORIGINAL FILE is in spatstat/develop/Spatstat/R  <<==
 
@@ -220,15 +220,21 @@ startinrange <- function(x0, dx, r) {
   return(y)
 }
 
-prettyinside <- function(x, ...) {
+prettyinside <- function(x, ..., n=NULL) {
   r <- range(x, na.rm=TRUE)
   if(diff(r) == 0) return(r[1L])
   ## call 'pretty' after removing any NULL arguments
-  p <- do.call(pretty, resolve.defaults(list(x=quote(x), ...),
+  p <- do.call(pretty, resolve.defaults(list(x=quote(x), ..., n=n),
                                         .MatchNull=FALSE,
                                         .StripNull=TRUE))
-  ok <- inside.range(p, r)
-  return(p[ok])
+  p <- p[inside.range(p, r)]
+  if(!is.null(n) && length(p) < n) {
+    p <- do.call(pretty, resolve.defaults(list(x=quote(x), ..., n=n+2),
+                                          .MatchNull=FALSE,
+                                          .StripNull=TRUE))
+    p <- p[inside.range(p, r)]
+  }
+  return(p)
 }
 
 prettydiscrete <- function(x, n=10) {

inst/doc/packagesizes.txt

@@ -33,4 +33,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2025-09-20" "3.2-0" 42 195 0 3716 2462
 "2026-01-08" "3.2-1" 43 196 0 3754 2535
 "2026-03-10" "3.2-2" 44 197 0 3778 2535
-"2026-04-15" "3.2-2.002" 44 197 0 3778 2542
+"2026-04-29" "3.2-2.003" 44 197 0 3784 2542

inst/info/packagesizes.txt

@@ -33,4 +33,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2025-09-20" "3.2-0" 42 195 0 3716 2462
 "2026-01-08" "3.2-1" 43 196 0 3754 2535
 "2026-03-10" "3.2-2" 44 197 0 3778 2535
-"2026-04-15" "3.2-2.002" 44 197 0 3778 2542
+"2026-04-29" "3.2-2.003" 44 197 0 3784 2542

man/macros/defns.Rd

@@ -7,6 +7,7 @@
 \newcommand{\spatstatAuthorsComma}{\adrian, \rolf, \ege}
 %% Contributors with emails (alphabetical order)
 \newcommand{\abdollah}{Abdollah Jalilian \email{jalilian@razi.ac.ir}}
+\newcommand{\bethany}{Bethany Macdonald \email{bethany.macdonald@canterbury.ac.nz}}
 \newcommand{\colette}{Marie-Colette van Lieshout \email{Marie-Colette.van.Lieshout@cwi.nl}}
 \newcommand{\dominic}{Dominic Schuhmacher \email{dominic.schuhmacher@mathematik.uni-goettingen.de}, URL \code{http://dominic.schuhmacher.name/}}
 \newcommand{\martinH}{Martin Hazelton \email{Martin.Hazelton@otago.ac.nz}}

man/spatstat.utils-internal.Rd

@@ -181,7 +181,7 @@ paste.expr(x)
 pasteFormula(f)
 pasteN(\dots)
 prettydiscrete(x, n)
-prettyinside(x, \dots)
+prettyinside(x, \dots, n)
 prolongseq(x, newrange, step)
 putSpatstatLocatorQueue(x)
 ratiotweak(a, b, overzero, zerozero)