propagate throughout

Author: teunbrand

R/guide-legend.R

@@ -19,7 +19,7 @@
 #'   Arguments that apply to a single legend are respected, most of which have
 #'   the `legend`-prefix. Arguments that apply to combined legends
 #'   (the legend box) are ignored, including `legend.position`,
-#'   `legend.justification.*`, `legend.location` and `legend.box.*`.
+#'   `legend.just.*`, `legend.location` and `legend.box.*`.
 #' @param position A character string indicating where the legend should be
 #'   placed relative to the plot panels.
 #'   One of "top", "right", "bottom", "left", or "inside".
@@ -179,7 +179,7 @@ GuideLegend <- ggproto(
     key            = "legend.key",
     key_height     = "legend.key.height",
     key_width      = "legend.key.width",
-    key_just       = "legend.key.justification",
+    key_just       = "legend.key.just",
     text           = "legend.text",
     theme.title    = "legend.title",
     spacing_x      = "legend.key.spacing.x",

R/guides-.R

@@ -500,7 +500,7 @@ Guides <- ggproto(
     }
 
     # prepare the position of inside legends
-    default_inside_just <- calc_element("legend.justification.inside", theme)
+    default_inside_just <- calc_element("legend.just.inside", theme)
     default_inside_position <- calc_element("legend.position.inside", theme)
 
     groups <- data_frame0(
@@ -514,9 +514,9 @@ Guides <- ggproto(
     for (i in which(positions == "inside")) {
       # the actual inside position and justification can be set in each guide
       # by `theme` argument, here, we won't use `calc_element()` which will
-      # use inherits from `legend.justification` or `legend.position`, we only
+      # use inherits from `legend.just` or `legend.position`, we only
       # follow the inside elements from the guide theme
-      just <- params[[i]]$theme[["legend.justification.inside"]]
+      just <- params[[i]]$theme[["legend.just.inside"]]
       just <- valid.just(just %||% default_inside_just)
       coord <- params[[i]]$theme[["legend.position.inside"]]
       coord <- coord %||% default_inside_position %||% just
@@ -541,7 +541,7 @@ Guides <- ggproto(
       if (position == "inside") {
         adjust <- theme(
           legend.position.inside = groups$key$coords[[i]],
-          legend.justification.inside = groups$key$justs[[i]]
+          legend.just.inside = groups$key$justs[[i]]
         )
       }
       adjust <- add_theme(theme, adjust, "internal theme settings")
@@ -615,7 +615,7 @@ Guides <- ggproto(
     stretch_y <- any(unlist(lapply(heights, unitType)) == "null")
 
     # Global justification of the complete legend box
-    global_just <- paste0("legend.justification.", position)
+    global_just <- paste0("legend.just.", position)
     global_just <- valid.just(calc_element(global_just, theme))
 
     if (position == "inside") {

R/theme-defaults.R

@@ -218,7 +218,7 @@ theme_grey <- function(base_size = 11, base_family = "",
     legend.ticks.length = rel(0.2),
     legend.position =    "right",
     legend.direction =   NULL,
-    legend.justification = "center",
+    legend.just =        "center",
     legend.box =         NULL,
     legend.box.margin =  margin_auto(0),
     legend.box.background = element_blank(),
@@ -707,7 +707,7 @@ theme_test <- function(base_size = 11, base_family = "",
     legend.ticks.length = rel(0.2),
     legend.position =    "right",
     legend.direction =   NULL,
-    legend.justification = "center",
+    legend.just =        "center",
     legend.box =         NULL,
     legend.box.margin =  margin_auto(0, unit = "cm"),
     legend.box.background = element_blank(),

R/theme-sub.R

@@ -105,7 +105,7 @@ theme_sub_legend <- function(
   spacing, spacing.x, spacing.y,   margin,
   # Seys
   key, key.size, key.height, key.width, key.spacing, key.spacing.x,
-  key.spacing.y, key.justification,
+  key.spacing.y, key.just,
   # Settings
   byrow, position, direction, location, position.inside,
   # Justification

tests/testthat/_snaps/theme.md

@@ -150,6 +150,9 @@
       [17] "axis.minor.ticks.r"            "axis.ticks.length.theta"      
       [19] "axis.ticks.length.r"           "axis.minor.ticks.length.theta"
       [21] "axis.minor.ticks.length.r"     "axis.line.theta"              
-      [23] "axis.line.r"                   "complete"                     
-      [25] "validate"                     
+      [23] "axis.line.r"                   "legend.just"                  
+      [25] "legend.just.top"               "legend.just.bottom"           
+      [27] "legend.just.left"              "legend.just.right"            
+      [29] "legend.just.inside"            "complete"                     
+      [31] "validate"                     
 

tests/testthat/test-guide-legend.R

@@ -186,7 +186,7 @@ test_that("absent titles don't take up space", {
       legend.title = element_blank(),
       legend.margin = margin(),
       legend.position = "top",
-      legend.justification = "left",
+      legend.just = "left",
       legend.key = element_rect(colour = "black"),
       axis.line = element_line(colour = "black")
     )
@@ -221,7 +221,7 @@ test_that("legend.byrow works in `guide_legend()`", {
   expect_doppelganger("legend.byrow = TRUE", p)
 })
 
-test_that("legend.key.justification works as intended", {
+test_that("legend.key.just works as intended", {
 
   p <- ggplot(mtcars, aes(mpg, disp, colour = factor(cyl), size = drat)) +
     geom_point() +
@@ -231,7 +231,7 @@ test_that("legend.key.justification works as intended", {
     scale_colour_discrete(
       labels = c("one line", "up\nto\nfour\nlines", "up\nto\nfive\nwhole\nlines")
     ) +
-    theme(legend.key.justification = c(1, 0))
+    theme(legend.key.just = c(1, 0))
 
   expect_doppelganger("legend key justification", p)
 

tests/testthat/test-guides.R

@@ -274,13 +274,13 @@ test_that("guides are positioned correctly", {
     p2 + theme(legend.position.inside = c(0.5, 0.5))
   )
   expect_doppelganger("legend inside plot, bottom left",
-    p2 + theme(legend.justification = c(0,0), legend.position.inside = c(0,0))
+    p2 + theme(legend.just = c(0,0), legend.position.inside = c(0,0))
   )
   expect_doppelganger("legend inside plot, top right",
-    p2 + theme(legend.justification = c(1,1), legend.position.inside = c(1,1))
+    p2 + theme(legend.just = c(1,1), legend.position.inside = c(1,1))
   )
   expect_doppelganger("legend inside plot, bottom left of legend at center",
-    p2 + theme(legend.justification = c(0,0), legend.position.inside = c(0.5,0.5))
+    p2 + theme(legend.just = c(0,0), legend.position.inside = c(0.5,0.5))
   )
   expect_doppelganger("legend inside plot, multiple positions",
     p2 +
@@ -289,14 +289,14 @@ test_that("guides are positioned correctly", {
               position = "inside",
               theme = theme(
                 legend.position.inside = c(0, 1),
-                legend.justification.inside = c(0, 1)
+                legend.just.inside = c(0, 1)
               )
           ),
           fill = guide_legend(
               position = "inside",
               theme = theme(
                 legend.position.inside = c(1, 0),
-                legend.justification.inside = c(1, 0)
+                legend.just.inside = c(1, 0)
               )
           )
       )

tests/testthat/test-theme.R

@@ -1026,11 +1026,11 @@ test_that("Legends can on all sides of the plot with custom justification", {
     ) +
     theme_test() +
     theme(
-      legend.justification.top    = "left",
-      legend.justification.bottom = c(1, 0),
-      legend.justification.left   = c(0, 1),
-      legend.justification.right  = "bottom",
-      legend.justification.inside = c(0.75, 0.75),
+      legend.just.top    = "left",
+      legend.just.bottom = c(1, 0),
+      legend.just.left   = c(0, 1),
+      legend.just.right  = "bottom",
+      legend.just.inside = c(0.75, 0.75),
       legend.location = "plot"
     )