Shorten names to viridis_c and viridis_d

Author: karawoo

NAMESPACE

@@ -379,8 +379,8 @@ export(scale_color_grey)
 export(scale_color_hue)
 export(scale_color_identity)
 export(scale_color_manual)
-export(scale_color_viridis_continuous)
-export(scale_color_viridis_discrete)
+export(scale_color_viridis_c)
+export(scale_color_viridis_d)
 export(scale_colour_brewer)
 export(scale_colour_continuous)
 export(scale_colour_date)
@@ -394,8 +394,8 @@ export(scale_colour_grey)
 export(scale_colour_hue)
 export(scale_colour_identity)
 export(scale_colour_manual)
-export(scale_colour_viridis_continuous)
-export(scale_colour_viridis_discrete)
+export(scale_colour_viridis_c)
+export(scale_colour_viridis_d)
 export(scale_fill_brewer)
 export(scale_fill_continuous)
 export(scale_fill_date)
@@ -409,8 +409,8 @@ export(scale_fill_grey)
 export(scale_fill_hue)
 export(scale_fill_identity)
 export(scale_fill_manual)
-export(scale_fill_viridis_continuous)
-export(scale_fill_viridis_discrete)
+export(scale_fill_viridis_c)
+export(scale_fill_viridis_d)
 export(scale_linetype)
 export(scale_linetype_continuous)
 export(scale_linetype_discrete)

R/scale-viridis.r

@@ -13,38 +13,37 @@
 #' @family colour scales
 #' @rdname scale_viridis
 #' @export
-scale_colour_viridis_discrete <- function(..., alpha = 1, begin = 0, end = 1,
-                                          direction = 1, option = "D") {
+scale_colour_viridis_d <- function(..., alpha = 1, begin = 0, end = 1,
+                                   direction = 1, option = "D") {
   discrete_scale(
     "colour",
-    "viridis_discrete",
+    "viridis_d",
     viridis_pal(alpha, begin, end, direction, option),
     ...
   )
 }
 
 #' @export
 #' @rdname scale_viridis
-scale_fill_viridis_discrete <- function(..., alpha = 1, begin = 0, end = 1,
-                                        direction = 1, option = "D") {
+scale_fill_viridis_d <- function(..., alpha = 1, begin = 0, end = 1,
+                                 direction = 1, option = "D") {
   discrete_scale(
     "fill",
-    "viridis_discrete",
+    "viridis_d",
     viridis_pal(alpha, begin, end, direction, option),
     ...
   )
 }
 
 #' @export
 #' @rdname scale_viridis
-scale_colour_viridis_continuous <- function(..., alpha = 1, begin = 0, end = 1,
-                                            direction = 1, option = "D",
-                                            values = NULL, space = "Lab",
-                                            na.value = "grey50",
-                                            guide = "colourbar") {
+scale_colour_viridis_c <- function(..., alpha = 1, begin = 0, end = 1,
+                                   direction = 1, option = "D", values = NULL,
+                                   space = "Lab", na.value = "grey50",
+                                   guide = "colourbar") {
   continuous_scale(
     "colour",
-    "viridis_continuous",
+    "viridis_c",
     gradient_n_pal(
       viridis_pal(alpha, begin, end, direction, option)(6),
       values,
@@ -57,14 +56,13 @@ scale_colour_viridis_continuous <- function(..., alpha = 1, begin = 0, end = 1,
 
 #' @export
 #' @rdname scale_viridis
-scale_fill_viridis_continuous <- function(..., alpha = 1, begin = 0, end = 1,
-                                          direction = 1, option = "D",
-                                          values = NULL, space = "Lab",
-                                          na.value = "grey50",
-                                          guide = "colourbar") {
+scale_fill_viridis_c <- function(..., alpha = 1, begin = 0, end = 1,
+                                 direction = 1, option = "D", values = NULL,
+                                 space = "Lab", na.value = "grey50",
+                                 guide = "colourbar") {
   continuous_scale(
     "fill",
-    "viridis_continuous",
+    "viridis_c",
     gradient_n_pal(
       viridis_pal(alpha, begin, end, direction, option)(6),
       values,

R/zxx.r

@@ -109,9 +109,9 @@ scale_color_manual <- scale_colour_manual
 #' @export
 #' @rdname scale_viridis
 #' @usage NULL
-scale_color_viridis_discrete <- scale_colour_viridis_discrete
+scale_color_viridis_d <- scale_colour_viridis_d
 
 #' @export
 #' @rdname scale_viridis
 #' @usage NULL
-scale_color_viridis_continuous <- scale_colour_viridis_continuous
+scale_color_viridis_c <- scale_colour_viridis_c