added modern excel colors

jrnold · Sep 11, 2012 · 3d0ca49 · 3d0ca49
1 parent 04ce386
commit 3d0ca49
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 4 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -3,18 +3,22 @@ export(circlefill_shape_pal)
 export(cleveland_shape_pal)
 export(economist_colors)
 export(economist_pal)
+export(excel10_pal)
 export(excel2003_pal)
 export(geom_rangeframe)
 export(geom_tufteboxplot)
 export(scale_color_economist)
+export(scale_color_excel10)
 export(scale_color_excel2003)
 export(scale_color_solarized)
 export(scale_color_stata)
 export(scale_colour_economist)
+export(scale_colour_excel10)
 export(scale_colour_excel2003)
 export(scale_colour_solarized)
 export(scale_colour_stata)
 export(scale_fill_economist)
+export(scale_fill_excel10)
 export(scale_fill_excel2003)
 export(scale_fill_solarized)
 export(scale_fill_stata)

diff --git a/R/excel.R b/R/excel.R
@@ -81,3 +81,52 @@ theme_excel2003 <- function(horizontal=TRUE, base_size=12, base_family="") {
     ret
 }
 
+##' Excel Colors
+##'
+##' Current Excel color palette. Color RGB values from
+##' \url{http://vis.stanford.edu/color-names/analyzer/}.
+##'
+##' @seeAlso \code{\link{excel2003_pal}} for an uglier color palette,
+##' and \code{\link{scale_colour_excel10}} for examples.
+##' @export
+excel10_pal <- function() {
+    excel10_colors <-
+        c("#365e96", "#983334", "#77973d", "#5d437c", "#36869f",
+          "#d1702f", "#8197c5", "#c47f80", "#acc484", "#9887b0")
+    manual_pal(excel10_colors)
+}
+
+##' Excel color scales
+##'
+##' Color scales from recent versions of Excel. See
+##' \code{\link{scale_fill_excel2003}} for the classic ugly colors.
+##'
+##' @inheritParams excel10_pal
+##' @inheritParams ggplot2::scale_colour_hue
+##' @family colour scales
+##' @rdname scale_excel10
+##' @export
+##' @seealso
+##' dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+##' (qplot(carat, price, data=dsamp, colour=clarity)
+##'  + scale_colour_excel10() )
+scale_fill_excel10 <- function(...) {
+    discrete_scale("fill", "excel10", excel10_pal(), ...)
+}
+
+#' @export
+#' @rdname scale_excel10
+scale_colour_excel10 <- function(...) {
+    discrete_scale("colour", "excel10", excel10_pal(), ...)
+}
+
+#' @export
+#' @rdname scale_excel10
+scale_color_excel10 <- scale_colour_excel10
+
+##' Color palette used by
+##' \href{http://www-958.ibm.com/software/data/cognos/manyeyes/0}{Many
+##' Eyes}. Colors values of the palette from
+##' \href{http://vis.stanford.edu/color-names/analyzer/}
+## many_eyes_colors <-
+##     c("#9c9ede", "#7375b5", "#4a5584", "#cedb9c", "#b5cf6b", "#8ca252", "#637939", "#e7cb94", "#e7ba52", "#bd9e39", "#8c6d31", "#e7969c", "#d6616b", "#ad494a", "#843c39", "#de9ed6", "#ce6dbd", "#a55194", "#7b4173")
diff --git a/man/excel10_pal.Rd b/man/excel10_pal.Rd
@@ -0,0 +1,11 @@
+\name{excel10_pal}
+\alias{excel10_pal}
+\title{Excel Colors}
+\usage{
+  excel10_pal()
+}
+\description{
+  Current Excel color palette. Color RGB values from
+  \url{http://vis.stanford.edu/color-names/analyzer/}.
+}
+
diff --git a/man/scale_economist.Rd b/man/scale_economist.Rd
@@ -27,12 +27,15 @@ dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
                + scale_colour_economist() )
 }
 \seealso{
-  Other colour.scales: \code{\link{scale_color_excel2003}},
+  Other colour scales: \code{\link{scale_color_excel10}},
+  \code{\link{scale_color_excel2003}},
   \code{\link{scale_color_solarized}},
   \code{\link{scale_color_stata}},
+  \code{\link{scale_colour_excel10}},
   \code{\link{scale_colour_excel2003}},
   \code{\link{scale_colour_solarized}},
   \code{\link{scale_colour_stata}},
+  \code{\link{scale_fill_excel10}},
   \code{\link{scale_fill_excel2003}},
   \code{\link{scale_fill_solarized}},
   \code{\link{scale_fill_stata}}

diff --git a/man/scale_excel10.Rd b/man/scale_excel10.Rd
@@ -0,0 +1,41 @@
+\name{scale_fill_excel10}
+\alias{scale_color_excel10}
+\alias{scale_colour_excel10}
+\alias{scale_fill_excel10}
+\title{Excel color scales}
+\usage{
+  scale_fill_excel10(...)
+
+  scale_colour_excel10(...)
+
+  scale_color_excel10(...)
+}
+\arguments{
+  \item{...}{Other arguments passed on to
+  \code{\link{discrete_scale}} to control name, limits,
+  breaks, labels and so forth.}
+}
+\description{
+  Color scales from recent versions of Excel. See
+  \code{\link{scale_fill_excel2003}} for the classic ugly
+  colors.
+}
+\seealso{
+  dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+  (qplot(carat, price, data=dsamp, colour=clarity) +
+  scale_colour_excel10() )
+
+  Other colour scales: \code{\link{scale_color_economist}},
+  \code{\link{scale_color_excel2003}},
+  \code{\link{scale_color_solarized}},
+  \code{\link{scale_color_stata}},
+  \code{\link{scale_colour_economist}},
+  \code{\link{scale_colour_excel2003}},
+  \code{\link{scale_colour_solarized}},
+  \code{\link{scale_colour_stata}},
+  \code{\link{scale_fill_economist}},
+  \code{\link{scale_fill_excel2003}},
+  \code{\link{scale_fill_solarized}},
+  \code{\link{scale_fill_stata}}
+}
+
diff --git a/man/scale_excel2003.Rd b/man/scale_excel2003.Rd
@@ -24,13 +24,16 @@
 \seealso{
   See \code{\link{theme_excel2003}} for examples.
 
-  Other colour.scales: \code{\link{scale_color_economist}},
+  Other colour scales: \code{\link{scale_color_economist}},
+  \code{\link{scale_color_excel10}},
   \code{\link{scale_color_solarized}},
   \code{\link{scale_color_stata}},
   \code{\link{scale_colour_economist}},
+  \code{\link{scale_colour_excel10}},
   \code{\link{scale_colour_solarized}},
   \code{\link{scale_colour_stata}},
   \code{\link{scale_fill_economist}},
+  \code{\link{scale_fill_excel10}},
   \code{\link{scale_fill_solarized}},
   \code{\link{scale_fill_stata}}
 }

diff --git a/man/scale_solarized.Rd b/man/scale_solarized.Rd
@@ -28,13 +28,16 @@ dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
                + scale_colour_solarized() )
 }
 \seealso{
-  Other colour.scales: \code{\link{scale_color_economist}},
+  Other colour scales: \code{\link{scale_color_economist}},
+  \code{\link{scale_color_excel10}},
   \code{\link{scale_color_excel2003}},
   \code{\link{scale_color_stata}},
   \code{\link{scale_colour_economist}},
+  \code{\link{scale_colour_excel10}},
   \code{\link{scale_colour_excel2003}},
   \code{\link{scale_colour_stata}},
   \code{\link{scale_fill_economist}},
+  \code{\link{scale_fill_excel10}},
   \code{\link{scale_fill_excel2003}},
   \code{\link{scale_fill_stata}}
 }

diff --git a/man/scale_stata.Rd b/man/scale_stata.Rd
@@ -31,13 +31,16 @@ dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
                + scale_color_stata("s1color"))
 }
 \seealso{
-  Other colour.scales: \code{\link{scale_color_economist}},
+  Other colour scales: \code{\link{scale_color_economist}},
+  \code{\link{scale_color_excel10}},
   \code{\link{scale_color_excel2003}},
   \code{\link{scale_color_solarized}},
   \code{\link{scale_colour_economist}},
+  \code{\link{scale_colour_excel10}},
   \code{\link{scale_colour_excel2003}},
   \code{\link{scale_colour_solarized}},
   \code{\link{scale_fill_economist}},
+  \code{\link{scale_fill_excel10}},
   \code{\link{scale_fill_excel2003}},
   \code{\link{scale_fill_solarized}}
 }