diff --git a/.Rbuildignore b/.Rbuildignore index eb3b612..133119f 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,13 +1,12 @@ -vignettes/tables.aux -vignettes/tables.bbl -vignettes/tables.blg -vignettes/tables.log -vignettes/tables.out -vignettes/tables.pdf -vignettes/tables.synctex -vignettes/tables.tex -vignettes/tables.toc -vignettes/tables-concordance.tex +vignettes/.*aux$ +vignettes/.*bbl$ +vignettes/.*blg$ +vignettes/.*log$ +vignettes/.*out$ +vignettes/.*synctex$ +vignettes/.*tex$ +vignettes/.*toc$ +vignettes/.*pdf$ ^.*\.Rproj$ ^\.Rproj\.user$ ^cran-comments\.md$ diff --git a/.gitignore b/.gitignore index 9168bf8..d297cf4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .httr-oauth .DS_Store docs +CRAN-SUBMISSION diff --git a/DESCRIPTION b/DESCRIPTION index d17e341..4ba63f6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -14,7 +14,7 @@ Depends: R (>= 2.12.0) Imports: stats, utils, knitr, htmltools Suggests: magrittr, kableExtra (>= 0.9.0), Hmisc, bookdown, rmarkdown, pkgdown, formatters, tinytable (>= 0.0.5) -VignetteBuilder: rmarkdown +VignetteBuilder: knitr, rmarkdown URL: https://dmurdoch.github.io/tables/ BugReports: https://github.com/dmurdoch/tables/issues SystemRequirements: pandoc (>= 1.12.3) for vignettes diff --git a/cran-comments.md b/cran-comments.md index 79877f8..7e20855 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,9 +1,5 @@ -# tables 0.9.31 +# tables 0.9.33 -Switch to `Authors@R`. - -# tables 0.9.30 - -A small bug fix release. - -There are no issues reported on CRAN about the previous version. +This is a small update. It checks okay in R 4.5.2. I'm +unable to install the suggested package pkgdown in R-devel, +so I haven't run the checks there. diff --git a/vignettes/tables.Rnw b/vignettes/tables.Rnw index 6710c04..db8190e 100644 --- a/vignettes/tables.Rnw +++ b/vignettes/tables.Rnw @@ -1152,7 +1152,9 @@ done. Those functions have a \code{texify} argument that can be set to \code{TR to enable this behaviour (e.g. if the label is not meant to be processed by \LaTeX). For example, with the definition <<>>= -df <- data.frame(A = factor(c( "$", "\\" ) ), B_label=1:2) +df <- data.frame(A = factor(c( "$", "\\" ), + levels = c( "$", "\\" ) ), + B_label = 1:2) @ the code <>= diff --git a/vignettes/tables.Rout.save b/vignettes/tables.Rout.save index f2bf091..a57b331 100644 --- a/vignettes/tables.Rout.save +++ b/vignettes/tables.Rout.save @@ -778,7 +778,8 @@ $i$ & Sepal.Length & Sepal.Width & Petal.Length & Petal.Width & \multicolumn{1} \bottomrule \end{tabular} -> df <- data.frame(A = factor(c("$", "\\")), B_label = 1:2) +> df <- data.frame(A = factor(c("$", "\\"), levels = c("$", ++ "\\")), B_label = 1:2) > options(tables.texify = TRUE)