Merge branch 'master' into feature/839-facet-margin-2

Author: Kirill Müller

NEWS

@@ -10,6 +10,9 @@ ggplot2 0.9.3.1.99
 * theme: new theme settings panel.margin.x and panel.margin.y (units) allow
   specifying horizontal and vertical gap between panels in facetted plots (for
   both grid and wrap).  (Kirill Müller. Fixes #839)
+* `aes()` no more treats variables like `a..x..b as a calculated aesthetic.
+  (@krlmlr, #834.)
+
 * Add `"none"` to documentation of `theme()` for parameter `legend.position`.
   (@krlmlr, #829)
 

R/labels.r

@@ -65,7 +65,7 @@ ggtitle <- function(label) {
 # Convert aesthetic mapping into text labels
 make_labels <- function(mapping) {
   remove_dots <- function(x) {
-    gsub("\\.\\.([a-zA-z._]+)\\.\\.", "\\1", x)
+    gsub(.calculated_aes_regex, "\\1", x)
   }
 
   lapply(mapping, function(x) remove_dots(deparse(x)))

R/layer.r

@@ -258,17 +258,19 @@ Layer <- proto(expr = {
 #' @export
 layer <- Layer$new
 
+# Regex to determine if an identifier refers to a calculated aesthetic
+.calculated_aes_regex <- "^\\.\\.([a-zA-z._]+)\\.\\.$"
+
 # Determine if aesthetic is calculated
 is_calculated_aes <- function(aesthetics) {
-  match <- "\\.\\.([a-zA-z._]+)\\.\\."
   stats <- rep(FALSE, length(aesthetics))
-  grepl(match, sapply(aesthetics, deparse))
+  grepl(.calculated_aes_regex, sapply(aesthetics, deparse))
 }
 
 # Strip dots from expressions
 strip_dots <- function(aesthetics) {
-  match <- "\\.\\.([a-zA-z._]+)\\.\\."
   strings <- lapply(aesthetics, deparse)
-  strings <- lapply(strings, gsub, pattern = match, replacement = "\\1")
+  strings <- lapply(strings, gsub, pattern = .calculated_aes_regex,
+                    replacement = "\\1")
   lapply(strings, function(x) parse(text = x)[[1]])
 }

inst/tests/test-layer.r

@@ -0,0 +1,7 @@
+context("Layer")
+
+test_that("Correctly decide if a variable is a calculated aesthetic", {
+  expect_true(is_calculated_aes(aes(x=..density..)))
+  expect_false(is_calculated_aes(aes(x=a..x..b)))
+  expect_equal(as.character(strip_dots(aes(x=..density..))), "density")
+})