Merge branch 'vjust' of github.com:krlmlr/ggplot2 into krlmlr-vjust

Author: hadley

NEWS

@@ -45,6 +45,12 @@ 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)
+* Fix vertical justification for rotated text.  This will change the appearance
+  of plots that use textual elements that are rotated by 90° or 270° and have a
+  `vjust` parameter other than the default 0.5; the interpretation of `vjust`
+  and `hjust` is now the same for both rotated and non-rotated text elements
+  (0 = top/left, 1 = bottom/right, 0.5 = centered).  (@krlmlr, #883)
+
 * `aes()` no more treats variables like `a..x..b as a calculated aesthetic.
   (@krlmlr, #834.)
 

R/theme-elements.r

@@ -196,15 +196,15 @@ element_grob.element_text <- function(element, label = "", x = NULL, y = NULL,
   angle <- angle %% 360
 
   if (angle == 90) {
-    xp <- vj
+    xp <- 1 - vj
     yp <- hj
   } else if (angle == 180) {
     xp <- 1 - hj
-    yp <- vj
+    yp <- 1 - vj
   } else if (angle == 270) {
     xp <- vj
     yp <- 1 - hj
-  }else {
+  } else {
     xp <- hj
     yp <- vj
   }