Bring up to date with latest in friendly:master

Merge branch 'resync' of github.com:mstackhouse/vcdExtra into resync

# Conflicts:
#	README.md

.Rbuildignore

@@ -6,4 +6,16 @@ inst/doc/*.pdf
 ^\.Rproj\.user$
 .build-steps.R
 Rplots.pdf
-vcdExtra-logo.png
+^CRAN-RELEASE$
+^revdep/
+^issues/
+^extra/
+^CRAN-SUBMISSION$
+^_pkgdown\.yml$
+^docs$
+^pkgdown$
+^vignettes-old/$
+^vignettes-new/$
+README.*
+^doc$
+^Meta$

.build-steps.R

@@ -1,19 +1,51 @@
 # keep rgl from popping up windows
 Sys.setenv(RGL_USE_NULL = TRUE)
 
-#it is necessary to build manually, using
+#it is no longer necessary to build manually, using --compact-vignettes=both
+# no longer necessary to use gs to compact pdf vignettes
+#Sys.setenv(R_GSCMD="C:/Program Files/gs/gs9.21/bin/gswin64c.exe")
+#Sys.setenv(R_GSCMD="C:/Program Files/gs/gs9.53.3/bin/gswin64c.exe")
 
-Sys.setenv(R_GSCMD="C:/Program Files/gs/gs9.21/bin/gswin64c.exe")
-devtools::build(args = c('--resave-data','--compact-vignettes="gs+qpdf"'))
+# Build the pkgdown site
+pkgdown::build_site()
+
+devtools::build_vignettes()
+remotes::install_local(".", build_vignettes = TRUE, force=TRUE)
+
+# to copy the vignettes to `inst/doc`:
+tools::buildVignettes(dir = ".", tangle=TRUE)
+dir.create("inst/doc")
+file.copy(dir("vignettes", full.names=TRUE), "inst/doc", overwrite=TRUE)
+
+# Check package
+devtools::check()
+devtools::check_win_release()
+devtools::check_win_devel()
+devtools::check_rhub()
+
+#args = c('--resave-data','--compact-vignettes=both')
+devtools::build()
 
 # then, test with win builder
-args = c('--resave-data','--compact-vignettes="gs+qpdf"')
-devtools::build_win(args=args)
+devtools::check_win_devel()
+
+devtools::check_rhub()
+
+# spellcheck
+(words <- devtools::spell_check())
+words$word
+
+
+# reverse dependencies
+devtools::revdep()
+# [1] "aplore3" "catdata" "gnm"     "iarm"    "jmv" 
+
+if (!require("revdepcheck")) remotes::install_github("r-lib/revdepcheck")
+revdepcheck::revdep_check(num_workers = 4)
+
+# build the pkgdown site
+pkgdown::build_site()
 
 # submit to cran
-devtools::submit_cran(args=args)
+devtools::release()
 
-# Warning: 'inst/doc' file
-# 'vcd-tutorial.pdf'
-# ignored as vignettes have been rebuilt.
-# Run R CMD build with --no-build-vignettes to prevent rebuilding.

.gitignore

@@ -4,5 +4,7 @@
 .Ruserdata
 /*.Rproj
 Rplots.pdf
+revdep/
 
-
+/doc/
+/Meta/

DESCRIPTION

@@ -1,28 +1,77 @@
 Package: vcdExtra
 Type: Package
 Title: 'vcd' Extensions and Additions
-Version: 0.7-4
-Date: 2019-09-25
-Authors@R: c(person(given = "Michael", family = "Friendly", role=c("aut", "cre"), email="[email protected]"),
+Version: 0.8-4
+Date: 2023-04-12
+Language: en-US
+Authors@R: c(
+            person(given = "Michael", 
+                   family = "Friendly", 
+                   role=c("aut", "cre"), 
+                   email="[email protected]",
+                   comment = c(ORCID = "0000-0002-3237-0941")),
             person(given = "Heather", family = "Turner", role="ctb"),
-            person(given = "Achim", family = "Zeileis", role="ctb"),
-            person(given = "Duncan", family = "Murdoch", role="ctb"),
-            person(given = "David", family = "Firth", role="ctb")
+            person(given = "David",
+                   family = "Meyer", 
+                   role="ctb"),
+            person(given = "Achim", 
+                   family = "Zeileis", 
+                   role="ctb",
+                   comment = c(ORCID = "0000-0003-0918-3766")),
+            person(given = "Duncan", 
+                   family = "Murdoch", 
+                   role="ctb"),
+            person(given = "David", 
+                   family = "Firth", 
+                   role="ctb"),
+            person(given = "Matt", family = "Kumar", role="ctb"),
+            person(given = "Shuguang", family = "Sun", role="ctb")
             )
-Author: Michael Friendly [aut, cre], Heather Turner [ctb], Achim Zeileis [ctb], Duncan Murdoch [ctb], David Firth [ctb]
 Maintainer: Michael Friendly <[email protected]>
-Depends: R (>= 2.10), vcd, gnm (>= 1.0-3), grid
-Suggests: gmodels, Fahrmeir, effects, VGAM, plyr, lmtest, nnet, ggplot2, Sleuth2, car, lattice, stats4, rgl, AER
-Imports: MASS, grDevices, stats, utils, ca
+Depends: R (>= 3.5.0), vcd, gnm (>= 1.0-3), grid
+Suggests: 
+  gmodels, 
+  Fahrmeir, 
+  effects, 
+  VGAM, 
+  plyr, 
+  lmtest, 
+  nnet, 
+  ggplot2, 
+  Sleuth2, 
+  car, 
+  lattice, 
+  stats4, 
+  rgl, 
+  AER, 
+  coin,
+  Hmisc,
+  knitr, 
+  rmarkdown,
+  seriation,
+Imports: 
+  MASS, 
+  grDevices, 
+  stats, 
+  utils, 
+  ca,
+  dplyr, 
+  glue, 
+  here, 
+  purrr, 
+  readxl, 
+  stringr, 
+  tidyr (>= 1.3.0)
 Description: Provides additional data sets, methods and documentation to complement the 'vcd' package for Visualizing Categorical Data
     and the 'gnm' package for Generalized Nonlinear Models.
 	In particular, 'vcdExtra' extends mosaic, assoc and sieve plots from 'vcd' to handle 'glm()' and 'gnm()' models and
 	adds a 3D version in 'mosaic3d'.  Additionally, methods are provided for comparing and visualizing lists of
 	'glm' and 'loglm' objects. This package is now a support package for the book, "Discrete Data Analysis with R" by
   Michael Friendly and David Meyer.
 License: GPL (>=2)
-URL: https://CRAN.R-project.org/package=vcdExtra
+URL: https://friendly.github.io/vcdExtra/
 BugReports: https://github.com/friendly/vcdExtra
+VignetteBuilder: knitr, rmarkdown
 LazyLoad: yes
 LazyData: yes
 

NAMESPACE

@@ -23,12 +23,23 @@ importFrom(MASS, loglm)
 # add inports for all base packages
 
 importFrom("grDevices", "hsv")
-importFrom("stats", "as.formula", "deviance", "family", "fitted", "formula", "glm", "logLik", "loglin", "model.frame", "na.pass", "nobs", "pchisq", "poisson", "qnorm", "quantile", "reformulate", "residuals", "rstandard", "runif", "terms", "update", "xtabs")
-importFrom("utils", "data", "menu", "type.convert")
-importFrom("ca", "cacoord", "multilines")
+importFrom("stats",     "as.formula", "deviance", "family", "fitted", "formula", "glm", "logLik", "loglin", "model.frame", "na.pass", "nobs", "pchisq", "poisson", "qnorm", "quantile", "reformulate", "residuals", "rstandard", "runif", "terms", "update", "xtabs")
+importFrom("utils",     "data", "menu", "type.convert")
+importFrom("ca",        "cacoord", "multilines")
 importFrom("grDevices", "rgb")
-importFrom("graphics", "abline", "plot", "points", "text")
-importFrom("stats", "update.formula")
+importFrom("graphics",  "abline", "plot", "points", "text")
+importFrom("stats",      "update.formula")
+
+# for datasets vignette
+importFrom("here",    "here")
+importFrom("readxl",  "read_excel")
+importFrom("glue",    "glue", "glue_collapse")
+importFrom("purrr",   "map")
+importFrom("stringr", "str_split_1")
+importFrom("tidyr",   "separate_longer_delim")
+importFrom("dplyr",   "select", "rename", "mutate", "group_by", "summarise", "left_join", "relocate")
+
+
 
 # joy to the world
 export(