diff --git a/DESCRIPTION b/DESCRIPTION index 37c01fd..e30b117 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: tables Title: Formula-Driven Table Generation -Version: 0.9.26 +Version: 0.9.27 Author: Duncan Murdoch Description: Computes and displays complex tables of summary statistics. Output may be in LaTeX, HTML, plain text, or an R diff --git a/NEWS.md b/NEWS.md index c312bc1..e1e5ff1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,10 @@ -# tables 0.9.26 +# tables 0.9.27 - A factor level of `""` caused an error when displayed. It will now be changed to `" "` for display (issue #19). - The `VignetteBuilder` field in `DESCRIPTION` has been changed to `rmarkdown` so that Pandoc can be found even when it is not on the `PATH`. +- Another minor update due to changes to the `formatters` package. # tables 0.9.25 diff --git a/cran-comments.md b/cran-comments.md index ecb84ff..01fe1a4 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,11 +1,5 @@ -# tables 0.9.25 - -Tried to handle the `formatters::matrix_print_form` differently, -so we never refer to something that isn't there. - -# tables 0.9.24 - -This is a minor release, fixing a few bugs and adding a function -at the request of the `tinytables` package. The submission was -triggered by a change to the exports of the `formatters` package. +# tables 0.9.27 +This is a small bug fix release. It also contains a fix for the +error reported by CRAN on June 21 to work with an update to the +formatters package. diff --git a/man/matrix_form.tabular.Rd b/man/matrix_form.tabular.Rd index f2c258a..b491c2f 100644 --- a/man/matrix_form.tabular.Rd +++ b/man/matrix_form.tabular.Rd @@ -55,8 +55,14 @@ if (requireNamespace("formatters")) { } # This gives the breaks by columns, counting the - # row label columns: - bycol <- formatters::vert_pag_indices(mform, cpp = 30, rep_cols = 2) + # row label columns. + # The formatters::vert_pag_indices function had an incompatible + # change in v0.5.8 + if ("fontspec" \%in\% names(formals(formatters::vert_pag_indices))) + bycol <- formatters::vert_pag_indices(mform, cpp = 30, rep_cols = 2, + fontspec = NULL) + else + bycol <- formatters::vert_pag_indices(mform, cpp = 30, rep_cols = 2) # Display the table with both kinds of breaks for (i in seq_along(byrow)) { rows <- byrow[[i]]