Merge branch 'master' into vjust

Author: Kirill Müller

.travis.yml

@@ -13,10 +13,26 @@ install:
 
 script: ./travis-tool.sh run_tests
 
+after_success:
+  - ./travis-tool.sh install_github hadley/staticdocs
+  - R -e "staticdocs::build_site()"
+
 on_failure:
   - ./travis-tool.sh dump_logs
 
 notifications:
   email:
     on_success: change
     on_failure: change
+
+deploy:
+  edge: true
+
+  provider: s3
+  access_key_id: AKIAJDM6KGIZ6LSGAK4Q
+  secret_access_key:
+    secure: "r3vSpvVNcpvIcjWFyk+GhYG55iuhfmy3mwuQHQS2EqjT3Skd3mOojnZuRIqy60XXElK5/nfa3qt7KH0GCSd4Is28cqPwh+1PtQ0ZVXfeKefAk2whTPDI4P+rgOA+srUxZraLALap9QGmvlzJyXbqBCRdDmXUjtXKi2ONE9PrUk4="
+  bucket: docs.ggplot2.org
+  skip_cleanup: true
+  local-dir: inst/web
+  upload-dir: dev

NEWS

@@ -9,6 +9,12 @@ ggplot2 0.9.3.1.99
 
 * Fix vertical justification for rotated text. (@krlmlr, #883)
 
+* `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)
+
 
 ggplot2 0.9.3.1
 ----------------------------------------------------------------

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]])
 }

R/theme.r

@@ -114,8 +114,8 @@ print.theme <- function(x, ...) str(x)
 #'                    (\code{element_text}; inherits from \code{title}) \cr
 #'   legend.title.align \tab alignment of legend title
 #'                    (number from 0 (left) to 1 (right)) \cr
-#'   legend.position  \tab the position of legends.
-#'                    ("left", "right", "bottom", "top", or two-element
+#'   legend.position  \tab the position of legends
+#'                    ("none", "left", "right", "bottom", "top", or two-element
 #'                      numeric vector) \cr
 #'   legend.direction \tab layout of items in legends
 #'                    ("horizontal" or "vertical") \cr

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")
+})

man/theme.Rd

@@ -81,17 +81,17 @@ last example below.
   legend.title \tab title of legend (\code{element_text};
   inherits from \code{title}) \cr legend.title.align \tab
   alignment of legend title (number from 0 (left) to 1
-  (right)) \cr legend.position \tab the position of
-  legends.  ("left", "right", "bottom", "top", or
-  two-element numeric vector) \cr legend.direction \tab
-  layout of items in legends ("horizontal" or "vertical")
-  \cr legend.justification \tab anchor point for
-  positioning legend inside plot ("center" or two-element
-  numeric vector) \cr legend.box \tab arrangement of
-  multiple legends ("horizontal" or "vertical") \cr
-  legend.box.just \tab justification of each legend within
-  the overall bounding box, when there are multiple legends
-  ("top", "bottom", "left", or "right")\cr
+  (right)) \cr legend.position \tab the position of legends
+  ("none", "left", "right", "bottom", "top", or two-element
+  numeric vector) \cr legend.direction \tab layout of items
+  in legends ("horizontal" or "vertical") \cr
+  legend.justification \tab anchor point for positioning
+  legend inside plot ("center" or two-element numeric
+  vector) \cr legend.box \tab arrangement of multiple
+  legends ("horizontal" or "vertical") \cr legend.box.just
+  \tab justification of each legend within the overall
+  bounding box, when there are multiple legends ("top",
+  "bottom", "left", or "right")\cr
 
   panel.background \tab background of plotting area, drawn
   underneath plot (\code{element_rect}; inherits from