Merge pull request #923 from jiho/fix/theme_bw

hadley · hadley · commit 188c8e02b2a1 · 2014-03-17T16:50:21.000-05:00
New themes that do not overwrite existing ones
diff --git a/NAMESPACE b/NAMESPACE
@@ -391,7 +391,9 @@ export(theme_classic)
 export(theme_get)
 export(theme_gray)
 export(theme_grey)
+export(theme_light)
 export(theme_line)
+export(theme_linedraw)
 export(theme_minimal)
 export(theme_rect)
 export(theme_segment)
diff --git a/NEWS b/NEWS
@@ -3,6 +3,11 @@ ggplot2 0.9.3.1.99
 * `stat_ellipse()` adds data ellipses. It supports bivariate normal and t distributions,
   as well as a euclidian distance circle. (@jofrhwld, #926)
 
+* Add new themes: `theme_linedraw()` is similar to `theme_bw()` but with
+  truly only white and black elements and spacing between elements identical
+  to `theme_gray`. `theme_light` is similar but with light gray box and axes
+  around the plot, to emphasise content more (@jiho, #923)
+
 * Allow specifying only one of the limits in a scale and use the automatic
   calculation of the other limit by passing NA to to the limit function,
   `xlim()` or `ylim()` (@jimhester, #557).
diff --git a/R/theme-defaults.r b/R/theme-defaults.r
@@ -4,6 +4,7 @@
 #' @param base_family base font family
 #' @aliases theme_gray theme_grey
 #' @export theme_gray theme_grey
+#' @family themes
 theme_grey <- function(base_size = 12, base_family = "") {
   theme(
     # Elements in this first block aren't used directly, but are inherited
@@ -61,11 +62,12 @@ theme_grey <- function(base_size = 12, base_family = "") {
 theme_gray <- theme_grey
 
 
-#' A theme with white background and black gridlines.
+#' A theme with white background and dark gridlines.
 #'
 #' @param base_size base font size
 #' @param base_family base font family
 #' @export
+#' @family themes
 theme_bw <- function(base_size = 12, base_family = "") {
   # Starts with theme_grey and then modify some parts
   theme_grey(base_size = base_size, base_family = base_family) %+replace%
@@ -82,11 +84,76 @@ theme_bw <- function(base_size = 12, base_family = "") {
     )
 }
 
+#' A theme with white background and black gridlines.
+#'
+#' @param base_size base font size
+#' @param base_family base font family
+#' @export
+#' @family themes
+#' @examples
+#' p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg))
+#' p
+#' # 'classic' dark-on-light theme
+#' p + theme_bw()
+#' # this theme
+#' p + theme_linedraw()
+#' # variation with light box and axes legends
+#' p + theme_light()
+theme_linedraw <- function(base_size = 12, base_family = "") {
+  # Starts with theme_grey and then modify some parts
+  theme_grey(base_size = base_size, base_family = base_family) %+replace%
+    theme(
+      axis.text         = element_text(colour = "black", size = rel(0.8)),
+      axis.ticks        = element_line(colour = "black", size = 0.25),
+      legend.key        = element_rect(colour = "black", size = 0.25),
+      panel.background  = element_rect(fill = "white", colour = NA),
+      panel.border      = element_rect(fill = NA, colour = "black", size = 0.5),
+      panel.grid.major  = element_line(colour = "black", size = 0.05),
+      panel.grid.minor  = element_line(colour = "black", size = 0.01),
+      strip.background  = element_rect(fill = "black", colour = NA),
+      strip.text.x      = element_text(colour = "white"),
+      strip.text.y      = element_text(colour = "white", angle = -90)
+    )
+}
+
+#' A theme with white background and light grey lines
+#'
+#' @param base_size base font size
+#' @param base_family base font family
+#' @export
+#' @family themes
+#' @examples
+#' p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg))
+#' p
+#' # 'classic' dark-on-light theme
+#' p + theme_bw()
+#' # this theme
+#' p + theme_light()
+#' # variation with dark box and axes legends
+#' p + theme_linedraw()
+theme_light <- function(base_size = 12, base_family = "") {
+  # Starts with theme_grey and then modify some parts
+  theme_grey(base_size = base_size, base_family = base_family) %+replace%
+    theme(
+      axis.ticks        = element_line(colour = "grey50", size = 0.25),
+      legend.key        = element_rect(fill = "white", colour = "grey50", size = 0.25),
+      panel.background  = element_rect(fill = "white", colour = NA),
+      panel.border      = element_rect(fill = NA, colour = "grey50", size = 0.5),
+      panel.grid.major  = element_line(colour = "grey80", size = 0.25),
+      panel.grid.minor  = element_line(colour = "grey92", size = 0.125),
+      strip.background  = element_rect(fill = "grey50", colour = NA),
+      strip.text.x      = element_text(colour = "white"),
+      strip.text.y      = element_text(colour = "white", angle = -90)
+    )
+
+}
+
 #' A minimalistic theme with no background annotations.
 #'
 #' @param base_size base font size
 #' @param base_family base font family
 #' @export
+#' @family themes
 theme_minimal <- function(base_size = 12, base_family = "") {
   # Starts with theme_bw and then modify some parts
   theme_bw(base_size = base_size, base_family = base_family) %+replace%
@@ -105,6 +172,7 @@ theme_minimal <- function(base_size = 12, base_family = "") {
 #' @param base_size base font size
 #' @param base_family base font family
 #' @export
+#' @family themes
 theme_classic <- function(base_size = 12, base_family = ""){
   theme_bw(base_size = base_size, base_family = base_family) %+replace%
     theme(
diff --git a/man/theme_bw.Rd b/man/theme_bw.Rd
@@ -1,7 +1,7 @@
 % Generated by roxygen2 (4.0.0): do not edit by hand
 \name{theme_bw}
 \alias{theme_bw}
-\title{A theme with white background and black gridlines.}
+\title{A theme with white background and dark gridlines.}
 \usage{
 theme_bw(base_size = 12, base_family = "")
 }
@@ -11,6 +11,12 @@ theme_bw(base_size = 12, base_family = "")
   \item{base_family}{base font family}
 }
 \description{
-A theme with white background and black gridlines.
+A theme with white background and dark gridlines.
+}
+\seealso{
+Other themes: \code{\link{theme_classic}};
+  \code{\link{theme_gray}}, \code{\link{theme_grey}};
+  \code{\link{theme_light}}; \code{\link{theme_linedraw}};
+  \code{\link{theme_minimal}}
 }
 
diff --git a/man/theme_classic.Rd b/man/theme_classic.Rd
@@ -13,4 +13,10 @@ theme_classic(base_size = 12, base_family = "")
 \description{
 A classic-looking theme, with x and y axis lines and no gridlines.
 }
+\seealso{
+Other themes: \code{\link{theme_bw}};
+  \code{\link{theme_gray}}, \code{\link{theme_grey}};
+  \code{\link{theme_light}}; \code{\link{theme_linedraw}};
+  \code{\link{theme_minimal}}
+}
 
diff --git a/man/theme_grey.Rd b/man/theme_grey.Rd
@@ -14,4 +14,9 @@ theme_grey(base_size = 12, base_family = "")
 \description{
 A theme with grey background and white gridlines.
 }
+\seealso{
+Other themes: \code{\link{theme_bw}};
+  \code{\link{theme_classic}}; \code{\link{theme_light}};
+  \code{\link{theme_linedraw}}; \code{\link{theme_minimal}}
+}
 
diff --git a/man/theme_light.Rd b/man/theme_light.Rd
@@ -0,0 +1,32 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
+\name{theme_light}
+\alias{theme_light}
+\title{A theme with white background and light grey lines}
+\usage{
+theme_light(base_size = 12, base_family = "")
+}
+\arguments{
+  \item{base_size}{base font size}
+
+  \item{base_family}{base font family}
+}
+\description{
+A theme with white background and light grey lines
+}
+\examples{
+p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg))
+p
+# 'classic' dark-on-light theme
+p + theme_bw()
+# this theme
+p + theme_light()
+# variation with dark box and axes legends
+p + theme_linedraw()
+}
+\seealso{
+Other themes: \code{\link{theme_bw}};
+  \code{\link{theme_classic}}; \code{\link{theme_gray}},
+  \code{\link{theme_grey}}; \code{\link{theme_linedraw}};
+  \code{\link{theme_minimal}}
+}
+
diff --git a/man/theme_linedraw.Rd b/man/theme_linedraw.Rd
@@ -0,0 +1,32 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
+\name{theme_linedraw}
+\alias{theme_linedraw}
+\title{A theme with white background and black gridlines.}
+\usage{
+theme_linedraw(base_size = 12, base_family = "")
+}
+\arguments{
+  \item{base_size}{base font size}
+
+  \item{base_family}{base font family}
+}
+\description{
+A theme with white background and black gridlines.
+}
+\examples{
+p <- ggplot(mtcars) + geom_point(aes(x = wt, y = mpg))
+p
+# 'classic' dark-on-light theme
+p + theme_bw()
+# this theme
+p + theme_linedraw()
+# variation with light box and axes legends
+p + theme_light()
+}
+\seealso{
+Other themes: \code{\link{theme_bw}};
+  \code{\link{theme_classic}}; \code{\link{theme_gray}},
+  \code{\link{theme_grey}}; \code{\link{theme_light}};
+  \code{\link{theme_minimal}}
+}
+
diff --git a/man/theme_minimal.Rd b/man/theme_minimal.Rd
@@ -13,4 +13,10 @@ theme_minimal(base_size = 12, base_family = "")
 \description{
 A minimalistic theme with no background annotations.
 }
+\seealso{
+Other themes: \code{\link{theme_bw}};
+  \code{\link{theme_classic}}; \code{\link{theme_gray}},
+  \code{\link{theme_grey}}; \code{\link{theme_light}};
+  \code{\link{theme_linedraw}}
+}
 

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,9 @@ theme_grey(base_size = 12, base_family = "")`
`14`	`14`	`\description{`
`15`	`15`	`A theme with grey background and white gridlines.`
`16`	`16`	`}`
	`17`	`+\seealso{`
	`18`	`+Other themes: \code{\link{theme_bw}};`
	`19`	`+ \code{\link{theme_classic}}; \code{\link{theme_light}};`
	`20`	`+ \code{\link{theme_linedraw}}; \code{\link{theme_minimal}}`
	`21`	`+}`
`17`	`22`