malcolmbarrett
commented
1 year ago patch
Index: src/library/grDevices/man/col2rgb.Rd
===================================================================
--- src/library/grDevices/man/col2rgb.Rd (revision 85029)
+++ src/library/grDevices/man/col2rgb.Rd (working copy)
@@ -15,9 +15,8 @@
\arguments{
\item{col}{vector of any of the three kinds of \R color specifications,
i.e., either a color name (as listed by \code{\link{colors}()}), a
- hexadecimal string of the form \code{"#rrggbb"} or
- \code{"#rrggbbaa"} (see \code{\link{rgb}}), or a positive integer
- \code{i} meaning \code{\link{palette}()[i]}.}
+ hexadecimal string of the form specified in \code{\link{rgb}}, or a
+ positive integer \code{i} meaning \code{\link{palette}()[i]}.}
\item{alpha}{logical value indicating whether the alpha channel (opacity)
values should be returned.}
}
@@ -58,6 +57,11 @@
col2rgb(c(red = "red", hex = "#abcdef"))
col2rgb(c(palette = 1:3))
+# long and short form of hexadecimal notation
+col2rgb(c(long = "#559955", short = "#595"))
+# with alpha
+col2rgb(c(long = "#559955BB", short = "#595B"), alpha = TRUE)
+
##-- NON-INTRODUCTORY examples --
grC <- col2rgb(paste0("gray", 0:100))
Index: src/library/grDevices/man/rgb.Rd
===================================================================
--- src/library/grDevices/man/rgb.Rd (revision 85029)
+++ src/library/grDevices/man/rgb.Rd (working copy)
@@ -57,11 +57,16 @@
\code{green} or \code{alpha}.
}
\value{
- A character vector with elements of 7 or 9 characters, \code{"#"}
- followed by the red, blue, green and optionally alpha values in
- hexadecimal (after rescaling to \code{0 ... 255}). The optional alpha
- values range from \code{0} (fully transparent) to \code{255} (opaque).
+ A character vector beginning with \code{"#"} followed by the red,
+ blue, green and optionally alpha values in hexadecimal (after
+ rescaling to \code{0 ... 255}). The optional alpha values range
+ from \code{0} (fully transparent) to \code{255} (opaque).
+ This can be in the long hexadecimal form (e.g., \code{"#rrggbb"} or
+ \code{"#rrggbbaa"}) or the short form (e.g, \code{"#rgb"} or
+ \code{"#rgba"}). The short form is expanded to the long form by
+ replicating digits (not by adding zeroes).
+
\R does \strong{not} use \sQuote{premultiplied alpha}.
}
\seealso{
Index: src/library/grDevices/src/colors.c
===================================================================
--- src/library/grDevices/src/colors.c (revision 85029)
+++ src/library/grDevices/src/colors.c (working copy)
@@ -1359,13 +1359,24 @@
g = 16 * hexdigit(rgb[3]) + hexdigit(rgb[4]);
b = 16 * hexdigit(rgb[5]) + hexdigit(rgb[6]);
break;
+ case 5:
+ a = 17 * hexdigit(rgb[4]);
+ case 4:
+ r = 17 * hexdigit(rgb[1]);
+ g = 17 * hexdigit(rgb[2]);
+ b = 17 * hexdigit(rgb[3]);
+ break;
default:
error(_("invalid RGB specification"));
}
- if (strlen(rgb) == 7)
- return R_RGB(r, g, b);
- else
- return R_RGBA(r, g, b, a);
+
+ switch(strlen(rgb)) {
+ case 7:
+ case 4:
+ return R_RGB(r, g, b);
+ default:
+ return R_RGBA(r, g, b, a);
+ }
}
/* External Color Name to Internal Color Code */test output
Unsurprisingly, the example tests now fail
Testing examples for package ‘grDevices’
comparing ‘grDevices-Ex.Rout’ to ‘grDevices-Ex.Rout.save’ ... NOTE
696,709d695
< > # long and short form of hexadecimal notation
< > col2rgb(c(long = "#559955", short = "#595"))
< long short
< red 85 85
< green 153 153
< blue 85 85
< > # with alpha
< > col2rgb(c(long = "#559955BB", short = "#595B"), alpha = TRUE)
< long short
< red 85 85
< green 153 153
< blue 85 85
< alpha 187 187
< > Is this the sort of thing that should be included in the patch?
make check-all otherwise gave us an OK status. We did see test differences for other parts of the codebase we didn't touch. Is that expected?
bastistician
MichaelChirico
hanneoberman
EllaKaye
gmbecker
pmur002
Discussed in https://github.com/r-devel/r-project-sprint-2023/discussions/73