Revert "proof-of-principle hack"

This reverts commit 45920fb.

Author: baptiste

R/geom-.r

@@ -67,16 +67,13 @@ Geom <- ggproto("Geom",
     )
   },
 
-  draw_layer = function(self, data, params, layout, coord, th) {
-    print("here")
+  draw_layer = function(self, data, params, layout, coord) {
     if (empty(data)) {
       n <- if (is.factor(data$PANEL)) nlevels(data$PANEL) else 1L
       return(rep(list(zeroGrob()), n))
     }
 
     # Trim off extra parameters
-    if(is.complex(data$colour)) data$colour <- th$plot.title$colour
-
     params <- params[intersect(names(params), self$parameters())]
 
     args <- c(list(quote(data), quote(panel_scales), quote(coord)), params)

R/geom-text.r

@@ -164,7 +164,7 @@ GeomText <- ggproto("GeomText", Geom,
   required_aes = c("x", "y", "label"),
 
   default_aes = aes(
-    colour = 1i, size = 3.88, angle = 0, hjust = 0.5,
+    colour = "black", size = 3.88, angle = 0, hjust = 0.5,
     vjust = 0.5, alpha = NA, family = "", fontface = 1, lineheight = 1.2
   ),
 

R/layer.r

@@ -301,15 +301,14 @@ Layer <- ggproto("Layer", NULL,
     self$stat$finish_layer(data, self$stat_params)
   },
 
-  draw_geom = function(self, data, layout, coord, th) {
+  draw_geom = function(self, data, layout, coord) {
     if (empty(data)) {
       n <- nrow(layout$panel_layout)
       return(rep(list(zeroGrob()), n))
     }
 
     data <- self$geom$handle_na(data, self$geom_params)
-    print("damn you")
-    self$geom$draw_layer(data, self$geom_params, layout, coord, th)
+    self$geom$draw_layer(data, self$geom_params, layout, coord)
   }
 )
 

R/plot-build.r

@@ -147,7 +147,7 @@ ggplot_gtable <- function(data) {
   data <- data$data
   theme <- plot_theme(plot)
 
-  geom_grobs <- Map(function(l, d) l$draw_geom(d, layout, plot$coordinates, th = theme),
+  geom_grobs <- Map(function(l, d) l$draw_geom(d, layout, plot$coordinates),
     plot$layers, data)
 
   plot_table <- layout$render(geom_grobs, data, plot$coordinates, theme, plot$labels)