Add scale_linetype_discrete

Author: hadley

NEWS

@@ -29,8 +29,8 @@ ggplot2 0.8.5 (2009-XX-XX) ----------------------------------------
   instead of the previous behaviour where scales where added as layers were
   added - this could cause problems if you layer modified the plot.
   (Implements #28)
-* scale_shape_discrete and scale_size_continuous added to scales to match 
-  naming convention of all other scales (Fixes #47)
+* scale_shape_discrete, scale_size_continuous and scale_linetype_discrete 
+  added to scales to match naming convention of all other scales (Fixes #47)
 * scale_colour_gradient, scale_colour_gradient2 & scale_colour_gradientn now
   have formatter argument to match scale_continuous
 * legends will only merge if both the title and all labels are the same.

R/scale-linetype.r

@@ -1,7 +1,8 @@
-ScaleLinetype <- proto(ScaleDiscrete, expr={
+ScaleLinetypeDiscrete <- proto(ScaleDiscrete, expr={
   doc <- TRUE
   common <- NULL
   .input <- .output <- "linetype"
+  alias <- "scale_linetype"
 
   output_set <- function(.) c("solid", "22", "42", "44", "13", "1343", "73", "2262", "12223242", "F282", "F4448444", "224282F2", "F1")[seq_along(.$input_set())]
   max_levels <- function(.) 12
@@ -10,7 +11,7 @@ ScaleLinetype <- proto(ScaleDiscrete, expr={
 
   # Documentation -----------------------------------------------
 
-  objname <- "linetype"
+  objname <- "linetype_discrete"
   desc <- "Scale for line patterns"
 
   icon <- function(.) {
@@ -32,7 +33,7 @@ ScaleLinetype <- proto(ScaleDiscrete, expr={
     qplot(date, value, data=ecm, geom="line", linetype=variable)
     qplot(date, value, data=ecm, geom="line", colour=variable)
 
-    # See scale_manual for more flexibilit
+    # See scale_manual for more flexibility
   }
 
 })

R/xxx.r

@@ -65,6 +65,7 @@ scale_fill_hue <- ScaleHue$build_accessor(list(variable = "\"fill\""))
 scale_fill_identity <- ScaleIdentity$build_accessor(list(variable = "\"fill\""))
 scale_fill_manual <- ScaleManual$build_accessor(list(variable = "\"fill\""))
 scale_linetype <- ScaleLinetype$build_accessor()
+scale_linetype_discrete <- ScaleLinetypeDiscrete$build_accessor()
 scale_linetype_identity <- ScaleIdentity$build_accessor(list(variable = "\"linetype\""))
 scale_linetype_manual <- ScaleManual$build_accessor(list(variable = "\"linetype\""))
 scale_shape <- ScaleShape$build_accessor()