diff --git a/DESCRIPTION b/DESCRIPTION index 13bb9255..7c16c0f9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: scales Title: Scale Functions for Visualization -Version: 1.2.0.9000 +Version: 1.2.1.9000 Authors@R: c( person("Hadley", "Wickham", , "hadley@rstudio.com", role = c("aut", "cre")), person("Dana", "Seidel", role = "aut"), @@ -35,5 +35,5 @@ Config/Needs/website: tidyverse/tidytemplate Encoding: UTF-8 LazyLoad: yes Roxygen: list(markdown = TRUE, r6 = FALSE) -RoxygenNote: 7.1.2 +RoxygenNote: 7.2.1 Config/testthat/edition: 3 diff --git a/NEWS.md b/NEWS.md index b2887695..212416c1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,6 +5,10 @@ * Transformation objects can optionally include the derivatives of the transform and the inverse transform (@mjskay, #322). +# scales 1.2.1 + +* Re-document to fix HTML issues in `.Rd`. + # scales 1.2.0 ## New features diff --git a/cran-comments.md b/cran-comments.md index acaf00b1..83224423 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -19,32 +19,4 @@ I'm seeing a warning from the JSTOR links, presumably because of their overactiv ## revdepcheck results -We checked 464 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. - - * We failed to check 21 packages - -Issues with CRAN packages are summarised below. - -### Failed to check - -* anglr (NA) -* DeducerSpatial (NA) -* dimRed (NA) -* dtwSat (NA) -* eechidna (NA) -* fingertipscharts (NA) -* geneNetBP (NA) -* geomerge (NA) -* ggalt (NA) -* GGEBiplots (NA) -* inlmisc (NA) -* loon (NA) -* MarketMatching (NA) -* plotKML (NA) -* ppcSpatial (NA) -* quadmesh (NA) -* rAvis (NA) -* simplevis (NA) -* smartR (NA) -* surveillance (NA) -* SWMPrExtension (NA) +I did not re-check revdeps because this just contains a documentation fix. diff --git a/man/dollar_format.Rd b/man/dollar_format.Rd index 0a07d6ff..fdf73383 100644 --- a/man/dollar_format.Rd +++ b/man/dollar_format.Rd @@ -35,7 +35,7 @@ dollar( ) } \arguments{ -\item{accuracy}{Number to round to. If \code{NULL}, the default, +\item{accuracy, largest_with_cents}{Number to round to. If \code{NULL}, the default, values will be rounded to the nearest integer, unless any of the values has non-zero fractional component (e.g. cents) and the largest value is less than \code{largest_with_cents} which by default is 100,000.} @@ -44,9 +44,7 @@ value is less than \code{largest_with_cents} which by default is 100,000.} formatting. This is useful if the underlying data is very small or very large.} -\item{prefix}{Symbols to display before and after value.} - -\item{suffix}{Symbols to display before and after value.} +\item{prefix, suffix}{Symbols to display before and after value.} \item{big.mark}{Character used between every 3 digits to separate thousands.} @@ -56,11 +54,6 @@ decimal point.} \item{trim}{Logical, if \code{FALSE}, values are right-justified to a common width (see \code{\link[base:format]{base::format()}}).} -\item{largest_with_cents}{Number to round to. If \code{NULL}, the default, -values will be rounded to the nearest integer, unless any of the -values has non-zero fractional component (e.g. cents) and the largest -value is less than \code{largest_with_cents} which by default is 100,000.} - \item{negative_parens}{\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#deprecated}{\figure{lifecycle-deprecated.svg}{options: alt='[Deprecated]'}}}{\strong{[Deprecated]}} Use \code{style_negative = "parens"} instead.} diff --git a/man/ordinal_format.Rd b/man/ordinal_format.Rd index b7e50350..c2a692a3 100644 --- a/man/ordinal_format.Rd +++ b/man/ordinal_format.Rd @@ -23,9 +23,7 @@ ordinal( ) } \arguments{ -\item{prefix}{Symbols to display before and after value.} - -\item{suffix}{Symbols to display before and after value.} +\item{prefix, suffix}{Symbols to display before and after value.} \item{big.mark}{Character used between every 3 digits to separate thousands.} diff --git a/man/scales-package.Rd b/man/scales-package.Rd index 94a17fda..49cedbcd 100644 --- a/man/scales-package.Rd +++ b/man/scales-package.Rd @@ -6,7 +6,7 @@ \alias{scales-package} \title{scales: Scale Functions for Visualization} \description{ -\if{html}{\figure{logo.png}{options: align='right' alt='logo' width='120'}} +\if{html}{\figure{logo.png}{options: style='float: right' alt='logo' width='120'}} Graphical scales map data to aesthetics, and provide methods for automatically determining breaks and labels for axes and legends. } diff --git a/man/scientific_format.Rd b/man/scientific_format.Rd index c8249e5d..dfa483d9 100644 --- a/man/scientific_format.Rd +++ b/man/scientific_format.Rd @@ -33,9 +33,7 @@ scientific( formatting. This is useful if the underlying data is very small or very large.} -\item{prefix}{Symbols to display before and after value.} - -\item{suffix}{Symbols to display before and after value.} +\item{prefix, suffix}{Symbols to display before and after value.} \item{decimal.mark}{The character to be used to indicate the numeric decimal point.} diff --git a/scales.Rproj b/scales.Rproj index edce964f..cba1b6b7 100644 --- a/scales.Rproj +++ b/scales.Rproj @@ -17,6 +17,5 @@ StripTrailingWhitespace: Yes BuildType: Package PackageUseDevtools: Yes -PackageCleanBeforeInstall: Yes PackageInstallArgs: --no-multiarch --with-keep.source PackageRoxygenize: rd,collate,namespace