diff --git a/.Rbuildignore b/.Rbuildignore index f007f468..ca3dfdab 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -17,6 +17,7 @@ Untitled* ^\.github/workflows/R-CMD-check\.yaml$ ^\.github/workflows/pr-commands\.yaml$ ^CODE_OF_CONDUCT\.md$ +^revdep$ ^vignettes$ ^tests/figs$ ^tests/testthat/_snaps$ diff --git a/DESCRIPTION b/DESCRIPTION index 9f658dfb..0fad915f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,17 +1,17 @@ Package: thematic Title: Unified and Automatic 'Theming' of 'ggplot2', 'lattice', and 'base' R Graphics -Version: 0.1.2.9000 +Version: 0.1.3 Authors@R: c( - person("Carson", "Sievert", role = c("aut", "cre"), email = "carson@rstudio.com", comment = c(ORCID = "0000-0002-4958-2844")), - person("Barret", "Schloerke", email = "barret@rstudio.com", role = "aut", comment = c(ORCID = "0000-0001-9986-114X")), - person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"), - person(family = "RStudio", role = "cph") + person("Carson", "Sievert", role = c("aut", "cre"), email = "carson@posit.co", comment = c(ORCID = "0000-0002-4958-2844")), + person("Barret", "Schloerke", email = "barret@posit.co", role = "aut", comment = c(ORCID = "0000-0001-9986-114X")), + person("Joe", "Cheng", role = "aut", email = "joe@posit.co"), + person("Posit Software, PBC", role = c("cph", "fnd")) ) Description: Theme 'ggplot2', 'lattice', and 'base' graphics based on a few choices, including foreground color, background color, accent color, and font family. Fonts that aren't available on the system, but are available via download on 'Google Fonts', can be automatically downloaded, cached, and registered for use with the 'showtext' and 'ragg' packages. -URL: https://rstudio.github.io/thematic/, https://github.com/rstudio/thematic#readme +URL: https://rstudio.github.io/thematic/, https://github.com/rstudio/thematic Depends: R (>= 3.0.0) Imports: utils, @@ -57,10 +57,10 @@ Collate: 'ggplot.R' 'globals.R' 'hooks.R' - 'imports.R' 'knitr.R' 'lattice.R' 'onLoad.R' + 'thematic-package.R' 'thematic-save-plot.R' 'thematic.R' 'utils.R' @@ -82,3 +82,4 @@ Config/Needs/check: tinytex, devtools, rversions +BugReports: https://github.com/rstudio/thematic/issues diff --git a/NEWS.md b/NEWS.md index f93d091f..240870d9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# thematic 0.1.2.9000 +# thematic 0.1.3 * Closed #129: Fixed a bug with not being able override thematic inside geom_sf(). (#129) * Closed #120: A warning about a `length-one vector` is no longer thrown on R 4.2. (#121) diff --git a/R/imports.R b/R/thematic-package.R similarity index 84% rename from R/imports.R rename to R/thematic-package.R index ad81d962..ffbf7099 100644 --- a/R/imports.R +++ b/R/thematic-package.R @@ -1,7 +1,12 @@ +#' @keywords internal +"_PACKAGE" + +## usethis namespace: start #' @importFrom graphics par plot plot.new #' @importFrom grid grid.newpage grid.draw grid.text gpar seekViewport pushViewport upViewport #' @importFrom grDevices col2rgb dev.new dev.cur dev.off dev.set devAskNewPage palette colorRampPalette #' @importFrom utils capture.output download.file unzip packageVersion modifyList getFromNamespace getS3method assignInNamespace #' @importFrom rlang is_installed list2 %|% #' @importFrom rstudioapi getThemeInfo versionInfo readRStudioPreference +## usethis namespace: end NULL diff --git a/README.Rmd b/README.Rmd index 4c7320ba..2934c2d0 100644 --- a/README.Rmd +++ b/README.Rmd @@ -62,7 +62,7 @@ install.packages("ragg") ## Overview -`{thematic}`'s [auto theming](https://rstudio.github.io/thematic/articles/auto.html) gives R plots the ability to style themselves inside [Shiny](#shiny) (via CSS), [RStudio](#rstudio) (via [RStudio themes](https://support.rstudio.com/hc/en-us/articles/115011846747-Using-RStudio-Themes)), and [R Markdown](#rmarkdown) (via [`{bslib}`](https://rstudio.github.io/bslib/)). +`{thematic}`'s [auto theming](https://rstudio.github.io/thematic/articles/auto.html) gives R plots the ability to style themselves inside [Shiny](#shiny) (via CSS), [RStudio](#rstudio) (via [RStudio themes](https://support.posit.co/hc/en-us/articles/115011846747-Using-RStudio-Themes)), and [R Markdown](#rmarkdown) (via [`{bslib}`](https://rstudio.github.io/bslib/)). ### Shiny {#shiny} diff --git a/README.md b/README.md index f9a8b205..c674e109 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ install.packages("ragg") theming](https://rstudio.github.io/thematic/articles/auto.html) gives R plots the ability to style themselves inside [Shiny](#shiny) (via CSS), [RStudio](#rstudio) (via [RStudio -themes](https://support.rstudio.com/hc/en-us/articles/115011846747-Using-RStudio-Themes)), +themes](https://support.posit.co/hc/en-us/articles/115011846747-Using-RStudio-Themes)), and [R Markdown](#rmarkdown) (via [`{bslib}`](https://rstudio.github.io/bslib/)). @@ -205,20 +205,20 @@ learn more about how to customize those defaults. ## Learn more - - See the [auto theming - article](https://rstudio.github.io/thematic/articles/auto.html) to - gain a more detailed understanding of how auto theming make styling - R plots easier in Shiny, R Markdown, and RStudio. - - See the [custom themes - article](https://rstudio.github.io/thematic/articles/custom.html) - for more on `{thematic}`’s theming options as well as how they - interact with `{ggplot2}`, `{lattice}`, and `{base}`. - - See the [fonts - article](https://rstudio.github.io/thematic/articles/fonts.html) for - more on using Google Fonts with `{thematic}`. - - See the [scoping - article](https://rstudio.github.io/thematic/articles/scope.html) for - more about scoping `{thematic}` to individual plots. +- See the [auto theming + article](https://rstudio.github.io/thematic/articles/auto.html) to + gain a more detailed understanding of how auto theming make styling R + plots easier in Shiny, R Markdown, and RStudio. +- See the [custom themes + article](https://rstudio.github.io/thematic/articles/custom.html) for + more on `{thematic}`’s theming options as well as how they interact + with `{ggplot2}`, `{lattice}`, and `{base}`. +- See the [fonts + article](https://rstudio.github.io/thematic/articles/fonts.html) for + more on using Google Fonts with `{thematic}`. +- See the [scoping + article](https://rstudio.github.io/thematic/articles/scope.html) for + more about scoping `{thematic}` to individual plots. ## Run some examples diff --git a/man/figures/README-ggrepel-1.png b/man/figures/README-ggrepel-1.png index b1e5b3d5..849e08ee 100644 Binary files a/man/figures/README-ggrepel-1.png and b/man/figures/README-ggrepel-1.png differ diff --git a/man/figures/README-ggrepel2-1.png b/man/figures/README-ggrepel2-1.png index 841e4482..000e8660 100644 Binary files a/man/figures/README-ggrepel2-1.png and b/man/figures/README-ggrepel2-1.png differ diff --git a/man/figures/README-ggrepel3-1.png b/man/figures/README-ggrepel3-1.png index d5c27e4d..8025ed67 100644 Binary files a/man/figures/README-ggrepel3-1.png and b/man/figures/README-ggrepel3-1.png differ diff --git a/man/thematic-package.Rd b/man/thematic-package.Rd new file mode 100644 index 00000000..f8ea2dbc --- /dev/null +++ b/man/thematic-package.Rd @@ -0,0 +1,37 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/thematic-package.R +\docType{package} +\name{thematic-package} +\alias{thematic} +\alias{thematic-package} +\title{thematic: Unified and Automatic 'Theming' of 'ggplot2', 'lattice', and 'base' R Graphics} +\description{ +\if{html}{\figure{logo.png}{options: style='float: right' alt='logo' width='120'}} + +Theme 'ggplot2', 'lattice', and 'base' graphics based on a few choices, including foreground color, background color, accent color, and font family. Fonts that aren't available on the system, but are available via download on 'Google Fonts', can be automatically downloaded, cached, and registered for use with the 'showtext' and 'ragg' packages. +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://rstudio.github.io/thematic/} + \item \url{https://github.com/rstudio/thematic} + \item Report bugs at \url{https://github.com/rstudio/thematic/issues} +} + +} +\author{ +\strong{Maintainer}: Carson Sievert \email{carson@posit.co} (\href{https://orcid.org/0000-0002-4958-2844}{ORCID}) + +Authors: +\itemize{ + \item Barret Schloerke \email{barret@posit.co} (\href{https://orcid.org/0000-0001-9986-114X}{ORCID}) + \item Joe Cheng \email{joe@posit.co} +} + +Other contributors: +\itemize{ + \item Posit Software, PBC [copyright holder, funder] +} + +} +\keyword{internal} diff --git a/revdep/.gitignore b/revdep/.gitignore new file mode 100644 index 00000000..8333ede7 --- /dev/null +++ b/revdep/.gitignore @@ -0,0 +1,7 @@ +checks +library +checks.noindex* +library.noindex* +cloud.noindex* +data.sqlite +*.html diff --git a/revdep/README.md b/revdep/README.md new file mode 100644 index 00000000..52e12c71 --- /dev/null +++ b/revdep/README.md @@ -0,0 +1,2 @@ +# Revdeps + diff --git a/revdep/cran.md b/revdep/cran.md new file mode 100644 index 00000000..fdf17920 --- /dev/null +++ b/revdep/cran.md @@ -0,0 +1,7 @@ +## revdepcheck results + +We checked 5 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. + + * We saw 0 new problems + * We failed to check 0 packages + diff --git a/revdep/failures.md b/revdep/failures.md new file mode 100644 index 00000000..9a207363 --- /dev/null +++ b/revdep/failures.md @@ -0,0 +1 @@ +*Wow, no problems at all. :)* \ No newline at end of file diff --git a/revdep/problems.md b/revdep/problems.md new file mode 100644 index 00000000..9a207363 --- /dev/null +++ b/revdep/problems.md @@ -0,0 +1 @@ +*Wow, no problems at all. :)* \ No newline at end of file