diff --git a/DESCRIPTION b/DESCRIPTION index 3e2e54c..de132e1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -18,7 +18,7 @@ BugReports: https://github.com/csdaw/ggprism/issues Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.1 +RoxygenNote: 7.3.1 Depends: R (>= 3.2) Imports: diff --git a/inst/examples/ex-annotation_ticks.R b/inst/examples/ex-annotation_ticks.R index 586bec6..c23bdd1 100644 --- a/inst/examples/ex-annotation_ticks.R +++ b/inst/examples/ex-annotation_ticks.R @@ -31,7 +31,7 @@ ggplot(mtcars, aes(x = mpg, y = disp)) + outside = TRUE, tick.length = unit(10, "pt"), colour = "red", - size = 2, + linewidth = 2, linetype = "dashed", lineend = "round" ) + diff --git a/man/annotation_ticks.Rd b/man/annotation_ticks.Rd index d428161..13605b9 100644 --- a/man/annotation_ticks.Rd +++ b/man/annotation_ticks.Rd @@ -17,7 +17,7 @@ annotation_ticks( outside = FALSE, tick.length = unit(4.8, "pt"), minor.length = unit(2.4, "pt"), - size = 0.6, + linewidth = 0.6, colour = "black", color = NULL, linetype = 1, @@ -44,7 +44,7 @@ of major ticks.} \item{minor.length}{a \code{\link[grid]{unit}} object specifying the length of minor ticks.} -\item{size}{\code{numeric}. Linewidth of ticks.} +\item{linewidth}{\code{numeric}. Linewidth of ticks.} \item{colour, color}{\code{string}. Colour of ticks.} @@ -102,7 +102,7 @@ ggplot(mtcars, aes(x = mpg, y = disp)) + outside = TRUE, tick.length = unit(10, "pt"), colour = "red", - size = 2, + linewidth = 2, linetype = "dashed", lineend = "round" ) + diff --git a/man/guide_prism_bracket.Rd b/man/guide_prism_bracket.Rd index fd266a1..e9f69ac 100644 --- a/man/guide_prism_bracket.Rd +++ b/man/guide_prism_bracket.Rd @@ -26,14 +26,21 @@ specified in \code{\link[ggplot2:labs]{labs()}} is used for the title.} \item{angle}{Compared to setting the angle in \code{\link[ggplot2:theme]{theme()}} / \code{\link[ggplot2:element_text]{element_text()}}, this also uses some heuristics to automatically pick the \code{hjust} and \code{vjust} that -you probably want.} +you probably want. Can be one of the following: +\itemize{ +\item \code{NULL} to take the angles and \code{hjust}/\code{vjust} directly from the theme. +\item \code{waiver()} to allow reasonable defaults in special cases. +\item A number representing the text angle in degrees. +}} \item{n.dodge}{The number of rows (for vertical axes) or columns (for horizontal axes) that should be used to render the labels. This is useful for displaying labels that would otherwise overlap.} -\item{order}{Used to determine the order of the guides (left-to-right, -top-to-bottom), if more than one guide must be drawn at the same location.} +\item{order}{A positive \code{integer} of length 1 that specifies the order of +this guide among multiple guides. This controls in which order guides are +merged if there are multiple guides for the same position. If 0 (default), +the order is determined by a secret algorithm.} \item{position}{Where this guide should be drawn: one of top, bottom, left, or right.} diff --git a/man/guide_prism_minor.Rd b/man/guide_prism_minor.Rd index 96f7490..4d45fa9 100644 --- a/man/guide_prism_minor.Rd +++ b/man/guide_prism_minor.Rd @@ -24,14 +24,21 @@ specified in \code{\link[ggplot2:labs]{labs()}} is used for the title.} \item{angle}{Compared to setting the angle in \code{\link[ggplot2:theme]{theme()}} / \code{\link[ggplot2:element_text]{element_text()}}, this also uses some heuristics to automatically pick the \code{hjust} and \code{vjust} that -you probably want.} +you probably want. Can be one of the following: +\itemize{ +\item \code{NULL} to take the angles and \code{hjust}/\code{vjust} directly from the theme. +\item \code{waiver()} to allow reasonable defaults in special cases. +\item A number representing the text angle in degrees. +}} \item{n.dodge}{The number of rows (for vertical axes) or columns (for horizontal axes) that should be used to render the labels. This is useful for displaying labels that would otherwise overlap.} -\item{order}{Used to determine the order of the guides (left-to-right, -top-to-bottom), if more than one guide must be drawn at the same location.} +\item{order}{A positive \code{integer} of length 1 that specifies the order of +this guide among multiple guides. This controls in which order guides are +merged if there are multiple guides for the same position. If 0 (default), +the order is determined by a secret algorithm.} \item{position}{Where this guide should be drawn: one of top, bottom, left, or right.} diff --git a/man/guide_prism_offset.Rd b/man/guide_prism_offset.Rd index 43370dd..dc408de 100644 --- a/man/guide_prism_offset.Rd +++ b/man/guide_prism_offset.Rd @@ -24,14 +24,21 @@ specified in \code{\link[ggplot2:labs]{labs()}} is used for the title.} \item{angle}{Compared to setting the angle in \code{\link[ggplot2:theme]{theme()}} / \code{\link[ggplot2:element_text]{element_text()}}, this also uses some heuristics to automatically pick the \code{hjust} and \code{vjust} that -you probably want.} +you probably want. Can be one of the following: +\itemize{ +\item \code{NULL} to take the angles and \code{hjust}/\code{vjust} directly from the theme. +\item \code{waiver()} to allow reasonable defaults in special cases. +\item A number representing the text angle in degrees. +}} \item{n.dodge}{The number of rows (for vertical axes) or columns (for horizontal axes) that should be used to render the labels. This is useful for displaying labels that would otherwise overlap.} -\item{order}{Used to determine the order of the guides (left-to-right, -top-to-bottom), if more than one guide must be drawn at the same location.} +\item{order}{A positive \code{integer} of length 1 that specifies the order of +this guide among multiple guides. This controls in which order guides are +merged if there are multiple guides for the same position. If 0 (default), +the order is determined by a secret algorithm.} \item{position}{Where this guide should be drawn: one of top, bottom, left, or right.} diff --git a/man/guide_prism_offset_minor.Rd b/man/guide_prism_offset_minor.Rd index 4c02924..586b743 100644 --- a/man/guide_prism_offset_minor.Rd +++ b/man/guide_prism_offset_minor.Rd @@ -24,14 +24,21 @@ specified in \code{\link[ggplot2:labs]{labs()}} is used for the title.} \item{angle}{Compared to setting the angle in \code{\link[ggplot2:theme]{theme()}} / \code{\link[ggplot2:element_text]{element_text()}}, this also uses some heuristics to automatically pick the \code{hjust} and \code{vjust} that -you probably want.} +you probably want. Can be one of the following: +\itemize{ +\item \code{NULL} to take the angles and \code{hjust}/\code{vjust} directly from the theme. +\item \code{waiver()} to allow reasonable defaults in special cases. +\item A number representing the text angle in degrees. +}} \item{n.dodge}{The number of rows (for vertical axes) or columns (for horizontal axes) that should be used to render the labels. This is useful for displaying labels that would otherwise overlap.} -\item{order}{Used to determine the order of the guides (left-to-right, -top-to-bottom), if more than one guide must be drawn at the same location.} +\item{order}{A positive \code{integer} of length 1 that specifies the order of +this guide among multiple guides. This controls in which order guides are +merged if there are multiple guides for the same position. If 0 (default), +the order is determined by a secret algorithm.} \item{position}{Where this guide should be drawn: one of top, bottom, left, or right.} diff --git a/man/scale_colour_prism.Rd b/man/scale_colour_prism.Rd index 7fe31a3..a2b911b 100644 --- a/man/scale_colour_prism.Rd +++ b/man/scale_colour_prism.Rd @@ -69,6 +69,7 @@ The default, \code{TRUE}, uses the levels that appear in the data; \code{\link[ggplot2:guides]{guides()}} for more information.} \item{\code{position}}{For position scales, The position of the axis. \code{left} or \code{right} for y axes, \code{top} or \code{bottom} for x axes.} + \item{\code{call}}{The \code{call} used to construct the scale for reporting messages.} \item{\code{super}}{The super class to use for the constructed scale} }} } diff --git a/man/scale_fill_prism.Rd b/man/scale_fill_prism.Rd index 5840404..39bfad4 100644 --- a/man/scale_fill_prism.Rd +++ b/man/scale_fill_prism.Rd @@ -66,6 +66,7 @@ The default, \code{TRUE}, uses the levels that appear in the data; \code{\link[ggplot2:guides]{guides()}} for more information.} \item{\code{position}}{For position scales, The position of the axis. \code{left} or \code{right} for y axes, \code{top} or \code{bottom} for x axes.} + \item{\code{call}}{The \code{call} used to construct the scale for reporting messages.} \item{\code{super}}{The super class to use for the constructed scale} }} } diff --git a/man/scale_shape_prism.Rd b/man/scale_shape_prism.Rd index bbed882..b2bb163 100644 --- a/man/scale_shape_prism.Rd +++ b/man/scale_shape_prism.Rd @@ -65,6 +65,7 @@ The default, \code{TRUE}, uses the levels that appear in the data; \code{\link[ggplot2:guides]{guides()}} for more information.} \item{\code{position}}{For position scales, The position of the axis. \code{left} or \code{right} for y axes, \code{top} or \code{bottom} for x axes.} + \item{\code{call}}{The \code{call} used to construct the scale for reporting messages.} \item{\code{super}}{The super class to use for the constructed scale} }} }