From 3b1944dea873bf721457ebcfd97e6a9cb2964802 Mon Sep 17 00:00:00 2001 From: Dan Chaltiel Date: Sun, 12 Nov 2023 22:40:10 +0100 Subject: [PATCH] v0.7.0 --- .gitignore | 1 + CRAN-SUBMISSION | 6 +++--- DESCRIPTION | 2 +- NEWS.md | 4 ++-- R/options.R | 10 +++++----- codemeta.json | 38 ++++++++++++++++++++++++++++++++++---- cran-comments.md | 2 +- inst/WORDLIST | 2 ++ man/crosstable_options.Rd | 10 +++++----- 9 files changed, 54 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 3ebc7ed9..6c1d06b2 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ TODO\.R DEV\.R tests/testthat/test-dummy.R .Renviron +cran-comments.md diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index 3b433a8d..ba568c4f 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ -Version: 0.6.2 -Date: 2023-05-27 08:29:29 UTC -SHA: 04fc653856a03d92de305b31ba51db89ec54ef3c +Version: 0.7.0 +Date: 2023-11-12 20:14:55 UTC +SHA: f314765b3ec282b02e9968afa5c9e3234c2f4c51 diff --git a/DESCRIPTION b/DESCRIPTION index deb1110e..3f0e323e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: crosstable Title: Crosstables for Descriptive Analyses -Version: 0.6.2.9011 +Version: 0.7.0 Authors@R: c(person(given = "Dan", family = "Chaltiel", diff --git a/NEWS.md b/NEWS.md index 66ee452a..29987967 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,10 +1,10 @@ Crosstables for descriptive analyses. See documentation at and browse code at . -# crosstable 0.7.0 2023-xx-xx +# crosstable 0.7.0 2023-11-12 #### New features -- New officer helper `body_add_table_section()`, which adds a table (crosstable or flextable) which can be surrounded by a title (lvl3 by default), a legend, and/or a short sentence. +- New officer helper `body_add_table_section()`, which adds a table (crosstable or flextable) which can be surrounded by a title (level 3 by default), a legend, and/or a short sentence. - `set_label()` now accepts a function as a value (e.g. `set_label(mtcars2, toupper)`). - Argument `format_fixed(scientific)` can now be `FALSE` to force standard format. Can be set through `options(crosstable_scientific_log=FALSE)` (#49). - New argument `format_fixed(epsilon)` to format values as `"1e4. diff --git a/codemeta.json b/codemeta.json index 04c963e3..c9d4f1a4 100644 --- a/codemeta.json +++ b/codemeta.json @@ -4,17 +4,23 @@ "identifier": "crosstable", "description": "Create descriptive tables for continuous and categorical variables. Apply summary statistics and counting function, with or without a grouping variable, and create beautiful reports using 'rmarkdown' or 'officer'. You can also compute effect sizes and statistical tests if needed.", "name": "crosstable: Crosstables for Descriptive Analyses", - "relatedLink": "https://danchaltiel.github.io/crosstable/", + "relatedLink": ["https://danchaltiel.github.io/crosstable/", "https://CRAN.R-project.org/package=crosstable"], "codeRepository": "https://github.com/DanChaltiel/crosstable/", "issueTracker": "https://github.com/DanChaltiel/crosstable/issues/", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "0.6.2", + "version": "0.7.0", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", "url": "https://r-project.org" }, "runtimePlatform": "R version 4.1.3 (2022-03-10)", + "provider": { + "@id": "https://cran.r-project.org", + "@type": "Organization", + "name": "Comprehensive R Archive Network (CRAN)", + "url": "https://cran.r-project.org" + }, "author": [ { "@type": "Person", @@ -154,6 +160,18 @@ }, "sameAs": "https://CRAN.R-project.org/package=Hmisc" }, + { + "@type": "SoftwareApplication", + "identifier": "hms", + "name": "hms", + "provider": { + "@id": "https://cran.r-project.org", + "@type": "Organization", + "name": "Comprehensive R Archive Network (CRAN)", + "url": "https://cran.r-project.org" + }, + "sameAs": "https://CRAN.R-project.org/package=hms" + }, { "@type": "SoftwareApplication", "identifier": "jsonlite", @@ -178,6 +196,18 @@ }, "sameAs": "https://CRAN.R-project.org/package=knitr" }, + { + "@type": "SoftwareApplication", + "identifier": "lubridate", + "name": "lubridate", + "provider": { + "@id": "https://cran.r-project.org", + "@type": "Organization", + "name": "Comprehensive R Archive Network (CRAN)", + "url": "https://cran.r-project.org" + }, + "sameAs": "https://CRAN.R-project.org/package=lubridate" + }, { "@type": "SoftwareApplication", "identifier": "openxlsx", @@ -493,10 +523,10 @@ }, "SystemRequirements": null }, - "fileSize": "1505.071KB", + "fileSize": "1530.568KB", "releaseNotes": "https://github.com/DanChaltiel/crosstable/blob/master/NEWS.md", "readme": "https://github.com/DanChaltiel/crosstable/blob/main/README.md", - "contIntegration": ["https://app.codecov.io/gh/DanChaltiel/crosstable?branch=main", "https://github.com/DanChaltiel/crosstable/actions"], + "contIntegration": ["https://app.codecov.io/gh/DanChaltiel/crosstable?branch=main", "https://github.com/DanChaltiel/crosstable/actions/workflows/check-standard.yaml"], "developmentStatus": "https://lifecycle.r-lib.org/articles/stages.html", "keywords": ["r", "descriptive-statistics", "rstats", "html-report", "frequency-table", "msword", "flextable", "officer"] } diff --git a/cran-comments.md b/cran-comments.md index 712f02d3..363e4331 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,7 +1,7 @@ ## Test environments -* local R installation, R 4.2.1 +* local R installation, R 4.1.3 * check_rhub() * check_win_devel() diff --git a/inst/WORDLIST b/inst/WORDLIST index f37fee6a..1c80397f 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,6 +1,7 @@ Acknowledgement Autofit Barnier's +CMD Codecov Consolas CrosstableMacros @@ -20,6 +21,7 @@ ORCID POSIXt RStudio RStudio's +Reimplement Rmarkdown Rmd StackOverflow diff --git a/man/crosstable_options.Rd b/man/crosstable_options.Rd index ac34d534..0c2e48f1 100644 --- a/man/crosstable_options.Rd +++ b/man/crosstable_options.Rd @@ -164,15 +164,15 @@ crosstable_options( \item{allow_break}{allow crosstable rows to break across pages} -\item{style_normal}{For specifying styles used in your {officer} template.} +\item{style_normal}{For specifying styles used in your \code{{officer}} template.} -\item{style_character}{For specifying styles used in your {officer} template.} +\item{style_character}{For specifying styles used in your \code{{officer}} template.} -\item{style_strong}{For specifying styles used in your {officer} template.} +\item{style_strong}{For specifying styles used in your \code{{officer}} template.} -\item{style_image}{For specifying styles used in your {officer} template.} +\item{style_image}{For specifying styles used in your \code{{officer}} template.} -\item{style_legend}{For specifying styles used in your {officer} template.} +\item{style_legend}{For specifying styles used in your \code{{officer}} template.} \item{style_heading}{For specifying styles used by headings on different levels. Levels will be pasted in the end (e.g. use \code{"title"} if your level 2 heading style is \code{"title2"}).}