Avoid more non-standard evaluation

Author: hadley

R/facet-layout.r

@@ -32,7 +32,9 @@ layout_grid <- function(data, rows = NULL, cols = NULL, margins = NULL, drop = T
   cols <- if (is.null(names(cols))) 1L else id(base[names(cols)], drop = TRUE)
 
   panels <- data.frame(PANEL = panel, ROW = rows, COL = cols, base)
-  arrange(panels, PANEL)
+  panels <- panels[order(panels$PANEL), ]
+  rownames(panels) <- NULL
+  panels
 }
 
 # Layout out panels in a 1d ribbon.
@@ -59,7 +61,9 @@ layout_wrap <- function(data, vars = NULL, nrow = NULL, ncol = NULL, as.table =
   layout$COL <- as.integer((id - 1L) %% dims[2] + 1L)
 
   panels <- cbind(layout, unrowname(base))
-  panels[order(panels$PANEL), ]
+  panels <- panels[order(panels$PANEL), ]
+  rownames(panels) <- NULL
+  panels
 }
 
 layout_null <- function(data) {

R/facet-locate.r

@@ -47,7 +47,7 @@ locate_grid <- function(data, panels, rows = NULL, cols = NULL, margins = FALSE)
     data$PANEL <- panels$PANEL[match(keys$x, keys$y)]
   }
 
-  arrange(data, PANEL)
+  data[order(data$PANEL), , drop = FALSE]
 }
 
 locate_wrap <- function(data, panels, vars) {

R/guide-legend.r

@@ -297,7 +297,8 @@ guide_gengrob.legend <- function(guide, theme) {
 
   # default setting
   label.position <- guide$label.position %||% "right"
-  if (!label.position %in% c("top", "bottom", "left", "right")) stop("label position \"", label.position, "\" is invalid")
+  if (!label.position %in% c("top", "bottom", "left", "right"))
+    stop("label position \"", label.position, "\" is invalid")
 
   nbreak <- nrow(guide$key)
 

R/plot-render.r

@@ -32,8 +32,15 @@ ggplot_gtable <- function(data) {
 
   # helper function return the position of panels in plot_table
   find_panel <- function(table) {
-    summarise(subset(table$layout, grepl("^panel", name)),
-      t = min(t), r = max(r), b = max(b), l = min(l))
+    layout <- table$layout
+    panels <- layout[grepl("^panel", layout$name), , drop = FALSE]
+
+    data.frame(
+      t = min(panels$t),
+      r = max(panels$r),
+      b = max(panels$b),
+      l = min(panels$l)
+    )
   }
 
   # List by layer, list by panel
@@ -137,7 +144,8 @@ ggplot_gtable <- function(data) {
   title_height <- grobHeight(title) +
     if (is.null(plot$labels$title)) unit(0, "lines") else unit(0.5, "lines")
 
-  pans <- subset(plot_table$layout, grepl("^panel", name))
+  pans <- plot_table$layout[grepl("^panel", plot_table$layout$name), ,
+    drop = FALSE]
 
   plot_table <- gtable_add_rows(plot_table, title_height, pos = 0)
   plot_table <- gtable_add_grob(plot_table, title, name = "title",

R/stat-summary.r

@@ -157,8 +157,8 @@ StatSummary <- proto(Stat, {
 # @param other arguments passed on to summary function
 # @keyword internal
 summarise_by_x <- function(data, summary, ...) {
-  summary <- ddply(data, .(group, x), summary, ...)
-  unique <- ddply(data, .(group, x), uniquecols)
+  summary <- ddply(data, c("group", "x"), summary, ...)
+  unique <- ddply(data, c("group", "x"), uniquecols)
   unique$y <- NULL
 
   merge(summary, unique, by = c("x", "group"))

R/stat-vline.r

@@ -126,7 +126,7 @@ compute_intercept <- function(data, intercept, var = "x") {
       data[[ivar]] <- f(data[[var]])
       data
     }
-    data <- ddply(data, .(group), trans)
+    data <- ddply(data, "group", trans)
   } else {
     stop("Invalid intercept type: should be a numeric vector, a function",
          ", or a name of a function", call. = FALSE)

R/utilities-table.r

@@ -14,7 +14,7 @@ compute_grob_dimensions <- function(grob_layout, dims) {
     return(unit(1, "null"))
   }
 
-  grob_layout <- subset(grob_layout, type %in% names(dims))
+  grob_layout <- grob_layout[grob_layout$type %in% names(dims), , drop = FALSE]
 
   dims <- unique(Map(function(type, pos) {
     type_width <- dims[[type]]