Skip to content
Browse files

Merge branch 'dev'

Conflicts:
	NEWS
	README.md
  • Loading branch information...
2 parents de59ee8 + ea742a3 commit 3b8151e415154b5ed2ee12e915b6262f00e99e87 @jrnold committed Dec 22, 2012
Showing with 313 additions and 323 deletions.
  1. +2 −2 DESCRIPTION
  2. +5 −9 NAMESPACE
  3. +10 −0 NEWS
  4. +2 −2 R/economist.R
  5. +46 −80 R/excel.R
  6. +3 −2 R/few.R
  7. +1 −0 R/geom-rangeframe.R
  8. +1 −0 R/geom-tufteboxplot.R
  9. +6 −6 R/ggthemes-data.R
  10. +11 −4 R/shapes.R
  11. +3 −1 R/solarized.R
  12. +8 −6 R/stata.R
  13. +5 −2 R/tableau.R
  14. +4 −4 R/theme-foundation.R
  15. +1 −1 R/tufte.R
  16. +2 −2 R/wsj.R
  17. +5 −5 README.Rmd
  18. +17 −17 README.md
  19. +7 −0 man/circlefill_shape_pal.Rd
  20. +7 −0 man/cleveland_shape_pal.Rd
  21. +6 −0 man/economist_pal.Rd
  22. +0 −19 man/excel10_pal.Rd
  23. +0 −19 man/excel2003_pal.Rd
  24. +26 −0 man/excel_pal.Rd
  25. +5 −0 man/few_pal.Rd
  26. +3 −0 man/geom_rangeframe.Rd
  27. +2 −0 man/geom_tufteboxplot.Rd
  28. +3 −3 man/ggthemes_data.Rd
  29. +1 −12 man/scale_color_tableau.Rd
  30. +2 −0 man/scale_economist.Rd
  31. +36 −0 man/scale_excel.Rd
  32. +0 −41 man/scale_excel10.Rd
  33. +0 −40 man/scale_excel2003.Rd
  34. +1 −12 man/scale_few.Rd
  35. +3 −0 man/scale_linetype_stata.Rd
  36. +6 −0 man/scale_shape_circlefill.Rd
  37. +6 −0 man/scale_shape_cleveland.Rd
  38. +3 −0 man/scale_shape_tableau.Rd
  39. +6 −0 man/scale_shape_tremmel.Rd
  40. +5 −12 man/scale_solarized.Rd
  41. +3 −0 man/scale_wsj.Rd
  42. +6 −0 man/solarized_pal.Rd
  43. +2 −0 man/stata_linetype_pal.Rd
  44. +6 −1 man/tableau_color_pal.Rd
  45. +3 −0 man/tableau_shape_pal.Rd
  46. +13 −12 man/{theme_excel2003.Rd → theme_excel.Rd}
  47. +0 −3 man/theme_few.Rd
  48. +4 −0 man/theme_foundation.Rd
  49. +2 −2 man/theme_igray.Rd
  50. +0 −4 man/theme_solarized.Rd
  51. +2 −0 man/theme_stata.Rd
  52. +7 −0 man/tremmel_shape_pal.Rd
  53. +5 −0 man/wsj_pal.Rd
View
4 DESCRIPTION
@@ -1,5 +1,5 @@
Package: ggthemes
-Version: 1.2.0
+Version: 1.3.0
Date: 2012-9-16
Title: ggplot related stuff
Authors@R: c(person("Jeffrey B.", "Arnold", role = c("aut", "cre"),
@@ -38,7 +38,7 @@ Collate:
'few.R'
'ggthemes-data.R'
'ggthemes-package.R'
- 'banking.R'
'theme-foundation.R'
+ 'banking.R'
'wsj.R'
'colorblind.R'
View
14 NAMESPACE
@@ -3,34 +3,30 @@ export(circlefill_shape_pal)
export(cleveland_shape_pal)
export(colorblind_pal)
export(economist_pal)
-export(excel10_pal)
-export(excel2003_pal)
+export(excel_pal)
export(few_pal)
export(geom_rangeframe)
export(geom_tufteboxplot)
export(ggthemes_data)
export(scale_color_colorblind)
export(scale_color_economist)
-export(scale_color_excel10)
-export(scale_color_excel2003)
+export(scale_color_excel)
export(scale_color_few)
export(scale_color_solarized)
export(scale_color_stata)
export(scale_color_tableau)
export(scale_color_wsj)
export(scale_colour_colorblind)
export(scale_colour_economist)
-export(scale_colour_excel10)
-export(scale_colour_excel2003)
+export(scale_colour_excel)
export(scale_colour_few)
export(scale_colour_solarized)
export(scale_colour_stata)
export(scale_colour_tableau)
export(scale_colour_wsj)
export(scale_fill_colorblind)
export(scale_fill_economist)
-export(scale_fill_excel10)
-export(scale_fill_excel2003)
+export(scale_fill_excel)
export(scale_fill_few)
export(scale_fill_solarized)
export(scale_fill_stata)
@@ -53,7 +49,7 @@ export(tableau_color_pal)
export(tableau_shape_pal)
export(theme_economist)
export(theme_economist_white)
-export(theme_excel2003)
+export(theme_excel)
export(theme_few)
export(theme_foundation)
export(theme_igray)
View
10 NEWS
@@ -1,8 +1,18 @@
+ggthemes 1.3.0
+------------------------
+
+* renamed `theme_excel2003` to `theme_excel`
+* replace `scale_fill_excel2003` and `scale_fill_excel10` with `scale_fill_excel`
+* replaced `scale_colour_excel2003` and `scale_colour_excel10` with `scale_colour_excel`
+* replaced `excel2003_pal` and `excel10_pal` with `excel_pal`
+* renamed `theme_base` to `theme_foundation`
+
ggthemes 1.2.0
------------------------
* added colorblind scales: `colorblind_pal`, `scale_*_colorblind`.
+
ggthemes 1.1.0
------------------------
View
4 R/economist.R
@@ -7,7 +7,7 @@
##'
##' @param stata Use the palette in the Stata economist scheme.
##' @param fill Use the fill palette.
-##' @family palettes economist
+##' @family colour economist
##' @export
##' @examples
##' library(scales)
@@ -80,7 +80,7 @@ economist_pal <- function(stata=FALSE, fill=TRUE) {
##'
##' @inheritParams ggplot2::scale_colour_hue
##' @inheritParams economist_pal
-##' @family colour scales economist
+##' @family colour economist
##' @rdname scale_economist
##' @seealso \code{\link{theme_economist}} for examples.
##' @export
View
126 R/excel.R
@@ -1,50 +1,63 @@
-##' Excel 2003 color palette (discrete)
+##' Excel color palette (discrete)
##'
-##' Color palettes from Excel 2003. For ironical purposes only.
+##' Color palettes from Excel, both current and the pre-2007 ugly
+##' palettes.
##'
-##' @param fill \code{logical} Use the fill palette?
+##' The color palettes are
+##' \describe{
+##' \item{line}{Excel 2003 default color palette.}
+##' \item{fill}{Excel 2003 bar chart color palette.}
+##' \item{new}{Color palette from newer Excel versions.}
+##' }
+##'
+##' @param palette One of "old", "fill", or "new".
##' @export
##' @examples
##' library(scales)
-##' show_col(excel2003_pal()(8))
-##' show_col(excel2003_pal(fill=TRUE)(8))
-excel2003_pal <- function(fill=FALSE) {
- if (!fill) {
- manual_pal(ggthemes_data$excel$excel2003)
+##' show_col(excel_pal()(8))
+##' show_col(excel_pal("fill")(8))
+##' show_col(excel_pal("new")(10))
+excel_pal <- function(palette="line") {
+ if (palette == "new") {
+ manual_pal(ggthemes_data$excel$new)
+ } else if (palette == "fill") {
+ manual_pal(ggthemes_data$excel$fill)
} else {
- manual_pal(ggthemes_data$excel$excel2003fill)
+ manual_pal(ggthemes_data$excel$line)
}
}
-##' Excel 2003 color scales
-##'
-##' Color scales from Excel 2003. For ironical purposes only. Supports
-##' both the fill and line palettes.
+##' Excel color scales
##'
-##' @inheritParams excel2003_pal
+##' @inheritParams excel_pal
##' @inheritParams ggplot2::scale_colour_hue
##' @family colour scales
-##' @rdname scale_excel2003
+##' @rdname scale_excel
##' @export
-##' @seealso See \code{\link{theme_excel2003}} for examples.
-scale_fill_excel2003 <- function(fill=TRUE, ...) {
- discrete_scale("fill", "excel2003", excel2003_pal(fill), ...)
+##' @seealso See \code{\link{theme_excel}} for examples.
+##' @examples
+##' dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+##' (qplot(carat, price, data=dsamp, colour=clarity)
+##' + theme_igray()
+##' + scale_colour_excel("new"))
+scale_fill_excel <- function(palette="line", ...) {
+ discrete_scale("fill", "excel", excel_pal(palette), ...)
}
#' @export
-#' @rdname scale_excel2003
-scale_colour_excel2003 <- function(fill=FALSE, ...) {
- discrete_scale("colour", "excel2003", excel2003_pal(fill), ...)
+#' @rdname scale_excel
+scale_colour_excel <- function(palette="fill", ...) {
+ discrete_scale("colour", "excel", excel_pal(palette), ...)
}
#' @export
-#' @rdname scale_excel2003
-scale_color_excel2003 <- scale_colour_excel2003
+#' @rdname scale_excel
+scale_color_excel <- scale_colour_excel
-##' ggplot color theme based on Excel 2003 plots
+##' ggplot color theme based on old Excel plots
##'
##' Theme to replicate the ugly monstrosity that was the Excel 2003
-##' chart. Please never use this for anything other than irony.
+##' chart. Please never use this.
##'
##' @param base_size base font size
##' @param base_family base font family
@@ -53,14 +66,17 @@ scale_color_excel2003 <- scale_colour_excel2003
##' @family themes
##' @examples
##' dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+##' # Old line color palette
##' (qplot(carat, price, data=dsamp, colour=clarity)
-##' + theme_excel2003()
-##' + scale_colour_excel2003() )
+##' + theme_excel()
+##' + scale_colour_excel() )
+##' # Old fill color palette
##' (ggplot(diamonds, aes(clarity, fill=cut))
##' + geom_bar()
-##' + scale_fill_excel2003()
-##' + theme_excel2003())
-theme_excel2003 <- function(horizontal=TRUE, base_size=12, base_family="") {
+##' + scale_fill_excel("fill")
+##' + theme_excel())
+##'
+theme_excel <- function(horizontal=TRUE, base_size=12, base_family="") {
gray <- "#C0C0C0"
ret <- (theme_bw()
+ theme(
@@ -79,53 +95,3 @@ 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
-##' @examples
-##' library(scales)
-##' show_col(excel10_pal()(10))
-excel10_pal <- function() {
- manual_pal(ggthemes_data$excel$excel10)
-}
-
-##' 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")
View
5 R/few.R
@@ -12,6 +12,7 @@
##'
##' @export
##' @param palette One of "medium", "dark", or "light"
+##' @family colour few
##' @examples
##' library(scales)
##' show_col(few_pal()(7))
@@ -32,7 +33,7 @@ few_pal <- function(palette="medium") {
##'
##' @inheritParams ggplot2::scale_colour_hue
##' @inheritParams few_pal
-##' @family colour scales
+##' @family colour few
##' @rdname scale_few
##' @export
##' @examples
@@ -68,7 +69,7 @@ scale_fill_few <- function(palette="light", ...) {
##' Rules for Using Color in Charts"}.
##'
##' @inheritParams ggplot2::theme_bw
-##' @family themes
+##' @family themes few
##' @export
##'
##' @seealso \code{\link{scale_colour_few}} for exaples.
View
1 R/geom-rangeframe.R
@@ -23,6 +23,7 @@
##' @references Tufte, Edward R. (2001) The Visual Display of
##' Quantitative Information, Chapter 6.
##'
+##' @family geom tufte
##' @examples
##' (ggplot(mtcars, aes(wt, mpg))
##' + geom_point() + geom_rangeframe()
View
1 R/geom-tufteboxplot.R
@@ -25,6 +25,7 @@
##' the same thing as the notch does in a standard boxplot.
##' @param boxwidth a number between 0 and 1 which represents the
##' relative width of the box to the middle line.
+##' @family geom tufte
##' @export
##'
##' @examples
View
12 R/ggthemes-data.R
@@ -12,9 +12,9 @@
##' }
##' \item{excel}{
##' \code{list} Various Excel color palettes.
-##' \code{excel2003} The Excel 2003 line color palette.
-##' \code{excel2003fill} The Excel 2003 bar chart color palette.
-##' \code{excel10} Color palette from more recent versions of Excel.
+##' \code{line} The Excel 2003 line color palette.
+##' \code{fill} The Excel 2003 bar chart color palette.
+##' \code{new} Color palette from more recent versions of Excel.
##' Color RGB values from \url{http://vis.stanford.edu/color-names/analyzer/}.
##' }
##' \item{solarized}{
@@ -126,13 +126,13 @@ ggthemes_data <- {
## Excel Colors
x$excel <-
- list(excel2003 =
+ list(line =
c("#FF00FF", "#FFFF00", "#00FFFF", "#800080",
"#800000", "#008080", "#0000FF"),
- excel2003fill =
+ fill =
c("#993366", "#FFFFCC", "#CCFFFF", "#660066",
"#FF8080", "#0066CC", "#CCCCFF"),
- excel10 =
+ new =
c("#365e96", "#983334", "#77973d", "#5d437c", "#36869f",
"#d1702f", "#8197c5", "#c47f80", "#acc484", "#9887b0"))
View
15 R/shapes.R
@@ -1,7 +1,6 @@
##' Shape palette from Cleveland "Elements of Graphing Data" (discrete).
##'
##' @param overlap \code{logical} Use the scale for overlapping points?
-##' @export
##'
##' @note In the Elements of Graphing Data, Cleveland suggests two
##' shapes palettes for scatter plots: one for overlapping data and
@@ -33,6 +32,8 @@
##' Journal of Computational and Graphical Statistics,
##' \url{http://www.jstor.org/stable/1390760}
##'
+##' @family shapes
+##' @export
cleveland_shape_pal <- function(overlap=TRUE) {
function(n) {
maxshapes <- 5
@@ -68,6 +69,7 @@ cleveland_shape_pal <- function(overlap=TRUE) {
##' @inheritParams cleveland_shape_pal
##' @export
##'
+##' @family shapes
##' @seealso \code{\link{cleveland_shape_pal}} for a description of the palette.
##' @references
##' Cleveland WS. The Elements of Graphing Data. Revised Edition. Hobart Press, Summit, NJ, 1994,
@@ -109,7 +111,7 @@ scale_shape_cleveland <- function(overlap=TRUE, ...) {
##' solid, hollow, half-filled, with two additional fill amounts:
##' three-quarters, and one-quarter.
##'
-##'
+##'
##'
##' @references
##' Lewandowsky, Stephan and Ian Spence (1989)
@@ -118,6 +120,7 @@ scale_shape_cleveland <- function(overlap=TRUE, ...) {
##' @examples
##' (ggplot(mtcars, aes(x=mpg, y=hp, shape=factor(cyl)))
##' + geom_point() + scale_shape_tremmel())
+##' @family shapes
##' @export
circlefill_shape_pal <- function() {
maxshapes <- 5
@@ -141,6 +144,7 @@ circlefill_shape_pal <- function() {
##'
##' @inheritParams ggplot2::scale_x_discrete
##' @inheritParams circlefill_shape_pal
+##' @family shapes
##' @seealso
##' \code{\link{circlefill_shape_pal}} for a description of the palette.
scale_shape_circlefill <- function(...) {
@@ -163,16 +167,17 @@ scale_shape_circlefill <- function(...) {
##' If more than three groups of data, then separate the groups into
##' different plots.
##'
-##' @export
##' @param overlap use an empty circle instead of a solid circle when
##' \code{n == 2}.
##' @param n3alt If \code{TRUE} then use a solid circle, plus sign and
##' empty triangle, else use a solid circle, empty circle, and empty
##' triangle.
+##' @family shapes
##' @references
##' Tremmel, Lothar, (1995) "The Visual Separability of Plotting Symbols in Scatterplots"
##' Journal of Computational and Graphical Statistics,
##' \url{http://www.jstor.org/stable/1390760}
+##' @export
tremmel_shape_pal <- function(overlap=FALSE, n3alt=TRUE) {
maxshapes <- 3
function (n) {
@@ -206,7 +211,7 @@ tremmel_shape_pal <- function(overlap=FALSE, n3alt=TRUE) {
##'
##' @inheritParams ggplot2::scale_x_discrete
##' @inheritParams tremmel_shape_pal
-##' @export
+##'
##'
##' @seealso \code{\link{tremmel_shape_pal}} for a description of the palette.
##' @examples
@@ -218,6 +223,8 @@ tremmel_shape_pal <- function(overlap=FALSE, n3alt=TRUE) {
##' + geom_point() + scale_shape_tremmel())
##' (ggplot(mtcars, aes(x=mpg, y=hp, shape=factor(am)))
##' + geom_point() + scale_shape_tremmel(overlap=TRUE))
+##' @family shapes
+##' @export
scale_shape_tremmel <- function(overlap=FALSE, n3alt=TRUE, ...) {
discrete_scale("shape", "tremmel", tremmel_shape_pal(overlap=overlap, n3alt=n3alt), ...)
}
View
4 R/solarized.R
@@ -27,6 +27,7 @@ solarized_rebase <- function(light=TRUE) {
##'
##' @param accent \code{character} Primary accent color.
##' @export
+##' @family solarized colour
##' @examples
##' library(scales)
##' show_col(solarized_pal()(2))
@@ -70,6 +71,7 @@ solarized_pal <- function(accent="blue") {
##' @inheritParams solarized_pal
##' @family colour scales
##' @rdname scale_solarized
+##' @family solarized colour
##' @export
##' @examples
##' dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
@@ -102,7 +104,7 @@ scale_color_solarized <- scale_colour_solarized
##' @param base_family base font family
##' @param light \code{logical}. Light or dark theme?
##' @export
-##' @family themes
+##' @family themes solarized
##' @examples
##' dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
##' (qplot(carat, price, data=dsamp, colour=clarity)
View
14 R/stata.R
@@ -4,6 +4,7 @@
##'
##' @param scheme \code{character}. One of "s2color", "s1rcolor", "s1color", or "mono".
##' @export
+##' @family stata colour
##' @examples
##' library(scales)
##' show_col(stata_pal("s2color")(15))
@@ -35,7 +36,7 @@ stata_pal <- function(scheme="s2color") {
##'
##' @inheritParams stata_pal
##' @inheritParams ggplot2::scale_colour_hue
-##' @family colour scales stata
+##' @family colour stata
##' @rdname scale_stata
##' @export
##' @examples
@@ -225,6 +226,7 @@ theme_stata_colors <- function(scheme="s2color") {
##' ## s1color
##' (q1 + theme_stata("s1color") + scale_colour_stata("s1color"))
##' (q2 + theme_stata("s1color"))
+##' \dontrun{
##' ## s1rcolor
##' (q1 + theme_stata("s1rcolor") + scale_colour_stata("s1rcolor"))
##' (ggplot(dsamp, aes(x=carat, y=price)) + geom_point(colour="white")
@@ -233,6 +235,7 @@ theme_stata_colors <- function(scheme="s2color") {
##' ## s1mono
##' (q1mono + theme_stata("s1mono") + scale_colour_stata("mono"))
##' (q2 + theme_stata("s1mono"))
+##' }
theme_stata <- function(scheme="s2color", base_size = 11, base_family = "sans") {
## Sizes
(theme_stata_base(base_size=eval(base_size), base_family=base_family)
@@ -245,6 +248,7 @@ theme_stata <- function(scheme="s2color", base_size = 11, base_family = "sans")
##' specifically the scheme s2mono.
##'
##' @export
+##' @family shapes stata
##' @seealso See \code{\link{scale_shape_stata}} for examples.
stata_shape_pal <- function() {
## From s1mono, ignore small shapes
@@ -262,7 +266,7 @@ stata_shape_pal <- function() {
##' specifically the one in scheme s1mono.
##'
##' @inheritParams ggplot2::scale_x_discrete
-##' @family shape scales stata
+##' @family shape stata
##' @export
##' @examples
##' dsmall <- diamonds[sample(nrow(diamonds), 100), ]
@@ -275,6 +279,7 @@ scale_shape_stata <- function (...) {
##'
##' Linetype palette based on the linepattern scheme in Stata.
##'
+##' @family linetype stata
##' @export
##' @seealso \code{\link{scale_linetype_stata}}
stata_linetype_pal <- function() {
@@ -289,7 +294,7 @@ stata_linetype_pal <- function() {
##' Linetype scale based on the linepatterns used in Stata.
##'
##' @inheritParams ggplot2::scale_x_discrete
-##' @family linetype scales stata
+##' @family linetype stata
##' @export
##' @examples
##' library(reshape2) # for melt
@@ -404,6 +409,3 @@ stata_gsize <-
## vlarge = rep(12, 4),
## vsmall = rep(0.6, 4),
## zero = rep(0, 4))
-
-
-
View
7 R/tableau.R
@@ -1,4 +1,4 @@
-##' Tabaleau Color Palettes (discrete)
+##' Tableau Color Palettes (discrete)
##'
##' Color palettes used by
##' \href{http://www.tableausoftware.com/}{Trableau}.
@@ -18,6 +18,7 @@
##' Factors in Computing Systems (CHI)
##' \url{http://vis.stanford.edu/files/2012-ColorNameModels-CHI.pdf}.
##'
+##' @family colour tableau
##' @examples
##' library(scales)
##' show_col(tableau_color_pal("tableau20")(20))
@@ -62,7 +63,7 @@ tableau_color_pal <- function(palette = "tableau10") {
##'
##' @inheritParams ggplot2::scale_colour_hue
##' @inheritParams tableau_color_pal
-##' @family colour scales
+##' @family colour tableau
##' @rdname scale_color_tableau
##' @export
##' @seealso \code{\link{tableau_color_pal}} for references.
@@ -100,6 +101,7 @@ scale_color_tableau <- scale_colour_tableau
##'
##' @export
##' @param palette Palette name
+##' @family shape tableau
##' @examples
##' show_shapes(tableau_shape_pal()(5))
tableau_shape_pal <- function(palette="default") {
@@ -114,6 +116,7 @@ tableau_shape_pal <- function(palette="default") {
##' @export
##' @inheritParams tableau_shape_pal
##' @inheritParams ggplot2::scale_x_discrete
+##' @family shape tableau
##' @examples
##' dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
##' p <- qplot(carat, price, data=dsamp, shape=clarity)
View
8 R/theme-foundation.R
@@ -66,7 +66,7 @@ theme_foundation_sizes <- function() {
axis.text = element_text(size = rel(0.8)),
axis.text.x = element_text(vjust = 1),
legend.text = element_text(size = rel(0.8)),
- legend.title = element_text(size = rel(0.8), hjust = 0),
+ legend.title = element_text(size = rel(0.8), hjust = 0),
panel.grid.minor = element_line(size = 0.25),
plot.title = element_text(size = rel(1.2)),
strip.text.y = element_text(angle = -90)
@@ -79,17 +79,17 @@ theme_foundation_sizes <- function() {
##' This theme is designed to be a foundation from which to build new
##' themes, and not meant to be used directly. \code{theme_foundation}
##' is a complete theme with only minimal number of elements defined.
-##'
+##'
##' It is easier to create new themes by extending this one rather
##' than \code{theme_gray} or \code{theme_bw}, because those themes
##' those themes define elements deep in the hierarchy.
-##'
+##'
##' @param base_size Base font size.
##' @param base_family Base font family.
##' @param use_sizes If \code{TRUE}, then define sizes and locations
##' with reasonable defaults taken from \code{\link{theme_gray}}.
##'
-##' @rdname theme_foundation
+##' @family themes
##' @export
theme_foundation <- function(base_size=12, base_family="", use_sizes=TRUE) {
thm <- theme_foundation_null(base_size=base_size, base_family=base_family)
View
2 R/tufte.R
@@ -20,6 +20,7 @@
##' @references Tufte, Edward R. (2001) The Visual Display of
##' Quantitative Information, Chapter 6.
##'
+##' @family themes tufte
##' @examples
##' # with ticks and range frames
##' (ggplot(mtcars, aes(wt, mpg))
@@ -58,4 +59,3 @@ theme_tufte <- function(ticks=TRUE, base_family="serif", base_size=11) {
}
ret
}
-
View
4 R/wsj.R
@@ -77,7 +77,7 @@ theme_wsj <- function(base_size=12, color="brown", base_family="sans", title_fam
##' must be a name in
##' \code{\link[=ggthemes_data]{ggthemes_data$wsj$palettes}}.
##'
-##' @family palettes wsj
+##' @family colour wsj
##' @export
wsj_pal <- function(palette) {
if (palette %in% names(ggthemes_data$wsj$palettes)) {
@@ -95,7 +95,7 @@ wsj_pal <- function(palette) {
##'
##' @inheritParams ggplot2::scale_colour_hue
##' @inheritParams wsj_pal
-##' @family colour scales wsj
+##' @family colour wsj
##' @rdname scale_wsj
##' @export
scale_colour_wsj <- function(palette, ...) {
View
10 README.Rmd
@@ -29,7 +29,7 @@ Quantitative Information*.
- ``scale_color_solarized``: [Solarized](http://ethanschoonover.com/solarized) colors
- ``scale_color_economist``: colors used in plots in plots in *The Economist*.
- ``scale_color_stata``, ``scale_shapes_stata``, ``scale_linetype_stata``: color, shape, and linetype palettes from Stata graph schemes.
-- ``scale_color_excel10``, ``scale_color_excel2003``: colors from new and old Excel.
+- ``scale_color_excel10``: colors from new and old Excel.
- ``scale_color_tableau``, ``scale_shape_tableau``: color and shape palettes from [Tableau](http://www.tableausoftware.com/).
- ``scale_shape_cleveland``, ``scale_shape_tremmel``, ``scale_shape_circlefill``: shape scales from classic works in visual perception: Cleveland,
Tremmel (1995), and Lewandowsky and Spence (1989).
@@ -144,16 +144,16 @@ and pies not included. Please never use this theme.
```{r excel1}
(qplot(carat, price, data=dsamp, colour=cut)
- + theme_excel2003()
- + scale_colour_excel2003())
+ + theme_excel()
+ + scale_colour_excel())
```
```{r excel2}
(ggplot(diamonds, aes(clarity, fill=cut))
+ geom_bar()
- + scale_fill_excel2003()
- + theme_excel2003())
+ + scale_fill_excel()
+ + theme_excel())
```
## Inverse Gray Theme
View
34 README.md
@@ -27,7 +27,7 @@ Quantitative Information*.
- ``scale_color_solarized``: [Solarized](http://ethanschoonover.com/solarized) colors
- ``scale_color_economist``: colors used in plots in plots in *The Economist*.
- ``scale_color_stata``, ``scale_shapes_stata``, ``scale_linetype_stata``: color, shape, and linetype palettes from Stata graph schemes.
-- ``scale_color_excel10``, ``scale_color_excel2003``: colors from new and old Excel.
+- ``scale_color_excel10``: colors from new and old Excel.
- ``scale_color_tableau``, ``scale_shape_tableau``: color and shape palettes from [Tableau](http://www.tableausoftware.com/).
- ``scale_shape_cleveland``, ``scale_shape_tremmel``, ``scale_shape_circlefill``: shape scales from classic works in visual perception: Cleveland,
Tremmel (1995), and Lewandowsky and Spence (1989).
@@ -84,7 +84,7 @@ Quantitative Information*.
(ggplot(mtcars, aes(wt, mpg)) + geom_point() + geom_rangeframe() + theme_tufte())
```
-![plot of chunk tufte-rangeframe](http://i.imgur.com/tiJ4p.png)
+![plot of chunk tufte-rangeframe](http://i.imgur.com/Nd4NL.png)
The Tufte minimal boxplot.
@@ -94,7 +94,7 @@ The Tufte minimal boxplot.
(ggplot(mtcars, aes(factor(cyl), mpg)) + theme_tufte(ticks = FALSE) + geom_tufteboxplot())
```
-![plot of chunk tufteboxplot](http://i.imgur.com/Jtaci.png)
+![plot of chunk tufteboxplot](http://i.imgur.com/cP2re.png)
## Economist theme
@@ -108,7 +108,7 @@ magazine.
ggtitle("Diamonds Are Forever"))
```
-![plot of chunk economist](http://i.imgur.com/itonH.png)
+![plot of chunk economist](http://i.imgur.com/VbJ2j.png)
## Solarized theme
@@ -122,7 +122,7 @@ The light theme.
(qplot(carat, price, data = dsamp, colour = cut) + theme_solarized() + scale_colour_solarized("blue"))
```
-![plot of chunk solarized-light](http://i.imgur.com/aenrJ.png)
+![plot of chunk solarized-light](http://i.imgur.com/5Q0r9.png)
The dark theme.
@@ -133,7 +133,7 @@ The dark theme.
scale_colour_solarized("red"))
```
-![plot of chunk solarized-dark](http://i.imgur.com/rVHYq.png)
+![plot of chunk solarized-dark](http://i.imgur.com/7xxKm.png)
## Stata theme
@@ -147,7 +147,7 @@ schemes in Stata.
ggtitle("Plot Title"))
```
-![plot of chunk stata](http://i.imgur.com/Z2Hbe.png)
+![plot of chunk stata](http://i.imgur.com/Gziqn.png)
## Excel 2003 theme
@@ -157,19 +157,19 @@ and pies not included. Please never use this theme.
```r
-(qplot(carat, price, data = dsamp, colour = cut) + theme_excel2003() + scale_colour_excel2003())
+(qplot(carat, price, data = dsamp, colour = cut) + theme_excel() + scale_colour_excel())
```
-![plot of chunk excel1](http://i.imgur.com/45m9x.png)
+![plot of chunk excel1](http://i.imgur.com/GgLnz.png)
```r
-(ggplot(diamonds, aes(clarity, fill = cut)) + geom_bar() + scale_fill_excel2003() +
- theme_excel2003())
+(ggplot(diamonds, aes(clarity, fill = cut)) + geom_bar() + scale_fill_excel() +
+ theme_excel())
```
-![plot of chunk excel2](http://i.imgur.com/n9OPs.png)
+![plot of chunk excel2](http://i.imgur.com/MAO7f.png)
## Inverse Gray Theme
@@ -181,7 +181,7 @@ Inverse of `theme_gray`, i.e. white plot area and gray background.
(qplot(carat, price, data = dsamp, colour = cut) + theme_igray())
```
-![plot of chunk igray](http://i.imgur.com/C6MF9.png)
+![plot of chunk igray](http://i.imgur.com/gZOhU.png)
@@ -194,15 +194,15 @@ Color, fill, and shape scales based on those used in the Tableau softare.
(qplot(carat, price, data = dsamp, colour = cut) + theme_igray() + scale_colour_tableau())
```
-![plot of chunk tableau](http://i.imgur.com/5Mswj.png)
+![plot of chunk tableau](http://i.imgur.com/nXcv7.png)
```r
(qplot(carat, price, data = dsamp, colour = cut) + theme_igray() + scale_colour_tableau("colorblind10"))
```
-![plot of chunk tableau-colorbind10](http://i.imgur.com/p3Hve.png)
+![plot of chunk tableau-colorbind10](http://i.imgur.com/wBTnd.png)
## Stephen Few's Practical Rules for Using Color ...
@@ -214,7 +214,7 @@ Color palette and theme based on Stephen Few's ["Practical Rules for Using Color
(qplot(carat, price, data = dsamp, colour = cut) + theme_few() + scale_colour_few())
```
-![plot of chunk few](http://i.imgur.com/YFqAC.png)
+![plot of chunk few](http://i.imgur.com/20iab.png)
## Wall Street Journal
@@ -227,5 +227,5 @@ Theme and some color palettes based on plots in the *The Wall Street Journal*.
"") + ggtitle("Diamond Prices"))
```
-![plot of chunk wsj](http://i.imgur.com/hkeHW.png)
+![plot of chunk wsj](http://i.imgur.com/hQhVq.png)
View
7 man/circlefill_shape_pal.Rd
@@ -20,4 +20,11 @@
American Statistical Assocation,
\url{http://www.jstor.org/stable/2289649}
}
+\seealso{
+ Other shapes: \code{\link{cleveland_shape_pal}},
+ \code{\link{scale_shape_circlefill}},
+ \code{\link{scale_shape_cleveland}},
+ \code{\link{scale_shape_tremmel}},
+ \code{\link{tremmel_shape_pal}}
+}
View
7 man/cleveland_shape_pal.Rd
@@ -48,4 +48,11 @@ dsamp <- diamonds[sample(nrow(diamonds), 100), ]
Computational and Graphical Statistics,
\url{http://www.jstor.org/stable/1390760}
}
+\seealso{
+ Other shapes: \code{\link{circlefill_shape_pal}},
+ \code{\link{scale_shape_circlefill}},
+ \code{\link{scale_shape_cleveland}},
+ \code{\link{scale_shape_tremmel}},
+ \code{\link{tremmel_shape_pal}}
+}
View
6 man/economist_pal.Rd
@@ -23,4 +23,10 @@ show_col(economist_pal(fill=TRUE)(6))
## RGB values from Stata's economist scheme
show_col(economist_pal(stata=TRUE)(16))
}
+\seealso{
+ Other colour economist:
+ \code{\link{scale_color_economist}},
+ \code{\link{scale_colour_economist}},
+ \code{\link{scale_fill_economist}}
+}
View
19 man/excel10_pal.Rd
@@ -1,19 +0,0 @@
-\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/}.
-}
-\examples{
-library(scales)
-show_col(excel10_pal()(10))
-}
-\seealso{
- \code{\link{excel2003_pal}} for an uglier color palette,
- and \code{\link{scale_colour_excel10}} for examples.
-}
-
View
19 man/excel2003_pal.Rd
@@ -1,19 +0,0 @@
-\name{excel2003_pal}
-\alias{excel2003_pal}
-\title{Excel 2003 color palette (discrete)}
-\usage{
- excel2003_pal(fill = FALSE)
-}
-\arguments{
- \item{fill}{\code{logical} Use the fill palette?}
-}
-\description{
- Color palettes from Excel 2003. For ironical purposes
- only.
-}
-\examples{
-library(scales)
-show_col(excel2003_pal()(8))
-show_col(excel2003_pal(fill=TRUE)(8))
-}
-
View
26 man/excel_pal.Rd
@@ -0,0 +1,26 @@
+\name{excel_pal}
+\alias{excel_pal}
+\title{Excel color palette (discrete)}
+\usage{
+ excel_pal(palette = "line")
+}
+\arguments{
+ \item{palette}{One of "old", "fill", or "new".}
+}
+\description{
+ Color palettes from Excel, both current and the pre-2007
+ ugly palettes.
+}
+\details{
+ The color palettes are \describe{ \item{line}{Excel 2003
+ default color palette.} \item{fill}{Excel 2003 bar chart
+ color palette.} \item{new}{Color palette from newer Excel
+ versions.} }
+}
+\examples{
+library(scales)
+show_col(excel_pal()(8))
+show_col(excel_pal("fill")(8))
+show_col(excel_pal("new")(10))
+}
+
View
5 man/few_pal.Rd
@@ -23,4 +23,9 @@ show_col(few_pal()(7))
show_col(few_pal("dark")(7))
show_col(few_pal("light")(7))
}
+\seealso{
+ Other colour few: \code{\link{scale_color_few}},
+ \code{\link{scale_colour_few}},
+ \code{\link{scale_fill_few}}
+}
View
3 man/geom_rangeframe.Rd
@@ -57,4 +57,7 @@
Tufte, Edward R. (2001) The Visual Display of
Quantitative Information, Chapter 6.
}
+\seealso{
+ Other geom tufte: \code{\link{geom_tufteboxplot}}
+}
View
2 man/geom_tufteboxplot.Rd
@@ -71,5 +71,7 @@ p + geom_tufteboxplot(usebox=TRUE, fatten=1)
}
\seealso{
\code{\link{geom_boxplot}}
+
+ Other geom tufte: \code{\link{geom_rangeframe}}
}
View
6 man/ggthemes_data.Rd
@@ -11,9 +11,9 @@ colors, \code{fg} are foreground colors.
}
\item{excel}{
\code{list} Various Excel color palettes.
-\code{excel2003} The Excel 2003 line color palette.
-\code{excel2003fill} The Excel 2003 bar chart color palette.
-\code{excel10} Color palette from more recent versions of Excel.
+\code{line} The Excel 2003 line color palette.
+\code{fill} The Excel 2003 bar chart color palette.
+\code{new} Color palette from more recent versions of Excel.
Color RGB values from \url{http://vis.stanford.edu/color-names/analyzer/}.
}
\item{solarized}{
View
13 man/scale_color_tableau.Rd
@@ -37,17 +37,6 @@ p + scale_colour_tableau("greenorange12")
\seealso{
\code{\link{tableau_color_pal}} for references.
- Other colour scales: \code{\link{scale_color_excel10}},
- \code{\link{scale_color_excel2003}},
- \code{\link{scale_color_few}},
- \code{\link{scale_color_solarized}},
- \code{\link{scale_colour_excel10}},
- \code{\link{scale_colour_excel2003}},
- \code{\link{scale_colour_few}},
- \code{\link{scale_colour_solarized}},
- \code{\link{scale_fill_excel10}},
- \code{\link{scale_fill_excel2003}},
- \code{\link{scale_fill_few}},
- \code{\link{scale_fill_solarized}}
+ Other colour tableau: \code{\link{tableau_color_pal}}
}
View
2 man/scale_economist.Rd
@@ -25,5 +25,7 @@
}
\seealso{
\code{\link{theme_economist}} for examples.
+
+ Other colour economist: \code{\link{economist_pal}}
}
View
36 man/scale_excel.Rd
@@ -0,0 +1,36 @@
+\name{scale_fill_excel}
+\alias{scale_color_excel}
+\alias{scale_colour_excel}
+\alias{scale_fill_excel}
+\title{Excel color scales}
+\usage{
+ scale_fill_excel(palette = "line", ...)
+
+ scale_colour_excel(palette = "fill", ...)
+
+ scale_color_excel(palette = "fill", ...)
+}
+\arguments{
+ \item{palette}{One of "old", "fill", or "new".}
+
+ \item{...}{Other arguments passed on to
+ \code{\link{discrete_scale}} to control name, limits,
+ breaks, labels and so forth.}
+}
+\description{
+ Excel color scales
+}
+\examples{
+dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+(qplot(carat, price, data=dsamp, colour=clarity)
+ + theme_igray()
+ + scale_colour_excel("new"))
+}
+\seealso{
+ See \code{\link{theme_excel}} for examples.
+
+ Other colour scales: \code{\link{scale_color_solarized}},
+ \code{\link{scale_colour_solarized}},
+ \code{\link{scale_fill_solarized}}
+}
+
View
41 man/scale_excel10.Rd
@@ -1,41 +0,0 @@
-\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_excel2003}},
- \code{\link{scale_color_few}},
- \code{\link{scale_color_solarized}},
- \code{\link{scale_color_tableau}},
- \code{\link{scale_colour_excel2003}},
- \code{\link{scale_colour_few}},
- \code{\link{scale_colour_solarized}},
- \code{\link{scale_colour_tableau}},
- \code{\link{scale_fill_excel2003}},
- \code{\link{scale_fill_few}},
- \code{\link{scale_fill_solarized}},
- \code{\link{scale_fill_tableau}}
-}
-
View
40 man/scale_excel2003.Rd
@@ -1,40 +0,0 @@
-\name{scale_fill_excel2003}
-\alias{scale_color_excel2003}
-\alias{scale_colour_excel2003}
-\alias{scale_fill_excel2003}
-\title{Excel 2003 color scales}
-\usage{
- scale_fill_excel2003(fill = TRUE, ...)
-
- scale_colour_excel2003(fill = FALSE, ...)
-
- scale_color_excel2003(fill = FALSE, ...)
-}
-\arguments{
- \item{fill}{\code{logical} Use the fill palette?}
-
- \item{...}{Other arguments passed on to
- \code{\link{discrete_scale}} to control name, limits,
- breaks, labels and so forth.}
-}
-\description{
- Color scales from Excel 2003. For ironical purposes only.
- Supports both the fill and line palettes.
-}
-\seealso{
- See \code{\link{theme_excel2003}} for examples.
-
- Other colour scales: \code{\link{scale_color_excel10}},
- \code{\link{scale_color_few}},
- \code{\link{scale_color_solarized}},
- \code{\link{scale_color_tableau}},
- \code{\link{scale_colour_excel10}},
- \code{\link{scale_colour_few}},
- \code{\link{scale_colour_solarized}},
- \code{\link{scale_colour_tableau}},
- \code{\link{scale_fill_excel10}},
- \code{\link{scale_fill_few}},
- \code{\link{scale_fill_solarized}},
- \code{\link{scale_fill_tableau}}
-}
-
View
13 man/scale_few.Rd
@@ -36,17 +36,6 @@ dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+ scale_fill_few("light"))
}
\seealso{
- Other colour scales: \code{\link{scale_color_excel10}},
- \code{\link{scale_color_excel2003}},
- \code{\link{scale_color_solarized}},
- \code{\link{scale_color_tableau}},
- \code{\link{scale_colour_excel10}},
- \code{\link{scale_colour_excel2003}},
- \code{\link{scale_colour_solarized}},
- \code{\link{scale_colour_tableau}},
- \code{\link{scale_fill_excel10}},
- \code{\link{scale_fill_excel2003}},
- \code{\link{scale_fill_solarized}},
- \code{\link{scale_fill_tableau}}
+ Other colour few: \code{\link{few_pal}}
}
View
3 man/scale_linetype_stata.Rd
@@ -22,4 +22,7 @@ rescale01 <- function(x) {(x - min(x)) / diff(range(x))}
ecm <- ddply(ecm, "variable", transform, value = rescale01(value))
qplot(date, value, data=ecm, geom="line", linetype=variable) + scale_linetype_stata()
}
+\seealso{
+ Other linetype stata: \code{\link{stata_linetype_pal}}
+}
View
6 man/scale_shape_circlefill.Rd
@@ -16,5 +16,11 @@
\seealso{
\code{\link{circlefill_shape_pal}} for a description of
the palette.
+
+ Other shapes: \code{\link{circlefill_shape_pal}},
+ \code{\link{cleveland_shape_pal}},
+ \code{\link{scale_shape_cleveland}},
+ \code{\link{scale_shape_tremmel}},
+ \code{\link{tremmel_shape_pal}}
}
View
6 man/scale_shape_cleveland.Rd
@@ -24,5 +24,11 @@
\seealso{
\code{\link{cleveland_shape_pal}} for a description of
the palette.
+
+ Other shapes: \code{\link{circlefill_shape_pal}},
+ \code{\link{cleveland_shape_pal}},
+ \code{\link{scale_shape_circlefill}},
+ \code{\link{scale_shape_tremmel}},
+ \code{\link{tremmel_shape_pal}}
}
View
3 man/scale_shape_tableau.Rd
@@ -21,4 +21,7 @@ dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
p <- qplot(carat, price, data=dsamp, shape=clarity)
p + scale_shape_tableau()
}
+\seealso{
+ Other shape tableau: \code{\link{tableau_shape_pal}}
+}
View
6 man/scale_shape_tremmel.Rd
@@ -33,5 +33,11 @@
\seealso{
\code{\link{tremmel_shape_pal}} for a description of the
palette.
+
+ Other shapes: \code{\link{circlefill_shape_pal}},
+ \code{\link{cleveland_shape_pal}},
+ \code{\link{scale_shape_circlefill}},
+ \code{\link{scale_shape_cleveland}},
+ \code{\link{tremmel_shape_pal}}
}
View
17 man/scale_solarized.Rd
@@ -28,17 +28,10 @@ dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+ scale_colour_solarized() )
}
\seealso{
- Other colour scales: \code{\link{scale_color_excel10}},
- \code{\link{scale_color_excel2003}},
- \code{\link{scale_color_few}},
- \code{\link{scale_color_tableau}},
- \code{\link{scale_colour_excel10}},
- \code{\link{scale_colour_excel2003}},
- \code{\link{scale_colour_few}},
- \code{\link{scale_colour_tableau}},
- \code{\link{scale_fill_excel10}},
- \code{\link{scale_fill_excel2003}},
- \code{\link{scale_fill_few}},
- \code{\link{scale_fill_tableau}}
+ Other colour scales: \code{\link{scale_color_excel}},
+ \code{\link{scale_colour_excel}},
+ \code{\link{scale_fill_excel}}
+
+ Other solarized colour: \code{\link{solarized_pal}}
}
View
3 man/scale_wsj.Rd
@@ -24,4 +24,7 @@
\code{\link{wsj_pal}} and are meant for use with
\code{\link{theme_wsj}}.
}
+\seealso{
+ Other colour wsj: \code{\link{wsj_pal}}
+}
View
6 man/solarized_pal.Rd
@@ -20,4 +20,10 @@ show_col(solarized_pal()(2))
show_col(solarized_pal()(3))
show_col(solarized_pal("red")(4))
}
+\seealso{
+ Other solarized colour:
+ \code{\link{scale_color_solarized}},
+ \code{\link{scale_colour_solarized}},
+ \code{\link{scale_fill_solarized}}
+}
View
2 man/stata_linetype_pal.Rd
@@ -10,5 +10,7 @@
}
\seealso{
\code{\link{scale_linetype_stata}}
+
+ Other linetype stata: \code{\link{scale_linetype_stata}}
}
View
7 man/tableau_color_pal.Rd
@@ -1,6 +1,6 @@
\name{tableau_color_pal}
\alias{tableau_color_pal}
-\title{Tabaleau Color Palettes (discrete)}
+\title{Tableau Color Palettes (discrete)}
\usage{
tableau_color_pal(palette = "tableau10")
}
@@ -37,4 +37,9 @@ show_col(tableau_color_pal("greenorange12")(12))
Design", ACM Human Factors in Computing Systems (CHI)
\url{http://vis.stanford.edu/files/2012-ColorNameModels-CHI.pdf}.
}
+\seealso{
+ Other colour tableau: \code{\link{scale_color_tableau}},
+ \code{\link{scale_colour_tableau}},
+ \code{\link{scale_fill_tableau}}
+}
View
3 man/tableau_shape_pal.Rd
@@ -14,4 +14,7 @@
\examples{
show_shapes(tableau_shape_pal()(5))
}
+\seealso{
+ Other shape tableau: \code{\link{scale_shape_tableau}}
+}
View
25 man/theme_excel2003.Rd → man/theme_excel.Rd
@@ -1,8 +1,8 @@
-\name{theme_excel2003}
-\alias{theme_excel2003}
-\title{ggplot color theme based on Excel 2003 plots}
+\name{theme_excel}
+\alias{theme_excel}
+\title{ggplot color theme based on old Excel plots}
\usage{
- theme_excel2003(horizontal = TRUE, base_size = 12,
+ theme_excel(horizontal = TRUE, base_size = 12,
base_family = "")
}
\arguments{
@@ -14,21 +14,22 @@
}
\description{
Theme to replicate the ugly monstrosity that was the
- Excel 2003 chart. Please never use this for anything
- other than irony.
+ Excel 2003 chart. Please never use this.
}
\examples{
dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+# Old line color palette
(qplot(carat, price, data=dsamp, colour=clarity)
- + theme_excel2003()
- + scale_colour_excel2003() )
+ + theme_excel()
+ + scale_colour_excel() )
+# Old fill color palette
(ggplot(diamonds, aes(clarity, fill=cut))
+ geom_bar()
-+ scale_fill_excel2003()
-+ theme_excel2003())
++ scale_fill_excel("fill")
++ theme_excel())
}
\seealso{
- Other themes: \code{\link{theme_few}},
- \code{\link{theme_igray}}, \code{\link{theme_solarized}}
+ Other themes: \code{\link{theme_foundation}},
+ \code{\link{theme_igray}}
}
View
3 man/theme_few.Rd
@@ -16,8 +16,5 @@
}
\seealso{
\code{\link{scale_colour_few}} for exaples.
-
- Other themes: \code{\link{theme_excel2003}},
- \code{\link{theme_igray}}, \code{\link{theme_solarized}}
}
View
4 man/theme_foundation.Rd
@@ -26,4 +26,8 @@
those themes those themes define elements deep in the
hierarchy.
}
+\seealso{
+ Other themes: \code{\link{theme_excel}},
+ \code{\link{theme_igray}}
+}
View
4 man/theme_igray.Rd
@@ -24,7 +24,7 @@ dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+ theme_igray())
}
\seealso{
- Other themes: \code{\link{theme_excel2003}},
- \code{\link{theme_few}}, \code{\link{theme_solarized}}
+ Other themes: \code{\link{theme_excel}},
+ \code{\link{theme_foundation}}
}
View
4 man/theme_solarized.Rd
@@ -35,8 +35,4 @@ dsamp <- diamonds[sample(nrow(diamonds), 1000), ]
+ theme_solarized()
+ scale_colour_solarized("blue"))
}
-\seealso{
- Other themes: \code{\link{theme_excel2003}},
- \code{\link{theme_few}}, \code{\link{theme_igray}}
-}
View
2 man/theme_stata.Rd
@@ -43,6 +43,7 @@ q1mono <- (qplot(carat, price, shape=clarity, color=clarity,
## s1color
(q1 + theme_stata("s1color") + scale_colour_stata("s1color"))
(q2 + theme_stata("s1color"))
+\dontrun{
## s1rcolor
(q1 + theme_stata("s1rcolor") + scale_colour_stata("s1rcolor"))
(ggplot(dsamp, aes(x=carat, y=price)) + geom_point(colour="white")
@@ -52,6 +53,7 @@ q1mono <- (qplot(carat, price, shape=clarity, color=clarity,
(q1mono + theme_stata("s1mono") + scale_colour_stata("mono"))
(q2 + theme_stata("s1mono"))
}
+}
\references{
\url{http://www.stata.com/help.cgi?schemes}
}
View
7 man/tremmel_shape_pal.Rd
@@ -36,4 +36,11 @@
Computational and Graphical Statistics,
\url{http://www.jstor.org/stable/1390760}
}
+\seealso{
+ Other shapes: \code{\link{circlefill_shape_pal}},
+ \code{\link{cleveland_shape_pal}},
+ \code{\link{scale_shape_circlefill}},
+ \code{\link{scale_shape_cleveland}},
+ \code{\link{scale_shape_tremmel}}
+}
View
5 man/wsj_pal.Rd
@@ -35,4 +35,9 @@
\item{colors6}{Red,blue,gold,green,orange, and black
palette. Examples: \url{http://twitpic.com/9gfg5q}.} }
}
+\seealso{
+ Other colour wsj: \code{\link{scale_color_wsj}},
+ \code{\link{scale_colour_wsj}},
+ \code{\link{scale_fill_wsj}}
+}

0 comments on commit 3b8151e

Please sign in to comment.
Something went wrong with that request. Please try again.